From 607b426e269b17f4ad32dca9c612c4a9f8541766 Mon Sep 17 00:00:00 2001
From: Gammut
Date: Sun, 9 Jul 2023 11:35:32 -0500
Subject: Refactor queries for ecma based languages (#7207)

---
 runtime/queries/jsx/highlights.scm  | 38 ++-----------------------------------
 runtime/queries/jsx/indents.scm     | 10 ++--------
 runtime/queries/jsx/injections.scm  |  4 +++-
 runtime/queries/jsx/locals.scm      |  4 +++-
 runtime/queries/jsx/tags.scm        |  3 +++
 runtime/queries/jsx/textobjects.scm |  4 +++-
 6 files changed, 16 insertions(+), 47 deletions(-)
 create mode 100644 runtime/queries/jsx/tags.scm

(limited to 'runtime/queries/jsx')

diff --git a/runtime/queries/jsx/highlights.scm b/runtime/queries/jsx/highlights.scm
index a1eb2d0e..eb2b1b1a 100644
--- a/runtime/queries/jsx/highlights.scm
+++ b/runtime/queries/jsx/highlights.scm
@@ -1,37 +1,3 @@
-; Highlight component names differently
-(jsx_opening_element ((identifier) @constructor
- (#match? @constructor "^[A-Z]")))
+; See runtime/queries/ecma/README.md for more info.
 
-; Handle the dot operator effectively - <My.Component>
-(jsx_opening_element ((nested_identifier (identifier) @tag (identifier) @constructor)))
-
-; Highlight brackets differently
-(jsx_opening_element ["<" ">"] @punctuation.bracket)
-
-(jsx_closing_element ((identifier) @constructor
- (#match? @constructor "^[A-Z]")))
-
-; Handle the dot operator effectively - </My.Component>
-(jsx_closing_element ((nested_identifier (identifier) @tag (identifier) @constructor)))
-
-; Highlight brackets differently
-(jsx_closing_element ["<" "/" ">"] @punctuation.bracket)
-
-(jsx_self_closing_element ((identifier) @constructor
- (#match? @constructor "^[A-Z]")))
-
-; Handle the dot operator effectively - <My.Component />
-(jsx_self_closing_element ((nested_identifier (identifier) @tag (identifier) @constructor)))
-
-; Highlight brackets differently
-(jsx_self_closing_element ["<" "/" ">"] @punctuation.bracket)
-
-; Handle attribute delimiter
-(jsx_attribute "=" @punctuation.delimiter)
-
-(jsx_opening_element (identifier) @tag)
-(jsx_closing_element (identifier) @tag)
-(jsx_self_closing_element (identifier) @tag)
-(jsx_attribute (property_identifier) @variable.other.member)
-
-; inherits: ecma
+; inherits: _jsx,_javascript,ecma
diff --git a/runtime/queries/jsx/indents.scm b/runtime/queries/jsx/indents.scm
index 6cb82545..eb2b1b1a 100644
--- a/runtime/queries/jsx/indents.scm
+++ b/runtime/queries/jsx/indents.scm
@@ -1,9 +1,3 @@
-[
-  (jsx_fragment)
-  (jsx_element)
-  (jsx_self_closing_element)
-] @indent
+; See runtime/queries/ecma/README.md for more info.
 
-(parenthesized_expression) @indent
-
-; inherits: ecma
+; inherits: _jsx,_javascript,ecma
diff --git a/runtime/queries/jsx/injections.scm b/runtime/queries/jsx/injections.scm
index 04328f09..eb2b1b1a 100644
--- a/runtime/queries/jsx/injections.scm
+++ b/runtime/queries/jsx/injections.scm
@@ -1 +1,3 @@
-; inherits: ecma
+; See runtime/queries/ecma/README.md for more info.
+
+; inherits: _jsx,_javascript,ecma
diff --git a/runtime/queries/jsx/locals.scm b/runtime/queries/jsx/locals.scm
index 04328f09..eb2b1b1a 100644
--- a/runtime/queries/jsx/locals.scm
+++ b/runtime/queries/jsx/locals.scm
@@ -1 +1,3 @@
-; inherits: ecma
+; See runtime/queries/ecma/README.md for more info.
+
+; inherits: _jsx,_javascript,ecma
diff --git a/runtime/queries/jsx/tags.scm b/runtime/queries/jsx/tags.scm
new file mode 100644
index 00000000..eb2b1b1a
--- /dev/null
+++ b/runtime/queries/jsx/tags.scm
@@ -0,0 +1,3 @@
+; See runtime/queries/ecma/README.md for more info.
+
+; inherits: _jsx,_javascript,ecma
diff --git a/runtime/queries/jsx/textobjects.scm b/runtime/queries/jsx/textobjects.scm
index 04328f09..eb2b1b1a 100644
--- a/runtime/queries/jsx/textobjects.scm
+++ b/runtime/queries/jsx/textobjects.scm
@@ -1 +1,3 @@
-; inherits: ecma
+; See runtime/queries/ecma/README.md for more info.
+
+; inherits: _jsx,_javascript,ecma
-- 
cgit v1.2.3-70-g09d2