From 8393b0b86fd7fcc7b62a7bf92f6399529c290f80 Mon Sep 17 00:00:00 2001
From: yogeshwaran-c <ycyogesh183@gmail.com>
Date: Wed, 29 Apr 2026 16:14:47 +0530
Subject: [PATCH] Strip codicons from terminal quickpick filter matching

The terminal quick access provider built labels like
\`$(icon-id) 1: Title\` and ran matchesFuzzy directly against the full
string, so typing letters that happened to appear inside the codicon
syntax (e.g. searching for \"err\" while a terminal had a \`$(error)\`
icon) highlighted into the icon source.

Use matchesFuzzyIconAware + parseLabelWithIcons instead, which is the
helper the base quickInputList already uses for its own icon-aware
matching. parseLabelWithIcons strips the icon syntax for matching while
returning offsets remapped back to the original label, so highlights
land on the visible text.

Fixes #153829
---
 .../quickAccess/browser/terminalQuickAccess.ts                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/vs/workbench/contrib/terminalContrib/quickAccess/browser/terminalQuickAccess.ts b/src/vs/workbench/contrib/terminalContrib/quickAccess/browser/terminalQuickAccess.ts
index cdf713d88ca52..6ffb0e9c53b4c 100644
--- a/src/vs/workbench/contrib/terminalContrib/quickAccess/browser/terminalQuickAccess.ts
+++ b/src/vs/workbench/contrib/terminalContrib/quickAccess/browser/terminalQuickAccess.ts
@@ -6,7 +6,7 @@
 import { localize } from '../../../../../nls.js';
 import { IQuickPickSeparator } from '../../../../../platform/quickinput/common/quickInput.js';
 import { IPickerQuickAccessItem, PickerQuickAccessProvider, TriggerAction } from '../../../../../platform/quickinput/browser/pickerQuickAccess.js';
-import { matchesFuzzy } from '../../../../../base/common/filters.js';
+import { matchesFuzzyIconAware, parseLabelWithIcons } from '../../../../../base/common/iconLabels.js';
 import { ITerminalEditorService, ITerminalGroupService, ITerminalInstance, ITerminalService } from '../../../terminal/browser/terminal.js';
 import { ICommandService } from '../../../../../platform/commands/common/commands.js';
 import { TerminalCommandId } from '../../../terminal/common/terminal.js';
@@ -101,7 +101,7 @@ export class TerminalQuickAccessProvider extends PickerQuickAccessProvider<IPick
 		if (uriClasses) {
 			iconClasses.push(...uriClasses);
 		}
-		const highlights = matchesFuzzy(filter, label, true);
+		const highlights = matchesFuzzyIconAware(filter, parseLabelWithIcons(label), true);
 		if (highlights) {
 			return {
 				label,