feat(spell): support more languages

27 files changed, 41 insertions, 44 deletions

diff --git a/queries/bash/highlights.scm b/queries/bash/highlights.scm
index 024ff25e3..961444a45 100644
--- a/queries/bash/highlights.scm
+++ b/queries/bash/highlights.scm
@@ -44,7 +44,7 @@
  (string)
  (raw_string)
  (heredoc_body)
-] @string
+] @string @spell
 
 (variable_assignment (word) @string)
 
@@ -84,7 +84,7 @@
 ((word) @boolean
   (#match? @boolean "^(true|false)$"))
 
-(comment) @comment
+(comment) @comment @spell
 (test_operator) @string
 
 (command_substitution
diff --git a/queries/c/highlights.scm b/queries/c/highlights.scm
index 24c008218..e8e4d43a9 100644
--- a/queries/c/highlights.scm
+++ b/queries/c/highlights.scm
@@ -166,8 +166,7 @@
 (preproc_function_def
   name: (identifier) @function.macro)
 
-(comment) @comment
-(comment) @spell
+(comment) @comment @spell
 
 ;; Parameters
 (parameter_declaration
diff --git a/queries/c_sharp/highlights.scm b/queries/c_sharp/highlights.scm
index 068565f1e..ca327c596 100644
--- a/queries/c_sharp/highlights.scm
+++ b/queries/c_sharp/highlights.scm
@@ -74,7 +74,7 @@
 
 (implicit_type) @keyword
 
-(comment) @comment
+(comment) @comment @spell
 
 (using_directive
   (identifier) @type)
diff --git a/queries/cmake/highlights.scm b/queries/cmake/highlights.scm
index 51bc5539b..417f8d926 100644
--- a/queries/cmake/highlights.scm
+++ b/queries/cmake/highlights.scm
@@ -9,7 +9,7 @@
 [
  (bracket_comment)
  (line_comment)
-] @comment
+] @comment @spell
 
 (normal_command (identifier) @function)
 
diff --git a/queries/comment/highlights.scm b/queries/comment/highlights.scm
index a076deec7..e516c6037 100644
--- a/queries/comment/highlights.scm
+++ b/queries/comment/highlights.scm
@@ -1,3 +1,5 @@
+(_) @spell
+
 [
  "("
  ")"
diff --git a/queries/css/highlights.scm b/queries/css/highlights.scm
index 7b8438cc7..18bf7f9b4 100644
--- a/queries/css/highlights.scm
+++ b/queries/css/highlights.scm
@@ -11,7 +11,7 @@
  (important)
  ] @keyword
 
-(comment) @comment
+(comment) @comment @spell
 
 [
  (tag_name)
diff --git a/queries/dockerfile/highlights.scm b/queries/dockerfile/highlights.scm
index af1c088c5..6ec8d645b 100644
--- a/queries/dockerfile/highlights.scm
+++ b/queries/dockerfile/highlights.scm
@@ -26,7 +26,7 @@
   "@"
 ] @operator
 
-(comment) @comment
+(comment) @comment @spell
 
 (image_spec
   (image_tag
diff --git a/queries/dot/highlights.scm b/queries/dot/highlights.scm
index f9c6ce7b1..4ed1df820 100644
--- a/queries/dot/highlights.scm
+++ b/queries/dot/highlights.scm
@@ -51,4 +51,6 @@
 (preproc)
 ] @comment
 
+(comment) @spell
+
 (ERROR) @error
diff --git a/queries/ecma/highlights.scm b/queries/ecma/highlights.scm
index d05e4d5b8..a99227119 100644
--- a/queries/ecma/highlights.scm
+++ b/queries/ecma/highlights.scm
@@ -108,7 +108,7 @@
 ] @boolean
 
 [
-  (null) 
+  (null)
   (undefined)
 ] @constant.builtin
 
@@ -117,7 +117,9 @@
   (hash_bang_line)
 ] @comment
 
-(string) @string
+(comment) @spell
+
+(string) @string @spell
 (template_string) @string
 (escape_sequence) @string.escape
 (regex_pattern) @string.regex
diff --git a/queries/gitignore/highlights.scm b/queries/gitignore/highlights.scm
index c5f1ac5e1..6e83ea6f2 100644
--- a/queries/gitignore/highlights.scm
+++ b/queries/gitignore/highlights.scm
@@ -1,4 +1,4 @@
-(comment) @comment
+(comment) @comment @spell
 
 [
   (directory_separator)
diff --git a/queries/go/highlights.scm b/queries/go/highlights.scm
index d68284ede..aaa6fe6b1 100644
--- a/queries/go/highlights.scm
+++ b/queries/go/highlights.scm
@@ -185,8 +185,7 @@
 ; Literals
 
 (interpreted_string_literal) @string
-(raw_string_literal) @string
-(raw_string_literal) @spell
+(raw_string_literal) @string @spell
 (rune_literal) @string
 (escape_sequence) @string.escape
 
@@ -202,8 +201,7 @@
   . (literal_element (identifier) @field))
 (field_declaration name: (field_identifier) @field)
 
-(comment) @comment
-(comment) @spell
+(comment) @comment @spell
 
 (ERROR) @error
 
diff --git a/queries/java/highlights.scm b/queries/java/highlights.scm
index 4aecd03ca..db9453d9c 100644
--- a/queries/java/highlights.scm
+++ b/queries/java/highlights.scm
@@ -149,7 +149,7 @@
 [
   (line_comment)
   (block_comment)
-] @comment
+] @comment @spell
 
 [
 (true)
diff --git a/queries/jsonc/highlights.scm b/queries/jsonc/highlights.scm
index a51c5c7e7..e50112155 100644
--- a/queries/jsonc/highlights.scm
+++ b/queries/jsonc/highlights.scm
@@ -1,3 +1,3 @@
 ; inherits: json
 
-(comment) @comment
+(comment) @comment @spell
diff --git a/queries/kotlin/highlights.scm b/queries/kotlin/highlights.scm
index 246a56c02..9c74e3f0b 100644
--- a/queries/kotlin/highlights.scm
+++ b/queries/kotlin/highlights.scm
@@ -212,6 +212,8 @@
 	(shebang_line)
 ] @comment
 
+(comment) @spell
+
 (real_literal) @float
 [
 	(integer_literal)
diff --git a/queries/lua/highlights.scm b/queries/lua/highlights.scm
index 054d78793..3c86c4cd6 100644
--- a/queries/lua/highlights.scm
+++ b/queries/lua/highlights.scm
@@ -180,15 +180,13 @@
 
 ;; Others
 
-(comment) @comment
-(comment) @spell
+(comment) @comment @spell
 
 (hash_bang_line) @comment
 
 (number) @number
 
-(string) @string
-(string) @spell
+(string) @string @spell
 
 ;; Error
 (ERROR) @error
diff --git a/queries/make/highlights.scm b/queries/make/highlights.scm
index bd0f6183e..e3f583d58 100644
--- a/queries/make/highlights.scm
+++ b/queries/make/highlights.scm
@@ -1,4 +1,4 @@
-(comment) @comment
+(comment) @comment @spell
 
 (conditional
  (_ [
diff --git a/queries/python/highlights.scm b/queries/python/highlights.scm
index f14e29f23..6555a5dea 100644
--- a/queries/python/highlights.scm
+++ b/queries/python/highlights.scm
@@ -140,8 +140,7 @@
 (integer) @number
 (float) @float
 
-(comment) @comment
-(comment) @spell
+(comment) @comment @spell
 (string) @string
 [
   (escape_sequence)
diff --git a/queries/query/highlights.scm b/queries/query/highlights.scm
index 37435a871..ae0272af8 100644
--- a/queries/query/highlights.scm
+++ b/queries/query/highlights.scm
@@ -6,7 +6,7 @@
 (named_node name: (identifier) @variable)
 (field_definition name: (identifier) @property)
 (negated_field "!" @operator (identifier) @property)
-(comment) @comment
+(comment) @comment @spell
 
 (quantifier) @operator
 (predicate_type) @punctuation.special
diff --git a/queries/rst/highlights.scm b/queries/rst/highlights.scm
index 0e5c346bb..5fb228faa 100644
--- a/queries/rst/highlights.scm
+++ b/queries/rst/highlights.scm
@@ -157,8 +157,7 @@
 
 (title) @text.title
 
-(comment) @comment
-(comment) @spell
+(comment) @comment @spell
 (comment "..") @comment
 
 (directive
diff --git a/queries/rust/highlights.scm b/queries/rust/highlights.scm
index 0e6c757d7..db5e39828 100644
--- a/queries/rust/highlights.scm
+++ b/queries/rust/highlights.scm
@@ -144,12 +144,7 @@
 [
   (line_comment)
   (block_comment)
-] @comment
-
-[
-  (line_comment)
-  (block_comment)
-] @spell
+] @comment @spell
 
 (boolean_literal) @boolean
 (integer_literal) @number
diff --git a/queries/scala/highlights.scm b/queries/scala/highlights.scm
index c226ba8c2..2c8175cb8 100644
--- a/queries/scala/highlights.scm
+++ b/queries/scala/highlights.scm
@@ -196,7 +196,7 @@
 
 "return" @keyword.return
 
-(comment) @comment
+(comment) @comment @spell
 
 ;; `case` is a conditional keyword in case_block
 
diff --git a/queries/swift/highlights.scm b/queries/swift/highlights.scm
index 03c06ca22..6faa55718 100644
--- a/queries/swift/highlights.scm
+++ b/queries/swift/highlights.scm
@@ -96,8 +96,10 @@
 (statement_label) @label
 
 ; Comments
-(comment) @comment
-(multiline_comment) @comment
+[
+ (comment)
+ (multiline_comment)
+] @comment @spell
 
 ; String literals
 (line_str_text) @string
diff --git a/queries/teal/highlights.scm b/queries/teal/highlights.scm
index 045fd05fd..2af9be589 100644
--- a/queries/teal/highlights.scm
+++ b/queries/teal/highlights.scm
@@ -1,8 +1,7 @@
 
 ;; Primitives
 (boolean) @boolean
-(comment) @comment
-(comment) @spell
+(comment) @comment @spell
 (shebang_comment) @comment
 (identifier) @variable
 ((identifier) @variable.builtin
diff --git a/queries/toml/highlights.scm b/queries/toml/highlights.scm
index 17c83d547..87e670b40 100644
--- a/queries/toml/highlights.scm
+++ b/queries/toml/highlights.scm
@@ -8,7 +8,7 @@
 ;---------
 
 (boolean) @boolean
-(comment) @comment
+(comment) @comment @spell
 (string) @string
 (integer) @number
 (float) @float
diff --git a/queries/verilog/highlights.scm b/queries/verilog/highlights.scm
index ba282aa07..89af15771 100644
--- a/queries/verilog/highlights.scm
+++ b/queries/verilog/highlights.scm
@@ -75,7 +75,7 @@
   "endcase"
 ] @conditional
 
-(comment) @comment
+(comment) @comment @spell
 
 (include_compiler_directive) @constant.macro
 (package_import_declaration
@@ -174,7 +174,7 @@
 [
   (double_quoted_string)
   (string_literal)
-] @string
+] @string @spell
 
 [
   (include_compiler_directive)
diff --git a/queries/yaml/highlights.scm b/queries/yaml/highlights.scm
index 89b9f20c0..311162c13 100644
--- a/queries/yaml/highlights.scm
+++ b/queries/yaml/highlights.scm
@@ -7,7 +7,7 @@
 (escape_sequence) @string.escape
 (integer_scalar) @number
 (float_scalar) @number
-(comment) @comment
+(comment) @comment @spell
 (anchor_name) @type
 (alias_name) @type
 (tag) @type
diff --git a/queries/zig/highlights.scm b/queries/zig/highlights.scm
index b63e7ce07..7767a3e5b 100644
--- a/queries/zig/highlights.scm
+++ b/queries/zig/highlights.scm
@@ -2,7 +2,7 @@
   (container_doc_comment)
   (doc_comment)
   (line_comment)
-] @comment
+] @comment @spell
 
 ((line_comment) @text.note
   (#match? @text.note "^// *zig fmt: (on|off) *$")
@@ -84,7 +84,7 @@ field_constant: (IDENTIFIER) @constant
 [
   (LINESTRING)
   (STRINGLITERALSINGLE)
-] @string
+] @string @spell
 
 (CHAR_LITERAL) @character
 (EscapeSequence) @string.escape