From 67415e096ea70173d30550803559eb2347ed04d6 Mon Sep 17 00:00:00 2001 From: Michael Davis Date: Wed, 30 Nov 2022 08:27:08 -0600 Subject: [PATCH] Fix file-types declaration for racket (#4915) Both the racket and scheme entries used the rkt file-extension. This commit removes that entry for scheme and so that the racket entry takes precedence. We explicitly point to the scheme grammar now and setup queries that inherit from scheme. This should enable using the racket language server configuration. --- book/src/generated/lang-support.md | 2 +- languages.toml | 3 ++- runtime/queries/racket/highlights.scm | 1 + runtime/queries/racket/injections.scm | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 runtime/queries/racket/highlights.scm create mode 100644 runtime/queries/racket/injections.scm diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md index 487057e6..b1fde001 100644 --- a/book/src/generated/lang-support.md +++ b/book/src/generated/lang-support.md @@ -95,7 +95,7 @@ | python | ✓ | ✓ | ✓ | `pylsp` | | qml | ✓ | | ✓ | `qmlls` | | r | ✓ | | | `R` | -| racket | | | | `racket` | +| racket | ✓ | | | `racket` | | regex | ✓ | | | | | rescript | ✓ | ✓ | | `rescript-language-server` | | rmarkdown | ✓ | | ✓ | `R` | diff --git a/languages.toml b/languages.toml index 756315cd..4eb8a4da 100644 --- a/languages.toml +++ b/languages.toml @@ -880,6 +880,7 @@ file-types = ["rkt"] shebangs = ["racket"] comment-token = ";" language-server = { command = "racket", args = ["-l", "racket-langserver"] } +grammar = "scheme" [[language]] name = "comment" @@ -1526,7 +1527,7 @@ source = { git = "https://github.com/metio/tree-sitter-ssh-client-config", rev = name = "scheme" scope = "source.scheme" injection-regex = "scheme" -file-types = ["ss", "rkt"] # "scm", +file-types = ["ss"] # "scm", roots = [] comment-token = ";" indent = { tab-width = 2, unit = " " } diff --git a/runtime/queries/racket/highlights.scm b/runtime/queries/racket/highlights.scm new file mode 100644 index 00000000..e11eb788 --- /dev/null +++ b/runtime/queries/racket/highlights.scm @@ -0,0 +1 @@ +; inherits: scheme diff --git a/runtime/queries/racket/injections.scm b/runtime/queries/racket/injections.scm new file mode 100644 index 00000000..e11eb788 --- /dev/null +++ b/runtime/queries/racket/injections.scm @@ -0,0 +1 @@ +; inherits: scheme