提交 219b61e7 编写于 作者: B Benjamin Pasero

reduce fuzzy use to file picker

上级 969982df
......@@ -214,7 +214,6 @@ export class EditorHistoryModel extends QuickOpenModel {
public getResults(searchValue: string): QuickOpenEntry[] {
searchValue = searchValue.trim();
const searchInPath = searchValue.indexOf(paths.nativeSep) >= 0;
const enableFuzzy = this.quickOpenService.isFuzzyMatchingEnabled();
let results: QuickOpenEntry[] = [];
for (let i = 0; i < this.entries.length; i++) {
......@@ -225,16 +224,16 @@ export class EditorHistoryModel extends QuickOpenModel {
// Check if this entry is a match for the search value
let targetToMatch = searchInPath ? labels.getPathLabel(entry.getResource(), this.contextService) : entry.getLabel();
if (!filters.matchesFuzzy(searchValue, targetToMatch, enableFuzzy)) {
if (!filters.matchesFuzzy(searchValue, targetToMatch)) {
continue;
}
// Apply highlights
const {labelHighlights, descriptionHighlights} = QuickOpenEntry.highlight(entry, searchValue, enableFuzzy);
const {labelHighlights, descriptionHighlights} = QuickOpenEntry.highlight(entry, searchValue);
results.push(entry.clone(labelHighlights, descriptionHighlights));
}
// Sort
return results.sort((elementA: EditorHistoryEntry, elementB: EditorHistoryEntry) => QuickOpenEntry.compare(elementA, elementB, searchValue, enableFuzzy));
return results.sort((elementA: EditorHistoryEntry, elementB: EditorHistoryEntry) => QuickOpenEntry.compare(elementA, elementB, searchValue));
}
}
......@@ -357,10 +357,10 @@ export class QuickOpenController extends WorkbenchComponent implements IQuickOpe
// Filter by value
else {
entries.forEach((entry) => {
let labelHighlights = filters.matchesFuzzy(value, entry.getLabel(), this.isFuzzyMatchingEnabled());
let labelHighlights = filters.matchesFuzzy(value, entry.getLabel());
let descriptionHighlights: filters.IMatch[] = null;
if (options.matchOnDescription) {
descriptionHighlights = filters.matchesFuzzy(value, entry.getDescription(), this.isFuzzyMatchingEnabled());
descriptionHighlights = filters.matchesFuzzy(value, entry.getDescription());
}
if (labelHighlights || descriptionHighlights) {
......
......@@ -55,7 +55,7 @@ class OutlineModel extends QuickOpenModel {
this.outline = outline;
}
public dofilter(searchValue: string, enableFuzzy: boolean): void {
public dofilter(searchValue: string): void {
// Normalize search
let normalizedSearchValue = searchValue;
......@@ -74,7 +74,7 @@ class OutlineModel extends QuickOpenModel {
// Filter by search
if (normalizedSearchValue) {
let highlights = filters.matchesFuzzy(normalizedSearchValue, entry.getLabel(), enableFuzzy);
let highlights = filters.matchesFuzzy(normalizedSearchValue, entry.getLabel());
if (highlights) {
entry.setHighlights(highlights);
entry.setHidden(false);
......@@ -407,7 +407,7 @@ export class GotoSymbolHandler extends QuickOpenHandler {
return this.getActiveOutline().then((outline) => {
// Filter by search
outline.dofilter(searchValue, this.quickOpenService.isFuzzyMatchingEnabled());
outline.dofilter(searchValue);
return outline;
});
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册