Fix Quick Open so discontiguous matches are highlighted in all modes #2062
Conversation
…r than file search: - Hoist out generic highlightMatch() utility to generate bolded strings - Use it in both defaultResultsFormatter() and _filenameResultsFormatter() Also: - Clarify stringMatch() docs a bit - Fix an older glitch in basicMatchSort(): the sort field precedence list had a gap, leading to a no-op comparison step
|
@dangoor: no obligation to spend time looking at this, but wanted to give you a heads-up since it's connected to your changes. I'm happy to hear any feedback you might have on this patch. |
|
I don't have time to try it out right now, but I took a quick look through the code. I like the way you abstracted the result formatting code so it's now a bit simpler and more flexible. looks good to me on my scan through. my time is very tight right now, so I couldn't spend a lot of time with it, but nothing popped out as being a bad change from the old behavior. |
ghost
assigned 
| * @param {?function(number, string):string} rangeFilter | ||
| * @return {!string} bolded, HTML-escaped result | ||
| */ | ||
| function highlightMatch(item, rawQuery, matchClass, rangeFilter) { |
There was a problem hiding this comment.
rawQuery doesn't appear to be used.
There was a problem hiding this comment.
Yeah... I thought it might be useful in the future -- e.g. we could do simple substring highlighting if item.stringRanges is absent (instead of highlighting nothing like we do now, which is a slight change from the old behavior of defaultResultsformatter()). I'd be ok with removing it if you think it's unneeded API complexity, though -- what do you think?
|
This looks good, but I found a bug. In QuickOpen.js, do a Cmd-T for "bom". Notice that when it shows |
|
Ah, yes, it is an edge case, though not the one I was thinking of. I think the |
|
Ah, I see. It repros on master for filenames too, e.g. if you put a leading underscore in the filename. But it's much easier to hit with function names, so this patch makes the bug a lot more prominent... I'll push up a fix. |
|
NJ's changes look good -- thanks for the fix! Merging. |
Fix Quick Open so discontiguous matches are highlighted in all modes. Fix bug where stringMatch() returns ranges missing the first char if the 1st char in unmatched while the 2nd char IS matched.
This is a follow-up to pull #1470, which added discontiguous matching to Quick Open but only highlights such matches in bold in the default search mode. To make it work in all modes, we:
Also: