Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

Swap Kotlin LSPs in documentation to reflect actual default config (#54061)

XiaoYan Li01568e5569b4
diff --git a/docs/src/languages/kotlin.md b/docs/src/languages/kotlin.md
index 262dce5ac45..93f48980a70 100644
--- a/docs/src/languages/kotlin.md
+++ b/docs/src/languages/kotlin.md
@@ -9,10 +9,45 @@ Kotlin language support in Zed is provided by the community-maintained [Kotlin e
Report issues to: [https://github.com/zed-extensions/kotlin/issues](https://github.com/zed-extensions/kotlin/issues)
- Tree-sitter: [fwcd/tree-sitter-kotlin](https://github.com/fwcd/tree-sitter-kotlin)
-- Language Server: [fwcd/kotlin-language-server](https://github.com/fwcd/kotlin-language-server)
-- Alternate Language Server: [kotlin/kotlin-lsp](https://github.com/kotlin/kotlin-lsp)
+- Language Server: [kotlin/kotlin-lsp](https://github.com/kotlin/kotlin-lsp)
+- Alternate Language Server: [fwcd/kotlin-language-server](https://github.com/fwcd/kotlin-language-server)
-## Configuration
+## Kotlin LSP
+
+[Kotlin LSP](https://github.com/kotlin/kotlin-lsp) is the official language server for Kotlin, built by JetBrains. It is used by default.
+
+It is downloaded and updated automatically. If you want to use a manually installed version instead, set the path to the `kotlin-lsp.sh` script from the release assets in your `settings.json`:
+
+```json [settings]
+{
+ "lsp": {
+ "kotlin-lsp": {
+ "binary": {
+ "path": "path/to/kotlin-lsp.sh",
+ "arguments": ["--stdio"]
+ }
+ }
+ }
+}
+```
+
+Note that the `kotlin-lsp.sh` script expects to be run from within the unzipped release zip file, and should not be moved elsewhere.
+
+## Kotlin Language Server
+
+The community-maintained [Kotlin Language Server](https://github.com/fwcd/kotlin-language-server) can be used instead of Kotlin LSP by explicitly enabling it in your `settings.json`:
+
+```json [settings]
+{
+ "languages": {
+ "Kotlin": {
+ "language_servers": ["kotlin-language-server", "!kotlin-lsp", "..."]
+ }
+ }
+}
+```
+
+### Configuration
Workspace configuration options can be passed to the language server via lsp
settings in `settings.json`.
@@ -21,7 +56,7 @@ The full list of lsp `settings` can be found
[here](https://github.com/fwcd/kotlin-language-server/blob/main/server/src/main/kotlin/org/javacs/kt/Configuration.kt)
under `class Configuration` and initialization_options under `class InitializationOptions`.
-### JVM Target
+#### JVM Target
The following example changes the JVM target from `default` (which is 1.8) to
`17`:
@@ -42,7 +77,7 @@ The following example changes the JVM target from `default` (which is 1.8) to
}
```
-### JAVA_HOME
+#### JAVA_HOME
To use a specific java installation, just specify the `JAVA_HOME` environment variable with: