Add fish highlighting (#1308)

The highlights were copied and modified from
https://github.com/nvim-treesitter/nvim-treesitter/blob/master/queries/fish/highlights.scm
This commit is contained in:
Sebastian Neubauer 2021-12-21 03:02:53 +01:00 committed by GitHub
parent f16651b590
commit 205dc8776b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 188 additions and 0 deletions

4
.gitmodules vendored
View File

@ -162,3 +162,7 @@
path = helix-syntax/languages/tree-sitter-dart path = helix-syntax/languages/tree-sitter-dart
url = https://github.com/UserNobody14/tree-sitter-dart.git url = https://github.com/UserNobody14/tree-sitter-dart.git
shallow = true shallow = true
[submodule "helix-syntax/languages/tree-sitter-fish"]
path = helix-syntax/languages/tree-sitter-fish
url = https://github.com/ram02z/tree-sitter-fish
shallow = true

View File

@ -9,6 +9,7 @@
| css | ✓ | | | | | css | ✓ | | | |
| dart | ✓ | | ✓ | `dart` | | dart | ✓ | | ✓ | `dart` |
| elixir | ✓ | | | `elixir-ls` | | elixir | ✓ | | | `elixir-ls` |
| fish | ✓ | ✓ | ✓ | |
| glsl | ✓ | | ✓ | | | glsl | ✓ | | ✓ | |
| go | ✓ | ✓ | ✓ | `gopls` | | go | ✓ | ✓ | ✓ | `gopls` |
| html | ✓ | | | | | html | ✓ | | | |

@ -0,0 +1 @@
Subproject commit 04e54ab6585dfd4fee6ddfe5849af56f101b6d4f

View File

@ -45,6 +45,17 @@ comment-token = "#"
language-server = { command = "elixir-ls" } language-server = { command = "elixir-ls" }
indent = { tab-width = 2, unit = " " } indent = { tab-width = 2, unit = " " }
[[language]]
name = "fish"
scope = "source.fish"
injection-regex = "fish"
file-types = ["fish"]
shebangs = ["fish"]
roots = []
comment-token = "#"
indent = { tab-width = 4, unit = " " }
[[language]] [[language]]
name = "mint" name = "mint"
scope = "source.mint" scope = "source.mint"

View File

@ -0,0 +1,156 @@
;; Operators
[
"&&"
"||"
"|"
"&"
"="
"!="
".."
"!"
(direction)
(stream_redirect)
(test_option)
] @operator
[
"not"
"and"
"or"
] @keyword.operator
;; Conditionals
(if_statement
[
"if"
"end"
] @keyword.control.conditional)
(switch_statement
[
"switch"
"end"
] @keyword.control.conditional)
(case_clause
[
"case"
] @keyword.control.conditional)
(else_clause
[
"else"
] @keyword.control.conditional)
(else_if_clause
[
"else"
"if"
] @keyword.control.conditional)
;; Loops/Blocks
(while_statement
[
"while"
"end"
] @keyword.control.repeat)
(for_statement
[
"for"
"end"
] @keyword.control.repeat)
(begin_statement
[
"begin"
"end"
] @keyword.control.repeat)
;; Keywords
[
"in"
(break)
(continue)
] @keyword
"return" @keyword.control.return
;; Punctuation
[
"["
"]"
"{"
"}"
"("
")"
] @punctuation.bracket
"," @punctuation.delimiter
;; Commands
(command
argument: [
(word) @variable.parameter (#match? @variable.parameter "^-")
]
)
; non-bultin command names
(command name: (word) @function)
; derived from builtin -n (fish 3.2.2)
(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)$")
]
)
(test_command "test" @function.builtin)
;; Functions
(function_definition ["function" "end"] @keyword.function)
(function_definition
name: [
(word) (concatenation)
]
@function)
(function_definition
option: [
(word)
(concatenation (word))
] @variable.parameter (#match? @variable.parameter "^-")
)
;; Strings
[(double_quote_string) (single_quote_string)] @string
(escape_sequence) @constant.character.escape
;; Variables
(variable_name) @variable
(variable_expansion) @constant
;; Nodes
(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

View File

@ -0,0 +1,12 @@
indent = [
"function_definition",
"while_statement",
"for_statement",
"if_statement",
"begin_statement",
"switch_statement",
]
outdent = [
"end"
]

View File

@ -0,0 +1,2 @@
((comment) @injection.content
(#set! injection.language "comment"))

View File

@ -0,0 +1 @@
(function_definition) @function.around