Migrate to typescript-language-server

jupyter-lsp · Oct 24, 2021 · 9b238a3 · 9b238a3
1 parent 1f57ce0
commit 9b238a3
Show file tree

Hide file tree

Showing 7 changed files with 151 additions and 194 deletions.
diff --git a/atest/05_Features/Completion.robot b/atest/05_Features/Completion.robot
@@ -60,7 +60,7 @@ Invalidates On Cell Change
 Invalidates On Focus Loss
     Enter Cell Editor    1    line=2
     Press Keys    None    TAB
-    Click JupyterLab Menu      File
+    Click JupyterLab Menu    File
     # just to increase chances of catching this on CI (which is slow)
     Sleep    4s
     Completer Should Not Suggest    test

diff --git a/atest/Keywords.robot b/atest/Keywords.robot
@@ -324,7 +324,7 @@ Wait Until Fully Initialized
     Wait Until Element Contains    ${STATUSBAR}    Fully initialized    timeout=60s
 
 Wait For Ready State
-    Wait For Condition                 return document.readyState=="complete"
+    Wait For Condition    return document.readyState=="complete"
 
 Open Context Menu Over
     [Arguments]    ${sel}

diff --git a/docs/Language Servers.ipynb b/docs/Language Servers.ipynb
@@ -250,7 +250,7 @@
     "    vscode-css-languageserver-bin \\\n",
     "    dockerfile-language-server-nodejs \\\n",
     "    vscode-html-languageserver-bin \\\n",
-    "    javascript-typescript-langserver \\\n",
+    "    typescript-language-server \\\n",
     "    vscode-json-languageserver-bin \\\n",
     "    yaml-language-server\n",
     "```\n",
@@ -374,4 +374,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 4
-}
+}
diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
     "eslint-plugin-prettier": "^3.1.4",
     "eslint-plugin-react": "^7.21.5",
     "husky": "^3.0.9",
-    "javascript-typescript-langserver": "^2.11.3",
+    "typescript-language-server": "^0.6.4",
     "jest-github-actions-reporter": "^1.0.2",
     "lerna": "^3.13.2",
     "npm-run-all": "^4.1.5",

diff --git a/python_packages/jupyter_lsp/jupyter_lsp/specs/javascript_typescript_langserver.py b/python_packages/jupyter_lsp/jupyter_lsp/specs/javascript_typescript_langserver.py
@@ -13,7 +13,7 @@ class JavascriptTypescriptLanguageServer(NodeModuleSpec):
         "javascriptreact",
     ]
     spec = dict(
-        display_name=key,
+        display_name=key + " (deprecated)",
         mime_types=[
             "application/typescript",
             "text/typescript-jsx",

diff --git a/python_packages/jupyter_lsp/jupyter_lsp/specs/typescript_language_server.py b/python_packages/jupyter_lsp/jupyter_lsp/specs/typescript_language_server.py
@@ -0,0 +1,39 @@
+from .utils import NodeModuleSpec
+
+
+class TypescriptLanguageServer(NodeModuleSpec):
+    node_module = key = "typescript-language-server"
+    script = ["lib", "cli.js"]
+    args = ["--stdio"]
+    languages = [
+        "javascript",
+        "jsx",
+        "typescript",
+        "typescript-jsx",
+        "typescriptreact",
+        "javascriptreact",
+    ]
+    spec = dict(
+        display_name=key,
+        mime_types=[
+            "application/typescript",
+            "text/typescript-jsx",
+            "text/javascript",
+            "text/ecmascript",
+            "application/javascript",
+            "application/x-javascript",
+            "application/ecmascript",
+            "text/jsx",
+        ],
+        urls=dict(
+            home="https://github.com/typescript-language-server/{}".format(key),
+            issues="https://github.com/typescript-language-server/{}/issues".format(
+                key
+            ),
+        ),
+        install=dict(
+            npm="npm install --save-dev {}".format(key),
+            yarn="yarn add --dev {}".format(key),
+            jlpm="jlpm add --dev {}".format(key),
+        ),
+    )