From a2ee2e66f2725fbd2d595d43c58ebf43ef9e9383 Mon Sep 17 00:00:00 2001 From: Matthew Toohey Date: Fri, 5 Apr 2024 05:53:07 -0400 Subject: [PATCH] Add koka language server and update grammar (#10119) --- book/src/generated/lang-support.md | 2 +- languages.toml | 4 +++- runtime/queries/koka/highlights.scm | 34 ----------------------------- runtime/queries/koka/indents.scm | 1 - 4 files changed, 4 insertions(+), 37 deletions(-) diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md index efdc8b634..156898d45 100644 --- a/book/src/generated/lang-support.md +++ b/book/src/generated/lang-support.md @@ -100,7 +100,7 @@ | julia | ✓ | ✓ | ✓ | `julia` | | just | ✓ | ✓ | ✓ | | | kdl | ✓ | ✓ | ✓ | | -| koka | ✓ | | ✓ | | +| koka | ✓ | | ✓ | `koka` | | kotlin | ✓ | | | `kotlin-language-server` | | latex | ✓ | ✓ | | `texlab` | | ld | ✓ | | ✓ | | diff --git a/languages.toml b/languages.toml index 95c467659..49185cc50 100644 --- a/languages.toml +++ b/languages.toml @@ -45,6 +45,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" } @@ -3264,10 +3265,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 fead98384..1ef409278 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 0a47bcbbd..6045373db 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)