From 72e3d8b11596e0719417c377b5f1d65bf486e1ef Mon Sep 17 00:00:00 2001
From: Ultra-Code <mega.alpha100@gmail.com>
Date: Sun, 18 Feb 2024 16:54:30 +0000
Subject: [PATCH 1/4] languages: add docker-compose language

it uses docker-compose-langserver as lsp
And yaml for syntax highlighting, indents and injections
---
 languages.toml                                | 11 +++++++++++
 runtime/queries/docker-compose/highlights.scm |  1 +
 runtime/queries/docker-compose/indents.scm    |  1 +
 runtime/queries/docker-compose/injections.scm |  1 +
 4 files changed, 14 insertions(+)
 create mode 100644 runtime/queries/docker-compose/highlights.scm
 create mode 100644 runtime/queries/docker-compose/indents.scm
 create mode 100644 runtime/queries/docker-compose/injections.scm

diff --git a/languages.toml b/languages.toml
index 78078ca5886a..7f412ee6235f 100644
--- a/languages.toml
+++ b/languages.toml
@@ -23,6 +23,7 @@ cuelsp = { command = "cuelsp" }
 dart = { command = "dart", args = ["language-server", "--client-id=helix"] }
 dhall-lsp-server = { command = "dhall-lsp-server" }
 docker-langserver = { command = "docker-langserver", args = ["--stdio"] }
+docker-compose-langserver = { command = "docker-compose-langserver", args = ["--stdio"]}
 dot-language-server = { command = "dot-language-server", args = ["--stdio"] }
 elixir-ls = { command = "elixir-ls", config = { elixirLS.dialyzerEnabled = false } }
 elm-language-server = { command = "elm-language-server" }
@@ -1460,6 +1461,16 @@ language-servers = [ "docker-langserver" ]
 name = "dockerfile"
 source = { git = "https://github.com/camdencheek/tree-sitter-dockerfile", rev = "8ee3a0f7587b2bd8c45c8cb7d28bd414604aec62" }
 
+[[language]]
+name = "docker-compose"
+scope = "source.yaml.docker-compose"
+roots = ["docker-compose.yaml", "docker-compose.yml"]
+language-servers = [ "docker-compose-langserver" ]
+file-types = ["docker-compose.yaml", "docker-compose.yml"]
+comment-token = "#"
+indent = { tab-width = 2, unit = "  " }
+grammar = "yaml"
+
 [[language]]
 name = "git-commit"
 scope = "git.commitmsg"
diff --git a/runtime/queries/docker-compose/highlights.scm b/runtime/queries/docker-compose/highlights.scm
new file mode 100644
index 000000000000..4ba254e826d2
--- /dev/null
+++ b/runtime/queries/docker-compose/highlights.scm
@@ -0,0 +1 @@
+; inherits: yaml
diff --git a/runtime/queries/docker-compose/indents.scm b/runtime/queries/docker-compose/indents.scm
new file mode 100644
index 000000000000..4ba254e826d2
--- /dev/null
+++ b/runtime/queries/docker-compose/indents.scm
@@ -0,0 +1 @@
+; inherits: yaml
diff --git a/runtime/queries/docker-compose/injections.scm b/runtime/queries/docker-compose/injections.scm
new file mode 100644
index 000000000000..4ba254e826d2
--- /dev/null
+++ b/runtime/queries/docker-compose/injections.scm
@@ -0,0 +1 @@
+; inherits: yaml

From 2e4916fb24ca9e5a4ff141671a3940bfb7d83e57 Mon Sep 17 00:00:00 2001
From: Ultra-Code <mega.alpha100@gmail.com>
Date: Sun, 18 Feb 2024 17:00:47 +0000
Subject: [PATCH 2/4] languages: add luajit as a shebang of lua

This helps to provide syntax highlighting and
other lua goodies when writing luajit
---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index 7f412ee6235f..c20fcaef60a2 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1093,7 +1093,7 @@ name = "lua"
 injection-regex = "lua"
 scope = "source.lua"
 file-types = ["lua"]
-shebangs = ["lua"]
+shebangs = ["lua", "luajit"]
 roots = [".luarc.json", ".luacheckrc", ".stylua.toml", "selene.toml", ".git"]
 comment-token = "--"
 indent = { tab-width = 2, unit = "  " }

From c8526d79ea0767eb220bcc6753d9fabd5187e736 Mon Sep 17 00:00:00 2001
From: Ultra-Code <mega.alpha100@gmail.com>
Date: Sun, 18 Feb 2024 20:58:26 +0000
Subject: [PATCH 3/4] book(update): run cargo xtask docgen

---
 book/src/generated/lang-support.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index bfe6d6b1e791..a37e165f29ef 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -30,6 +30,7 @@
 | devicetree | ✓ |  |  |  |
 | dhall | ✓ | ✓ |  | `dhall-lsp-server` |
 | diff | ✓ |  |  |  |
+| docker-compose | ✓ |  | ✓ | `docker-compose-langserver` |
 | dockerfile | ✓ |  |  | `docker-langserver` |
 | dot | ✓ |  |  | `dot-language-server` |
 | dtd | ✓ |  |  |  |

From b6b465841c0eeb8cb20eadcd54d9264f33a2da2d Mon Sep 17 00:00:00 2001
From: Ultra-Code <mega.alpha100@gmail.com>
Date: Sun, 18 Feb 2024 21:01:23 +0000
Subject: [PATCH 4/4] since #8006 full filenames uses glob

---
 languages.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/languages.toml b/languages.toml
index c20fcaef60a2..e52dcabbcf0a 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1466,7 +1466,7 @@ name = "docker-compose"
 scope = "source.yaml.docker-compose"
 roots = ["docker-compose.yaml", "docker-compose.yml"]
 language-servers = [ "docker-compose-langserver" ]
-file-types = ["docker-compose.yaml", "docker-compose.yml"]
+file-types = [{ glob = "docker-compose.yaml" }, { glob = "docker-compose.yml" }]
 comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
 grammar = "yaml"