Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'runtime/queries/fish/highlights.scm')
| -rw-r--r-- | runtime/queries/fish/highlights.scm | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/runtime/queries/fish/highlights.scm b/runtime/queries/fish/highlights.scm index 225d2796..27d509a0 100644 --- a/runtime/queries/fish/highlights.scm +++ b/runtime/queries/fish/highlights.scm @@ -4,13 +4,14 @@ "&&" "||" "|" - "&|" - "2>|" "&" + "=" + "!=" ".." "!" (direction) (stream_redirect) + (test_option) ] @operator [ @@ -38,12 +39,12 @@ "case" ] @keyword.control.conditional) -(else_clause +(else_clause [ "else" ] @keyword.control.conditional) -(else_if_clause +(else_if_clause [ "else" "if" @@ -94,16 +95,6 @@ ;; Commands -(command name: (word) @function) - -(command - name: (word) @function.builtin (#match? @function.builtin "^test$") - argument: (word) @operator (#match? @operator "^(!?=|-[a-zA-Z]+)$")) - -(command - name: (word) @punctuation.bracket (#match? @punctuation.bracket "^\\[$") - argument: (word) @operator (#match? @operator "^(!?=|-[a-zA-Z]+)$")) - (command argument: [ (word) @variable.parameter (#match? @variable.parameter "^-") @@ -118,6 +109,11 @@ ] ) +(test_command "test" @function.builtin) + +; non-builtin command names +(command name: (word) @function) + ;; Functions (function_definition ["function" "end"] @keyword.function) @@ -125,7 +121,7 @@ (function_definition name: [ (word) (concatenation) - ] + ] @function) (function_definition @@ -150,6 +146,11 @@ (integer) @constant.numeric.integer (float) @constant.numeric.float (comment) @comment +(test_option) @string ((word) @constant.builtin.boolean (#match? @constant.builtin.boolean "^(true|false)$")) + +;; Error + +(ERROR) @error |