Merge pull request #1114 from tani/tinymist

feat: add tinymist support for Typst language
manateelazycat · Nov 19, 2024 · 155952f · 155952f
2 parents 72a19f4 + b2bcd81
commit 155952f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -460,6 +460,7 @@ If your language supports mixed multi-language servers, it is recommended to che
 | TTCN-3  | [ntt](https://github.com/nokia/ntt)             |                                                                                                                                                                                                                               |
 | Typescript  | [typescript](https://github.com/typescript-language-server/typescript-language-server)             |                                                                                                                                                                                                                                                                     |
 | Typst       | [typst-lsp](https://github.com/nvarner/typst-lsp)                                                  |                                                                                                                                                                                                                                                                     |
+| Typst       | [tinymist](https://github.com/Myriad-Dreamin/tinymist)                                                  |                                                                                                                                                                                                                                                                     |
 | V     | [v-analyzer](https://github.com/vlang/vscode-vlang)                                                |                                                                                                                                                                                                                               |
 | Verilog     | [verible](https://github.com/chipsalliance/verible)                                                | `lsp-bridge-verilog-lsp-server` set to `verible`                                                                                                                                                                                                                                                                    |
 |      | [svls](https://github.com/dalance/svls)                                                | `lsp-bridge-verilog-lsp-server` set to `svls`                                                                                                                                                                                                                                                                    |

diff --git a/README.zh-CN.md b/README.zh-CN.md
@@ -455,6 +455,7 @@ lsp-bridge 针对许多语言都提供 2 个以上的语言服务器支持，
 | TTCN-3  | [ntt](https://github.com/nokia/ntt)             |                                                                                                                                                                                                                               |
 | Typescript  | [typescript](https://github.com/typescript-language-server/typescript-language-server)             |                                                                                                                                                                                                                               |
 | Typst       | [typst-lsp](https://github.com/nvarner/typst-lsp)                                                  |                                                                                                                                                                                                                               |
+| Typst       | [tinymist](https://github.com/Myriad-Dreamin/tinymist)                                                  |                                                                                                                                                                                                                               |
 | V     | [v-analyzer](https://github.com/vlang/vscode-vlang)                                                |                                                                                                                                                                                                                               |
 | Verilog     | [verible](https://github.com/chipsalliance/verible)                                                | `lsp-bridge-verilog-lsp-server` 设置为 `verible`                                                                                                                                                                                                                              |
 |      | [svls](https://github.com/dalance/svls)                                                | `lsp-bridge-verilog-lsp-server` 设置为 `svls`                                                                                                                                                                                                                              |

diff --git a/langserver/tinymist.json b/langserver/tinymist.json
@@ -0,0 +1,6 @@
+{
+  "name": "tinymist",
+  "languageId": "typst",
+  "command": ["tinymist", "lsp"],
+  "settings": {}
+}
diff --git a/lsp-bridge.el b/lsp-bridge.el
@@ -458,7 +458,7 @@ Then LSP-Bridge will start by gdb, please send new issue with `*lsp-bridge*' buf
     (("wxml") . "wxml-language-server")
     (("html") . "vscode-html-language-server")
     (("astro") . "astro-ls")
-    (("typ") . "typst-lsp")
+    (("typ") . "tinymist")
     )
   "The lang server rule for file extension."
   :type 'cons)
@@ -701,6 +701,7 @@ If nil, lsp-bridge would try to detect by default."
     kotlin-mode-hook
     vhdl-mode-hook
     typst-mode-hook
+    typst-ts-mode-hook
     graphql-mode-hook
     graphql-ts-mode-hook
     c-ts-mode-hook
@@ -881,6 +882,7 @@ you can customize `lsp-bridge-get-workspace-folder' to return workspace folder p
     (sh-mode .            "\$\{")
     (bash-mode .          "\$\{")
     (bash-ts-mode .       "\$\{")
+    (typst-ts-mode .      "\$\{")
     (typst--base-mode .   "\$\{")
     (typst--code-mode .   "\$\{")
     (typst--math-mode .   "\$\{")