mirrors/helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-04-05 11:57:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Add fish-lsp and bump tree-sitter-fish

Browse source
This commit is contained in:
Branch Vincent 2025-01-08 22:45:38 -08:00 • committed by Michael Davis
parent 122bbea7cf
commit 0d5f6f04c9
3 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
book/src/generated/lang-support.md
View file

@ -56,7 +56,7 @@
| erlang | ✓ | ✓ | | `erlang_ls`, `elp` | | erlang | ✓ | ✓ | | `erlang_ls`, `elp` |
| esdl | ✓ | | | | | esdl | ✓ | | | |
| fidl | ✓ | | | | | fidl | ✓ | | | |
| fish | ✓ | ✓ | ✓ | | | fish | ✓ | ✓ | ✓ | `fish-lsp` |
| forth | ✓ | | | `forth-lsp` | | forth | ✓ | | | `forth-lsp` |
| fortran | ✓ | | ✓ | `fortls` | | fortran | ✓ | | ✓ | `fortls` |
| fsharp | ✓ | | | `fsautocomplete` | | fsharp | ✓ | | | `fsautocomplete` |

4
languages.toml
View file

@ -38,6 +38,7 @@ elm-language-server = { command = "elm-language-server" }
elp = { command = "elp", args = ["server"] } elp = { command = "elp", args = ["server"] }
elvish = { command = "elvish", args = ["-lsp"] } elvish = { command = "elvish", args = ["-lsp"] }
erlang-ls = { command = "erlang_ls" } erlang-ls = { command = "erlang_ls" }
fish-lsp = { command = "fish-lsp", args = ["start"], environment = { fish_lsp_show_client_popups = "false" } }
forc = { command = "forc", args = ["lsp"] } forc = { command = "forc", args = ["lsp"] }
forth-lsp = { command = "forth-lsp" } forth-lsp = { command = "forth-lsp" }
fortls = { command = "fortls", args = ["--lowercase_intrinsics"] } fortls = { command = "fortls", args = ["--lowercase_intrinsics"] }
@ -391,13 +392,14 @@ injection-regex = "fish"
file-types = ["fish"] file-types = ["fish"]
shebangs = ["fish"] shebangs = ["fish"]
comment-token = "#" comment-token = "#"
language-servers = ["fish-lsp"]
indent = { tab-width = 4, unit = " " } indent = { tab-width = 4, unit = " " }
auto-format = true auto-format = true
formatter = { command = "fish_indent" } formatter = { command = "fish_indent" }
[[grammar]] [[grammar]]
name = "fish" name = "fish"
source = { git = "https://github.com/ram02z/tree-sitter-fish", rev = "84436cf24c2b3176bfbb220922a0fdbd0141e406" } source = { git = "https://github.com/ram02z/tree-sitter-fish", rev = "a78aef9abc395c600c38a037ac779afc7e3cc9e0" }
[[language]] [[language]]
name = "mint" name = "mint"

16
runtime/queries/fish/highlights.scm
View file

@ -4,14 +4,13 @@
"&&" "&&"
"||" "||"
"|" "|"
"&|"
"2>|"
"&" "&"
"="
"!="
".." ".."
"!" "!"
(direction) (direction)
(stream_redirect) (stream_redirect)
(test_option)
] @operator ] @operator
[ [
@ -95,6 +94,14 @@
;; Commands ;; Commands
(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 (command
argument: [ argument: [
(word) @variable.parameter (#match? @variable.parameter "^-") (word) @variable.parameter (#match? @variable.parameter "^-")
@ -109,8 +116,6 @@
] ]
) )
(test_command "test" @function.builtin)
; non-builtin command names ; non-builtin command names
(command name: (word) @function) (command name: (word) @function)
@ -146,7 +151,6 @@
(integer) @constant.numeric.integer (integer) @constant.numeric.integer
(float) @constant.numeric.float (float) @constant.numeric.float
(comment) @comment (comment) @comment
(test_option) @string
((word) @constant.builtin.boolean ((word) @constant.builtin.boolean
(#match? @constant.builtin.boolean "^(true|false)$")) (#match? @constant.builtin.boolean "^(true|false)$"))