Merge branch 'philc:master' into feat/move-tab-to-existing-window

Author: IdoKendo

CHANGELOG.md

@@ -1,11 +1,17 @@
-2.1.3 (unreleased)
+2.2.1 (2025-03-20)
 
+- Fix findSelected and findSelectedBackwards commands (https://github.com/philc/vimium/issues/4655)
+- Fix openCopiedUrlInCurrentTab (https://github.com/philc/vimium/issues/4654)
+
+2.2.0 (2025-03-08)
+
+- Use the browser's default search engine. [(#2598)](https://github.com/philc/vimium/issues/2598)
+- Add "reload hard" command (R). ([#4445](https://github.com/philc/vimium/pull/4445)).
+- Add zoomIn (zi), zoomOut (zo), zoomReset (z0), and setZoom commands.
+  ([#4488](https://github.com/philc/vimium/pull/4488))
 - Add findSelected and findSelectedBackwards commands.
   ([#4502](https://github.com/philc/vimium/pull/4502))
-- Add commands zoomIn, zoomOut, zoomReset (zi, zo, z0), and setZoom.
-  ([#4488](https://github.com/philc/vimium/pull/4488))
-- Add "reload hard" command (bound to R). ([#4445](https://github.com/philc/vimium/pull/4445)).
-- Options page: improve UX, add error validation.
+- Options page: improve UI, add error validation.
 - Make tab commands handle Firefox hidden tabs.
 - Bug fixes.
 
@@ -60,7 +66,7 @@
 - Fix exception when migrating some pre-v2.0 settings.
   ([#4323](https://github.com/philc/vimium/issues/4323))
 
-2.0.0 (2023-09-28 -- partially rolled out to users on the Chrome store)
+2.0.0 (2023-09-28)
 
 - Support manifest v3, as now required by Chrome. This involved a partial rewrite and many changes.
   Please report any new issues [here](https://github.com/philc/vimium/issues).

background_scripts/completion.js

@@ -523,13 +523,18 @@ class SearchEngineCompleter {
     CompletionSearch.cancel();
   }
 
-  // TODO(philc): Consider moving to UserSearchEngines
+  // Returns the UserSearchEngine for the given query. Returns null if the query does not begin with
+  // a keyword from one of the user's search engines.
   getUserSearchEngineForQuery(query) {
     const parts = query.trimStart().split(/\s+/);
     // For a keyword "w", we match "w search terms" and "w ", but not "w" on its own.
-    if (parts.length <= 1) return;
     const keyword = parts[0];
-    return UserSearchEngines.keywordToEngine[keyword];
+    if (parts.length <= 1) return null;
+    // Don't match queries for built-in properties like "constructor". See #4396.
+    if (Object.hasOwn(UserSearchEngines.keywordToEngine, keyword)) {
+      return UserSearchEngines.keywordToEngine[keyword];
+    }
+    return null;
   }
 
   refresh() {

content_scripts/hud.js

@@ -25,7 +25,7 @@ const HUD = {
       hideFindMode: this.hideFindMode,
       search: this.search,
       unfocusIfFocused: this.unfocusIfFocused,
-      paseResponse: this.pasteResponse,
+      pasteResponse: this.pasteResponse,
       showClipboardUnavailableMessage: this.showClipboardUnavailableMessage,
     };
     const handler = handlers[data.name];

content_scripts/mode_find.js

@@ -401,7 +401,7 @@ const getCurrentRange = function () {
     range.setStart(document.body, 0);
     range.setEnd(document.body, 0);
     return range;
-  } 
+  }
 
   if (selection.type === "Range") {
     selection.collapseToStart();

content_scripts/mode_normal.js

@@ -75,6 +75,14 @@ const enterNormalMode = function (count) {
   return mode;
 };
 
+function findSelectedHelper(backwards) {
+  const selection = window.getSelection().toString();
+  if (!selection) return;
+  FindMode.updateQuery(selection);
+  FindMode.saveQuery();
+  FindMode.findNext(backwards);
+}
+
 const NormalModeCommands = {
   // Scrolling.
   scrollToBottom() {
@@ -216,14 +224,6 @@ const NormalModeCommands = {
     }
   },
 
-  findSelectedHelper(backwards) {
-    const selection = window.getSelection().toString();
-    if (!selection) return;
-    FindMode.updateQuery(selection);
-    FindMode.saveQuery();
-    return FindMode.findNext(backwards);
-  },
-
   findSelected() {
     findSelectedHelper(false);
   },

deno.json

@@ -3,10 +3,11 @@
     "lineWidth": 100
   },
   "imports": {
-    "@b-fuze/deno-dom": "jsr:@b-fuze/deno-dom@^0.1.48",
+    "@b-fuze/deno-dom": "jsr:@b-fuze/deno-dom@^0.1.49",
     "@std/fs": "jsr:@std/fs@^1.0.8",
     "@std/http": "jsr:@std/http@^1.0.12",
     "@std/path": "jsr:@std/path@^1.0.8",
+    "jsdom": "npm:jsdom@^26.0.0",
     "json5": "npm:json5@^2.2.3"
   }
 }