Skip to content

fix omnibar crash when encountering tabs without title #4399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix omnibar crash when encountering tabs without title #4399

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions background_scripts/completion.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,8 +487,8 @@ class TabCompleter {
const suggestion = new Suggestion({
queryTerms,
description: "tab",
url: tab.url,
title: tab.title,
url: tab.url || "",
title: tab.title || "",
tabId: tab.id,
deDuplicate: false,
});
Expand Down Expand Up @@ -693,7 +693,7 @@ const RankingUtils = {
let matchedTerm = false;
for (const thing of things) {
if (!matchedTerm) {
matchedTerm = thing.match(regexp);
matchedTerm = thing?.match(regexp);
Copy link
Owner

@philc philc Jan 25, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This null-check seems redundant if we're populating the url and title with empty strings above, right?

Of the two checks you have, I think I would prefer keeping only the second: allow these fields to be null, document why they can be null, and update the matching code to handle null fields.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There were other places in the code like https://github.com/philc/vimium/blob/master/background_scripts/completion.js#L417 that suggest there is a built-in assumption that the url field is never null:

    const result = new Suggestion({
      queryTerms,
      description: "domain",
      // This should be the URL or the domain, or an empty string, but not null.
      url: domainsAndScores[0]?.[0] || "",
      relevancy: 2.0,
    });

In https://github.com/philc/vimium/blob/master/background_scripts/completion.js#L484 we're calling matches directly on tabs:

    const tabs = await chrome.tabs.query({});
    const results = tabs.filter((tab) => RankingUtils.matches(queryTerms, tab.url, tab.title));

That's why I had to do both changes.

}
}
if (!matchedTerm) return false;
Expand Down