fix advancing to next statement

Author: vezwork

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

@@ -374,28 +374,26 @@ 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
+          // BEGIN ref: https://github.com/posit-dev/positron/blob/main/src/vs/workbench/contrib/positronConsole/browser/positronConsoleActions.ts#L428
+          // strategy from Positron using `StatementRangeProvider` to find range of next statement
+          // and move cursor based on that.
           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)
+                new Position(end.line + 1, 1) // look for statement at line after current statement
               );
             });
             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
+              // the nextStatement may start before & end after the current statement if e.g. inside a function:
             } 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
             }
           }
+          // END ref.
         }
       }
 

packages/editor-codemirror/src/behaviors/trackselection.ts

@@ -27,7 +27,7 @@ import { DispatchEvent, codeViewCellContext, kCodeViewNextLineTransaction } from
 import { Behavior, BehaviorContext, State } from ".";
 
 // track the selection in prosemirror
-export function trackSelectionBehavior(context: BehaviorContext) : Behavior {
+export function trackSelectionBehavior(context: BehaviorContext): Behavior {
 
   let unsubscribe: VoidFunction;
 
@@ -50,32 +50,32 @@ export function trackSelectionBehavior(context: BehaviorContext) : Behavior {
       unsubscribe = context.pmContext.events.subscribe(DispatchEvent, (tr: Transaction | undefined) => {
         if (tr) {
           // track selection changes that occur when we don't have focus
-          if (!cmView.hasFocus && tr.selectionSet && !tr.docChanged && (tr.selection instanceof TextSelection)) {
+          if (tr.selectionSet && !tr.docChanged && (tr.selection instanceof TextSelection)) {
             const cmSelection = asCodeMirrorSelection(context.view, cmView, context.getPos);
             context.withState(State.Updating, () => {
               if (cmSelection) {
                 cmView.dispatch({ selection: cmSelection });
               } else {
-                cmView.dispatch({ selection: EditorSelection.single(0)})
-              } 
+                cmView.dispatch({ selection: EditorSelection.single(0) })
+              }
             })
           } else if (tr.getMeta(kCodeViewNextLineTransaction) === true) {
             // NOTE: this is a special directive to advance to the next line. as distinct
             // from the block above it is not a reporting of a change in the PM selection
-            // but rather an instruction to move the CM selection to the next line. as 
+            // but rather an instruction to move the CM selection to the next line. as
             // such we do not encose the code in State.Updating, because we want an update
             // to the PM selection to occur
             const cmSelection = asCodeMirrorSelection(context.view, cmView, context.getPos);
             if (cmSelection) {
               if (cursorLineDown(cmView)) {
                 cursorLineStart(cmView);
-              } 
+              }
             }
-          // for other selection changes 
+            // for other selection changes
           } else if (cmView.hasFocus && tr.selectionSet && (tr.selection instanceof TextSelection)) {
             codeViewAssist();
           }
-        } 
+        }
       });
     },
 
@@ -91,7 +91,7 @@ export const asCodeMirrorSelection = (
   cmView: EditorView,
   getPos: (() => number) | boolean
 ) => {
-  if (typeof(getPos) === "function") {
+  if (typeof (getPos) === "function") {
     const offset = getPos() + 1;
     const node = pmView.state.doc.nodeAt(getPos());
     if (node) {
@@ -104,8 +104,8 @@ export const asCodeMirrorSelection = (
       } else if (selection.from <= cmRange.from && selection.to >= cmRange.to) {
         return EditorSelection.single(0, cmView.state.doc.length);
       }
-      
+
     }
   }
   return undefined;
-}
+}

packages/editor/src/api/codeview.ts

@@ -211,15 +211,17 @@ export function codeViewSetBlockSelection(
     if (typeof action === 'object') {
       // convert action line and character in code block space to pos in prosemirror space
       const block = context.blocks[activeIndex]
+      // asummes the meta line looks like this:
+      const metaLine = '{' + block.language + '}\n'
       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
+      let pos = block.pos + metaLine.length
+      for (let i = 0; i < action.line; i++) {
+        pos += code[i].length + 1
       }
       pos += action.character
 
-      console.log('yoooo', pos, navigateToPos(view, pos, false));
+      navigateToPos(view, pos, false)
     }
     else if (action === "nextline") {
       const tr = view.state.tr;