WIP fix advancing to next statement

I don't think my changes to `codeViewSetBlockSelection` work. It seems that `navigateToPos` does not work inside codeMirror? That must be why only "nextline" works in the command - it doesn't use `navigateToPos` it uses a special codeView thing.

Author: vezwork

apps/vscode/src/providers/cell/commands.ts

@@ -355,10 +355,10 @@ class RunCurrentCommand extends RunCommand implements Command {
       // if the selection is empty and we are in Positron:
       //   try to get the statement's range and use that as the selection
       if (selection.length <= 0 && activeBlock && hasHooks()) {
-        const language = embeddedLanguage(activeBlock.language);
-        const vdoc = virtualDocForCode(lines(activeBlock.code), language!);
-        const parentUri = Uri.file(editor.document.fileName);
+        const codeLines = lines(activeBlock.code)
+        const vdoc = virtualDocForCode(codeLines, embeddedLanguage(activeBlock.language)!);
         if (vdoc) {
+          const parentUri = Uri.file(editor.document.fileName);
           const result = await withVirtualDocUri(vdoc, parentUri, "statementRange", async (uri) => {
             return await commands.executeCommand<StatementRange>(
               "vscode.executeStatementRangeProvider",
@@ -373,6 +373,29 @@ class RunCurrentCommand extends RunCommand implements Command {
 
           selection = slicedLines.join('\n')
           action = "nextline";
+
+          // ref: https://github.com/posit-dev/positron/blob/main/src/vs/workbench/contrib/positronConsole/browser/positronConsoleActions.ts#L428
+          if (end.line + 1 <= codeLines.length) {
+            const nextStatementRange = await withVirtualDocUri(vdoc, parentUri, "statementRange", async (uri) => {
+              return await commands.executeCommand<StatementRange>(
+                "vscode.executeStatementRangeProvider",
+                uri,
+                new Position(end.line + 1, 1)
+              );
+            });
+            const nextStatement = nextStatementRange.range;
+            if (nextStatement.start.line > end.line) {
+              // If the next statement's start is after this statement's end,
+              // then move to the start of the next statement.
+              action = nextStatement.start
+            } else if (nextStatement.end.line > end.line) {
+              // If the above condition failed, but the next statement's end
+              // is after this statement's end, assume we are exiting some
+              // nested scope (like running an individual line of an R
+              // function) and move to the end of the next statement.
+              action = nextStatement.end
+            }
+          }
         }
       }
 
@@ -389,8 +412,10 @@ class RunCurrentCommand extends RunCommand implements Command {
         await executeInteractive(executor, [selection], editor.document);
 
         // advance cursor if necessary
+        //
         if (action) {
-          editor.setBlockSelection(context, "nextline");
+          console.log('action!!!', action, this.id)
+          await editor.setBlockSelection(context, action);
         }
       }
     }

packages/editor-types/src/codeview.ts

@@ -31,7 +31,7 @@ export interface CodeViewActiveBlockContext {
   selectedText: string;
 }
 
-export type CodeViewSelectionAction = "nextline" | "nextblock" | "prevblock";
+export type CodeViewSelectionAction = "nextline" | "nextblock" | "prevblock" | { line: number, character: number };
 
 export interface CodeViewCellContext {
   filepath: string;

packages/editor/src/api/codeview.ts

@@ -205,12 +205,23 @@ export function codeViewSetBlockSelection(
   context: CodeViewActiveBlockContext,
   action: CodeViewSelectionAction
 ) {
-
-
   const activeIndex = context.blocks.findIndex(block => block.active);
 
   if (activeIndex !== -1) {
-    if (action === "nextline") {
+    if (typeof action === 'object') {
+      // convert action line and character in code block space to pos in prosemirror space
+      const block = context.blocks[activeIndex]
+      const code = lines(block.code)
+      if (action.line > code.length) throw 'trying to move cursor outside block!'
+      let pos = block.pos
+      for (let i = 0; i <= action.line; i++) {
+        pos += code[i].length
+      }
+      pos += action.character
+
+      console.log('yoooo', pos, navigateToPos(view, pos, false));
+    }
+    else if (action === "nextline") {
       const tr = view.state.tr;
       tr.setMeta(kCodeViewNextLineTransaction, true);
       view.dispatch(tr);
@@ -222,13 +233,11 @@ export function codeViewSetBlockSelection(
         navigatePos = context.blocks[activeIndex - 1]?.pos;
       }
       if (navigatePos) {
+        console.log('yoooo22', navigatePos)
         navigateToPos(view, navigatePos!, false);
       }
     }
   }
-
-
-
 }