move js to ecma to avoid jsx problems

nvim-treesitter · Oct 27, 2022 · 024f5fb · 024f5fb
1 parent 53d55ba
commit 024f5fb
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 74 deletions.
diff --git a/queries/ecma/injections.scm b/queries/ecma/injections.scm
@@ -0,0 +1,31 @@
+;; extends
+((decorator
+  (call_expression
+    function: ((identifier) @_name
+               (#eq? @_name "Component"))
+    arguments: (arguments
+                 (object
+                   (pair
+                     key: ((property_identifier) @_prop
+                           (#eq? @_prop "template"))
+                     value: ((template_string) @html (#offset! @html 0 1 0 -1))
+                   )
+               ))
+  )
+))
+
+((decorator
+  (call_expression
+    function: ((identifier) @_name
+               (#eq? @_name "Component"))
+    arguments: (arguments
+                 (object
+                   (pair
+                     key: ((property_identifier) @_prop
+                           (#eq? @_prop "styles"))
+                     value: (array
+                              ((template_string) @css (#offset! @css 0 1 0 -1)))
+                   )
+               ))
+  )
+))
diff --git a/queries/html/highlights.scm b/queries/html/highlights.scm
@@ -1,11 +1,12 @@
+;; extends
 (attribute
   ((attribute_name) @_name
-   (#lua-match? @_name "%[.*%]"))) @keyword
+   (#lua-match? @_name "%[.*%]")) @keyword)
 
 (attribute
   ((attribute_name) @_name
-   (#lua-match? @_name "%(.*%)"))) @keyword
+   (#lua-match? @_name "%(.*%)")) @keyword)
 
 (attribute
   ((attribute_name) @_name
-   (#lua-match? @_name "^%*.*"))) @keyword
+   (#lua-match? @_name "^%*.*")) @keyword)
diff --git a/queries/html/injections.scm b/queries/html/injections.scm
@@ -1,26 +1,18 @@
-; [state]="myState$ | async"
+;; extends
 (attribute
   ((attribute_name) @_name
-   (#lua-match? @_name "%[.*%]"))
+   (#lua-match? @_name "[%[%(].*[%)%]]"))
   (quoted_attribute_value
     (attribute_value) @angular))
 
-; (myEvent)="handle($event)"
 (attribute
   ((attribute_name) @_name
-   (#lua-match? @_name "%(.*%)"))
+   (#lua-match? @_name "^%*"))
   (quoted_attribute_value
     ((attribute_value) @angular)))
 
-; *ngIf="blorgy"
-(attribute
-  ((attribute_name) @_name
-   (#lua-match? @_name "^%*.*"))
-  (quoted_attribute_value
-    ((attribute_value) @angular)))
-
-; {{ someBinding }}
 (element
   ((text) @angular
    (#lua-match? @angular "%{%{.*%}%}")
    (#offset! @angular 0 2 0 -2)))
+
diff --git a/queries/javascript/injections.scm b/queries/javascript/injections.scm
diff --git a/queries/typescript/injections.scm b/queries/typescript/injections.scm