Apply changes from Amaan's query updates

Co-authored-by: Amaan Qureshi <[email protected]>

build-flavored-queries.py

@@ -9,9 +9,9 @@
 
 <https://docs.helix-editor.com/master/themes.html#syntax-highlighting> has a bit better
 guide for these parameters than tree-sitter does.
-    
 """
 
+import re
 from glob import glob
 from pathlib import Path
 
@@ -24,6 +24,13 @@
     ("@variable.parameter", "@parameter"),
     ("@comment.line", "@comment"),
     ("@constant.character.escape", "@string.escape"),
+    ("@keyword.module", "@module"),
+]
+
+REPLACEMENTS_RE = [
+    (r";\s*NVIM-DISABLE-START.*;\s*NVIM-DISABLE-END", "", re.MULTILINE | re.DOTALL),
+    ("^.*NVIM-ENABLE(?P<content>.*)$", r"\g<content>", re.MULTILINE),
+    ("@indent\s+@extend", "@indent.begin", 0),
 ]
 
 
@@ -35,8 +42,11 @@ def main():
         with open(fname) as f:
             contents += f.read()
 
-        for x, to in REPLACEMENTS:
-            contents = contents.replace(x, to)
+        for query, sub in REPLACEMENTS:
+            contents = contents.replace(query, sub)
+
+        for query, sub, flags in REPLACEMENTS_RE:
+            contents = re.sub(query, sub, contents, flags=flags)
 
         dest = Path("queries") / "just" / Path(fname).name
         with open(dest, "w") as f:

queries-src/highlights.scm

@@ -1,16 +1,104 @@
 ; This file specifies how matched syntax patterns should be highlighted
-;
-; This file is ordered roughly the same as grammar.js
 
-(shebang) @comment
+[
+  "export"
+  "import"
+] @keyword.import
+
+"mod" @keyword.module
+
+[
+  "alias"
+  "set"
+  "shell"
+] @keyword
+
+[
+  "if"
+  "else"
+] @keyword.control.conditional
+
+(boolean ["true" "false"]) @constant.builtin.boolean
+
+; Variables
+
+(value (identifier) @variable)
 
 (alias left: (identifier) @variable)
-(assignment
-  left: (identifier) @variable
-  [":="] @operator)
+
+(assignment left: (identifier) @variable)
+
+; Functions
+
+(recipe_header name: (identifier) @function)
+
+(dependency name: (identifier) @function.call)
+
+(dependency_expression name: (identifier) @function.call)
+
+(function_call name: (identifier) @function.call)
+
+; Parameters
+
+(parameter name: (identifier) @variable.parameter)
+
+; Namespaces
 
 (module name: (identifier) @namespace)
 
+; Operators
+
+[
+  ":="
+  "?"
+  "=="
+  "!="
+  "=~"
+  "@"
+  "="
+  "$"
+  "*"
+  "+"
+  "&&"
+  "@-"
+  "-@"
+  "-"
+  "/"
+  ":"
+] @operator
+
+; Punctuation
+
+[ "," ] @punctuation.delimiter
+
+[
+  "{"
+  "}"
+  "["
+  "]"
+  "("
+  ")"
+] @punctuation.bracket
+
+[ "{{" "}}" "`" ] @punctuation.special
+
+; Literals
+
+(boolean) @boolean
+
+[
+  (string)
+  (external_command)
+] @string
+
+(escape_sequence) @constant.character.escape
+
+; Comments
+
+(comment) @comment.line @spell
+
+(shebang) @comment
+
 ; highlight known settings (filtering does not always work)
 (setting
   left: ((identifier) @keyword
@@ -29,15 +117,6 @@
     "windows-shell"
     )))
 
-(boolean ["true" "false"]) @constant.builtin.boolean
-
-["if" "else"] @keyword.control.conditional
-
-(value (identifier) @variable)
-
-(function_call
-  name: (identifier) @function)
-
 ; highlight known attributes (filtering does not always work)
 (attribute
   ((identifier) @attribute
@@ -56,46 +135,3 @@
       "windows-powershell"
       "windows-shell"
       )))
-
-(recipe_header name: (identifier) @function)
-
-; recipe argument specification
-; pattern includes variadic_parameter
-(parameter
-  name: (identifier) @variable.parameter
-  "="? @operator)
-
-(dependencies "&&" @operator)
-(dependency name: (identifier) @function)
-(dependency_expression name: (identifier) @function)
-
-; handle escape sequences
-(string (escape_sequence) @constant.character.escape)
-(string) @string
-
-(comment) @comment.line
-
-; (interpolation) @string
-
-; FIXME: interpreter
-; (shebang interpreter:(TEXT) @keyword ) @comment
-
-[
-  "alias"
-  "export"
-  "import"
-  "mod"
-  "set"
-] @keyword
-
-; exclude `=` and `&&` since they are valid in more normal scopes
-; (matching is covered in their parent nodes)
-["@" "==" "!=" "+" "*" ":" "/" "?"] @operator
-
-["(" ")" "[" "]" "{{" "}}" "{" "}"] @punctuation.bracket
-
-["," ":"] @punctuation.delimiter
-
-"`" @punctuation.special
-
-(ERROR) @error

queries-src/indents.scm

@@ -2,6 +2,10 @@
 ;
 ; Better documentation is in https://docs.helix-editor.com/guides/indent.html
 
-(recipe) @indent @extend
-(string) @indent @extend
-(external_command) @indent @extend
+[
+  (recipe)
+  (string)
+  (external_command)
+] @indent @extend
+
+(comment) @indent.auto

queries-src/locals.scm

@@ -1,18 +1,30 @@
 ; This file tells us about the scope of variables so e.g. local
 ; variables override global functions with the same name
 
+; Scope
+
 (recipe) @local.scope
 
-; definition sources
+; Definitions
+
 (alias left: (identifier) @local.definition.variable)
+
 (assignment left: (identifier) @local.definition.variable)
+
 (module name: (identifier) @local.definition.namespace)
+
 (parameter name: (identifier) @local.definition.variable)
+
 (recipe_header name: (identifier) @local.definition.function)
 
-; reference locations
+; References
+
 (alias right: (identifier) @local.reference.variable)
+
 (function_call name: (identifier) @local.reference.function)
+
 (dependency name: (identifier) @local.reference.function)
+
 (dependency_expression name: (identifier) @local.reference.function)
+
 (value (identifier) @local.reference.variable)