Skip to content

Commit

Permalink
fix: fish builtin functions are highlighted as such (#11792)
Browse files Browse the repository at this point in the history
* fix: fish builtin functions are highlighted as such

* fix: single-character commands recognized as builtins

???? how did that query even happen

* fix: update builtins to fish 3.7.1

* fix: add back `alias` and `isatty`

they are builtins, but aren't reported by builtin -n for some reason
  • Loading branch information
Axlefublr authored Sep 30, 2024
1 parent dd45ae1 commit 48b89d4
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions runtime/queries/fish/highlights.scm
Original file line number Diff line number Diff line change
Expand Up @@ -101,19 +101,19 @@
]
)

; non-builtin command names
(command name: (word) @function)

; derived from builtin -n (fish 3.2.2)
; derived from builtin -n (fish 3.7.1)
(command
name: [
(word) @function.builtin
(#match? @function.builtin "^(\.|:|_|alias|argparse|bg|bind|block|breakpoint|builtin|cd|command|commandline|complete|contains|count|disown|echo|emit|eval|exec|exit|fg|functions|history|isatty|jobs|math|printf|pwd|random|read|realpath|set|set_color|source|status|string|test|time|type|ulimit|wait)$")
]
(word) @function.builtin
(#any-of? @function.builtin "abbr" "alias" "and" "argparse" "begin" "bg" "bind" "block" "break" "breakpoint" "builtin" "case" "cd" "command" "commandline" "complete" "contains" "continue" "count" "disown" "echo" "else" "emit" "end" "eval" "exec" "exit" "false" "fg" "for" "function" "functions" "history" "if" "isatty" "jobs" "math" "not" "or" "path" "printf" "pwd" "random" "read" "realpath" "return" "set" "set_color" "source" "status" "string" "switch" "test" "time" "true" "type" "ulimit" "wait" "while")
]
)

(test_command "test" @function.builtin)

; non-builtin command names
(command name: (word) @function)

;; Functions

(function_definition ["function" "end"] @keyword.function)
Expand Down

0 comments on commit 48b89d4

Please sign in to comment.