Merge remote-tracking branch 'upstream/master' into add-texlab-spec

Author: bollwyvl

CHANGELOG.md

@@ -1,6 +1,10 @@
 ## CHANGELOG
 
-### `@krassowski/jupyterlab-lsp 1.0.1` (unreleased)
+### `@krassowski/jupyterlab-lsp 1.1.0` (2020-07-20)
+
+- features
+
+  - language servers can now be configured from the Advanced Settings Editor ([#245][])
 
 - features
 
@@ -13,6 +17,8 @@
     (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][])
+  - fixes some pyflakes issues caused by line magics substitution ([#293][])
+  - updated the link to the documentation of language servers ([#294][])
 
 ### `lsp-ws-connection 0.4.1` (unreleased)
 
@@ -24,6 +30,30 @@
 [#195]: https://github.com/krassowski/jupyterlab-lsp/issues/195
 [#245]: https://github.com/krassowski/jupyterlab-lsp/pull/245
 [#261]: https://github.com/krassowski/jupyterlab-lsp/issues/261
+[#293]: https://github.com/krassowski/jupyterlab-lsp/pull/293
+[#294]: https://github.com/krassowski/jupyterlab-lsp/pull/294
+
+### `jupyter-lsp 0.9.0` (2020-07-20)
+
+- features
+
+  - language servers can now be configured from the Advanced Settings Editor ([#245][])
+
+- bug fixes
+
+  - handles document open and change operation ordering more predictably ([#284][])
+
+### `lsp-ws-connection 0.5.0` (2020-07-20)
+
+- features
+
+  - language servers can now be configured from the Advanced Settings Editor ([#245][])
+
+- bug fixes
+
+  - handles document open and change operation ordering more predictably ([#284][])
+
+[#245]: https://github.com/krassowski/jupyterlab-lsp/pull/245
 [#284]: https://github.com/krassowski/jupyterlab-lsp/pull/284
 [#288]: https://github.com/krassowski/jupyterlab-lsp/pull/288
 

azure-pipelines.yml

@@ -13,8 +13,8 @@ variables:
   ATEST_RETRIES: 3
   YARN_CACHE_FOLDER: $(Pipeline.Workspace)/.yarn
 
-  PY_JLSP_VERSION: 0.8.0
-  JS_JLLSP_VERSION: 1.0.0
+  PY_JLSP_VERSION: 0.9.0
+  JS_JLLSP_VERSION: 1.1.0
   JS_JLG2D_VERSION: 1.0.0
 
   FIRST_PARTY_LABEXTENSIONS: >-

packages/jupyterlab-lsp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@krassowski/jupyterlab-lsp",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Language Server Protocol integration for JupyterLab",
   "keywords": [
     "jupyter",
@@ -38,7 +38,7 @@
   "dependencies": {
     "@krassowski/jupyterlab_go_to_definition": "~1.0.0",
     "lodash.mergewith": "^4.6.1",
-    "lsp-ws-connection": "~0.4.0"
+    "lsp-ws-connection": "~0.5.0"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.4.3",

packages/jupyterlab-lsp/src/adapters/jupyterlab/components/statusbar.tsx

@@ -213,7 +213,7 @@ class LSPPopup extends VDomRenderer<LSPStatus.Model> {
           Documentation:{' '}
           <a
             href={
-              'https://github.com/krassowski/jupyterlab-lsp/blob/master/docs/LANGUAGESERVERS.md'
+              'https://jupyterlab-lsp.readthedocs.io/en/latest/Language%20Servers.html'
             }
             target="_blank"
             rel="noreferrer"

packages/jupyterlab-lsp/src/magics/defaults.spec.ts

@@ -104,6 +104,18 @@ describe('Default IPython overrides', () => {
       expect(reverse).to.equal(LINE_MAGIC_WITH_SPACE);
     });
 
+    it('overrides x =%ls', () => {
+      // this is a corner-case as described in
+      // https://github.com/krassowski/jupyterlab-lsp/issues/281#issuecomment-645286076
+      let override = line_magics_map.override_for('x =%ls');
+      expect(override).to.equal('x =get_ipython().run_line_magic("ls", "")');
+    });
+
+    it('does not override line-magic-like constructs', () => {
+      let override = line_magics_map.override_for('list("%")');
+      expect(override).to.equal(null);
+    });
+
     it('escapes arguments', () => {
       const line_magic_with_args = '%MAGIC "arg"';
       let override = line_magics_map.override_for(line_magic_with_args);
@@ -122,5 +134,10 @@ describe('Default IPython overrides', () => {
       let reverse = line_magics_map.reverse.override_for(override);
       expect(reverse).to.equal('!ls -o');
     });
+
+    it('does not override shell-like constructs', () => {
+      let override = line_magics_map.override_for('"!ls"');
+      expect(override).to.equal(null);
+    });
   });
 });

packages/jupyterlab-lsp/src/magics/defaults.ts

@@ -38,9 +38,13 @@ export const language_specific_overrides: IOverridesRegistry = {
       //  keep the content, keep magic/command name and new line at the end
 
       // note magics do not have to start with the new line, for example x = !ls or x = %ls are both valid.
+      // x =%ls is also valid. However, percent may also appear in strings, e.g. ls('%').
+      // Hence: (^|\\s|=) for shell commands (!) and line magics (%); see issue #281.
+      // This does not solve all issues, for example `list(" %ls")` still leads to:
+      // `list(" get_ipython().run_line_magic("ls")", "")`.
       {
-        pattern: '!(\\S+)(.*)(\n)?',
-        replacement: 'get_ipython().getoutput("$1$2")$3',
+        pattern: '(^|\\s|=)!(\\S+)(.*)(\n)?',
+        replacement: '$1get_ipython().getoutput("$2$3")$4',
         reverse: {
           pattern: 'get_ipython\\(\\).getoutput\\("(.*?)"\\)(\n)?',
           replacement: '!$1$2'
@@ -62,11 +66,11 @@ export const language_specific_overrides: IOverridesRegistry = {
         }
       },
       {
-        pattern: '%(\\S+)(.*)(\n)?',
-        replacement: (match, name, args, line_break) => {
+        pattern: '(^|\\s|=)%(\\S+)(.*)(\n)?',
+        replacement: (match, prefix, name, args, line_break) => {
           args = empty_or_escaped(args);
           line_break = line_break || '';
-          return `get_ipython().run_line_magic("${name}", "${args}")${line_break}`;
+          return `${prefix}get_ipython().run_line_magic("${name}", "${args}")${line_break}`;
         },
         reverse: {
           pattern:

packages/lsp-ws-connection/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lsp-ws-connection",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Utility for adapting editors to language server protocol",
   "main": "dist/index.js",
   "module": "dist/index.js",

packages/metapackage/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@krassowski/jupyterlab-lsp-metapackage",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "JupyterLab LSP - Meta Package.  All of the packages used by JupyterLab LSP",
   "homepage": "https://github.com/krassowski/jupyterlab-lsp",
   "bugs": {

py_src/jupyter_lsp/_version.py

@@ -1,3 +1,3 @@
 """ single source of truth for jupyter_lsp version
 """
-__version__ = "0.8.0"
+__version__ = "0.9.0"