Skip to content

Commit bcf7820

Browse files
authored
Merge pull request jupyter-lsp#697 from jupyter-lsp/update-typescript-server
Migrate to typescript-language-server
2 parents 1f57ce0 + a07e008 commit bcf7820

File tree

16 files changed

+165
-205
lines changed

16 files changed

+165
-205
lines changed

atest/01_Editor.robot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ SCSS
6161

6262
TSX
6363
${def} = Set Variable xpath:(//span[contains(@class, 'cm-tag')][contains(text(), 'HelloWorld')])[last()]
64-
Editor Shows Features for Language TSX example.tsx Diagnostics=Cannot find module 'react' Jump to Definition=${def} Rename=${def}
64+
Editor Shows Features for Language TSX example.tsx Diagnostics='hello' is declared but its value is never read. Jump to Definition=${def} Rename=${def}
6565

6666
TypeScript
6767
${def} = Set Variable xpath:(//span[contains(@class, 'cm-variable')][contains(text(), 'inc')])[last()]

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/05_Features/Hover.robot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Hover works in foreign code (javascript)
4242
# also for multiple cells of the same document
4343
Enter Cell Editor 3
4444
Trigger Tooltip Math
45-
Element Should Contain ${HOVER_BOX} const Math: Math
45+
Element Should Contain ${HOVER_BOX} Math: Math
4646

4747
*** Keywords ***
4848
Last Occurrence

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}

atest/examples/example.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,3 @@ export class HelloWorld extends React.Component<any, any> {
77
}
88

99
const hello = <HelloWorld/>;
10-
11-
;hello;

docs/Extending.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,8 @@
238238
" {\n",
239239
" 'all_listeners': ['some.module.some_function'],\n",
240240
" 'client_listeners': ['some.module.some_other_function'],\n",
241-
" 'server_listeners': ['some.module.yet_another_function'],\n",
242-
" },\n",
241+
" 'server_listeners': ['some.module.yet_another_function']\n",
242+
" }\n",
243243
"}\n",
244244
"```"
245245
]

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+
}

docs/Roadmap.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
"source": [
3636
"### Backend\n",
3737
"\n",
38-
"- [#49](https://github.com/jupyter-lsp/jupyterlab-lsp/issues/49) cookiecutter for\n",
39-
" pip-installable specs\n",
38+
"- [#49](https://github.com/jupyter-lsp/jupyterlab-lsp/issues/49) cookiecutter\n",
39+
" for pip-installable specs\n",
4040
"- add hook system to allow serverextensions/kernels to modify, inspect and react\n",
4141
" to LSP messages"
4242
]

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/__init__.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
from .r_languageserver import RLanguageServer
1414
from .sql_language_server import SQLLanguageServer
1515
from .texlab import Texlab
16+
from .typescript_language_server import TypescriptLanguageServer
1617
from .unified_language_server import UnifiedLanguageServer
1718
from .vscode_css_languageserver import VSCodeCSSLanguageServer
1819
from .vscode_html_languageserver import VSCodeHTMLLanguageServer
@@ -32,6 +33,7 @@
3233
pyright = PyrightLanguageServer()
3334
r = RLanguageServer()
3435
tex = Texlab()
35-
ts = JavascriptTypescriptLanguageServer()
36+
ts_old = JavascriptTypescriptLanguageServer()
37+
ts = TypescriptLanguageServer()
3638
sql = SQLLanguageServer()
3739
yaml = YAMLLanguageServer()

0 commit comments

Comments
 (0)