提交 34ccd042 编写于 作者: B Benjamin Pasero

do not filter symbol results based on resource

上级 b52e3c25
...@@ -269,6 +269,10 @@ export class QuickOpenEntry { ...@@ -269,6 +269,10 @@ export class QuickOpenEntry {
return { labelHighlights, descriptionHighlights }; return { labelHighlights, descriptionHighlights };
} }
public isFile(): boolean {
return false; // TODO@Ben debt with editor history merging
}
} }
export class QuickOpenEntryItem extends QuickOpenEntry { export class QuickOpenEntryItem extends QuickOpenEntry {
......
...@@ -627,11 +627,7 @@ export class QuickOpenController extends WorkbenchComponent implements IQuickOpe ...@@ -627,11 +627,7 @@ export class QuickOpenController extends WorkbenchComponent implements IQuickOpe
this.quickOpenWidget.setExtraClass(null); this.quickOpenWidget.setExtraClass(null);
// Trigger onOpen // Trigger onOpen
if (handlerDescriptor) { this.resolveHandler(handlerDescriptor || defaultHandlerDescriptor);
this.resolveHandler(handlerDescriptor);
} else {
this.resolveHandler(defaultHandlerDescriptor);
}
// Remove leading and trailing whitespace // Remove leading and trailing whitespace
const trimmedValue = strings.trim(value); const trimmedValue = strings.trim(value);
...@@ -770,7 +766,7 @@ export class QuickOpenController extends WorkbenchComponent implements IQuickOpe ...@@ -770,7 +766,7 @@ export class QuickOpenController extends WorkbenchComponent implements IQuickOpe
const result = handlerResults[i]; const result = handlerResults[i];
const resource = result.getResource(); const resource = result.getResource();
if (!resource || !mapEntryToResource[resource.toString()]) { if (!result.isFile() || !resource || !mapEntryToResource[resource.toString()]) {
additionalHandlerResults.push(result); additionalHandlerResults.push(result);
} }
} }
......
...@@ -77,6 +77,10 @@ export class FileEntry extends EditorQuickOpenEntry { ...@@ -77,6 +77,10 @@ export class FileEntry extends EditorQuickOpenEntry {
this.range = range; this.range = range;
} }
public isFile(): boolean {
return true; // TODO@Ben debt with editor history merging
}
public getInput(): IResourceInput | EditorInput { public getInput(): IResourceInput | EditorInput {
const input: IResourceInput = { const input: IResourceInput = {
resource: this.resource, resource: this.resource,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册