From 1cb09d3cdb82b290b5ce623211828d455ffff5b9 Mon Sep 17 00:00:00 2001
From: Michael Davis <mcarsondavis@gmail.com>
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 487057e61f3b4..b1fde0016abb9 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 756315cd6924c..4eb8a4dab1d5d 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 0000000000000..e11eb7881081f
--- /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 0000000000000..e11eb7881081f
--- /dev/null
+++ b/runtime/queries/racket/injections.scm
@@ -0,0 +1 @@
+; inherits: scheme