Merge pull request #301 from krassowski/kiteco-completion-items

Support JupyterLab 2.2

Author: krassowski

CHANGELOG.md

@@ -1,5 +1,19 @@
 ## CHANGELOG
 
+### `@krassowski/jupyterlab-lsp 1.2.0` (unreleased)
+
+- features
+
+  - support for JupyterLab 2.2 ([#301][])
+  - completer now displays server-provided documentation,
+    and a kernel icon for kernel suggestions without type information ([#301][])
+
+- bug fixes
+
+  - path-autocompletion issues were resolved upstream an this release adopts these changes
+
+[#301]: https://github.com/krassowski/jupyterlab-lsp/pull/301
+
 ### `@krassowski/jupyterlab-lsp 1.1.2` (2020-08-05)
 
 - bug fixes

README.md

@@ -76,7 +76,7 @@ Open it searching for "Show diagnostics panel" in JupyterLab commands palette or
 
 Either:
 
-- JupyterLab >=2.1.0,<3.0.0a0
+- JupyterLab >=2.2.0,<3.0.0a0
 
 And:
 
@@ -99,9 +99,9 @@ Use of a python `virtualenv` or a conda env is also recommended.
 1. install JupyterLab
 
    ```bash
-   conda install -c conda-forge 'jupyterlab>=2.1,<3.0.0a0'
+   conda install -c conda-forge 'jupyterlab>=2.2,<3.0.0a0'
    # or
-   pip install 'jupyterlab>=2.1,<3.0.0a0'
+   pip install 'jupyterlab>=2.2,<3.0.0a0'
    ```
 
 1. install the server extension:

atest/05_Features/Completion.robot

@@ -43,9 +43,27 @@ Autocompletes If Only One Option
     Enter Cell Editor    3    line=1
     Press Keys    None    cle
     Wait Until Fully Initialized
+    # First tab brings up the completer
     Press Keys    None    TAB
+    Completer Should Suggest    clear
+    # Second tab inserts the only suggestion
+    Press Keys    None    TAB
+    # depends on Python list type having only one method with prefix "cle"
     Wait Until Keyword Succeeds    40x    0.5s    Cell Editor Should Equal    3    list.clear
 
+Does Not Autocomplete If Multiple Options
+    Enter Cell Editor    3    line=1
+    Press Keys    None    c
+    Wait Until Fully Initialized
+    # First tab brings up the completer
+    Press Keys    None    TAB
+    Completer Should Suggest    copy
+    # Second tab inserts should not insert the first of many choices.
+    Press Keys    None    TAB
+    # depends on Python list type having multiple methods with prefix "c"
+    # in this case "Completer Should Suggest" means that the completer is still shown!
+    Completer Should Suggest    copy
+
 User Can Select Lowercase After Starting Uppercase
     # `from time import Tim<tab>` → `from time import time`
     Enter Cell Editor    5    line=1
@@ -58,12 +76,16 @@ Mid Token Completions Do Not Overwrite
     # `disp<tab>data` → `display_table<cursor>data`
     Place Cursor In Cell Editor At    9    line=1    character=4
     Capture Page Screenshot    01-cursor-placed.png
-    Press Keys    None    TAB
+    Trigger Completer
+    Completer Should Suggest    display_table
+    Select Completer Suggestion    display_table
     Capture Page Screenshot    02-completed.png
     Wait Until Keyword Succeeds    40x    0.5s    Cell Editor Should Equal    9    display_tabledata
     # `disp<tab>lay` → `display_table<cursor>`
     Place Cursor In Cell Editor At    11    line=1    character=4
-    Press Keys    None    TAB
+    Trigger Completer
+    Completer Should Suggest    display_table
+    Select Completer Suggestion    display_table
     Wait Until Keyword Succeeds    40x    0.5s    Cell Editor Should Equal    11    display_table
 
 Completion Works For Tokens Separated By Space
@@ -108,6 +130,7 @@ Cell Editor Should Equal
 Select Completer Suggestion
     [Arguments]    ${text}
     ${suggestion} =    Set Variable    css:.jp-Completer-item[data-value="${text}"]
+    Wait Until Element Is Visible   ${suggestion}  timeout=10s
     Mouse Over    ${suggestion}
     Click Element    ${suggestion} code
 

binder/environment.yml

@@ -7,7 +7,7 @@ channels:
 dependencies:
   # runtime dependencies
   - python >=3.7,<3.8.0a0
-  - jupyterlab >=2.1.0,<3.0.0a0
+  - jupyterlab >=2.2.0,<3.0.0a0
   - notebook >=4.3.1
   # build dependencies
   - nodejs >=10,<14

ci/job.test.yml

@@ -12,15 +12,15 @@ parameters:
   pythons:
     - name: ThreeSix
       spec: '=3.6'
-      lab: '>=2.1.0,<3.0.0a0'
+      lab: '>=2.2.0,<3.0.0a0'
       nodejs: '>=10,<11.0.0.a0'
     - name: ThreeSeven
       spec: '=3.7'
-      lab: '>=2.1.0,<3.0.0a0'
+      lab: '>=2.2.0,<3.0.0a0'
       nodejs: '>=12,<13.0.0a0'
     - name: ThreeEight
       spec: '=3.8'
-      lab: '>=2.1.0,<3.0.0a0'
+      lab: '>=2.2.0,<3.0.0a0'
       nodejs: '>=13,<14.0.0a0'
   js_cov_packages:
     - jupyterlab-go-to-definition

ci/steps.conda.yml

@@ -1,7 +1,7 @@
 parameters:
   name: Linux
   packages: ''
-  install_cmd: conda install -yn base -c conda-forge conda python-libarchive-c
+  install_cmd: conda install -yn base conda
 
 steps:
   - ${{ if eq(parameters.name, 'Linux') }}:

docs/Releasing.ipynb

@@ -50,6 +50,8 @@
     "- `packages/jupyterlab-lsp/package.json` > `devDependencies` >\n",
     "  `@jupyterlab/application` (canonical)\n",
     "- `binder/environment.yml`\n",
+    "- `requirements/lab.txt`\n",
+    "- `ci/job.test.yml`\n",
     "- `README.md`\n",
     "\n",
     "### Releasing:\n",

package.json

@@ -6,11 +6,11 @@
     "bash-language-server": "^1.6.1",
     "dictionary-en": "^3.0.0",
     "dockerfile-language-server-nodejs": "^0.0.22",
+    "eslint": "^6.8.0",
     "eslint-config-prettier": "^6.7.0",
     "eslint-plugin-jest": "^23.8.2",
     "eslint-plugin-prettier": "^3.1.1",
     "eslint-plugin-react": "^7.19.0",
-    "eslint": "^6.8.0",
     "husky": "^3.0.9",
     "javascript-typescript-langserver": "^2.11.3",
     "lerna": "^3.13.2",
@@ -25,7 +25,6 @@
   },
   "husky": {
     "hooks": {
-      "pre-commit": "precise-commits"
     }
   },
   "prettier": {

packages/jupyterlab-go-to-definition/package.json

@@ -30,37 +30,37 @@
     "test": "jlpm jest --coverage --coverageReporters=cobertura --coverageReporters=html --coverageReporters=text-summary"
   },
   "peerDependencies": {
-    "@jupyterlab/application": "~2.0.0",
-    "@jupyterlab/apputils": "~2.0.0",
-    "@jupyterlab/codeeditor": "~2.0.0",
-    "@jupyterlab/codemirror": "~2.0.0",
-    "@jupyterlab/coreutils": "~4.0.0",
-    "@jupyterlab/docmanager": "~2.0.0",
-    "@jupyterlab/docregistry": "~2.0.0",
-    "@jupyterlab/fileeditor": "~2.0.0",
-    "@jupyterlab/notebook": "~2.0.0",
-    "@jupyterlab/observables": "~3.0.0",
-    "@jupyterlab/services": "~5.0.0",
+    "@jupyterlab/application": "~2.2.0",
+    "@jupyterlab/apputils": "~2.2.0",
+    "@jupyterlab/codeeditor": "~2.2.0",
+    "@jupyterlab/codemirror": "~2.2.0",
+    "@jupyterlab/coreutils": "~4.2.0",
+    "@jupyterlab/docmanager": "~2.2.0",
+    "@jupyterlab/docregistry": "~2.2.0",
+    "@jupyterlab/fileeditor": "~2.2.0",
+    "@jupyterlab/notebook": "~2.2.0",
+    "@jupyterlab/observables": "~3.2.0",
+    "@jupyterlab/services": "~5.2.0",
     "@lumino/algorithm": "*",
     "codemirror": "*",
     "react": "*"
   },
   "devDependencies": {
-    "@jupyterlab/application": "~2.0.0",
-    "@jupyterlab/apputils": "~2.0.0",
-    "@jupyterlab/codeeditor": "~2.0.0",
-    "@jupyterlab/codemirror": "~2.0.0",
+    "@jupyterlab/application": "~2.2.0",
+    "@jupyterlab/apputils": "~2.2.0",
+    "@jupyterlab/codeeditor": "~2.2.0",
+    "@jupyterlab/codemirror": "~2.2.0",
     "@jupyterlab/coreutils": "~4.0.0",
-    "@jupyterlab/docmanager": "~2.0.0",
-    "@jupyterlab/docregistry": "~2.0.0",
-    "@jupyterlab/fileeditor": "~2.0.0",
-    "@jupyterlab/notebook": "~2.0.0",
-    "@jupyterlab/observables": "~3.0.0",
-    "@jupyterlab/services": "~5.0.0",
+    "@jupyterlab/docmanager": "~2.2.0",
+    "@jupyterlab/docregistry": "~2.2.0",
+    "@jupyterlab/fileeditor": "~2.2.0",
+    "@jupyterlab/notebook": "~2.2.0",
+    "@jupyterlab/observables": "~3.2.0",
+    "@jupyterlab/services": "~5.2.0",
     "@lumino/algorithm": "*",
     "codemirror": "*",
     "react": "*",
-    "@jupyterlab/testutils": "~2.0.0",
+    "@jupyterlab/testutils": "~2.2.0",
     "@types/codemirror": "^0.0.74",
     "@types/chai": "^4.1.7",
     "@types/jest": "^23.3.11",

packages/jupyterlab-go-to-definition/src/jumpers/jumper.ts

@@ -65,7 +65,7 @@ const system_keys = [
   'F2',
   'F3',
   'F4',
-  ' F5',
+  'F5',
   'F6',
   'F7',
   'F8',