Add GLSL language support

manateelazycat · Jul 14, 2024 · a22b96e · a22b96e
1 parent 094f551
commit a22b96e
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -381,7 +381,8 @@ If your language supports mixed multi-language servers, it is recommended to che
 | Fortran     | [fortls](https://github.com/gnikit/fortls)                                                         |                                                                                                                                                                                                                                                                     |
 | Futhark     | [futhark-lsp](https://futhark-lang.org)                                         |                                                                                                                                                                                                                               |
 | F#          | [fsautocomplete](https://github.com/fsharp/FsAutoComplete)                                         |                                                                                                                                                                                                                                                                     |
-| Gleam       | [gleam lsp](https://gleam.run/news/v0.21-introducing-the-gleam-language-server/)                   |                                                                                                                                                                                                                                                                     |
+| Gleam       | [gleam lsp](https://gleam.run/news/v0.21-introducing-the-gleam-language-server/)                   |                                                                                                                                                                                              | GLSL        | [glsl-language-server](https://github.com/svenstaro/glsl-language-server)                   |                                                                                                                                                                                                                               |
+                                                                       |
 | Go          | [gopls](https://github.com/golang/tools/tree/master/gopls)                                         | Make sure install [go-mode](https://github.com/dominikh/go-mode.el) and `gopls` in PATH, please do `ln -s ~/go/bin/gopls ~/.local/bin`, and do `go mod init` first                                                                                                    |
 | GraphQL     | [graphql-lsp](https://github.com/graphql/graphiql/tree/main/packages/graphql-language-service-cli) |                                                                                                                                                                                                                                                                     |
 | Groovy      | [groovy-language-server](https://github.com/GroovyLanguageServer/groovy-language-server)           | Create a script "groovy-language-server" in PATH, with `$JAVA_HOME/bin/java -jar <path>/groovy-language-server-all.jar`                                                                                                                                             |

diff --git a/README.zh-CN.md b/README.zh-CN.md
@@ -381,6 +381,7 @@ lsp-bridge 针对许多语言都提供 2 个以上的语言服务器支持，
 | Futhark     | [futhark-lsp](https://futhark-lang.org)                                         |                                                                                                                                                                                                                               |
 | F#          | [fsautocomplete](https://github.com/fsharp/FsAutoComplete)                                         |                                                                                                                                                                                                                               |
 | Gleam       | [gleam lsp](https://gleam.run/news/v0.21-introducing-the-gleam-language-server/)                   |                                                                                                                                                                                                                               |
+| GLSL        | [glsl-language-server](https://github.com/svenstaro/glsl-language-server)                   |                                                                                                                                                                                                                               |
 | Go          | [gopls](https://github.com/golang/tools/tree/master/gopls)                                         | 确保安装 [go-mode](https://github.com/dominikh/go-mode.el)， 同时确保 `gopls` 在 PATH 环境变量中, 执行命令 `ln -s ~/go/bin/gopls ~/.local/bin`, 还要在补全之前执行 `go mod init` 命令                                           |
 | GraphQL     | [graphql-lsp](https://github.com/graphql/graphiql/tree/main/packages/graphql-language-service-cli) |                                                                                                                                                                                                                               |
 | Groovy      | [groovy-language-server](https://github.com/GroovyLanguageServer/groovy-language-server)           | 在 PATH 中创建一个名为 "groovy-language-server" 的脚本, 内容为 `$JAVA_HOME/bin/java -jar <path>/groovy-language-server-all.jar`                                                                                               |

diff --git a/langserver/glsl-language-server.json b/langserver/glsl-language-server.json
@@ -0,0 +1,9 @@
+{
+  "name": "glsl-language-server",
+  "languageId": "glsl",
+  "command": [
+    "glslls",
+    "--stdin"
+  ],
+  "settings": {}
+}
diff --git a/lsp-bridge.el b/lsp-bridge.el
@@ -577,6 +577,7 @@ Possible choices are basedpyright_ruff, pyright_ruff, pyright-background-analysi
     (solidity-mode .                                                             "solidity")
     (gleam-ts-mode .                                                             "gleam")
     (ada-mode .                                                                  "ada-language-server")
+    (glsl-mode .                                                                 "glsl-language-server")
     (cobol-mode .                                                                "che-che4z-lsp-for-cobol")
     (hlasm-mode .                                                                "che-che4z-lsp-for-hlasm")
     (yang-mode .                                                                 "yang-lsp")
@@ -684,6 +685,7 @@ Possible choices are basedpyright_ruff, pyright_ruff, pyright-background-analysi
     solidity-mode-hook
     gleam-ts-mode-hook
     ada-mode-hook
+    glsl-mode-hook
     cobol-mode-hook
     hlasm-mode-hook
     yang-mode-hook
@@ -748,6 +750,7 @@ you can customize `lsp-bridge-get-workspace-folder' to return workspace folder p
     (raku-mode                  . raku-indent-offset)  ; Perl6/Raku
     (erlang-mode                . erlang-indent-level) ; Erlang
     (ada-mode                   . ada-indent)          ; Ada
+    (glsl-mode                  . lsp-bridge-indent-two-level)  ; GLSL
     (cobol-mode                 . lsp-bridge-indent-four-level) ; Cobol
     (hlasm-mode                 . lsp-bridge-indent-eight-level) ; HLASM
     (yang-mode                  . lsp-bridge-indent-two-level) ; Yang

diff --git a/todo.md b/todo.md
@@ -28,8 +28,6 @@ Below LSP server haven't supported, PR are welcome. ;)
 
 16. **Gauge**: [github.com/getgauge/gauge](https://github.com/getgauge/gauge)
 
-17. **GLSL**: [github.com/svenstaro/glsl-language-server](https://github.com/svenstaro/glsl-language-server)
-
 18. **Grain**: [github.com/grain-lang/grain](https://github.com/grain-lang/grain)
 
 19. **Helm (Kubernetes)**: [github.com/mrjosh/helm-ls](https://github.com/mrjosh/helm-ls)