Skip to content

Commit 9b238a3

Browse files
committed
Migrate to typescript-language-server
1 parent 1f57ce0 commit 9b238a3

File tree

7 files changed

+151
-194
lines changed

7 files changed

+151
-194
lines changed

atest/05_Features/Completion.robot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Invalidates On Cell Change
6060
Invalidates On Focus Loss
6161
Enter Cell Editor 1 line=2
6262
Press Keys None TAB
63-
Click JupyterLab Menu File
63+
Click JupyterLab Menu File
6464
# just to increase chances of catching this on CI (which is slow)
6565
Sleep 4s
6666
Completer Should Not Suggest test

atest/Keywords.robot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ Wait Until Fully Initialized
324324
Wait Until Element Contains ${STATUSBAR} Fully initialized timeout=60s
325325

326326
Wait For Ready State
327-
Wait For Condition return document.readyState=="complete"
327+
Wait For Condition return document.readyState=="complete"
328328

329329
Open Context Menu Over
330330
[Arguments] ${sel}

docs/Language Servers.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@
250250
" vscode-css-languageserver-bin \\\n",
251251
" dockerfile-language-server-nodejs \\\n",
252252
" vscode-html-languageserver-bin \\\n",
253-
" javascript-typescript-langserver \\\n",
253+
" typescript-language-server \\\n",
254254
" vscode-json-languageserver-bin \\\n",
255255
" yaml-language-server\n",
256256
"```\n",
@@ -374,4 +374,4 @@
374374
},
375375
"nbformat": 4,
376376
"nbformat_minor": 4
377-
}
377+
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"eslint-plugin-prettier": "^3.1.4",
1414
"eslint-plugin-react": "^7.21.5",
1515
"husky": "^3.0.9",
16-
"javascript-typescript-langserver": "^2.11.3",
16+
"typescript-language-server": "^0.6.4",
1717
"jest-github-actions-reporter": "^1.0.2",
1818
"lerna": "^3.13.2",
1919
"npm-run-all": "^4.1.5",

python_packages/jupyter_lsp/jupyter_lsp/specs/javascript_typescript_langserver.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class JavascriptTypescriptLanguageServer(NodeModuleSpec):
1313
"javascriptreact",
1414
]
1515
spec = dict(
16-
display_name=key,
16+
display_name=key + " (deprecated)",
1717
mime_types=[
1818
"application/typescript",
1919
"text/typescript-jsx",
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
from .utils import NodeModuleSpec
2+
3+
4+
class TypescriptLanguageServer(NodeModuleSpec):
5+
node_module = key = "typescript-language-server"
6+
script = ["lib", "cli.js"]
7+
args = ["--stdio"]
8+
languages = [
9+
"javascript",
10+
"jsx",
11+
"typescript",
12+
"typescript-jsx",
13+
"typescriptreact",
14+
"javascriptreact",
15+
]
16+
spec = dict(
17+
display_name=key,
18+
mime_types=[
19+
"application/typescript",
20+
"text/typescript-jsx",
21+
"text/javascript",
22+
"text/ecmascript",
23+
"application/javascript",
24+
"application/x-javascript",
25+
"application/ecmascript",
26+
"text/jsx",
27+
],
28+
urls=dict(
29+
home="https://github.com/typescript-language-server/{}".format(key),
30+
issues="https://github.com/typescript-language-server/{}/issues".format(
31+
key
32+
),
33+
),
34+
install=dict(
35+
npm="npm install --save-dev {}".format(key),
36+
yarn="yarn add --dev {}".format(key),
37+
jlpm="jlpm add --dev {}".format(key),
38+
),
39+
)

0 commit comments

Comments
 (0)