Merge branch 'krassowski:master' into master

Author: FlyingSamson

CHANGELOG.md

@@ -1,5 +1,12 @@
 ## Changelog
 
+### `@krassowski/jupyterlab-lsp 3.8.1` (unreleased)
+
+- bug fixes:
+  - `%Rdevice` magic is now properly overridden and won't be extracted to R code [(#646)]
+
+[#646]: https://github.com/krassowski/jupyterlab-lsp/pull/646
+
 ### `@krassowski/jupyterlab-lsp 3.8.0` (2021-07-04)
 
 - improvements:

CONTRIBUTING.md

@@ -332,7 +332,7 @@ python scripts/lint.py
 
 ### Specs
 
-While language servers can be configured by the user using a simple JSON or Python [configuration file](./Configuring.html#language-servers),
+While language servers can be configured by the user using a simple JSON or Python [configuration file](./docs/Configuring.ipynb),
 it is preferable to provide users with an option that does not require manual configuration. The language server specifications (specs)
 wrap the configuration (as would be defined by the user) into a Python class or function that can be either:
 
@@ -361,7 +361,7 @@ A spec is a Python callable (a function, or a class with `__call__` method) that
 
 The above example is only intended as an illustration and not as an up-to-date guide.
 For details on the dictionary contents, see the [schema][] definition and [built-in specs][].
-Basic concepts (meaning of the `argv` and `languages` arguments) are also explained in the [configuration files](./Configuring.html#language-servers) documentation.
+Basic concepts (meaning of the `argv` and `languages` arguments) are also explained in the [configuration files](./docs/Configuring.ipynb) documentation.
 
 When contributing a specification we recommend to make use of the helper classes and other [utilities][] that take care of the common use-cases:
 

packages/jupyterlab-lsp/src/transclusions/ipython-rpy2/extractors.spec.ts

@@ -34,6 +34,14 @@ describe('IPython rpy2 extractors', () => {
   });
 
   describe('%R line magic', () => {
+    it('should not extract parts of non-code commands', () => {
+      let code = wrap_in_python_lines('%Rdevice svg');
+      let { cell_code_kept, foreign_document_map } = extract(code);
+
+      expect(cell_code_kept).to.equal(code);
+      expect(foreign_document_map.size).to.equal(0);
+    });
+
     it('correctly gives ranges in source', () => {
       let code = '%R ggplot()';
       let { foreign_document_map } = extract(code);

packages/jupyterlab-lsp/src/transclusions/ipython-rpy2/extractors.ts

@@ -53,7 +53,8 @@ export let foreign_code_extractors: IForeignCodeExtractorsRegistry = {
       language: 'r',
       // it is very important to not include the space which will be trimmed in the capture group,
       // otherwise the offset will be off by one and the R language server will crash
-      pattern: '(?:^|\n)%R' + rpy2_args_pattern(RPY2_MAX_ARGS) + ' ?(.*)?\n?',
+      pattern:
+        '(?:^|\n)%R' + rpy2_args_pattern(RPY2_MAX_ARGS) + '(?: (.*))?(?:\n|$)',
       foreign_capture_groups: [RPY2_MAX_ARGS * 2 + 1],
       foreign_replacer: create_rpy_code_extractor(true),
       extract_arguments: rpy2_args,

packages/jupyterlab-lsp/src/transclusions/ipython-rpy2/overrides.spec.ts

@@ -34,6 +34,23 @@ describe('rpy2 IPython overrides', () => {
     let line_magics = new ReversibleOverridesMap(
       overrides.filter(override => override.scope == 'line')
     );
+
+    it('works with other Rdevice', () => {
+      let line = '%Rdevice svg';
+      let override = line_magics.override_for(line);
+      expect(override).to.equal(
+        'rpy2.ipython.rmagic.RMagics.Rdevice(" svg", "")'
+      );
+      let reverse = line_magics.reverse.override_for(override);
+      expect(reverse).to.equal(line);
+    });
+
+    it('does not overwrite non-rpy2 magics', () => {
+      let line = '%RestMagic';
+      let override = line_magics.override_for(line);
+      expect(override).to.equal(null);
+    });
+
     it('works with the short form arguments, inputs and outputs', () => {
       let line = '%R -i x';
       let override = line_magics.override_for(line);

packages/jupyterlab-lsp/src/transclusions/ipython-rpy2/overrides.ts

@@ -13,12 +13,17 @@ export let overrides: IScopedCodeOverride[] = [
   {
     // support up to 10 arguments
     pattern:
-      LINE_MAGIC_PREFIX + '%R' + rpy2_args_pattern(RPY2_MAX_ARGS) + '(.*)(\n)?',
+      LINE_MAGIC_PREFIX +
+      '%R' +
+      rpy2_args_pattern(RPY2_MAX_ARGS) +
+      '( .*)?(\n|$)',
     replacement: (match, prefix, ...args) => {
       let r = parse_r_args(args, -4);
       // note: only supports assignment or -o/--output, not both
       // TODO assignment like in x = %R 1 should be distinguished from -o
-      return `${prefix}${r.outputs}rpy2.ipython.rmagic.RMagics.R("${r.content}", "${r.others}"${r.inputs})`;
+      return `${prefix}${r.outputs}rpy2.ipython.rmagic.RMagics.R("${
+        r.content || ''
+      }", "${r.others}"${r.inputs})`;
     },
     scope: 'line',
     reverse: {
@@ -47,5 +52,20 @@ export let overrides: IScopedCodeOverride[] = [
       },
       scope: 'cell'
     }
+  },
+  {
+    pattern: LINE_MAGIC_PREFIX + '%Rdevice( .*)?(\n|$)',
+    replacement: (match, prefix, ...args) => {
+      return `${prefix}rpy2.ipython.rmagic.RMagics.Rdevice("${args[0]}", "")`;
+    },
+    scope: 'line',
+    reverse: {
+      pattern: rpy2_reverse_pattern('"', false, 'Rdevice'),
+      replacement: (match, ...args) => {
+        let r = rpy2_reverse_replacement(match, ...args);
+        return '%Rdevice' + r.input + r.output + r.other + r.contents;
+      },
+      scope: 'line'
+    }
   }
 ];

packages/jupyterlab-lsp/src/transclusions/ipython-rpy2/rpy2.ts

@@ -46,11 +46,17 @@ export function parse_r_args(args: string[], content_position: number) {
   };
 }
 
-export function rpy2_reverse_pattern(quote = '"', multi_line = false): string {
+export function rpy2_reverse_pattern(
+  quote = '"',
+  multi_line = false,
+  magic = 'R'
+): string {
   return (
     '(\\S+)?' +
     '(?:, (\\S+))?'.repeat(9) +
-    '( = )?rpy2\\.ipython\\.rmagic\\.RMagics.R\\(' +
+    '( = )?rpy2\\.ipython\\.rmagic\\.RMagics.' +
+    magic +
+    '\\(' +
     quote +
     (multi_line ? '([\\s\\S]*)' : '(.*?)') +
     quote +

python_packages/jupyter_lsp/jupyter_lsp/specs/utils.py

@@ -141,9 +141,11 @@ def __call__(self, mgr: LanguageServerManagerAPI) -> KeyedLanguageServerSpecs:
             troubleshooting.append(spec["troubleshoot"])
         spec["troubleshoot"] = "\n\n".join(troubleshooting)
 
+        is_installed = self.is_installed(mgr)
+
         return {
             self.key: {
-                "argv": [mgr.nodejs, node_module, *self.args],
+                "argv": ([mgr.nodejs, node_module, *self.args] if is_installed else []),
                 "languages": self.languages,
                 "version": SPEC_VERSION,
                 **spec,

requirements/lint.yml

@@ -10,7 +10,6 @@ dependencies:
   - isort
   - mypy
   - robotframework-lint >=1.1
-  - robotframework >=4
+  - robotframework >=4,<4.1
   - pytest-tornasync
-  - pip:
-      - types-six
+  - types-six

yarn.lock

@@ -2000,7 +2000,7 @@
     "@jupyterlab/application" "^3.0.0"
 
 "@krassowski/jupyterlab-lsp@file:packages/jupyterlab-lsp":
-  version "3.7.0"
+  version "3.8.0"
   dependencies:
     "@krassowski/code-jumpers" "~1.1.0"
     "@krassowski/completion-theme" "~3.1.0"
@@ -14850,9 +14850,9 @@ uri-js@^4.2.2:
     punycode "^2.1.0"
 
 urijs@^1.19.1:
-  version "1.19.6"
-  resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.6.tgz#51f8cb17ca16faefb20b9a31ac60f84aa2b7c870"
-  integrity sha512-eSXsXZ2jLvGWeLYlQA3Gh36BcjF+0amo92+wHPyN1mdR8Nxf75fuEuYTd9c0a+m/vhCjRK0ESlE9YNLW+E1VEw==
+  version "1.19.7"
+  resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.7.tgz#4f594e59113928fea63c00ce688fb395b1168ab9"
+  integrity sha512-Id+IKjdU0Hx+7Zx717jwLPsPeUqz7rAtuVBRLLs+qn+J2nf9NGITWVCxcijgYxBqe83C7sqsQPs6H1pyz3x9gA==
 
 urix@^0.1.0:
   version "0.1.0"