"Go to definition" in context menu (ScratchAddons#8064)

* "Go to definition" in context menu

* Apply mxmou's suggestions

Co-authored-by: Maximouse <brestl1c@outlook.com>

* Consistent ordering

* Bump latestUpdate version

---------

Co-authored-by: Samq64 <81489795+Samq64@users.noreply.github.com>
Co-authored-by: Maximouse <brestl1c@outlook.com>

Author: 3 people

addon-api/content-script/Tab.js

@@ -11,7 +11,7 @@ const DATA_PNG = "data:image/png;base64,";
 const isScratchGui = location.origin === "https://scratchfoundation.github.io" || location.port === "8601";
 
 const contextMenuCallbacks = [];
-const CONTEXT_MENU_ORDER = ["editor-devtools", "block-switching", "blocks2image", "swap-local-global"];
+const CONTEXT_MENU_ORDER = ["jump-to-def", "editor-devtools", "block-switching", "blocks2image", "swap-local-global"];
 let createdAnyBlockContextMenus = false;
 
 const PROJECT_ACTIONS_CSS = `

addons-l10n/en/jump-to-def.json

@@ -0,0 +1,3 @@
+{
+  "jump-to-def/to-def": "Go to Definition"
+}

addons/jump-to-def/addon.json

@@ -1,6 +1,6 @@
 {
   "name": "Jump to custom block definition",
-  "description": "Allows you to jump to a custom block's definition using the middle mouse button or Shift+Click on the block.",
+  "description": "Jump to a custom block's definition by middle-clicking or Shift+clicking on the block or selecting \"Go to Definition\" in the right click context menu.",
   "credits": [
     {
       "name": "griffpatch"
@@ -13,6 +13,10 @@
     }
   ],
   "versionAdded": "1.28.0",
+  "latestUpdate": {
+    "version": "1.43.0",
+    "temporaryNotice": "You can now use the context menu (open by right clicking or touching and holding) to jump to custom block definitions."
+  },
   "tags": ["editor", "codeEditor", "recommended"],
   "enabledByDefault": true,
   "dynamicEnable": true,

addons/jump-to-def/userscript.js

@@ -4,6 +4,22 @@ export default async function ({ addon, msg, console }) {
 
   const Blockly = await addon.tab.traps.getBlockly();
 
+  function jumpToBlockDefinition(block) {
+    let findProcCode = block.getProcCode();
+
+    let topBlocks = addon.tab.traps.getWorkspace().getTopBlocks();
+    for (const root of topBlocks) {
+      if (root.type === "procedures_definition") {
+        let label = root.getChildren()[0];
+        let procCode = label.getProcCode();
+        if (procCode && procCode === findProcCode) {
+          // Found... navigate to it!
+          utils.scrollBlockIntoView(root);
+        }
+      }
+    }
+  }
+
   Object.defineProperty(Blockly.Gesture.prototype, "jumpToDef", {
     get() {
       return !addon.self.disabled;
@@ -20,24 +36,26 @@ export default async function ({ addon, msg, console }) {
       let block = Blockly.registry ? this.startBlock : this.startBlock_;
       for (; block; block = block.getSurroundParent()) {
         if (block.type === "procedures_call") {
-          let findProcCode = block.getProcCode();
-
-          let topBlocks = addon.tab.traps.getWorkspace().getTopBlocks();
-          for (const root of topBlocks) {
-            if (root.type === "procedures_definition") {
-              let label = root.getChildren()[0];
-              let procCode = label.getProcCode();
-              if (procCode && procCode === findProcCode) {
-                // Found... navigate to it!
-                utils.scrollBlockIntoView(root);
-                return;
-              }
-            }
-          }
+          jumpToBlockDefinition(block);
+          return;
         }
       }
     }
 
     _doBlockClick_.call(this);
   };
+
+  addon.tab.createBlockContextMenu(
+    (items, block) => {
+      if (!addon.self.disabled && block.type === "procedures_call") {
+        items.push({
+          enabled: true,
+          text: msg("to-def"),
+          callback: () => jumpToBlockDefinition(block),
+        });
+      }
+      return items;
+    },
+    { blocks: true, flyout: true }
+  );
 }