From 1bc1628b56cc5eef96f2ec9601b6204b5307c6b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matou=C5=A1=20Dzivjak?= Date: Thu, 8 Sep 2022 20:16:11 +0200 Subject: [PATCH 1/2] feat(lsp): jsonnet-language-server Add jsonnet-language-server for jsonnet language. See: https://github.com/grafana/jsonnet-language-server --- book/src/generated/lang-support.md | 2 +- languages.toml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md index 88c9df91484f..586db6e94c98 100644 --- a/book/src/generated/lang-support.md +++ b/book/src/generated/lang-support.md @@ -53,7 +53,7 @@ | javascript | ✓ | ✓ | ✓ | `typescript-language-server` | | jsdoc | ✓ | | | | | json | ✓ | | ✓ | `vscode-json-language-server` | -| jsonnet | ✓ | | | | +| jsonnet | ✓ | | | `jsonnet-language-server` | | jsx | ✓ | ✓ | ✓ | `typescript-language-server` | | julia | ✓ | | | `julia` | | kotlin | ✓ | | | `kotlin-language-server` | diff --git a/languages.toml b/languages.toml index 12f02781d44b..f267da9fd11f 100644 --- a/languages.toml +++ b/languages.toml @@ -1734,6 +1734,7 @@ file-types = ["libsonnet", "jsonnet"] roots = [] comment-token = "//" indent = { tab-width = 2, unit = " " } +language-server = { command = "jsonnet-language-server", args= ["-t"] } [[grammar]] name = "jsonnet" From 4c8916eb0c949874b18bece09254980fbc41b398 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matou=C5=A1=20Dzivjak?= Date: Thu, 8 Sep 2022 23:10:24 +0200 Subject: [PATCH 2/2] enable lint option Enable lint option to highlight unused vars, etc. and take full advantage of the running language server. --- languages.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/languages.toml b/languages.toml index f267da9fd11f..c8e72af8a823 100644 --- a/languages.toml +++ b/languages.toml @@ -1731,10 +1731,10 @@ source = { git = "https://github.com/Giorbo/tree-sitter-sml", rev = "bd4055d5554 name = "jsonnet" scope = "source.jsonnet" file-types = ["libsonnet", "jsonnet"] -roots = [] +roots = ["jsonnetfile.json"] comment-token = "//" indent = { tab-width = 2, unit = " " } -language-server = { command = "jsonnet-language-server", args= ["-t"] } +language-server = { command = "jsonnet-language-server", args= ["-t", "--lint"] } [[grammar]] name = "jsonnet"