Revert "Comment: use `@combined` to create just one tree per buffer (#1252)"

This reverts commit 4a7a713c527f57c355bc817f16fc6d955b8cce9b.

42 files changed, 41 insertions, 46 deletions

diff --git a/queries/bash/injections.scm b/queries/bash/injections.scm
index 4ff116fc..4bb7d675 100644
--- a/queries/bash/injections.scm
+++ b/queries/bash/injections.scm
@@ -1 +1 @@
-(comment) @comment @combined
+(comment) @comment
diff --git a/queries/c/injections.scm b/queries/c/injections.scm
index 97621fcb..afeb068a 100644
--- a/queries/c/injections.scm
+++ b/queries/c/injections.scm
@@ -1,3 +1,3 @@
 (preproc_arg) @c
 
-(comment) @comment @combined
+(comment) @comment
diff --git a/queries/c_sharp/injections.scm b/queries/c_sharp/injections.scm
index 4ff116fc..4bb7d675 100644
--- a/queries/c_sharp/injections.scm
+++ b/queries/c_sharp/injections.scm
@@ -1 +1 @@
-(comment) @comment @combined
+(comment) @comment
diff --git a/queries/clojure/injections.scm b/queries/clojure/injections.scm
index 4ff116fc..4bb7d675 100644
--- a/queries/clojure/injections.scm
+++ b/queries/clojure/injections.scm
@@ -1 +1 @@
-(comment) @comment @combined
+(comment) @comment
diff --git a/queries/cpp/injections.scm b/queries/cpp/injections.scm
index 9a8a0bf3..13842120 100644
--- a/queries/cpp/injections.scm
+++ b/queries/cpp/injections.scm
@@ -1,3 +1,3 @@
 (preproc_arg) @cpp
 
-(comment) @comment @combined
+(comment) @comment
diff --git a/queries/css/injections.scm b/queries/css/injections.scm
index 4ff116fc..4bb7d675 100644
--- a/queries/css/injections.scm
+++ b/queries/css/injections.scm
@@ -1 +1 @@
-(comment) @comment @combined
+(comment) @comment
diff --git a/queries/dart/injections.scm b/queries/dart/injections.scm
index 4ff116fc..4bb7d675 100644
--- a/queries/dart/injections.scm
+++ b/queries/dart/injections.scm
@@ -1 +1 @@
-(comment) @comment @combined
+(comment) @comment
diff --git a/queries/devicetree/injections.scm b/queries/devicetree/injections.scm
index 4ff116fc..4bb7d675 100644
--- a/queries/devicetree/injections.scm
+++ b/queries/devicetree/injections.scm
@@ -1 +1 @@
-(comment) @comment @combined
+(comment) @comment
diff --git a/queries/ecma/injections.scm b/queries/ecma/injections.scm
index 1552efc9..0816b197 100644
--- a/queries/ecma/injections.scm
+++ b/queries/ecma/injections.scm
@@ -1,5 +1,5 @@
-(comment) @jsdoc @combined
-(comment) @comment @combined
+(comment) @jsdoc
+(comment) @comment
 
 ((regex_pattern) @regex)
 
diff --git a/queries/fennel/injections.scm b/queries/fennel/injections.scm
index 4ff116fc..4bb7d675 100644
--- a/queries/fennel/injections.scm
+++ b/queries/fennel/injections.scm
@@ -1 +1 @@
-(comment) @comment @combined
+(comment) @comment
diff --git a/queries/gdscript/injections.scm b/queries/gdscript/injections.scm
index 4ff116fc..4bb7d675 100644
--- a/queries/gdscript/injections.scm
+++ b/queries/gdscript/injections.scm
@@ -1 +1 @@
-(comment) @comment @combined
+(comment) @comment
diff --git a/queries/go/injections.scm b/queries/go/injections.scm
index 4ff116fc..4bb7d675 100644
--- a/queries/go/injections.scm
+++ b/queries/go/injections.scm
@@ -1 +1 @@
-(comment) @comment @combined
+(comment) @comment
diff --git a/queries/graphql/injections.scm b/queries/graphql/injections.scm
index 4ff116fc..4bb7d675 100644
--- a/queries/graphql/injections.scm
+++ b/queries/graphql/injections.scm
@@ -1 +1 @@
-(comment) @comment @combined
+(comment) @comment
diff --git a/queries/html/injections.scm b/queries/html/injections.scm
index 101e5941..68243119 100644
--- a/queries/html/injections.scm
+++ b/queries/html/injections.scm
@@ -9,4 +9,4 @@
 ((script_element
   (raw_text) @javascript))
 
-(comment) @comment @combined
+(comment) @comment
diff --git a/queries/java/injections.scm b/queries/java/injections.scm
index 4ff116fc..4bb7d675 100644
--- a/queries/java/injections.scm
+++ b/queries/java/injections.scm
@@ -1 +1 @@
-(comment) @comment @combined
+(comment) @comment
diff --git a/queries/jsonc/injections.scm b/queries/jsonc/injections.scm
index 4ff116fc..4bb7d675 100644
--- a/queries/jsonc/injections.scm
+++ b/queries/jsonc/injections.scm
@@ -1 +1 @@
-(comment) @comment @combined
+(comment) @comment
diff --git a/queries/julia/injections.scm b/queries/julia/injections.scm
index fee6c7de..5ae30dfa 100644
--- a/queries/julia/injections.scm
+++ b/queries/julia/injections.scm
@@ -1,4 +1,4 @@
 ((triple_string) @markdown
   (#offset! @markdown 0 3 0 -3))
 
-(comment) @comment @combined
+(comment) @comment
diff --git a/queries/kotlin/injections.scm b/queries/kotlin/injections.scm
index 4ff116fc..4bb7d675 100644
--- a/queries/kotlin/injections.scm
+++ b/queries/kotlin/injections.scm
@@ -1 +1 @@
-(comment) @comment @combined
+(comment) @comment
diff --git a/queries/ledger/injections.scm b/queries/ledger/injections.scm
index 4ff116fc..4bb7d675 100644
--- a/queries/ledger/injections.scm
+++ b/queries/ledger/injections.scm
@@ -1 +1 @@
-(comment) @comment @combined
+(comment) @comment
diff --git a/queries/lua/injections.scm b/queries/lua/injections.scm
index 196204d6..7bca11bb 100644
--- a/queries/lua/injections.scm
+++ b/queries/lua/injections.scm
@@ -9,4 +9,4 @@
   (#eq? @_cdef_identifier "cdef")
 )
 
-(comment) @comment @combined
+(comment) @comment
diff --git a/queries/nix/injections.scm b/queries/nix/injections.scm
index 4ff116fc..4bb7d675 100644
--- a/queries/nix/injections.scm
+++ b/queries/nix/injections.scm
@@ -1 +1 @@
-(comment) @comment @combined
+(comment) @comment
diff --git a/queries/ocaml/injections.scm b/queries/ocaml/injections.scm
index 4ff116fc..4bb7d675 100644
--- a/queries/ocaml/injections.scm
+++ b/queries/ocaml/injections.scm
@@ -1 +1 @@
-(comment) @comment @combined
+(comment) @comment
diff --git a/queries/ocamllex/injections.scm b/queries/ocamllex/injections.scm
index 2e47febf..337d8073 100644
--- a/queries/ocamllex/injections.scm
+++ b/queries/ocamllex/injections.scm
@@ -1,3 +1,3 @@
 (ocaml) @ocaml
 
-(comment) @comment @combined
+(comment) @comment
diff --git a/queries/php/injections.scm b/queries/php/injections.scm
index c7f97cac..8683d6ce 100644
--- a/queries/php/injections.scm
+++ b/queries/php/injections.scm
@@ -1,3 +1,3 @@
 (text) @html
 
-(comment) @comment @combined
+(comment) @comment
diff --git a/queries/python/injections.scm b/queries/python/injections.scm
index fb939cc0..197e725e 100644
--- a/queries/python/injections.scm
+++ b/queries/python/injections.scm
@@ -23,4 +23,4 @@
 (((expression_statement (assignment)) . (expression_statement (string) @rst))
  (#offset! @rst 0 3 0 -3))
 
-(comment) @comment @combined
+(comment) @comment
diff --git a/queries/ql/injections.scm b/queries/ql/injections.scm
index 74976e90..88d49d42 100644
--- a/queries/ql/injections.scm
+++ b/queries/ql/injections.scm
@@ -2,4 +2,4 @@
   (line_comment)
   (block_comment)
   (qldoc)
-] @comment @combined
+] @comment
diff --git a/queries/query/injections.scm b/queries/query/injections.scm
index 607f0693..95ce2978 100644
--- a/queries/query/injections.scm
+++ b/queries/query/injections.scm
@@ -3,4 +3,4 @@
   parameters: (parameters (string) @regex))
  (#match? @_name "^#?(not-)?(match|vim-match|lua-match)$"))
 
-(comment) @comment @combined
+(comment) @comment
diff --git a/queries/rst/injections.scm b/queries/rst/injections.scm
index 84d9aab2..6d62550a 100644
--- a/queries/rst/injections.scm
+++ b/queries/rst/injections.scm
@@ -59,4 +59,4 @@
   (role) @_role)
  (#eq? @_role ":math:"))
 
-(comment) @comment @combined
+(comment) @comment
diff --git a/queries/ruby/injections.scm b/queries/ruby/injections.scm
index 4ff116fc..4bb7d675 100644
--- a/queries/ruby/injections.scm
+++ b/queries/ruby/injections.scm
@@ -1 +1 @@
-(comment) @comment @combined
+(comment) @comment
diff --git a/queries/rust/injections.scm b/queries/rust/injections.scm
index 27070f6e..b1e90e09 100644
--- a/queries/rust/injections.scm
+++ b/queries/rust/injections.scm
@@ -9,4 +9,4 @@
 [
   (line_comment)
   (block_comment)
-] @comment @combined
+] @comment
diff --git a/queries/scss/highlights.scm b/queries/scss/highlights.scm
index fcb6ecc3..7dc780a8 100644
--- a/queries/scss/highlights.scm
+++ b/queries/scss/highlights.scm
@@ -37,5 +37,3 @@
 ] @punctuation.bracket
 
 (include_statement (identifier) @function)
-
-(single_line_comment) @comment
diff --git a/queries/scss/injections.scm b/queries/scss/injections.scm
deleted file mode 100644
index 51c1cf7b..00000000
--- a/queries/scss/injections.scm
+++ /dev/null
@@ -1,3 +0,0 @@
-; inherits: css
-
-(single_line_comment) @comment @combined
diff --git a/queries/sparql/injections.scm b/queries/sparql/injections.scm
index 4ff116fc..4bb7d675 100644
--- a/queries/sparql/injections.scm
+++ b/queries/sparql/injections.scm
@@ -1 +1 @@
-(comment) @comment @combined
+(comment) @comment
diff --git a/queries/supercollider/injections.scm b/queries/supercollider/injections.scm
index eca90852..e48ce9af 100644
--- a/queries/supercollider/injections.scm
+++ b/queries/supercollider/injections.scm
@@ -1,4 +1,4 @@
 [
   (line_comment)
   (block_comment)
-] @comment @combined
+] @comment
diff --git a/queries/svelte/injections.scm b/queries/svelte/injections.scm
index c260cdbb..c57ccb75 100644
--- a/queries/svelte/injections.scm
+++ b/queries/svelte/injections.scm
@@ -29,4 +29,4 @@
   (#match? @_lang "(ts|typescript)")
 )
 
-(comment) @comment @combined
+(comment) @comment
diff --git a/queries/teal/injections.scm b/queries/teal/injections.scm
index bd53b103..c61f7d57 100644
--- a/queries/teal/injections.scm
+++ b/queries/teal/injections.scm
@@ -9,4 +9,4 @@
   (#eq? @_cdef_identifier "cdef")
 )
 
-(comment) @comment @combined
+(comment) @comment
diff --git a/queries/toml/injections.scm b/queries/toml/injections.scm
index 4ff116fc..4bb7d675 100644
--- a/queries/toml/injections.scm
+++ b/queries/toml/injections.scm
@@ -1 +1 @@
-(comment) @comment @combined
+(comment) @comment
diff --git a/queries/turtle/injections.scm b/queries/turtle/injections.scm
index 4ff116fc..4bb7d675 100644
--- a/queries/turtle/injections.scm
+++ b/queries/turtle/injections.scm
@@ -1 +1 @@
-(comment) @comment @combined
+(comment) @comment
diff --git a/queries/verilog/injections.scm b/queries/verilog/injections.scm
index 4ff116fc..4bb7d675 100644
--- a/queries/verilog/injections.scm
+++ b/queries/verilog/injections.scm
@@ -1 +1 @@
-(comment) @comment @combined
+(comment) @comment
diff --git a/queries/vue/injections.scm b/queries/vue/injections.scm
index 4c3fb305..b7e19646 100644
--- a/queries/vue/injections.scm
+++ b/queries/vue/injections.scm
@@ -29,4 +29,4 @@
     (quoted_attribute_value 
       (attribute_value) @javascript)))
 
-(comment) @comment @combined
+(comment) @comment
diff --git a/queries/yaml/injections.scm b/queries/yaml/injections.scm
index 4ff116fc..4bb7d675 100644
--- a/queries/yaml/injections.scm
+++ b/queries/yaml/injections.scm
@@ -1 +1 @@
-(comment) @comment @combined
+(comment) @comment
diff --git a/queries/zig/injections.scm b/queries/zig/injections.scm
index 0d1c189d..a7dbad4a 100644
--- a/queries/zig/injections.scm
+++ b/queries/zig/injections.scm
@@ -1 +1 @@
-(line_comment) @comment @combined
+(line_comment) @comment