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

* Comment: use `@combined` to create just one tree per buffer

There is no need to create a tree per line/block for comments.
Should fix https://github.com/nvim-treesitter/nvim-treesitter/issues/1251

* Add injections for scss

* Fix jsonc

* Combine jsdoc

42 files changed, 46 insertions, 41 deletions

diff --git a/queries/bash/injections.scm b/queries/bash/injections.scm
index 4bb7d675d..4ff116fce 100644
--- a/queries/bash/injections.scm
+++ b/queries/bash/injections.scm
@@ -1 +1 @@
-(comment) @comment
+(comment) @comment @combined
diff --git a/queries/c/injections.scm b/queries/c/injections.scm
index afeb068a2..97621fcb3 100644
--- a/queries/c/injections.scm
+++ b/queries/c/injections.scm
@@ -1,3 +1,3 @@
 (preproc_arg) @c
 
-(comment) @comment
+(comment) @comment @combined
diff --git a/queries/c_sharp/injections.scm b/queries/c_sharp/injections.scm
index 4bb7d675d..4ff116fce 100644
--- a/queries/c_sharp/injections.scm
+++ b/queries/c_sharp/injections.scm
@@ -1 +1 @@
-(comment) @comment
+(comment) @comment @combined
diff --git a/queries/clojure/injections.scm b/queries/clojure/injections.scm
index 4bb7d675d..4ff116fce 100644
--- a/queries/clojure/injections.scm
+++ b/queries/clojure/injections.scm
@@ -1 +1 @@
-(comment) @comment
+(comment) @comment @combined
diff --git a/queries/cpp/injections.scm b/queries/cpp/injections.scm
index 13842120d..9a8a0bf32 100644
--- a/queries/cpp/injections.scm
+++ b/queries/cpp/injections.scm
@@ -1,3 +1,3 @@
 (preproc_arg) @cpp
 
-(comment) @comment
+(comment) @comment @combined
diff --git a/queries/css/injections.scm b/queries/css/injections.scm
index 4bb7d675d..4ff116fce 100644
--- a/queries/css/injections.scm
+++ b/queries/css/injections.scm
@@ -1 +1 @@
-(comment) @comment
+(comment) @comment @combined
diff --git a/queries/dart/injections.scm b/queries/dart/injections.scm
index 4bb7d675d..4ff116fce 100644
--- a/queries/dart/injections.scm
+++ b/queries/dart/injections.scm
@@ -1 +1 @@
-(comment) @comment
+(comment) @comment @combined
diff --git a/queries/devicetree/injections.scm b/queries/devicetree/injections.scm
index 4bb7d675d..4ff116fce 100644
--- a/queries/devicetree/injections.scm
+++ b/queries/devicetree/injections.scm
@@ -1 +1 @@
-(comment) @comment
+(comment) @comment @combined
diff --git a/queries/ecma/injections.scm b/queries/ecma/injections.scm
index 0816b1977..1552efc91 100644
--- a/queries/ecma/injections.scm
+++ b/queries/ecma/injections.scm
@@ -1,5 +1,5 @@
-(comment) @jsdoc
-(comment) @comment
+(comment) @jsdoc @combined
+(comment) @comment @combined
 
 ((regex_pattern) @regex)
 
diff --git a/queries/fennel/injections.scm b/queries/fennel/injections.scm
index 4bb7d675d..4ff116fce 100644
--- a/queries/fennel/injections.scm
+++ b/queries/fennel/injections.scm
@@ -1 +1 @@
-(comment) @comment
+(comment) @comment @combined
diff --git a/queries/gdscript/injections.scm b/queries/gdscript/injections.scm
index 4bb7d675d..4ff116fce 100644
--- a/queries/gdscript/injections.scm
+++ b/queries/gdscript/injections.scm
@@ -1 +1 @@
-(comment) @comment
+(comment) @comment @combined
diff --git a/queries/go/injections.scm b/queries/go/injections.scm
index 4bb7d675d..4ff116fce 100644
--- a/queries/go/injections.scm
+++ b/queries/go/injections.scm
@@ -1 +1 @@
-(comment) @comment
+(comment) @comment @combined
diff --git a/queries/graphql/injections.scm b/queries/graphql/injections.scm
index 4bb7d675d..4ff116fce 100644
--- a/queries/graphql/injections.scm
+++ b/queries/graphql/injections.scm
@@ -1 +1 @@
-(comment) @comment
+(comment) @comment @combined
diff --git a/queries/html/injections.scm b/queries/html/injections.scm
index 682431195..101e59410 100644
--- a/queries/html/injections.scm
+++ b/queries/html/injections.scm
@@ -9,4 +9,4 @@
 ((script_element
   (raw_text) @javascript))
 
-(comment) @comment
+(comment) @comment @combined
diff --git a/queries/java/injections.scm b/queries/java/injections.scm
index 4bb7d675d..4ff116fce 100644
--- a/queries/java/injections.scm
+++ b/queries/java/injections.scm
@@ -1 +1 @@
-(comment) @comment
+(comment) @comment @combined
diff --git a/queries/jsonc/injections.scm b/queries/jsonc/injections.scm
index 4bb7d675d..4ff116fce 100644
--- a/queries/jsonc/injections.scm
+++ b/queries/jsonc/injections.scm
@@ -1 +1 @@
-(comment) @comment
+(comment) @comment @combined
diff --git a/queries/julia/injections.scm b/queries/julia/injections.scm
index 5ae30dfa7..fee6c7deb 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
+(comment) @comment @combined
diff --git a/queries/kotlin/injections.scm b/queries/kotlin/injections.scm
index 4bb7d675d..4ff116fce 100644
--- a/queries/kotlin/injections.scm
+++ b/queries/kotlin/injections.scm
@@ -1 +1 @@
-(comment) @comment
+(comment) @comment @combined
diff --git a/queries/ledger/injections.scm b/queries/ledger/injections.scm
index 4bb7d675d..4ff116fce 100644
--- a/queries/ledger/injections.scm
+++ b/queries/ledger/injections.scm
@@ -1 +1 @@
-(comment) @comment
+(comment) @comment @combined
diff --git a/queries/lua/injections.scm b/queries/lua/injections.scm
index 7bca11bb8..196204d62 100644
--- a/queries/lua/injections.scm
+++ b/queries/lua/injections.scm
@@ -9,4 +9,4 @@
   (#eq? @_cdef_identifier "cdef")
 )
 
-(comment) @comment
+(comment) @comment @combined
diff --git a/queries/nix/injections.scm b/queries/nix/injections.scm
index 4bb7d675d..4ff116fce 100644
--- a/queries/nix/injections.scm
+++ b/queries/nix/injections.scm
@@ -1 +1 @@
-(comment) @comment
+(comment) @comment @combined
diff --git a/queries/ocaml/injections.scm b/queries/ocaml/injections.scm
index 4bb7d675d..4ff116fce 100644
--- a/queries/ocaml/injections.scm
+++ b/queries/ocaml/injections.scm
@@ -1 +1 @@
-(comment) @comment
+(comment) @comment @combined
diff --git a/queries/ocamllex/injections.scm b/queries/ocamllex/injections.scm
index 337d8073e..2e47febf4 100644
--- a/queries/ocamllex/injections.scm
+++ b/queries/ocamllex/injections.scm
@@ -1,3 +1,3 @@
 (ocaml) @ocaml
 
-(comment) @comment
+(comment) @comment @combined
diff --git a/queries/php/injections.scm b/queries/php/injections.scm
index 8683d6cec..c7f97cac5 100644
--- a/queries/php/injections.scm
+++ b/queries/php/injections.scm
@@ -1,3 +1,3 @@
 (text) @html
 
-(comment) @comment
+(comment) @comment @combined
diff --git a/queries/python/injections.scm b/queries/python/injections.scm
index 197e725e5..fb939cc0c 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
+(comment) @comment @combined
diff --git a/queries/ql/injections.scm b/queries/ql/injections.scm
index 88d49d424..74976e90e 100644
--- a/queries/ql/injections.scm
+++ b/queries/ql/injections.scm
@@ -2,4 +2,4 @@
   (line_comment)
   (block_comment)
   (qldoc)
-] @comment
+] @comment @combined
diff --git a/queries/query/injections.scm b/queries/query/injections.scm
index 95ce2978f..607f06930 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
+(comment) @comment @combined
diff --git a/queries/rst/injections.scm b/queries/rst/injections.scm
index 6d62550ad..84d9aab27 100644
--- a/queries/rst/injections.scm
+++ b/queries/rst/injections.scm
@@ -59,4 +59,4 @@
   (role) @_role)
  (#eq? @_role ":math:"))
 
-(comment) @comment
+(comment) @comment @combined
diff --git a/queries/ruby/injections.scm b/queries/ruby/injections.scm
index 4bb7d675d..4ff116fce 100644
--- a/queries/ruby/injections.scm
+++ b/queries/ruby/injections.scm
@@ -1 +1 @@
-(comment) @comment
+(comment) @comment @combined
diff --git a/queries/rust/injections.scm b/queries/rust/injections.scm
index b1e90e09a..27070f6e6 100644
--- a/queries/rust/injections.scm
+++ b/queries/rust/injections.scm
@@ -9,4 +9,4 @@
 [
   (line_comment)
   (block_comment)
-] @comment
+] @comment @combined
diff --git a/queries/scss/highlights.scm b/queries/scss/highlights.scm
index 7dc780a87..fcb6ecc31 100644
--- a/queries/scss/highlights.scm
+++ b/queries/scss/highlights.scm
@@ -37,3 +37,5 @@
 ] @punctuation.bracket
 
 (include_statement (identifier) @function)
+
+(single_line_comment) @comment
diff --git a/queries/scss/injections.scm b/queries/scss/injections.scm
new file mode 100644
index 000000000..51c1cf7bc
--- /dev/null
+++ b/queries/scss/injections.scm
@@ -0,0 +1,3 @@
+; inherits: css
+
+(single_line_comment) @comment @combined
diff --git a/queries/sparql/injections.scm b/queries/sparql/injections.scm
index 4bb7d675d..4ff116fce 100644
--- a/queries/sparql/injections.scm
+++ b/queries/sparql/injections.scm
@@ -1 +1 @@
-(comment) @comment
+(comment) @comment @combined
diff --git a/queries/supercollider/injections.scm b/queries/supercollider/injections.scm
index e48ce9af3..eca908527 100644
--- a/queries/supercollider/injections.scm
+++ b/queries/supercollider/injections.scm
@@ -1,4 +1,4 @@
 [
   (line_comment)
   (block_comment)
-] @comment
+] @comment @combined
diff --git a/queries/svelte/injections.scm b/queries/svelte/injections.scm
index c57ccb759..c260cdbb4 100644
--- a/queries/svelte/injections.scm
+++ b/queries/svelte/injections.scm
@@ -29,4 +29,4 @@
   (#match? @_lang "(ts|typescript)")
 )
 
-(comment) @comment
+(comment) @comment @combined
diff --git a/queries/teal/injections.scm b/queries/teal/injections.scm
index c61f7d573..bd53b103a 100644
--- a/queries/teal/injections.scm
+++ b/queries/teal/injections.scm
@@ -9,4 +9,4 @@
   (#eq? @_cdef_identifier "cdef")
 )
 
-(comment) @comment
+(comment) @comment @combined
diff --git a/queries/toml/injections.scm b/queries/toml/injections.scm
index 4bb7d675d..4ff116fce 100644
--- a/queries/toml/injections.scm
+++ b/queries/toml/injections.scm
@@ -1 +1 @@
-(comment) @comment
+(comment) @comment @combined
diff --git a/queries/turtle/injections.scm b/queries/turtle/injections.scm
index 4bb7d675d..4ff116fce 100644
--- a/queries/turtle/injections.scm
+++ b/queries/turtle/injections.scm
@@ -1 +1 @@
-(comment) @comment
+(comment) @comment @combined
diff --git a/queries/verilog/injections.scm b/queries/verilog/injections.scm
index 4bb7d675d..4ff116fce 100644
--- a/queries/verilog/injections.scm
+++ b/queries/verilog/injections.scm
@@ -1 +1 @@
-(comment) @comment
+(comment) @comment @combined
diff --git a/queries/vue/injections.scm b/queries/vue/injections.scm
index b7e196463..4c3fb305d 100644
--- a/queries/vue/injections.scm
+++ b/queries/vue/injections.scm
@@ -29,4 +29,4 @@
     (quoted_attribute_value 
       (attribute_value) @javascript)))
 
-(comment) @comment
+(comment) @comment @combined
diff --git a/queries/yaml/injections.scm b/queries/yaml/injections.scm
index 4bb7d675d..4ff116fce 100644
--- a/queries/yaml/injections.scm
+++ b/queries/yaml/injections.scm
@@ -1 +1 @@
-(comment) @comment
+(comment) @comment @combined
diff --git a/queries/zig/injections.scm b/queries/zig/injections.scm
index a7dbad4a5..0d1c189dd 100644
--- a/queries/zig/injections.scm
+++ b/queries/zig/injections.scm
@@ -1 +1 @@
-(line_comment) @comment
+(line_comment) @comment @combined