Merge pull request microsoft#242247 from microsoft/tyriar/241727

Fix new terminal suggest icon colors

Author: Tyriar

build/lib/stylelint/vscode-known-variables.json

@@ -57,7 +57,6 @@
 		"--vscode-chat-requestBorder",
 		"--vscode-chat-slashCommandBackground",
 		"--vscode-chat-slashCommandForeground",
-		"--vscode-chatEdits-minimapColor",
 		"--vscode-checkbox-background",
 		"--vscode-checkbox-border",
 		"--vscode-checkbox-foreground",
@@ -473,6 +472,7 @@
 		"--vscode-mergeEditor-conflict-unhandledUnfocused-border",
 		"--vscode-mergeEditor-conflictingLines-background",
 		"--vscode-minimap-background",
+		"--vscode-minimap-chatEditHighlight",
 		"--vscode-minimap-errorHighlight",
 		"--vscode-minimap-findMatchHighlight",
 		"--vscode-minimap-foregroundOpacity",
@@ -690,13 +690,11 @@
 		"--vscode-symbolIcon-eventForeground",
 		"--vscode-symbolIcon-fieldForeground",
 		"--vscode-symbolIcon-fileForeground",
-		"--vscode-symbolIcon-flagForeground",
 		"--vscode-symbolIcon-folderForeground",
 		"--vscode-symbolIcon-functionForeground",
 		"--vscode-symbolIcon-interfaceForeground",
 		"--vscode-symbolIcon-keyForeground",
 		"--vscode-symbolIcon-keywordForeground",
-		"--vscode-symbolIcon-methodArrowForeground",
 		"--vscode-symbolIcon-methodForeground",
 		"--vscode-symbolIcon-moduleForeground",
 		"--vscode-symbolIcon-namespaceForeground",
@@ -784,6 +782,8 @@
 		"--vscode-terminalStickyScroll-background",
 		"--vscode-terminalStickyScroll-border",
 		"--vscode-terminalStickyScrollHover-background",
+		"--vscode-terminalSymbolIcon-aliasForeground",
+		"--vscode-terminalSymbolIcon-flagForeground",
 		"--vscode-testing-coverCountBadgeBackground",
 		"--vscode-testing-coverCountBadgeForeground",
 		"--vscode-testing-coveredBackground",

src/vs/editor/contrib/symbolIcons/browser/symbolIcons.css

@@ -11,10 +11,6 @@
 .monaco-workbench .codicon.codicon-symbol-class { color: var(--vscode-symbolIcon-classForeground); }
 .monaco-editor .codicon.codicon-symbol-method,
 .monaco-workbench .codicon.codicon-symbol-method { color: var(--vscode-symbolIcon-methodForeground); }
-.monaco-editor .codicon.codicon-symbol-method-arrow,
-.monaco-workbench .codicon.codicon-symbol-method-arrow { color: var(--vscode-symbolIcon-methodArrowForeground); }
-.monaco-editor .codicon.codicon-flag,
-.monaco-workbench .codicon.codicon-flag { color: var(--vscode-symbolIcon-flagForeground); }
 .monaco-editor .codicon.codicon-symbol-color,
 .monaco-workbench .codicon.codicon-symbol-color { color: var(--vscode-symbolIcon-colorForeground); }
 .monaco-editor .codicon.codicon-symbol-constant,

src/vs/editor/contrib/symbolIcons/browser/symbolIcons.ts

@@ -36,9 +36,6 @@ export const SYMBOL_ICON_ENUMERATOR_FOREGROUND = registerColor('symbolIcon.enume
 	hcLight: '#D67E00'
 }, localize('symbolIcon.enumeratorForeground', 'The foreground color for enumerator symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
 
-
-export const SYMBOL_ICON_FLAG_FOREGROUND = registerColor('symbolIcon.flagForeground', SYMBOL_ICON_ENUMERATOR_FOREGROUND, localize('symbolIcon.enumeratorForeground', 'The foreground color for enumerator symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
-
 export const SYMBOL_ICON_ENUMERATOR_MEMBER_FOREGROUND = registerColor('symbolIcon.enumeratorMemberForeground', {
 	dark: '#75BEFF',
 	light: '#007ACC',
@@ -89,8 +86,6 @@ export const SYMBOL_ICON_METHOD_FOREGROUND = registerColor('symbolIcon.methodFor
 	hcLight: '#652D90'
 }, localize('symbolIcon.methodForeground', 'The foreground color for method symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
 
-export const SYMBOL_ICON_METHOD_ARROW_FOREGROUND = registerColor('symbolIcon.methodArrowForeground', SYMBOL_ICON_METHOD_FOREGROUND, localize('symbolIcon.methodArrowForeground', 'The foreground color for method with an arrow symbols. These symbols appear in the suggest widget.'));
-
 export const SYMBOL_ICON_MODULE_FOREGROUND = registerColor('symbolIcon.moduleForeground', foreground, localize('symbolIcon.moduleForeground', 'The foreground color for module symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));
 
 export const SYMBOL_ICON_NAMESPACE_FOREGROUND = registerColor('symbolIcon.namespaceForeground', foreground, localize('symbolIcon.namespaceForeground', 'The foreground color for namespace symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'));

src/vs/workbench/contrib/terminalContrib/suggest/browser/media/terminalSymbolIcons.css

@@ -0,0 +1,9 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.monaco-editor .codicon.codicon-symbol-method-arrow,
+.monaco-workbench .codicon.codicon-symbol-method-arrow { color: var(--vscode-terminalSymbolIcon-aliasForeground); }
+.monaco-editor .codicon.codicon-flag,
+.monaco-workbench .codicon.codicon-flag { color: var(--vscode-terminalSymbolIcon-flagForeground); }

src/vs/workbench/contrib/terminalContrib/suggest/browser/terminal.suggest.contribution.ts

@@ -32,6 +32,7 @@ import { SuggestDetailsClassName } from '../../../../services/suggest/browser/si
 import { EditorContextKeys } from '../../../../../editor/common/editorContextKeys.js';
 import { MenuId } from '../../../../../platform/actions/common/actions.js';
 import { IPreferencesService } from '../../../../services/preferences/common/preferences.js';
+import './terminalSymbolIcons.js';
 
 registerSingleton(ITerminalCompletionService, TerminalCompletionService, InstantiationType.Delayed);
 

src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSymbolIcons.ts

@@ -0,0 +1,13 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import './media/terminalSymbolIcons.css';
+import { SYMBOL_ICON_ENUMERATOR_FOREGROUND, SYMBOL_ICON_METHOD_FOREGROUND } from '../../../../../editor/contrib/symbolIcons/browser/symbolIcons.js';
+import { registerColor } from '../../../../../platform/theme/common/colorUtils.js';
+import { localize } from '../../../../../nls.js';
+
+export const TERMINAL_SYMBOL_ICON_FLAG_FOREGROUND = registerColor('terminalSymbolIcon.flagForeground', SYMBOL_ICON_ENUMERATOR_FOREGROUND, localize('terminalSymbolIcon.flagForeground', 'The foreground color for an flag icon. These icons will appear in the terminal suggest widget.'));
+
+export const TERMINAL_SYMBOL_ICON_ALIAS_FOREGROUND = registerColor('terminalSymbolIcon.aliasForeground', SYMBOL_ICON_METHOD_FOREGROUND, localize('terminalSymbolIcon.aliasForeground', 'The foreground color for an alias icon. These icons will appear in the terminal suggest widget.'));