提交 b0f248f6 编写于 作者: B Benjamin Pasero

symbols - remove exclude support for workspace symbols quick access

上级 8e1ae328
......@@ -19,9 +19,6 @@ import { Range } from 'vs/editor/common/core/range';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { IWorkbenchEditorConfiguration } from 'vs/workbench/common/editor';
import { IKeyMods } from 'vs/platform/quickinput/common/quickInput';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { createResourceExcludeMatcher } from 'vs/workbench/services/search/common/search';
import { ResourceMap } from 'vs/base/common/map';
import { URI } from 'vs/base/common/uri';
import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
import { getSelectionSearchString } from 'vs/editor/contrib/find/findController';
......@@ -52,8 +49,6 @@ export class SymbolsQuickAccessProvider extends PickerQuickAccessProvider<ISymbo
private delayer = this._register(new ThrottledDelayer<ISymbolQuickPickItem[]>(SymbolsQuickAccessProvider.TYPING_SEARCH_DELAY));
private readonly resourceExcludeMatcher = this._register(createResourceExcludeMatcher(this.instantiationService, this.configurationService));
get defaultFilterValue(): string | undefined {
// Prefer the word under the cursor in the active editor as default filter
......@@ -70,7 +65,6 @@ export class SymbolsQuickAccessProvider extends PickerQuickAccessProvider<ISymbo
@IOpenerService private readonly openerService: IOpenerService,
@IEditorService private readonly editorService: IEditorService,
@IConfigurationService private readonly configurationService: IConfigurationService,
@IInstantiationService private readonly instantiationService: IInstantiationService,
@ICodeEditorService private readonly codeEditorService: ICodeEditorService
) {
super(SymbolsQuickAccessProvider.PREFIX, { canAcceptInBackground: true });
......@@ -119,7 +113,6 @@ export class SymbolsQuickAccessProvider extends PickerQuickAccessProvider<ISymbo
// Convert to symbol picks and apply filtering
const openSideBySideDirection = this.configuration.openSideBySideDirection;
const symbolsExcludedByResource = new ResourceMap<boolean>();
for (const [provider, symbols] of workspaceSymbols) {
for (const symbol of symbols) {
......@@ -160,19 +153,6 @@ export class SymbolsQuickAccessProvider extends PickerQuickAccessProvider<ISymbo
}
}
// Filter out symbols that match the global resource filter
if (symbolUri) {
let excludeSymbolByResource = symbolsExcludedByResource.get(symbolUri);
if (typeof excludeSymbolByResource === 'undefined') {
excludeSymbolByResource = this.resourceExcludeMatcher.matches(symbolUri);
symbolsExcludedByResource.set(symbolUri, excludeSymbolByResource);
}
if (excludeSymbolByResource) {
continue;
}
}
const symbolLabelWithIcon = `$(symbol-${SymbolKinds.toString(symbol.kind) || 'property'}) ${symbolLabel}`;
const deprecated = symbol.tags ? symbol.tags.indexOf(SymbolTag.Deprecated) >= 0 : false;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册