tor-browser

commit 9406c58887da69dffe628cde41d3da9dc19f6da2
parent cf20d85b1ed67592a37ef2732da89ca8d65c931e
Author: Daisuke Akatsuka <daisuke@birchill.co.jp>
Date:   Thu, 11 Dec 2025 01:12:05 +0000

Bug 1995227: Remove NONE highlight type r=adw

Differential Revision: https://phabricator.services.mozilla.com/D274720

Diffstat:
M
browser/components/urlbar/UrlbarProviderClipboard.sys.mjs
 | 
4
----
M
browser/components/urlbar/UrlbarProviderHeuristicFallback.sys.mjs
 | 
14
--------------
M
browser/components/urlbar/UrlbarProviderHistoryUrlHeuristic.sys.mjs
 | 
1
-
M
browser/components/urlbar/UrlbarProviderPrivateSearch.sys.mjs
 | 
1
-
M
browser/components/urlbar/UrlbarProviderSearchSuggestions.sys.mjs
 | 
1
-
M
browser/components/urlbar/UrlbarProviderSemanticHistorySearch.sys.mjs
 | 
8
--------
M
browser/components/urlbar/UrlbarUtils.sys.mjs
 | 
1
-
M
browser/components/urlbar/tests/unit/head.js
 | 
4
+---

8 files changed, 1 insertion(+), 33 deletions(-)
diff --git a/browser/components/urlbar/UrlbarProviderClipboard.sys.mjs b/browser/components/urlbar/UrlbarProviderClipboard.sys.mjs
@@ -130,10 +130,6 @@ export class UrlbarProviderClipboard extends UrlbarProvider {
         icon: "chrome://global/skin/icons/clipboard.svg",
         isBlockable: true,
       },
-      highlights: {
-        title: UrlbarUtils.HIGHLIGHT.NONE,
-        url: UrlbarUtils.HIGHLIGHT.NONE,
-      },
     });
 
     addCallback(this, result);
diff --git a/browser/components/urlbar/UrlbarProviderHeuristicFallback.sys.mjs b/browser/components/urlbar/UrlbarProviderHeuristicFallback.sys.mjs
@@ -167,10 +167,6 @@ export class UrlbarProviderHeuristicFallback extends UrlbarProvider {
             fallbackTitle: searchUrl,
             url: searchUrl,
           },
-          highlights: {
-            fallbackTitle: UrlbarUtils.HIGHLIGHT.NONE,
-            url: UrlbarUtils.HIGHLIGHT.NONE,
-          },
         });
       }
 
@@ -235,10 +231,6 @@ export class UrlbarProviderHeuristicFallback extends UrlbarProvider {
         url: escapedURL,
         icon: iconUri,
       },
-      highlights: {
-        fallbackTitle: UrlbarUtils.HIGHLIGHT.NONE,
-        url: UrlbarUtils.HIGHLIGHT.NONE,
-      },
     });
   }
 
@@ -295,10 +287,6 @@ export class UrlbarProviderHeuristicFallback extends UrlbarProvider {
         query: query.trimStart(),
         keyword: firstToken,
       },
-      highlights: {
-        query: UrlbarUtils.HIGHLIGHT.NONE,
-        keyword: UrlbarUtils.HIGHLIGHT.NONE,
-      },
     });
   }
 
@@ -348,8 +336,6 @@ export class UrlbarProviderHeuristicFallback extends UrlbarProvider {
       },
       highlights: {
         engine: UrlbarUtils.HIGHLIGHT.TYPED,
-        query: UrlbarUtils.HIGHLIGHT.NONE,
-        keyword: UrlbarUtils.HIGHLIGHT.NONE,
       },
     });
   }
diff --git a/browser/components/urlbar/UrlbarProviderHistoryUrlHeuristic.sys.mjs b/browser/components/urlbar/UrlbarProviderHistoryUrlHeuristic.sys.mjs
@@ -120,7 +120,6 @@ export class UrlbarProviderHistoryUrlHeuristic extends UrlbarProvider {
       },
       highlights: {
         url: UrlbarUtils.HIGHLIGHT.TYPED,
-        title: UrlbarUtils.HIGHLIGHT.NONE,
       },
     });
   }
diff --git a/browser/components/urlbar/UrlbarProviderPrivateSearch.sys.mjs b/browser/components/urlbar/UrlbarProviderPrivateSearch.sys.mjs
@@ -116,7 +116,6 @@ export class UrlbarProviderPrivateSearch extends UrlbarProvider {
       },
       highlights: {
         engine: UrlbarUtils.HIGHLIGHT.TYPED,
-        query: UrlbarUtils.HIGHLIGHT.NONE,
       },
     });
     addCallback(this, result);
diff --git a/browser/components/urlbar/UrlbarProviderSearchSuggestions.sys.mjs b/browser/components/urlbar/UrlbarProviderSearchSuggestions.sys.mjs
@@ -517,7 +517,6 @@ export class UrlbarProviderSearchSuggestions extends UrlbarProvider {
               suggestion: UrlbarUtils.HIGHLIGHT.SUGGESTED,
               tail: UrlbarUtils.HIGHLIGHT.SUGGESTED,
               keyword: UrlbarUtils.HIGHLIGHT.TYPED,
-              query: UrlbarUtils.HIGHLIGHT.NONE,
             },
           })
         );
diff --git a/browser/components/urlbar/UrlbarProviderSemanticHistorySearch.sys.mjs b/browser/components/urlbar/UrlbarProviderSemanticHistorySearch.sys.mjs
@@ -153,10 +153,6 @@ export class UrlbarProviderSemanticHistorySearch extends UrlbarProvider {
               "awesome-bar-result-menu",
             frecency: res.frecency,
           },
-          highlights: {
-            title: UrlbarUtils.HIGHLIGHT.NONE,
-            url: UrlbarUtils.HIGHLIGHT.NONE,
-          },
         });
         addCallback(this, result);
       }
@@ -220,10 +216,6 @@ export class UrlbarProviderSemanticHistorySearch extends UrlbarProvider {
             ? UrlbarUtils.createTabSwitchSecondaryAction(tabUserContextId)
             : undefined,
         },
-        highlights: {
-          url: UrlbarUtils.HIGHLIGHT.NONE,
-          title: UrlbarUtils.HIGHLIGHT.NONE,
-        },
       });
       addCallback(this, result);
       added = true;
diff --git a/browser/components/urlbar/UrlbarUtils.sys.mjs b/browser/components/urlbar/UrlbarUtils.sys.mjs
@@ -183,7 +183,6 @@ export var UrlbarUtils = {
   // Whether a result should be highlighted up to the point the user has typed
   // or after that point.
   HIGHLIGHT: Object.freeze({
-    NONE: 0,
     TYPED: 1,
     SUGGESTED: 2,
     ALL: 3,
diff --git a/browser/components/urlbar/tests/unit/head.js b/browser/components/urlbar/tests/unit/head.js
@@ -849,9 +849,7 @@ function makeSearchResult(
       engine: UrlbarUtils.HIGHLIGHT.TYPED,
       suggestion: UrlbarUtils.HIGHLIGHT.SUGGESTED,
       tail: UrlbarUtils.HIGHLIGHT.SUGGESTED,
-      keyword: providesSearchMode
-        ? UrlbarUtils.HIGHLIGHT.TYPED
-        : UrlbarUtils.HIGHLIGHT.NONE,
+      keyword: providesSearchMode ? UrlbarUtils.HIGHLIGHT.TYPED : undefined,
       query: UrlbarUtils.HIGHLIGHT.TYPED,
     },
   });