Skip to content

Commit 724a65f

Browse files
bernardassanmtoohey31
authored andcommitted
Add docker-compose language (helix-editor#9661)
* languages: add docker-compose language it uses docker-compose-langserver as lsp And yaml for syntax highlighting, indents and injections * languages: add luajit as a shebang of lua This helps to provide syntax highlighting and other lua goodies when writing luajit * book(update): run cargo xtask docgen * since helix-editor#8006 full filenames uses glob
1 parent 609edb9 commit 724a65f

File tree

5 files changed

+16
-1
lines changed

5 files changed

+16
-1
lines changed

book/src/generated/lang-support.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
| devicetree || | | |
3131
| dhall ||| | `dhall-lsp-server` |
3232
| diff || | | |
33+
| docker-compose || || `docker-compose-langserver` |
3334
| dockerfile || | | `docker-langserver` |
3435
| dot || | | `dot-language-server` |
3536
| dtd || | | |

languages.toml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ cuelsp = { command = "cuelsp" }
2323
dart = { command = "dart", args = ["language-server", "--client-id=helix"] }
2424
dhall-lsp-server = { command = "dhall-lsp-server" }
2525
docker-langserver = { command = "docker-langserver", args = ["--stdio"] }
26+
docker-compose-langserver = { command = "docker-compose-langserver", args = ["--stdio"]}
2627
dot-language-server = { command = "dot-language-server", args = ["--stdio"] }
2728
elixir-ls = { command = "elixir-ls", config = { elixirLS.dialyzerEnabled = false } }
2829
elm-language-server = { command = "elm-language-server" }
@@ -1092,7 +1093,7 @@ name = "lua"
10921093
injection-regex = "lua"
10931094
scope = "source.lua"
10941095
file-types = ["lua"]
1095-
shebangs = ["lua"]
1096+
shebangs = ["lua", "luajit"]
10961097
roots = [".luarc.json", ".luacheckrc", ".stylua.toml", "selene.toml", ".git"]
10971098
comment-token = "--"
10981099
indent = { tab-width = 2, unit = " " }
@@ -1460,6 +1461,16 @@ language-servers = [ "docker-langserver" ]
14601461
name = "dockerfile"
14611462
source = { git = "https://github.com/camdencheek/tree-sitter-dockerfile", rev = "8ee3a0f7587b2bd8c45c8cb7d28bd414604aec62" }
14621463

1464+
[[language]]
1465+
name = "docker-compose"
1466+
scope = "source.yaml.docker-compose"
1467+
roots = ["docker-compose.yaml", "docker-compose.yml"]
1468+
language-servers = [ "docker-compose-langserver" ]
1469+
file-types = [{ glob = "docker-compose.yaml" }, { glob = "docker-compose.yml" }]
1470+
comment-token = "#"
1471+
indent = { tab-width = 2, unit = " " }
1472+
grammar = "yaml"
1473+
14631474
[[language]]
14641475
name = "git-commit"
14651476
scope = "git.commitmsg"
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
; inherits: yaml
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
; inherits: yaml
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
; inherits: yaml

0 commit comments

Comments
 (0)