intelligent run selection for R (runs complete statment not just line)

Author: jjallaire

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## 1.54.0 (Unreleased)
 
+- Intelligent run selection for R (runs complete statment not just line)
 - Improve handling of first-run files for create project command
 
 ## 1.53.0 (Release on 27 October 2022)

src/providers/cell/commands.ts

@@ -26,6 +26,7 @@ import {
   codeFromBlock,
   ensureRequiredExtension,
   executeInteractive,
+  executeSelectionInteractive,
 } from "./executors";
 
 export function cellCommands(engine: MarkdownEngine): Command[] {
@@ -165,29 +166,36 @@ class RunSelectionCommand extends RunCommand implements Command {
     _line: number,
     block: Token
   ) {
-    // if the selection is empty take the whole line, otherwise
-    // take the selected text exactly
-    const selection = editor.selection.isEmpty
-      ? editor.document.getText(
-          new Range(
-            new Position(editor.selection.start.line, 0),
-            new Position(
-              editor.selection.end.line,
-              editor.document.lineAt(editor.selection.end).text.length
+    // get language and attempt language aware runSelection
+    const language = languageNameFromBlock(block);
+    const executed = await executeSelectionInteractive(language);
+
+    // if the executor isn't capable of lenguage aware runSelection
+    // then determine the selection manually
+    if (!executed) {
+      // if the selection is empty take the whole line, otherwise
+      // take the selected text exactly
+      const selection = editor.selection.isEmpty
+        ? editor.document.getText(
+            new Range(
+              new Position(editor.selection.start.line, 0),
+              new Position(
+                editor.selection.end.line,
+                editor.document.lineAt(editor.selection.end).text.length
+              )
             )
           )
-        )
-      : editor.document.getText(editor.selection);
+        : editor.document.getText(editor.selection);
 
-    // for empty selections we advance to the next line
-    if (editor.selection.isEmpty) {
-      const selPos = new Position(editor.selection.start.line + 1, 0);
-      editor.selection = new Selection(selPos, selPos);
-    }
+      // for empty selections we advance to the next line
+      if (editor.selection.isEmpty) {
+        const selPos = new Position(editor.selection.start.line + 1, 0);
+        editor.selection = new Selection(selPos, selPos);
+      }
 
-    // run code
-    const language = languageNameFromBlock(block);
-    await executeInteractive(language, [selection]);
+      // run code
+      await executeInteractive(language, [selection]);
+    }
   }
 }
 

src/providers/cell/executors.ts

@@ -72,6 +72,19 @@ export async function executeInteractive(
   }
 }
 
+// attempt language aware execution of current selection (returns false
+// if the executor doesn't support this, in which case generic
+// executeInteractive will be called)
+export async function executeSelectionInteractive(language: string) {
+  const executor = kCellExecutors.find((x) => x.language === language);
+  if (executor?.executeSelection) {
+    await executor.executeSelection();
+    return true;
+  } else {
+    return false;
+  }
+}
+
 export function hasCellExecutor(language: string) {
   return !!kCellExecutors.find((x) => x.language === language);
 }
@@ -178,6 +191,7 @@ interface CellExecutor {
   requiredVersion?: string;
   isYamlOption: (line: string) => boolean;
   execute: (blocks: string[]) => Promise<void>;
+  executeSelection?: () => Promise<void>;
 }
 
 const pythonCellExecutor: CellExecutor = {
@@ -202,6 +216,9 @@ const rCellExecutor: CellExecutor = {
   execute: async (blocks: string[]) => {
     await commands.executeCommand("r.runSelection", blocks.join("\n").trim());
   },
+  executeSelection: async () => {
+    await commands.executeCommand("r.runSelection");
+  },
 };
 
 const juliaCellExecutor: CellExecutor = {