Merge branch 'master' into refactor-completion-item

Author: krassowski

.github/workflows/job.test.yml

@@ -16,17 +16,17 @@ defaults:
     shell: bash -l {0}
 
 env:
-  # Increase this value to reset all caches
-  CACHE_EPOCH: 0
-
-  JLPM_CMD: jlpm --ignore-optional --prefer-offline --frozen-lockfile
-
+  JULIA_NUM_THREADS: 2
+  MAMBA_NO_BANNER: 1
+  PIP_DISABLE_PIP_VERSION_CHECK: 1
   PYTHONUNBUFFERED: 1
+
   ATEST_RETRIES: 3
-  PIP_DISABLE_PIP_VERSION_CHECK: 1
+  JLPM_CMD: jlpm --ignore-optional --prefer-offline --frozen-lockfile
 
-  # TODO: replace once mambaforge "just works" with setup-miniconda
-  MAMBAFORGE_URL: https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge
+  # Increase this value to reset all caches
+  CACHE_EPOCH: 2
+  JULIA_LANGSERVER: 3.2.0
 
 jobs:
   lint:
@@ -50,7 +50,7 @@ jobs:
           nodejs: '${{ matrix.nodejs }}'
 
       - name: Cache conda
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ~/conda_pkgs_dir
           key: |
@@ -59,13 +59,12 @@ jobs:
             ${{ env.CACHE_EPOCH }}-${{ matrix.os }}-lint-
 
       - name: Set up Python and mamba
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@master
         with:
-          installer-url: ${{ env.MAMBAFORGE_URL }}-Linux-x86_64.sh
           condarc-file: .github/.condarc
-
-      - name: Install base conda dependencies
-        run: mamba env update -n test --file requirements/github-actions.yml
+          environment-file: requirements/github-actions.yml
+          miniforge-variant: Mambaforge
+          use-mamba: true
 
       - name: Install linting dependencies
         run: mamba env update -n test --file requirements/lint.yml
@@ -78,15 +77,17 @@ jobs:
         uses: actions/cache@v2
         with:
           path: '**/node_modules'
-          key: ${{ env.CACHE_EPOCH }}-${{ runner.os }}-node-lint-${{ hashFiles('yarn.lock', 'requirements/github-actions.yml') }}
+          key: |
+            ${{ env.CACHE_EPOCH }}-${{ runner.os }}-node-lint-${{ hashFiles('yarn.lock', 'requirements/github-actions.yml') }}
 
       - name: Cache yarn packages
         id: cache-yarn-packages
         if: steps.cache-node-modules.outputs.cache-hit != 'true'
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: .yarn-packages
-          key: ${{ env.CACHE_EPOCH }}-yarn-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
+          key: |
+            ${{ env.CACHE_EPOCH }}-yarn-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
           restore-keys: |
             ${{ env.CACHE_EPOCH }}-yarn-${{ runner.os }}-
             ${{ env.CACHE_EPOCH }}-yarn-
@@ -128,7 +129,7 @@ jobs:
           nodejs: '${{ matrix.nodejs }}'
 
       - name: Cache conda
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ~/conda_pkgs_dir
           key: |
@@ -137,10 +138,10 @@ jobs:
             ${{ env.CACHE_EPOCH }}-${{ matrix.os }}-build-
 
       - name: Set up Python and mamba
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@master
         with:
-          installer-url: ${{ env.MAMBAFORGE_URL }}-Linux-x86_64.sh
           condarc-file: .github/.condarc
+          miniforge-variant: Mambaforge
 
       - name: Install minimal build deps
         shell: bash -l {0}
@@ -151,15 +152,17 @@ jobs:
         uses: actions/cache@v2
         with:
           path: '**/node_modules'
-          key: ${{ env.CACHE_EPOCH }}-${{ runner.os }}-node-build-${{ hashFiles('yarn.lock', 'requirements/github-actions.yml') }}
+          key: |
+            ${{ env.CACHE_EPOCH }}-${{ runner.os }}-node-build-${{ hashFiles('yarn.lock', 'requirements/github-actions.yml') }}
 
       - name: Cache yarn packages
         id: cache-yarn-packages
         if: steps.cache-node-modules.outputs.cache-hit != 'true'
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: .yarn-packages
-          key: ${{ env.CACHE_EPOCH }}-yarn-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
+          key: |
+            ${{ env.CACHE_EPOCH }}-yarn-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
           restore-keys: |
             ${{ env.CACHE_EPOCH }}-yarn-${{ runner.os }}-
             ${{ env.CACHE_EPOCH }}-yarn-
@@ -230,11 +233,6 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - uses: julia-actions/setup-julia@v1
-
-      - name: Install Julia language server
-        run: julia -e 'using Pkg; Pkg.add("LanguageServer")'
-
       - name: Set JupyterLab and Node versions
         uses: cschleiden/replace-tokens@v1
         with:
@@ -246,7 +244,7 @@ jobs:
           nodejs: '${{ matrix.nodejs }}'
 
       - name: Cache conda
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ~/conda_pkgs_dir
           key: |
@@ -255,26 +253,12 @@ jobs:
             ${{ env.CACHE_EPOCH }}-${{ matrix.os }}-${{ matrix.python }}-atest-
 
       - name: Set up Python and mamba
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@master
         with:
-          installer-url: ${{ env.MAMBAFORGE_URL }}-${{ matrix.mambaforge }}
-          python-version: ${{ matrix.python }}
           condarc-file: .github/.condarc
-
-      - name: Describe conda
-        run: |
-          conda info
-          conda config --show-sources
-          conda config --show
-
-      - name: Install conda dependencies (unix)
-        if: ${{ matrix.os != 'windows' }}
-        run: mamba env update -n test --file requirements/github-actions.yml
-
-      - name: Install conda dependencies (windows)
-        if: ${{ matrix.os == 'windows' }}
-        shell: cmd /C call {0}
-        run: mamba env update -n test --file requirements/github-actions.yml
+          environment-file: requirements/github-actions.yml
+          miniforge-variant: Mambaforge
+          use-mamba: true
 
       - name: List all packages
         run: conda list
@@ -284,22 +268,26 @@ jobs:
         uses: actions/cache@v2
         with:
           path: '**/node_modules'
-          key: ${{ env.CACHE_EPOCH }}-${{ runner.os }}-node-test-${{ hashFiles('yarn.lock', 'requirements/github-actions.yml') }}
+          key: |
+            ${{ env.CACHE_EPOCH }}-${{ runner.os }}-node-atest-${{ hashFiles('yarn.lock') }}
 
       - name: Cache yarn packages
         id: cache-yarn-packages
         if: steps.cache-node-modules.outputs.cache-hit != 'true'
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: .yarn-packages
-          key: ${{ env.CACHE_EPOCH }}-yarn-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
+          key: |
+            ${{ env.CACHE_EPOCH }}-yarn-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
           restore-keys: |
             ${{ env.CACHE_EPOCH }}-yarn-${{ runner.os }}-
             ${{ env.CACHE_EPOCH }}-yarn-
 
-      - name: install npm dependencies
-        if: steps.cache-node-modules.outputs.cache-hit != 'true'
-        run: ${{ env.JLPM_CMD }}
+      - uses: actions/cache@v2
+        with:
+          path: ~/.julia/artifacts
+          key: |
+            ${{ env.CACHE_EPOCH }}-julia-test-${{ runner.os }}-${{ env.JULIA_LANGSERVER }}
 
       - uses: actions/download-artifact@v2
         with:
@@ -325,6 +313,16 @@ jobs:
       - name: List frontend extensions
         run: jupyter labextension list
 
+      - name: install node-based language servers
+        if: steps.cache-node-modules.outputs.cache-hit != 'true'
+        run: ${{ env.JLPM_CMD }}
+
+      - name: Install Julia
+        uses: julia-actions/setup-julia@v1
+
+      - name: Install Julia language server
+        run: julia -e 'using Pkg; Pkg.add(Pkg.PackageSpec(;name="LanguageServer", version="${{ env.JULIA_LANGSERVER }}"))'
+
       - name: Run python tests
         run: python scripts/utest.py
 

CHANGELOG.md

@@ -1,14 +1,26 @@
 ## CHANGELOG
 
-### `@krassowski/jupyterlab-lsp 3.4.2` (unreleased)
+### `@krassowski/jupyterlab-lsp 3.5.0` (unreleased)
+
+- features:
+
+  - adds `%%bigquery` IPython cell magic support for BigQuery ([#553], thanks @julioyildo)
 
 - bug fixes:
 
   - prevents throwing a highlights error when adding new cell with <kbd>Shift</kbd> + <kbd>Enter</kbd> ([#544])
   - fixes IPython `pinfo` and `pinfo2` (`?` and `??`) for identifiers containing `s` ([#547])
+  - fixes incorrect behaviour of LSP features in some IPython magics with single line of content ([#560])
+
+- for extension authors:
+
+  - minimal functional extractor and code overrides APIs are now exported; these APIs cab be subject to change in future releases ([#562])
 
 [#544]: https://github.com/krassowski/jupyterlab-lsp/pull/544
 [#547]: https://github.com/krassowski/jupyterlab-lsp/pull/547
+[#553]: https://github.com/krassowski/jupyterlab-lsp/pull/553
+[#560]: https://github.com/krassowski/jupyterlab-lsp/pull/560
+[#562]: https://github.com/krassowski/jupyterlab-lsp/pull/562
 
 ### `jupyter-lsp 1.1.4` (2020-02-21)
 

atest/05_Features/Completion.robot

@@ -296,6 +296,28 @@ Shows Documentation With CompletionItem Resolve
     Completer Should Include Documentation    the default method of the
     [Teardown]    Clean Up After Working With File    completion.R
 
+Shows Only Relevant Suggestions In Known Magics
+    # https://github.com/krassowski/jupyterlab-lsp/issues/559
+    # h<tab>
+    Enter Cell Editor    20    line=2
+    Trigger Completer
+    Completer Should Suggest    help
+    Completer Should Not Suggest    from
+    Completer Should Suggest    hash
+
+Completes In R Magics
+    # Proper completion in R magics needs to be tested as:
+    # - R magic extractor uses a tailor-made replacer function, not tested elsewhere
+    # - R lanugage server is very sensitive to off-by-one errors (see https://github.com/REditorSupport/languageserver/issues/395)
+    # '%%R\n librar<tab>'
+    Enter Cell Editor    22    line=2
+    Trigger Completer
+    Completer Should Suggest    library
+    # '%R lib<tab>'
+    Enter Cell Editor    24    line=1
+    Trigger Completer
+    Completer Should Suggest    library
+
 *** Keywords ***
 Setup Completion Test
     Setup Notebook    Python    Completion.ipynb

atest/examples/Completion.ipynb

@@ -150,6 +150,56 @@
    "source": [
     "t"
    ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Cell magics show only relevant suggestions (triggering after `h` should return `hash`, `help`, etc, but not `from`):"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "%%python\n",
+    "h"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Test that the leading space does not cause issues in R cell magic:"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "%%R\n",
+    " librar"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "And that R line magic works too:"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "%R li"
+   ]
   }
  ],
  "metadata": {

docs/Installation.ipynb

@@ -250,7 +250,7 @@
     "##### pip\n",
     "\n",
     "```bash\n",
-    "pip install jupyterlab-lsp={JUPYTERLAB_LSP_VERSION}\n",
+    "pip install jupyterlab-lsp=={JUPYTERLAB_LSP_VERSION}\n",
     "```"
    ]
   },

packages/.eslintrc.js

@@ -6,6 +6,7 @@ module.exports = {
     node: true,
     'jest/globals': true
   },
+  globals: { JSX: 'readonly' },
   root: true,
   extends: [
     'eslint:recommended',

packages/_example-extractor/README.md

@@ -0,0 +1,5 @@
+# Extractor API
+
+This is an example of the Extractor API. See the [discussion].
+
+[discussion]: https://github.com/krassowski/jupyterlab-lsp/issues/561

packages/_example-extractor/babel.config.js

@@ -0,0 +1 @@
+module.exports = require('@jupyterlab/testutils/lib/babel.config');

packages/_example-extractor/jest.config.js

@@ -0,0 +1,31 @@
+const func = require('@jupyterlab/testutils/lib/jest-config');
+const upstream = func('jupyterlab-lsp', __dirname);
+
+const reuseFromUpstream = [
+  'moduleFileExtensions',
+  'moduleNameMapper',
+  'setupFiles',
+  'setupFilesAfterEnv',
+  'testPathIgnorePatterns'
+];
+
+let local = {
+  globals: { 'ts-jest': { tsconfig: 'tsconfig.json' } },
+  testRegex: `.*\.spec\.tsx?$`,
+  transform: {
+    '\\.(ts|tsx)?$': 'ts-jest',
+    '\\.(js|jsx)?$': './transform.js',
+    '\\.svg$': 'jest-raw-loader'
+  },
+  transformIgnorePatterns: [
+    '/node_modules/(?!(@jupyterlab/.*|@jupyterlab-classic/.*)/)'
+  ],
+  testLocationInResults: true,
+  reporters: [...upstream['reporters'], 'jest-github-actions-reporter']
+};
+
+for (const option of reuseFromUpstream) {
+  local[option] = upstream[option];
+}
+
+module.exports = local;