Merge branch 'features-refactor' into syntax_higlighting

Author: krassowski

CHANGELOG.md

@@ -1,12 +1,21 @@
 ## CHANGELOG
 
+### `jupyter-lsp 0.9.2` (unreleased)
+
+- autodetects the `sql` language server for `.sql` files ([#328][])
+  - diagnostics are provided by `sqlint` which requires Node 11+
+    to work well (in contrast to currently required Node 10+).
+
+[#328]: https://github.com/krassowski/jupyterlab-lsp/pull/328
+
 ### `@krassowski/jupyterlab-lsp 2.0.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][])
+  - add two icons themes for the completer (material and vscode) ([#322])
   - the documentation by the completer can be turned on or off ([#315])
   - continuous hinting (Hinterland mode) can be enabled in settings ([#315])
   - tokens in which the completer should not be triggered can be changed ([#315])
@@ -33,7 +42,8 @@
 [#301]: https://github.com/krassowski/jupyterlab-lsp/pull/301
 [#315]: https://github.com/krassowski/jupyterlab-lsp/pull/315
 [#318]: https://github.com/krassowski/jupyterlab-lsp/pull/318
-[#319]: https://github.com/krassowski/jupyterlab-lsp/pull/318
+[#319]: https://github.com/krassowski/jupyterlab-lsp/pull/319
+[#322]: https://github.com/krassowski/jupyterlab-lsp/pull/322
 [00448d0]: https://github.com/krassowski/jupyterlab-lsp/pull/318/commits/00448d0c55e7f9a1e7e0a5322f17610daac47dfe
 [bacc006]: https://github.com/krassowski/jupyterlab-lsp/pull/318/commits/bacc0066da0727ff7397574914bf0401e4d8f7cb
 [4e5b2ad]: https://github.com/krassowski/jupyterlab-lsp/pull/318/commits/4e5b2adf655120458cc8be4b453fe9a78c98e061

atest/01_Editor.robot

@@ -60,6 +60,9 @@ TypeScript
     ${def} =    Set Variable    xpath:(//span[contains(@class, 'cm-variable')][contains(text(), 'inc')])[last()]
     Editor Shows Features for Language    TypeScript    example.ts    Diagnostics=The left-hand side of an arithmetic    Jump to Definition=${def}    Rename=${def}
 
+SQL
+    Editor Shows Features for Language    SQL    example.sql    Diagnostics=Expected
+
 YAML
     Editor Shows Features for Language    YAML    example.yaml    Diagnostics=duplicate key
 

atest/05_Features/Completion.robot

@@ -39,6 +39,14 @@ Works When Kernel Is Shut Down
     # this comes from kernel:
     Completer Should Not Suggest    %%timeit
 
+Works In File Editor
+    Prepare File for Editing    Python    completion    completion.py
+    Place Cursor In File Editor At    9    2
+    Capture Page Screenshot    01-editor-ready.png
+    Trigger Completer
+    Completer Should Suggest    add
+    [Teardown]    Clean Up After Working With File    completion.py
+
 Autocompletes If Only One Option
     Enter Cell Editor    3    line=1
     Press Keys    None    cle
@@ -113,6 +121,61 @@ Triggers Completer On Dot
     Wait Until Page Contains Element    ${COMPLETER_BOX}    timeout=35s
     Completer Should Suggest    append
 
+Material Theme Works
+    Configure JupyterLab Plugin    {"theme": "material"}    plugin id=${COMPLETION PLUGIN ID}
+    Capture Page Screenshot    01-configured.png
+    Enter Cell Editor    1    line=2
+    Trigger Completer
+    Capture Page Screenshot    02-completions-shown.png
+    # TabError is a builtin exception which is a class in Python,
+    # so we should get lsp:material-class-light icon:
+    Completer Should Suggest    TabError
+    Completer Should Include Icon    lsp:material-class-light
+
+VSCode Theme Works
+    Configure JupyterLab Plugin    {"theme": "vscode"}    plugin id=${COMPLETION PLUGIN ID}
+    Capture Page Screenshot    01-configured.png
+    Enter Cell Editor    1    line=2
+    Trigger Completer
+    Capture Page Screenshot    02-completions-shown.png
+    Completer Should Suggest    TabError
+    Completer Should Include Icon    lsp:vscode-class-light
+
+VSCode Dark Theme Works
+    ${file} =    Set Variable    Completion.ipynb
+    Lab Command    Use JupyterLab Dark Theme
+    Wait For Splash
+    Capture Page Screenshot    00-theme-changed.png
+    Configure JupyterLab Plugin    {"theme": "vscode"}    plugin id=${COMPLETION PLUGIN ID}
+    Capture Page Screenshot    01-configured.png
+    Open ${file} in ${MENU NOTEBOOK}
+    Enter Cell Editor    1    line=2
+    Wait Until Fully Initialized
+    Trigger Completer
+    Capture Page Screenshot    02-completions-shown.png
+    Completer Should Suggest    TabError
+    Completer Should Include Icon    lsp:vscode-class-dark
+    Lab Command    Use JupyterLab Light Theme
+    Wait For Splash
+
+Works Without A Theme
+    Configure JupyterLab Plugin    {"theme": null}    plugin id=${COMPLETION PLUGIN ID}
+    Capture Page Screenshot    01-configured.png
+    Enter Cell Editor    1    line=2
+    Trigger Completer
+    Capture Page Screenshot    02-completions-shown.png
+    Completer Should Suggest    TabError
+    Wait Until Page Contains Element    ${COMPLETER_BOX} .jp-Completer-monogram
+
+Works With Incorrect Theme
+    Configure JupyterLab Plugin    {"theme": "a-non-existing-theme"}    plugin id=${COMPLETION PLUGIN ID}
+    Capture Page Screenshot    01-configured.png
+    Enter Cell Editor    1    line=2
+    Trigger Completer
+    Capture Page Screenshot    02-completions-shown.png
+    Completer Should Suggest    TabError
+    Wait Until Page Contains Element    ${COMPLETER_BOX} .jp-Completer-monogram
+
 *** Keywords ***
 Setup Completion Test
     Setup Notebook    Python    Completion.ipynb
@@ -130,7 +193,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
+    Wait Until Element Is Visible    ${suggestion}    timeout=10s
     Mouse Over    ${suggestion}
     Click Element    ${suggestion} code
 
@@ -139,6 +202,10 @@ Completer Should Suggest
     Wait Until Page Contains Element    ${COMPLETER_BOX} .jp-Completer-item[data-value="${text}"]
     Capture Page Screenshot    ${text.replace(' ', '_')}.png
 
+Completer Should Include Icon
+    [Arguments]    ${icon}
+    Wait Until Page Contains Element    ${COMPLETER_BOX} svg[data-icon="${icon}"]
+
 Completer Should Not Suggest
     [Arguments]    ${text}
     Wait Until Page Does Not Contain Element    ${COMPLETER_BOX} .jp-Completer-item[data-value="${text}"]

atest/Keywords.robot

@@ -263,6 +263,15 @@ Place Cursor In Cell Editor At
     Enter Cell Editor    ${cell_nr}    ${line}
     Execute JavaScript    return document.querySelector('.jp-Cell:nth-child(${cell_nr}) .CodeMirror').CodeMirror.setCursor({line: ${line} - 1, ch: ${character}})
 
+Enter File Editor
+    Click Element    css:.jp-FileEditor .CodeMirror
+    Wait Until Page Contains Element    css:.jp-FileEditor .CodeMirror-focused
+
+Place Cursor In File Editor At
+    [Arguments]    ${line}    ${character}
+    Enter File Editor
+    Execute JavaScript    return document.querySelector('.jp-FileEditor .CodeMirror').CodeMirror.setCursor({line: ${line} - 1, ch: ${character}})
+
 Wait Until Fully Initialized
     Wait Until Element Contains    ${STATUSBAR}    Fully initialized    timeout=60s
 

atest/Variables.robot

@@ -33,6 +33,7 @@ ${CM CURSOR}      css:.CodeMirror-cursor
 ${CM CURSORS}     css:.CodeMirror-cursors:not([style='visibility: hidden'])
 # settings
 ${LSP PLUGIN ID}    @krassowski/jupyterlab-lsp:plugin
+${COMPLETION PLUGIN ID}    @krassowski/jupyterlab-lsp:completion
 ${LSP PLUGIN SETTINGS FILE}    @krassowski${/}jupyterlab-lsp${/}plugin.jupyterlab-settings
 ${CSS USER SETTINGS}    .jp-SettingsRawEditor-user
 ${JLAB XP CLOSE SETTINGS}    ${JLAB XP DOCK TAB}\[contains(., 'Settings')]/*[contains(@class, 'm-TabBar-tabCloseIcon')]

atest/examples/completion.py

@@ -0,0 +1,9 @@
+addition = ''
+
+
+def add(a: int, b: int):
+    """Adds a and b together"""
+    return a, b
+
+
+ad

atest/examples/example.sql

@@ -0,0 +1 @@
+SELECT * FR

azure-pipelines.yml

@@ -25,8 +25,10 @@ variables:
   LINKED_EXTENSIONS: >-
     packages/lsp-ws-connection
     packages/jupyterlab-go-to-definition
+    packages/completion-theme
+    packages/theme-vscode
+    packages/theme-material
 
 jobs:
   - template: ci/job.lint.yml
   - template: ci/job.test.yml
-  - template: ci/job.docs.yml

ci/job.docs.yml

@@ -5,11 +5,11 @@ parameters:
       activate: source activate
   pythons:
     - name: ThreeSeven
-      spec: '>=3.7,<3.8.0a0'
+      spec: '>=3.8,<3.9.0a0'
       lab: '>=2,<3.0.0a0'
       nodejs: '>=12,<13.0.0a0'
-  env_update: conda env update -n jupyterlab-lsp --file env-test.yml --quiet
-  env_lint: conda env update -n jupyterlab-lsp --file requirements/lint.yml --quiet
+  env_update: mamba env update -n jupyterlab-lsp --file env-test.yml --quiet
+  env_lint: mamba env update -n jupyterlab-lsp --file requirements/lint.yml --quiet
 
 jobs:
   - ${{ each platform in parameters.platforms }}:
@@ -18,7 +18,7 @@ jobs:
             pool:
               vmImage: ${{ platform.vmImage }}
             steps:
-              - template: steps.conda.yml
+              - template: steps.mamba.yml
                 parameters:
                   name: ${{ platform.name }}