aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Toohey2024-05-01 21:24:13 +0000
committerJJ2024-05-01 23:54:41 +0000
commit214f7ba218223cd292fb1788ad203e5168657975 (patch)
treeb5f277e45bd83bef80810b91f0b9e42899ad447b
parentbbc1a3cc99644e5be1030b5ed8d51928c821b866 (diff)
Add koka language server and update grammar
ref: https://github.com/helix-editor/helix/pull/10119
-rw-r--r--book/src/generated/lang-support.md2
-rw-r--r--languages.toml4
-rw-r--r--runtime/queries/koka/highlights.scm34
-rw-r--r--runtime/queries/koka/indents.scm1
4 files changed, 4 insertions, 37 deletions
diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 2030949e..9acab0de 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -98,7 +98,7 @@
| julia | ✓ | ✓ | ✓ | `julia` |
| just | ✓ | ✓ | ✓ | |
| kdl | ✓ | ✓ | ✓ | |
-| koka | ✓ | | ✓ | |
+| koka | ✓ | | ✓ | `koka` |
| kotlin | ✓ | | | `kotlin-language-server` |
| latex | ✓ | ✓ | | `texlab` |
| ld | ✓ | | ✓ | |
diff --git a/languages.toml b/languages.toml
index a5764420..92a62b98 100644
--- a/languages.toml
+++ b/languages.toml
@@ -43,6 +43,7 @@ intelephense = { command = "intelephense", args = ["--stdio"] }
jdtls = { command = "jdtls" }
jsonnet-language-server = { command = "jsonnet-language-server", args= ["-t", "--lint"] }
julia = { command = "julia", timeout = 60, args = [ "--startup-file=no", "--history-file=no", "--quiet", "-e", "using LanguageServer; runserver()", ] }
+koka = { command = "koka", args = ["--language-server", "--lsstdio"] }
kotlin-language-server = { command = "kotlin-language-server" }
lean = { command = "lean", args = [ "--server" ] }
ltex-ls = { command = "ltex-ls" }
@@ -3249,10 +3250,11 @@ injection-regex = "koka"
file-types = ["kk"]
comment-token = "//"
indent = { tab-width = 8, unit = " " }
+language-servers = ["koka"]
[[grammar]]
name = "koka"
-source = { git = "https://github.com/mtoohey31/tree-sitter-koka", rev = "2527e152d4b6a79fd50aebd8d0b4b4336c94a034" }
+source = { git = "https://github.com/mtoohey31/tree-sitter-koka", rev = "96d070c3700692858035f3524cc0ad944cef2594" }
[[language]]
name = "tact"
diff --git a/runtime/queries/koka/highlights.scm b/runtime/queries/koka/highlights.scm
index fead9838..1ef40927 100644
--- a/runtime/queries/koka/highlights.scm
+++ b/runtime/queries/koka/highlights.scm
@@ -12,18 +12,6 @@
])))
["(" (block) (fnexpr)])
-(ntlappexpr
- function: (ntlappexpr
- (atom
- (qidentifier
- [
- (qvarid) @function
- (qidop) @function
- (identifier
- [(varid) (idop)] @function)
- ])))
- ["(" (block) (fnexpr)])
-
(appexpr
field: (atom
(qidentifier
@@ -46,28 +34,6 @@
])))
"[")
-(ntlappexpr
- field: (atom
- (qidentifier
- [
- (qvarid) @function
- (qidop) @function
- (identifier
- [(varid) (idop)] @function)
- ])))
-
-(ntlappexpr
- (ntlappexpr
- field: (atom
- (qidentifier
- [
- (qvarid) @variable
- (qidop) @variable
- (identifier
- [(varid) (idop)] @variable)
- ])))
- "[")
-
[
"initially"
"finally"
diff --git a/runtime/queries/koka/indents.scm b/runtime/queries/koka/indents.scm
index 0a47bcbb..6045373d 100644
--- a/runtime/queries/koka/indents.scm
+++ b/runtime/queries/koka/indents.scm
@@ -1,6 +1,5 @@
[
(appexpr ["[" "("]) ; Applications.
- (ntlappexpr ["[" "("])
(atom ["[" "("]) ; Lists and tuples.
(program (moduledecl "{")) ; Braced module declarations.
(funbody)