Merge branch 'main' into makecode-tweaks

Author: microbit-matt-hillsdon

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@blockly/keyboard-experiment",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "A plugin for keyboard navigation.",
   "scripts": {
     "audit:fix": "blockly-scripts auditFix",

package.json

@@ -548,10 +548,13 @@ export class Navigation {
   }
 
   /**
-   * Moves the cursor to the top connection point on on the first top block.
-   * If the workspace is empty, moves the cursor to the default location on
-   * the workspace.
-   *
+   * Sets the cursor location when focusing the workspace.
+   * Tries the following, in order, stopping after the first success:
+   *  - Resume editing by putting the cursor at the marker location, if any.
+   *  - Resume editing by returning the cursor to its previous location, if any.
+   *  - Move the cursor to the top connection point on on the first top block.
+   *  - Move the cursor to the default location on the workspace.
+   * 
    * @param workspace The main Blockly workspace.
    * @param keepPosition Whether to retain the cursor's previous position.
    */
@@ -564,6 +567,13 @@ export class Navigation {
     if (!cursor) {
       return;
     }
+
+    if (this.markedNode) {
+      cursor.setCurNode(this.markedNode);
+      this.removeMark(workspace);
+      return;
+    }
+
     if (cursor.getCurNode() && keepPosition) {
       // Retain the cursor's previous position since it's set.
       return;