🐛 FIX: Split javascript and typescript servers into separate classes

sublimelsp · Nov 13, 2019 · ef391d6 · ef391d6
1 parent 7f5c2e7
commit ef391d6
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 14 deletions.
diff --git a/LSP-javascript.sublime-settings b/LSP-javascript.sublime-settings
@@ -0,0 +1,21 @@
+{
+    "client" : {
+        "enabled": true,
+        "languages": [
+            {
+                "languageId": "javascript",
+                "scopes": [
+                    "source.js",
+                    "source.jsx"
+                ],
+                "syntaxes": [
+                    "Packages/User/JS Custom/Syntaxes/React.sublime-syntax",
+                    "Packages/JavaScript/JavaScript.sublime-syntax",
+                    "Packages/Babel/JavaScript (Babel).sublime-syntax"
+                ]
+            }
+        ],
+        "initializationOptions": {},
+        "settings": {}
+    }
+}
diff --git a/LSP-typescript.sublime-settings b/LSP-typescript.sublime-settings
@@ -5,18 +5,12 @@
 			{
 				"languageId": "typescript",
 				"scopes": [
-					"source.js",
-					"source.jsx",
 					"source.ts",
 					"source.tsx"
 				],
 				"syntaxes": [
-					"Packages/User/JS Custom/Syntaxes/React.sublime-syntax",
-					"Packages/JavaScript/JavaScript.sublime-syntax",
-					"Packages/Babel/JavaScript (Babel).sublime-syntax",
 					"Packages/TypeScript Syntax/TypeScript.tmLanguage",
-					"Packages/TypeScript Syntax/TypeScriptReact.tmLanguage",
-					"Packages/User/TypeScriptReactGraphQL.sublime-syntax"
+					"Packages/TypeScript Syntax/TypeScriptReact.tmLanguage"
 				]
 			}
 		],

diff --git a/plugin.py b/plugin.py
@@ -90,18 +90,12 @@ def config(self) -> ClientConfig:
                 {
                     "languageId": "typescript",
                     "scopes": [
-                        "source.js",
-                        "source.jsx",
                         "source.ts",
                         "source.tsx"
                     ],
                     "syntaxes": [
-                        "Packages/User/JS Custom/Syntaxes/React.sublime-syntax",
-                        "Packages/JavaScript/JavaScript.sublime-syntax",
-                        "Packages/Babel/JavaScript (Babel).sublime-syntax",
                         "Packages/TypeScript Syntax/TypeScript.tmLanguage",
-                        "Packages/TypeScript Syntax/TypeScriptReact.tmLanguage",
-                        "Packages/User/TypeScriptReactGraphQL.sublime-syntax"
+                        "Packages/TypeScript Syntax/TypeScriptReact.tmLanguage"
                     ]
                 }
             ],
@@ -117,5 +111,51 @@ def on_start(self, window) -> bool:
             return False
         return True
 
+    def on_initialized(self, client) -> None:
+        pass   # extra initialization here.
+
+
+class LspJavaScriptPlugin(LanguageHandler):
+    @property
+    def name(self) -> str:
+        return 'lsp-javascript'
+
+    @property
+    def config(self) -> ClientConfig:
+        settings = sublime.load_settings("LSP-javascript.sublime-settings")
+        client_configuration = settings.get('client')
+
+        default_configuration = {
+            "command": [
+                "node",
+                server_path,
+                '--stdio'
+            ],
+            "languages": [
+                {
+                    "languageId": "javascript",
+                    "scopes": [
+                        "source.js",
+                        "source.jsx"
+                    ],
+                    "syntaxes": [
+                        "Packages/User/JS Custom/Syntaxes/React.sublime-syntax",
+                        "Packages/JavaScript/JavaScript.sublime-syntax",
+                        "Packages/Babel/JavaScript (Babel).sublime-syntax"
+                    ]
+                }
+            ],
+            "initializationOptions": {}
+        }
+
+        default_configuration.update(client_configuration)
+        return read_client_config('lsp-javascript', default_configuration)
+
+    def on_start(self, window) -> bool:
+        if not is_node_installed():
+            sublime.status_message('Please install Node.js for the JavaScript Language Server to work.')
+            return False
+        return True
+
     def on_initialized(self, client) -> None:
         pass   # extra initialization here.