Merge branch 'jupyter-lsp:master' into master

FlyingSamson · web-flow · commit 9367ee96eb00 · 2021-10-26T18:38:10.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -114,6 +114,7 @@ junit.xml
 coverage/
 .vscode/
 _*.d.ts
+_*.ts
 _build
 .virtual_documents/
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,22 @@
 ## Changelog
 
+### `@krassowski/jupyterlab-lsp 3.9.1` (2021-10-24)
+
+- bug fixes:
+  - fix build issues making it difficult to reuse/extend the package ([#696], thanks @cccs-jc)
+
+[#696]: https://github.com/jupyter-lsp/jupyterlab-lsp/pull/696
+
+### `jupyter-lsp 1.5.0` (2021-10-24):
+
+- features:
+  - add support for new `typescript-language-server` replacing `javascript-typescript-langserver`;
+    despite the name both packages provide support for all four: JavaScrip, JSX, TypeScript and TSX;
+    the old `javascript-typescript-langserver` can still be used, but it is no longer maintained
+    and we will not be supported, and specs may be removed in the next major release ([#697]).
+
+[#697]: https://github.com/jupyter-lsp/jupyterlab-lsp/pull/697
+
 ### `@krassowski/jupyterlab-lsp 3.9.0` (2021-10-17)
 
 - features:
diff --git a/atest/01_Editor.robot b/atest/01_Editor.robot
@@ -61,7 +61,7 @@ SCSS
 
 TSX
     ${def} =    Set Variable    xpath:(//span[contains(@class, 'cm-tag')][contains(text(), 'HelloWorld')])[last()]
-    Editor Shows Features for Language    TSX    example.tsx    Diagnostics=Cannot find module 'react'    Jump to Definition=${def}    Rename=${def}
+    Editor Shows Features for Language    TSX    example.tsx    Diagnostics='hello' is declared but its value is never read.    Jump to Definition=${def}    Rename=${def}
 
 TypeScript
     ${def} =    Set Variable    xpath:(//span[contains(@class, 'cm-variable')][contains(text(), 'inc')])[last()]
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/05_Features/Hover.robot b/atest/05_Features/Hover.robot
@@ -42,7 +42,7 @@ Hover works in foreign code (javascript)
     # also for multiple cells of the same document
     Enter Cell Editor    3
     Trigger Tooltip    Math
-    Element Should Contain    ${HOVER_BOX}    const Math: Math
+    Element Should Contain    ${HOVER_BOX}    Math: Math
 
 *** Keywords ***
 Last Occurrence
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/atest/examples/example.tsx b/atest/examples/example.tsx
@@ -7,5 +7,3 @@ export class HelloWorld extends React.Component<any, any> {
 }
 
 const hello = <HelloWorld/>;
-
-;hello;
diff --git a/docs/Extending.ipynb b/docs/Extending.ipynb
@@ -238,8 +238,8 @@
     "    {\n",
     "      'all_listeners': ['some.module.some_function'],\n",
     "      'client_listeners': ['some.module.some_other_function'],\n",
-    "      'server_listeners': ['some.module.yet_another_function'],\n",
-    "    },\n",
+    "      'server_listeners': ['some.module.yet_another_function']\n",
+    "    }\n",
     "}\n",
     "```"
    ]
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/docs/Roadmap.ipynb b/docs/Roadmap.ipynb
@@ -35,8 +35,8 @@
    "source": [
     "### Backend\n",
     "\n",
-    "- [#49](https://github.com/jupyter-lsp/jupyterlab-lsp/issues/49) cookiecutter for\n",
-    "  pip-installable specs\n",
+    "- [#49](https://github.com/jupyter-lsp/jupyterlab-lsp/issues/49) cookiecutter\n",
+    "  for pip-installable specs\n",
     "- add hook system to allow serverextensions/kernels to modify, inspect and react\n",
     "  to LSP messages"
    ]
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/packages/jupyterlab-lsp/package.json b/packages/jupyterlab-lsp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@krassowski/jupyterlab-lsp",
-  "version": "3.9.0",
+  "version": "3.9.1",
   "description": "Language Server Protocol integration for JupyterLab",
   "keywords": [
     "jupyter",
@@ -34,15 +34,15 @@
     "build:lib": "tsc",
     "build:prod": "jlpm run build:lib && jlpm run build:labextension",
     "build:schema": "jlpm build:schema-backend && jlpm build:schema-completion && jlpm build:schema-hover && jlpm build:schema-diagnostics && jlpm build:schema-syntax_highlighting && jlpm build:schema-jump_to && jlpm build:schema-signature && jlpm build:schema-highlights && jlpm build:schema-plugin",
-    "build:schema-backend": "json2ts ../../python_packages/jupyter_lsp/jupyter_lsp/schema/schema.json --unreachableDefinitions | prettier --stdin-filepath _schema.d.ts > src/_schema.d.ts",
-    "build:schema-plugin": "json2ts schema/plugin.json | prettier --stdin-filepath _plugin.d.ts > src/_plugin.d.ts",
-    "build:schema-completion": "json2ts schema/completion.json | prettier --stdin-filepath _completion.d.ts > src/_completion.d.ts",
-    "build:schema-diagnostics": "json2ts schema/diagnostics.json | prettier --stdin-filepath _diagnostics.d.ts > src/_diagnostics.d.ts",
-    "build:schema-hover": "json2ts schema/hover.json | prettier --stdin-filepath _hover.d.ts > src/_hover.d.ts",
-    "build:schema-jump_to": "json2ts schema/jump_to.json | prettier --stdin-filepath _jump_to.d.ts > src/_jump_to.d.ts",
-    "build:schema-syntax_highlighting": "json2ts schema/syntax_highlighting.json | prettier --stdin-filepath _syntax_highlighting.d.ts > src/_syntax_highlighting.d.ts",
-    "build:schema-highlights": "json2ts schema/highlights.json | prettier --stdin-filepath _highlights.d.ts > src/_highlights.d.ts",
-    "build:schema-signature": "json2ts schema/signature.json | prettier --stdin-filepath _signature.d.ts > src/_signature.d.ts",
+    "build:schema-backend": "json2ts ../../python_packages/jupyter_lsp/jupyter_lsp/schema/schema.json --unreachableDefinitions | prettier --stdin-filepath _schema.d.ts > src/_schema.ts",
+    "build:schema-plugin": "json2ts schema/plugin.json | prettier --stdin-filepath _plugin.d.ts > src/_plugin.ts",
+    "build:schema-completion": "json2ts schema/completion.json | prettier --stdin-filepath _completion.d.ts > src/_completion.ts ",
+    "build:schema-diagnostics": "json2ts schema/diagnostics.json | prettier --stdin-filepath _diagnostics.d.ts > src/_diagnostics.ts ",
+    "build:schema-hover": "json2ts schema/hover.json | prettier --stdin-filepath _hover.d.ts > src/_hover.ts",
+    "build:schema-jump_to": "json2ts schema/jump_to.json | prettier --stdin-filepath _jump_to.d.ts > src/_jump_to.ts",
+    "build:schema-syntax_highlighting": "json2ts schema/syntax_highlighting.json | prettier --stdin-filepath _syntax_highlighting.d.ts > src/_syntax_highlighting.ts ",
+    "build:schema-highlights": "json2ts schema/highlights.json | prettier --stdin-filepath _highlights.d.ts > src/_highlights.ts",
+    "build:schema-signature": "json2ts schema/signature.json | prettier --stdin-filepath _signature.d.ts > src/_signature.ts",
     "bundle": "npm pack .",
     "clean": "jlpm run clean:lib",
     "clean:all": "jlpm run clean:lib && jlpm run clean:labextension",
diff --git a/packages/jupyterlab-lsp/src/virtual/document.ts b/packages/jupyterlab-lsp/src/virtual/document.ts
@@ -1,6 +1,6 @@
 import { CodeEditor } from '@jupyterlab/codeeditor';
 import { Signal } from '@lumino/signaling';
-import { IDocumentInfo } from 'lsp-ws-connection/src';
+import { IDocumentInfo } from 'lsp-ws-connection';
 
 import { DocumentConnectionManager } from '../connection_manager';
 import {
diff --git a/packages/metapackage/package.json b/packages/metapackage/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@krassowski/jupyterlab-lsp-metapackage",
-  "version": "3.9.0",
+  "version": "3.9.1",
   "description": "JupyterLab LSP - Meta Package. All of the packages used by JupyterLab LSP",
   "homepage": "https://github.com/jupyter-lsp/jupyterlab-lsp",
   "bugs": {
diff --git a/python_packages/jupyter_lsp/jupyter_lsp/_version.py b/python_packages/jupyter_lsp/jupyter_lsp/_version.py
@@ -1,3 +1,3 @@
 """ single source of truth for jupyter_lsp version
 """
-__version__ = "1.4.1"
+__version__ = "1.5.0"
diff --git a/python_packages/jupyter_lsp/jupyter_lsp/specs/__init__.py b/python_packages/jupyter_lsp/jupyter_lsp/specs/__init__.py
@@ -13,6 +13,7 @@
 from .r_languageserver import RLanguageServer
 from .sql_language_server import SQLLanguageServer
 from .texlab import Texlab
+from .typescript_language_server import TypescriptLanguageServer
 from .unified_language_server import UnifiedLanguageServer
 from .vscode_css_languageserver import VSCodeCSSLanguageServer
 from .vscode_html_languageserver import VSCodeHTMLLanguageServer
@@ -32,6 +33,7 @@
 pyright = PyrightLanguageServer()
 r = RLanguageServer()
 tex = Texlab()
-ts = JavascriptTypescriptLanguageServer()
+ts_old = JavascriptTypescriptLanguageServer()
+ts = TypescriptLanguageServer()
 sql = SQLLanguageServer()
 yaml = YAMLLanguageServer()
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),
+        ),
+    )
diff --git a/python_packages/jupyter_lsp/jupyter_lsp/tests/conftest.py b/python_packages/jupyter_lsp/jupyter_lsp/tests/conftest.py
@@ -18,7 +18,7 @@
 KNOWN_SERVERS = [
     "bash-language-server",
     "dockerfile-language-server-nodejs",
-    "javascript-typescript-langserver",
+    "typescript-language-server",
     "pylsp",
     "unified-language-server",
     "sql-language-server",
diff --git a/python_packages/jupyter_lsp/setup.cfg b/python_packages/jupyter_lsp/setup.cfg
@@ -36,14 +36,15 @@ install_requires =
 jupyter_lsp_spec_v1 =
     bash-language-server = jupyter_lsp.specs:bash
     dockerfile-language-server-nodejs = jupyter_lsp.specs:dockerfile
-    javascript-typescript-langserver = jupyter_lsp.specs:ts
+    javascript-typescript-langserver = jupyter_lsp.specs:ts_old
     jedi-language-server = jupyter_lsp.specs:jedi
     julia-language-server = jupyter_lsp.specs:julia
     python-language-server = jupyter_lsp.specs:py_palantir
     python-lsp-server = jupyter_lsp.specs:py_lsp_server
     pyright = jupyter_lsp.specs:pyright
     r-languageserver = jupyter_lsp.specs:r
     texlab = jupyter_lsp.specs:tex
+    typescript-language-server = jupyter_lsp.specs:ts
     sql-language-server = jupyter_lsp.specs:sql
     unified-language-server = jupyter_lsp.specs:md
     vscode-css-languageserver-bin = jupyter_lsp.specs:css
diff --git a/requirements/github-actions.yml b/requirements/github-actions.yml
@@ -11,6 +11,8 @@ dependencies:
   - nodejs {nodejs}
   # for python language server (and development)
   - flake8 >=3.5
+  # temporarily pin autopep8
+  - autopep8 <1.6.0
   # for R language server and kernel
   # TODO: try r 4.0 soon
   - r <4
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,3 @@ export class HelloWorld extends React.Component<any, any> {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`const hello = <HelloWorld/>;`
`10`		`-`
`11`		`-;hello;`