Merge pull request #930 from braineo/graphql-ts-mode-support

Graphql ts mode support and initialization fix
manateelazycat · May 2, 2024 · 896fea5 · 896fea5
2 parents c0dfa97 + f81cb16
commit 896fea5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/core/lspserver.py b/core/lspserver.py
@@ -556,17 +556,24 @@ def handle_workspace_configuration_request(self, name, request_id, params):
 
         # Otherwise, send back section value or default settings.
         items = []
+        serverName = self.server_info["name"]
         for p in params["items"]:
-            section = p.get("section", self.server_info["name"])
+            section = p.get("section", serverName)
             sessionSettings = settings.get(section, {})
 
-            if self.server_info["name"] == "vscode-eslint-language-server":
+            if serverName == "vscode-eslint-language-server":
                 sessionSettings = settings
                 sessionSettings["workspaceFolder"] = {
                     "name": self.project_name,
                     "uri": path_to_uri(self.project_path),
                 }
 
+            elif serverName == "graphql-lsp":
+                sessionSettings = settings
+                sessionSettings["load"] = {
+                    "rootDir": self.project_path,
+                }
+
             items.append(sessionSettings)
         self.sender.send_response(request_id, items)
 

diff --git a/lsp-bridge.el b/lsp-bridge.el
@@ -547,7 +547,7 @@ Possible choices are pyright_ruff, pyright-background-analysis_ruff, jedi_ruff,
     (nix-mode .                                                                  lsp-bridge-nix-lsp-server)
     (nickel-mode .                                                               "nls")
     (ess-r-mode .                                                                "rlanguageserver")
-    (graphql-mode .                                                              "graphql-lsp")
+    ((graphql-mode graphql-ts-mode) .                                            "graphql-lsp")
     (swift-mode .                                                                "swift-sourcekit")
     (csharp-mode .                                                               lsp-bridge-csharp-lsp-server)
     (kotlin-mode .                                                               "kotlin-language-server")
@@ -635,6 +635,7 @@ Possible choices are pyright_ruff, pyright-background-analysis_ruff, jedi_ruff,
     vhdl-mode-hook
     typst-mode-hook
     graphql-mode-hook
+    graphql-ts-mode-hook
     c-ts-mode-hook
     c++-ts-mode-hook
     cmake-ts-mode-hook