Correctly parse long for arguments for rpy2 magics

Author: krassowski

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

@@ -1,6 +1,7 @@
 import { IOverridesRegistry } from './overrides';
 import {
   parse_r_args,
+  rpy2_args_pattern,
   rpy2_reverse_pattern,
   rpy2_reverse_replacement
 } from './rpy2';
@@ -46,7 +47,7 @@ export const language_specific_overrides: IOverridesRegistry = {
       },
       {
         // support up to 10 arguments
-        pattern: '%R' + '(?: -(\\S+) (\\S+))?'.repeat(10) + '(.*)(\n)?',
+        pattern: '%R' + rpy2_args_pattern(10) + '(.*)(\n)?',
         replacement: (match, ...args) => {
           let r = parse_r_args(args, -4);
           return `${r.outputs}rpy2.ipython.rmagic.RMagics.R("${r.content}", "${r.others}"${r.inputs})`;
@@ -81,7 +82,7 @@ export const language_specific_overrides: IOverridesRegistry = {
       // rpy2 extension R magic - this should likely go as an example to the user documentation, rather than being a default
       //   only handles simple one input - one output case
       {
-        pattern: '^%%R' + '(?: -(\\S) (\\S+))?'.repeat(10) + '(\n)?([\\s\\S]*)',
+        pattern: '^%%R' + rpy2_args_pattern(10) + '(\n)?([\\s\\S]*)',
         replacement: (match, ...args) => {
           let r = parse_r_args(args, -3);
           return `${r.outputs}rpy2.ipython.rmagic.RMagics.R("""${r.content}""", "${r.others}"${r.inputs})`;

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

@@ -32,7 +32,7 @@ describe('rpy2 IPython overrides', () => {
     let line_magics_map = new LineMagicsMap(
       language_specific_overrides['python'].line_magics
     );
-    it('inputs and outputs', () => {
+    it('works with the short form arguments, inputs and outputs', () => {
       let line = '%R -i x';
       let override = line_magics_map.override_for(line);
       expect(override).to.equal('rpy2.ipython.rmagic.RMagics.R("", "", x)');
@@ -75,5 +75,22 @@ describe('rpy2 IPython overrides', () => {
       reverse = line_magics_map.reverse.override_for(override);
       expect(reverse).to.equal(line);
     });
+
+    it('works with the long form arguments', () => {
+      let line = '%R --input x';
+      let override = line_magics_map.override_for(line);
+      expect(override).to.equal('rpy2.ipython.rmagic.RMagics.R("", "", x)');
+      let reverse = line_magics_map.reverse.override_for(override);
+      // TODO: make this preserve the long form
+      expect(reverse).to.equal('%R -i x');
+
+      line = '%R --width 800 --height 400 command()';
+      override = line_magics_map.override_for(line);
+      expect(override).to.equal(
+        'rpy2.ipython.rmagic.RMagics.R(" command()", "--width 800 --height 400")'
+      );
+      reverse = line_magics_map.reverse.override_for(override);
+      expect(reverse).to.equal(line);
+    });
   });
 });

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

@@ -7,9 +7,9 @@ export function parse_r_args(args: string[], content_position: number) {
     let variable = args[i + 1];
     if (typeof arg === 'undefined') {
       break;
-    } else if (arg === 'i') {
+    } else if (arg === 'i' || arg === '-input') {
       inputs.push(variable);
-    } else if (arg === 'o') {
+    } else if (arg === 'o' || arg === '-output') {
       outputs.push(variable);
     } else {
       others.push('-' + arg + ' ' + variable);
@@ -81,3 +81,7 @@ export function rpy2_reverse_replacement(match: string, ...args: string[]) {
     contents: contents
   };
 }
+
+export function rpy2_args_pattern(max_n: number) {
+  return '(?: -(\\S+) (\\S+))?'.repeat(max_n);
+}