Merge from vscode 1ec43773e37997841c5af42b33ddb180e9735bf2

src/vs/editor/contrib/documentSymbols/media/outlineTree.css

@@ -20,10 +20,6 @@
 	color: var(--outline-element-color);
 }
 
-.monaco-tree .monaco-tree-row.focused .outline-element .outline-element-detail {
-	visibility: inherit;
-}
-
 .monaco-list .outline-element .outline-element-decoration {
 	opacity: 0.75;
 	font-size: 90%;

src/vs/editor/contrib/gotoSymbol/documentSymbols.ts

@@ -62,7 +62,6 @@ function flatten(bucket: DocumentSymbol[], entries: DocumentSymbol[], overrideCo
 	}
 }
 
-
 CommandsRegistry.registerCommand('_executeDocumentSymbolProvider', async function (accessor, ...args) {
 	const [resource] = args;
 	assertType(URI.isUri(resource));

src/vs/editor/contrib/indentation/indentation.ts

@@ -241,7 +241,7 @@ export class ChangeIndentationSizeAction extends EditorAction {
 					}
 				}
 			});
-		}, 50/* quick open is sensitive to being opened so soon after another */);
+		}, 50/* quick input is sensitive to being opened so soon after another */);
 	}
 }
 

src/vs/editor/contrib/quickAccess/editorNavigationQuickAccess.ts

@@ -72,7 +72,7 @@ export abstract class AbstractEditorNavigationQuickAccessProvider implements IQu
 
 				// Remember view state and update it when the cursor position
 				// changes even later because it could be that the user has
-				// configured quick open to remain open when focus is lost and
+				// configured quick access to remain open when focus is lost and
 				// we always want to restore the current location.
 				let lastKnownEditorViewState = withNullAsUndefined(editor.saveViewState());
 				disposables.add(codeEditor.onDidChangeCursorPosition(() => {

src/vs/editor/contrib/quickAccess/gotoSymbolQuickAccess.ts

@@ -17,6 +17,7 @@ import { values } from 'vs/base/common/collections';
 import { trim, format } from 'vs/base/common/strings';
 import { fuzzyScore, FuzzyScore, createMatches } from 'vs/base/common/filters';
 import { assign } from 'vs/base/common/objects';
+import { prepareQuery, IPreparedQuery } from 'vs/base/common/fuzzyScorer';
 
 export interface IGotoSymbolQuickPickItem extends IQuickPickItem {
 	kind: SymbolKind,
@@ -155,7 +156,7 @@ export abstract class AbstractGotoSymbolQuickAccessProvider extends AbstractEdit
 			// Collect symbol picks
 			picker.busy = true;
 			try {
-				const items = await this.doGetSymbolPicks(symbolsPromise, picker.value.substr(AbstractGotoSymbolQuickAccessProvider.PREFIX.length).trim(), picksCts.token);
+				const items = await this.doGetSymbolPicks(symbolsPromise, prepareQuery(picker.value.substr(AbstractGotoSymbolQuickAccessProvider.PREFIX.length).trim()), undefined, picksCts.token);
 				if (token.isCancellationRequested) {
 					return;
 				}
@@ -194,18 +195,24 @@ export abstract class AbstractGotoSymbolQuickAccessProvider extends AbstractEdit
 		return disposables;
 	}
 
-	protected async doGetSymbolPicks(symbolsPromise: Promise<DocumentSymbol[]>, filter: string, token: CancellationToken): Promise<Array<IGotoSymbolQuickPickItem | IQuickPickSeparator>> {
+	protected async doGetSymbolPicks(symbolsPromise: Promise<DocumentSymbol[]>, query: IPreparedQuery, options: { extraContainerLabel?: string } | undefined, token: CancellationToken): Promise<Array<IGotoSymbolQuickPickItem | IQuickPickSeparator>> {
 		const symbols = await symbolsPromise;
 		if (token.isCancellationRequested) {
 			return [];
 		}
 
-		// Normalize filter
-		const filterBySymbolKind = filter.indexOf(AbstractGotoSymbolQuickAccessProvider.SCOPE_PREFIX) === 0;
+		const filterBySymbolKind = query.original.indexOf(AbstractGotoSymbolQuickAccessProvider.SCOPE_PREFIX) === 0;
 		const filterPos = filterBySymbolKind ? 1 : 0;
-		const [symbolFilter, containerFilter] = filter.split(' ') as [string, string | undefined];
-		const symbolFilterLow = symbolFilter.toLowerCase();
-		const containerFilterLow = containerFilter?.toLowerCase();
+
+		// Split between symbol and container query if separated by space
+		let symbolQuery: IPreparedQuery;
+		let containerQuery: IPreparedQuery | undefined;
+		if (query.values && query.values.length > 1) {
+			symbolQuery = prepareQuery(query.values[0].original);
+			containerQuery = prepareQuery(query.values[1].original);
+		} else {
+			symbolQuery = query;
+		}
 
 		// Convert to symbol picks and apply filtering
 		const filteredSymbolPicks: IGotoSymbolQuickPickItem[] = [];
@@ -213,22 +220,28 @@ export abstract class AbstractGotoSymbolQuickAccessProvider extends AbstractEdit
 			const symbol = symbols[index];
 
 			const symbolLabel = trim(symbol.name);
-			const containerLabel = symbol.containerName;
+
+			let containerLabel = symbol.containerName;
+			if (containerLabel && options?.extraContainerLabel) {
+				containerLabel = `${options.extraContainerLabel} • ${containerLabel}`;
+			} else {
+				containerLabel = options?.extraContainerLabel;
+			}
 
 			let symbolScore: FuzzyScore | undefined = undefined;
 			let containerScore: FuzzyScore | undefined = undefined;
 
 			let includeSymbol = true;
-			if (filter.length > filterPos) {
+			if (query.original.length > filterPos) {
 
 				// Score by symbol
-				symbolScore = fuzzyScore(symbolFilter, symbolFilterLow, filterPos, symbolLabel, symbolLabel.toLowerCase(), 0, true);
+				symbolScore = fuzzyScore(symbolQuery.original, symbolQuery.originalLowercase, filterPos, symbolLabel, symbolLabel.toLowerCase(), 0, true);
 				includeSymbol = !!symbolScore;
 
 				// Score by container if specified
-				if (includeSymbol && containerFilter && containerFilterLow) {
+				if (includeSymbol && containerQuery) {
 					if (containerLabel) {
-						containerScore = fuzzyScore(containerFilter, containerFilterLow, filterPos, containerLabel, containerLabel.toLowerCase(), 0, true);
+						containerScore = fuzzyScore(containerQuery.original, containerQuery.originalLowercase, filterPos, containerLabel, containerLabel.toLowerCase(), 0, true);
 					}
 
 					includeSymbol = !!containerScore;

src/vs/editor/contrib/wordHighlighter/wordHighlighter.ts

@@ -401,12 +401,13 @@ class WordHighlighter {
 	private renderDecorations(): void {
 		this.renderDecorationsTimer = -1;
 		let decorations: IModelDeltaDecoration[] = [];
-		for (let i = 0, len = this.workerRequestValue.length; i < len; i++) {
-			let info = this.workerRequestValue[i];
-			decorations.push({
-				range: info.range,
-				options: WordHighlighter._getDecorationOptions(info.kind)
-			});
+		for (const info of this.workerRequestValue) {
+			if (info.range) {
+				decorations.push({
+					range: info.range,
+					options: WordHighlighter._getDecorationOptions(info.kind)
+				});
+			}
 		}
 
 		this._decorationIds = this.editor.deltaDecorations(this._decorationIds, decorations);