Refresh generated neovim config

config/neovim/store/nvim-treesitter/queries/latex/highlights.scm

@@ -1,24 +1,29 @@
 ; General syntax
-(command_name) @function
-
-(text_mode
-  [
-    "\\text"
-    "\\intertext"
-    "\\shortintertext"
-  ] @function)
+(command_name) @function @nospell
 
 (caption
   command: _ @function)
 
+; Turn spelling on for text
+(text) @spell
+
+; \text, \intertext, \shortintertext, ...
+(text_mode
+  command: _ @function @nospell
+  content: (curly_group
+    (_) @none @spell))
+
+; Variables, parameters
+(placeholder) @variable
+
 (key_value_pair
-  key: (_) @variable.parameter
+  key: (_) @variable.parameter @nospell
   value: (_))
 
-[
-  (brack_group)
-  (brack_group_argc)
-] @variable.parameter
+(curly_group_spec
+  (text) @variable.parameter)
+
+(brack_group_argc) @variable.parameter
 
 [
   (operator)
@@ -29,8 +34,13 @@
 
 "\\item" @punctuation.special
 
-((word) @punctuation.delimiter
-  (#eq? @punctuation.delimiter "&"))
+(delimiter) @punctuation.delimiter
+
+(math_delimiter
+  left_command: _ @punctuation.delimiter
+  left_delimiter: _ @punctuation.delimiter
+  right_command: _ @punctuation.delimiter
+  right_delimiter: _ @punctuation.delimiter)
 
 [
   "["
@@ -43,46 +53,42 @@
 (begin
   command: _ @module
   name: (curly_group_text
-    (text) @label))
+    (text) @label @nospell))
 
 (end
   command: _ @module
   name: (curly_group_text
-    (text) @label))
+    (text) @label @nospell))
 
 ; Definitions and references
 (new_command_definition
-  command: _ @function.macro
-  declaration: (curly_group_command_name
-    (_) @function))
+  command: _ @function.macro @nospell)
 
 (old_command_definition
-  command: _ @function.macro
-  declaration: (_) @function)
+  command: _ @function.macro @nospell)
 
 (let_command_definition
-  command: _ @function.macro
-  declaration: (_) @function)
+  command: _ @function.macro @nospell)
 
 (environment_definition
-  command: _ @function.macro
+  command: _ @function.macro @nospell
   name: (curly_group_text
-    (_) @markup.link))
+    (_) @label @nospell))
 
 (theorem_definition
-  command: _ @function.macro
+  command: _ @function.macro @nospell
   name: (curly_group_text_list
-    (_) @label))
+    (_) @label @nospell))
 
 (paired_delimiter_definition
-  command: _ @function.macro
+  command: _ @function.macro @nospell
   declaration: (curly_group_command_name
     (_) @function))
 
 (label_definition
   command: _ @function.macro
   name: (curly_group_text
-    (_) @markup.link))
+    (_) @markup.link @nospell))
 
 (label_reference_range
   command: _ @function.macro
@@ -103,13 +109,18 @@
   number: (_) @markup.link)
 
 (citation
-  command: _ @function.macro
-  keys: (curly_group_text_list) @markup.link)
+  command: _ @function.macro @nospell
+  keys: (curly_group_text_list) @markup.link @nospell)
+
+(hyperlink
+  command: _ @function @nospell
+  uri: (curly_group_uri
+    (_) @markup.link.url @nospell))
 
 (glossary_entry_definition
-  command: _ @function.macro
+  command: _ @function.macro @nospell
   name: (curly_group_text
-    (_) @markup.link))
+    (_) @markup.link @nospell))
 
 (glossary_entry_reference
   command: _ @function.macro
@@ -117,9 +128,9 @@
     (_) @markup.link))
 
 (acronym_definition
-  command: _ @function.macro
+  command: _ @function.macro @nospell
   name: (curly_group_text
-    (_) @markup.link))
+    (_) @markup.link @nospell))
 
 (acronym_reference
   command: _ @function.macro
@@ -136,26 +147,6 @@
   name: (curly_group_text
     (_) @markup.link))
 
-; Formatting
-(text_mode
-  content: (curly_group
-    (_) @none @spell))
-
-(math_environment
-  (begin
-    command: _ @markup.math
-    name: (curly_group_text
-      (_) @markup.math)))
-
-(math_environment
-  (_) @markup.math)
-
-(math_environment
-  (end
-    command: _ @markup.math
-    name: (curly_group_text
-      (_) @markup.math)))
-
 ; Sectioning
 (title_declaration
   command: _ @module
@@ -231,20 +222,14 @@
 ((generic_command
   command: (command_name) @_name
   arg: (curly_group
-    (text) @markup.heading))
+    (_) @markup.heading))
   (#eq? @_name "\\frametitle"))
 
 ((generic_command
   command: (command_name) @_name
   arg: (curly_group
     (_) @markup.italic))
-  (#eq? @_name "\\emph"))
-
-((generic_command
-  command: (command_name) @_name
-  arg: (curly_group
-    (_) @markup.italic))
-  (#any-of? @_name "\\textit" "\\mathit"))
+  (#any-of? @_name "\\emph" "\\textit" "\\mathit"))
 
 ((generic_command
   command: (command_name) @_name
@@ -252,13 +237,6 @@
     (_) @markup.strong))
   (#any-of? @_name "\\textbf" "\\mathbf"))
 
-((generic_command
-  command: (command_name) @_name
-  .
-  arg: (curly_group
-    (_) @markup.link.url))
-  (#any-of? @_name "\\url" "\\href"))
-
 ; File inclusion commands
 (class_include
   command: _ @keyword.import
@@ -270,12 +248,16 @@
 
 (latex_include
   command: _ @keyword.import
-  path: (curly_group_path) @string)
+  path: (curly_group_path) @string.special.path)
+
+(verbatim_include
+  command: _ @keyword.import
+  path: (curly_group_path) @string.special.path)
 
 (import_include
   command: _ @keyword.import
-  directory: (curly_group_path) @string
-  file: (curly_group_path) @string)
+  directory: (curly_group_path) @string.special.path
+  file: (curly_group_path) @string.special.path)
 
 (bibstyle_include
   command: _ @keyword.import
@@ -283,7 +265,7 @@
 
 (bibtex_include
   command: _ @keyword.import
-  paths: (curly_group_path_list) @string)
+  paths: (curly_group_path_list) @string.special.path)
 
 (biblatex_include
   "\\addbibresource" @keyword.import
@@ -291,41 +273,53 @@
 
 (graphics_include
   command: _ @keyword.import
-  path: (curly_group_path) @string)
+  path: (curly_group_path) @string.special.path)
+
+(svg_include
+  command: _ @keyword.import
+  path: (curly_group_path) @string.special.path)
+
+(inkscape_include
+  command: _ @keyword.import
+  path: (curly_group_path) @string.special.path)
 
 (tikz_library_import
   command: _ @keyword.import
   paths: (curly_group_path_list) @string)
 
-(text) @spell
-
-(inline_formula) @nospell
-
-(displayed_equation) @nospell
-
-(key_value_pair) @nospell
-
-(generic_environment
-  begin: _ @nospell
-  end: _ @nospell)
-
-(citation
-  keys: _ @nospell)
-
-(command_name) @nospell
-
-(label_definition) @nospell
-
-(label_reference) @nospell
-
-(label_reference_range) @nospell
+; Turn spelling off for whole nodes
+[
+  (label_reference)
+  (label_reference_range)
+  (label_number)
+  (glossary_entry_reference)
+  (acronym_reference)
+  (color_definition)
+  (color_reference)
+  (class_include)
+  (package_include)
+  (latex_include)
+  (verbatim_include)
+  (import_include)
+  (bibstyle_include)
+  (bibtex_include)
+  (biblatex_include)
+  (graphics_include)
+  (svg_include)
+  (inkscape_include)
+  (tikz_library_import)
+] @nospell
 
 ; Math
 [
   (displayed_equation)
   (inline_formula)
-] @markup.math
+] @markup.math @nospell
 
+(math_environment
+  (_) @markup.math)
+
+; Comments
 [
   (line_comment)
   (block_comment)