sync with upstream #13

Author: Titanium2099

package-lock.json

@@ -34,7 +34,7 @@
   "dependencies": {
     "@microbit/microbit-universal-hex": "0.2.2",
     "@turbowarp/jszip": "^3.11.1",
-    "@turbowarp/nanolog": "^0.2.0",
+    "@turbowarp/nanolog": "^1.0.1",
     "@turbowarp/scratch-l10n": "^3.1001.0-202401241456-994097a5",
     "@turbowarp/scratch-storage": "^0.0.202505311821",
     "@turbowarp/scratch-svg-renderer": "^1.0.0-202312242305-12c360b",

package.json

@@ -79,6 +79,7 @@ const addons = [
     'hide-stage',
     'tw-straighten-comments',
     'tw-remove-backpack',
+    'tw-disable-vibration',
     'tw-disable-cloud-variables',
     'tw-disable-compiler',
     'editor-stepping'

src/addons/addons.js

@@ -733,6 +733,8 @@ class TokenTypeBlock extends TokenType {
           strings.push(...blockPart.toLowerCase().split(" "));
         } else if (blockPart.type === BlockInputType.ENUM) {
           for (const enumValue of blockPart.values) {
+            if (this.stringForms.length >= WorkspaceQuerier.MAX_RESULTS) return;
+
             enumerateStringForms(
               partIdx + 1,
               [...strings, ...enumValue.string.toLowerCase().split(" ")],
@@ -749,6 +751,13 @@ class TokenTypeBlock extends TokenType {
     };
 
     enumerateStringForms();
+
+    if (this.stringForms.length >= WorkspaceQuerier.MAX_STRING_FORMS) {
+      console.warn(
+        "Warning: Block '" + this.block.id + "' has too many string forms. Search results may not be very good."
+      );
+      this.stringForms.length = 0;
+    }
   }
 
   /**
@@ -1164,7 +1173,12 @@ export default class WorkspaceQuerier {
   /**
    * The maximum number of tokens to find before giving up.
    */
-  static MAX_TOKENS = 10000;
+  static MAX_TOKENS = 100000;
+
+  /**
+   * The maximum number of string forms a block can have before we give up.
+   */
+  static MAX_STRING_FORMS = 500;
 
   /**
    * Indexes a workspace in preparation for querying it.
@@ -1208,12 +1222,12 @@ export default class WorkspaceQuerier {
       }
       ++query.resultCount;
       if (!limited && query.resultCount >= WorkspaceQuerier.MAX_RESULTS) {
-        console.log("Warning: Workspace query exceeded maximum result count.");
+        console.warn("Warning: Workspace query exceeded maximum result count.");
         limited = true;
       }
 
       if (!query.canCreateMoreTokens()) {
-        console.log("Warning: Workspace query exceeded maximum token count.");
+        console.warn("Warning: Workspace query exceeded maximum token count.");
         limited = true;
         break;
       }

src/addons/addons/middle-click-popup/WorkspaceQuerier.js

@@ -0,0 +1,16 @@
+/* generated by pull.js */
+const manifest = {
+  "noTranslations": true,
+  "name": "Disable vibrations",
+  "description": "Prevents the vibration and gamepad extensions from causing vibrations.",
+  "userscripts": [
+    {
+      "url": "userscript.js"
+    }
+  ],
+  "tags": [
+    "danger"
+  ],
+  "enabledByDefault": false
+};
+export default manifest;

src/addons/addons/tw-disable-vibration/_manifest_entry.js

@@ -0,0 +1,5 @@
+/* generated by pull.js */
+import _js from "./userscript.js";
+export const resources = {
+  "userscript.js": _js,
+};

src/addons/addons/tw-disable-vibration/_runtime_entry.js

@@ -0,0 +1,31 @@
+export default async function ({ addon }) {
+  if (navigator.vibrate) {
+    const originalVibrate = navigator.vibrate;
+    navigator.vibrate = function (...args) {
+      if (addon.self.disabled) {
+        return originalVibrate.call(this, ...args);
+      }
+      return false;
+    };
+  }
+
+  if (typeof GamepadHapticActuator === 'function' && typeof GamepadHapticActuator.prototype.pulse === 'function') {
+    const originalPulse = GamepadHapticActuator.prototype.pulse;
+    GamepadHapticActuator.prototype.pulse = function (...args) {
+      if (addon.self.disabled) {
+        return originalPulse.call(this, ...args);
+      }
+      return Promise.resolve(false);
+    };
+  }
+
+  if (typeof GamepadHapticActuator === 'function' && typeof GamepadHapticActuator.prototype.playEffect === 'function') {
+    const originalPlayEffect = GamepadHapticActuator.prototype.playEffect;
+    GamepadHapticActuator.prototype.playEffect = function (...args) {
+      if (addon.self.disabled) {
+        return originalPlayEffect.call(this, ...args);
+      }
+      return Promise.resolve('preempted');
+    };
+  }
+}

src/addons/addons/tw-disable-vibration/userscript.js

@@ -75,6 +75,7 @@ import _fullscreen from "../addons/fullscreen/_manifest_entry.js";
 import _hide_stage from "../addons/hide-stage/_manifest_entry.js";
 import _tw_straighten_comments from "../addons/tw-straighten-comments/_manifest_entry.js";
 import _tw_remove_backpack from "../addons/tw-remove-backpack/_manifest_entry.js";
+import _tw_disable_vibration from "../addons/tw-disable-vibration/_manifest_entry.js";
 import _tw_disable_cloud_variables from "../addons/tw-disable-cloud-variables/_manifest_entry.js";
 import _tw_disable_compiler from "../addons/tw-disable-compiler/_manifest_entry.js";
 import _editor_stepping from "../addons/editor-stepping/_manifest_entry.js";
@@ -159,6 +160,7 @@ export default {
   "hide-stage": _hide_stage,
   "tw-straighten-comments": _tw_straighten_comments,
   "tw-remove-backpack": _tw_remove_backpack,
+  "tw-disable-vibration": _tw_disable_vibration,
   "tw-disable-cloud-variables": _tw_disable_cloud_variables,
   "tw-disable-compiler": _tw_disable_compiler,
   "editor-stepping": _editor_stepping,

src/addons/generated/addon-entries.js

@@ -1 +1 @@
-{"commit":"df5f51e"}
+{"commit":"965a016"}