@codingame/monaco-vscode-api 15.0.3 → 16.0.1

package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidget.js

@@ -1,8 +1,8 @@
 
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Dimension, append, $, addStandardDisposableListener, hide, show, runAtThisOrScheduleAtNextAnimationFrame, getWindow, getClientArea, getDomNodePagePosition } from '../../../../base/browser/dom.js';
-import '../../../../base/browser/ui/codicons/codicon/codicon.css.js';
-import '../../../../base/browser/ui/codicons/codicon/codicon-modifiers.css.js';
+import '../../../../base/browser/ui/codicons/codicon/codicon.css';
+import '../../../../base/browser/ui/codicons/codicon/codicon-modifiers.css';
 import { List } from '../../../../base/browser/ui/list/listWidget.js';
 import { TimeoutTimer, createCancelablePromise, disposableTimeout } from '../../../../base/common/async.js';
 import { onUnexpectedError } from '../../../../base/common/errors.js';
@@ -10,7 +10,7 @@ import { PauseableEmitter, Emitter } from '../../../../base/common/event.js';
 import { MutableDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { clamp } from '../../../../base/common/numbers.js';
 import { format } from '../../../../base/common/strings.js';
-import './media/suggest.css.js';
+import './media/suggest.css';
 import { ContentWidgetPositionPreference } from '../../../browser/editorBrowser.js';
 import { EmbeddedCodeEditorWidget } from '../../../browser/widget/codeEditor/embeddedCodeEditorWidget.js';
 import { EditorOption } from '../../../common/config/editorOptions.js';
@@ -40,20 +40,21 @@ import { SuggestDetailsWidget, SuggestDetailsOverlay, canExpandCompletionItem }
 import { ItemRenderer } from './suggestWidgetRenderer.js';
 import { getListStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { status } from '../../../../base/browser/ui/aria/aria.js';
+import { CompletionItemKinds } from '../../../common/languages.js';
 
 var SuggestWidget_1;
-registerColor('editorSuggestWidget.background', editorWidgetBackground, ( localize(1490, 'Background color of the suggest widget.')));
-registerColor('editorSuggestWidget.border', editorWidgetBorder, ( localize(1491, 'Border color of the suggest widget.')));
-const editorSuggestWidgetForeground = registerColor('editorSuggestWidget.foreground', editorForeground, ( localize(1492, 'Foreground color of the suggest widget.')));
-registerColor('editorSuggestWidget.selectedForeground', quickInputListFocusForeground, ( localize(1493, 'Foreground color of the selected entry in the suggest widget.')));
-registerColor('editorSuggestWidget.selectedIconForeground', quickInputListFocusIconForeground, ( localize(1494, 'Icon foreground color of the selected entry in the suggest widget.')));
-const editorSuggestWidgetSelectedBackground = registerColor('editorSuggestWidget.selectedBackground', quickInputListFocusBackground, ( localize(1495, 'Background color of the selected entry in the suggest widget.')));
-registerColor('editorSuggestWidget.highlightForeground', listHighlightForeground, ( localize(1496, 'Color of the match highlights in the suggest widget.')));
+registerColor('editorSuggestWidget.background', editorWidgetBackground, ( localize(1520, 'Background color of the suggest widget.')));
+registerColor('editorSuggestWidget.border', editorWidgetBorder, ( localize(1521, 'Border color of the suggest widget.')));
+const editorSuggestWidgetForeground = registerColor('editorSuggestWidget.foreground', editorForeground, ( localize(1522, 'Foreground color of the suggest widget.')));
+registerColor('editorSuggestWidget.selectedForeground', quickInputListFocusForeground, ( localize(1523, 'Foreground color of the selected entry in the suggest widget.')));
+registerColor('editorSuggestWidget.selectedIconForeground', quickInputListFocusIconForeground, ( localize(1524, 'Icon foreground color of the selected entry in the suggest widget.')));
+const editorSuggestWidgetSelectedBackground = registerColor('editorSuggestWidget.selectedBackground', quickInputListFocusBackground, ( localize(1525, 'Background color of the selected entry in the suggest widget.')));
+registerColor('editorSuggestWidget.highlightForeground', listHighlightForeground, ( localize(1526, 'Color of the match highlights in the suggest widget.')));
 registerColor('editorSuggestWidget.focusHighlightForeground', listFocusHighlightForeground, ( localize(
-    1497,
+    1527,
     'Color of the match highlights in the suggest widget when an item is focused.'
 )));
-registerColor('editorSuggestWidgetStatus.foreground', ( transparent(editorSuggestWidgetForeground, .5)), ( localize(1498, 'Foreground color of the suggest widget status.')));
+registerColor('editorSuggestWidgetStatus.foreground', ( transparent(editorSuggestWidgetForeground, .5)), ( localize(1528, 'Foreground color of the suggest widget status.')));
 var State;
 (function (State) {
     State[State["Hidden"] = 0] = "Hidden";
@@ -90,8 +91,8 @@ class PersistedWidgetSize {
 }
 let SuggestWidget = class SuggestWidget {
     static { SuggestWidget_1 = this; }
-    static { this.LOADING_MESSAGE = ( localize(1499, "Loading...")); }
-    static { this.NO_SUGGESTIONS_MESSAGE = ( localize(1500, "No suggestions.")); }
+    static { this.LOADING_MESSAGE = ( localize(1529, "Loading...")); }
+    static { this.NO_SUGGESTIONS_MESSAGE = ( localize(1530, "No suggestions.")); }
     constructor(editor, _storageService, _contextKeyService, _themeService, instantiationService) {
         this.editor = editor;
         this._storageService = _storageService;
@@ -174,29 +175,33 @@ let SuggestWidget = class SuggestWidget {
             mouseSupport: false,
             multipleSelectionSupport: false,
             accessibilityProvider: {
-                getRole: () => 'option',
-                getWidgetAriaLabel: () => ( localize(1501, "Suggest")),
+                getRole: () => 'listitem',
+                getWidgetAriaLabel: () => ( localize(1531, "Suggest")),
                 getWidgetRole: () => 'listbox',
                 getAriaLabel: (item) => {
                     let label = item.textLabel;
+                    const kindLabel = CompletionItemKinds.toLabel(item.completion.kind);
                     if (typeof item.completion.label !== 'string') {
                         const { detail, description } = item.completion.label;
                         if (detail && description) {
-                            label = ( localize(1502, '{0} {1}, {2}', label, detail, description));
+                            label = ( localize(1532, '{0} {1}, {2}, {3}', label, detail, description, kindLabel));
                         }
                         else if (detail) {
-                            label = ( localize(1503, '{0} {1}', label, detail));
+                            label = ( localize(1533, '{0} {1}, {2}', label, detail, kindLabel));
                         }
                         else if (description) {
-                            label = ( localize(1504, '{0}, {1}', label, description));
+                            label = ( localize(1534, '{0}, {1}, {2}', label, description, kindLabel));
                         }
                     }
+                    else {
+                        label = ( localize(1535, '{0}, {1}', label, kindLabel));
+                    }
                     if (!item.isResolved || !this._isDetailsVisible()) {
                         return label;
                     }
                     const { documentation, detail } = item.completion;
                     const docs = format('{0}{1}', detail || '', documentation ? (typeof documentation === 'string' ? documentation : documentation.value) : '');
-                    return localize(1505, "{0}, docs: {1}", label, docs);
+                    return localize(1536, "{0}, docs: {1}", label, docs);
                 },
             }
         }));
@@ -207,7 +212,7 @@ let SuggestWidget = class SuggestWidget {
         this._status = instantiationService.createInstance(SuggestWidgetStatus, this.element.domNode, suggestWidgetStatusbarMenu);
         const applyStatusBarStyle = () => this.element.domNode.classList.toggle('with-status-bar', this.editor.getOption(EditorOption.suggest).showStatusBar);
         applyStatusBarStyle();
-        this._disposables.add(_themeService.onDidColorThemeChange(t => this._onThemeChange(t.theme)));
+        this._disposables.add(_themeService.onDidColorThemeChange(t => this._onThemeChange(t)));
         this._onThemeChange(_themeService.getColorTheme());
         this._disposables.add(this._list.onMouseDown(e => this._onListMouseDownOrTap(e)));
         this._disposables.add(this._list.onTap(e => this._onListMouseDownOrTap(e)));

package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidgetDetails.js

@@ -38,7 +38,7 @@ let SuggestDetailsWidget = class SuggestDetailsWidget {
         this._disposables.add(this._scrollbar);
         this._header = append(this._body, $('.header'));
         this._close = append(this._header, $('span' + ThemeIcon.asCSSSelector(Codicon.close)));
-        this._close.title = ( localize(1506, "Close"));
+        this._close.title = ( localize(1537, "Close"));
         this._close.role = 'button';
         this._close.tabIndex = -1;
         this._type = append(this._header, $('p.type'));
@@ -84,7 +84,7 @@ let SuggestDetailsWidget = class SuggestDetailsWidget {
         };
     }
     renderLoading() {
-        this._type.textContent = ( localize(1507, "Loading..."));
+        this._type.textContent = ( localize(1538, "Loading..."));
         this._docs.textContent = '';
         this.domNode.classList.remove('no-docs', 'no-type');
         this.layout(this.size.width, this.getLayoutInfo().lineHeight * 2);

package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidgetRenderer.js

@@ -19,7 +19,7 @@ import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js'
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
 import { canExpandCompletionItem } from './suggestWidgetDetails.js';
 
-const suggestMoreInfoIcon = registerIcon('suggest-more-info', Codicon.chevronRight, ( localize(1508, 'Icon for more information in the suggest widget.')));
+const suggestMoreInfoIcon = registerIcon('suggest-more-info', Codicon.chevronRight, ( localize(1539, 'Icon for more information in the suggest widget.')));
 const _completionItemColor = new (class ColorExtractor {
     static { this._regexRelaxed = /(#([\da-fA-F]{3}){1,2}|(rgb|hsl)a\(\s*(\d{1,3}%?\s*,\s*){3}(1|0?\.\d+)\)|(rgb|hsl)\(\s*\d{1,3}%?(\s*,\s*\d{1,3}%?){2}\s*\))/; }
     static { this._regexStrict = ( new RegExp(`^${ColorExtractor._regexRelaxed.source}$`, 'i')); }
@@ -75,7 +75,7 @@ let ItemRenderer = class ItemRenderer {
         const qualifierLabel = append(left, $('span.qualifier-label'));
         const detailsLabel = append(right, $('span.details-label'));
         const readMore = append(right, $('span.readMore' + ThemeIcon.asCSSSelector(suggestMoreInfoIcon)));
-        readMore.title = ( localize(1509, "Read More"));
+        readMore.title = ( localize(1540, "Read More"));
         const configureFont = () => {
             const options = this._editor.getOptions();
             const fontInfo = options.get(EditorOption.fontInfo);

package/vscode/src/vs/editor/contrib/suggest/browser/wordContextKey.js

@@ -9,7 +9,7 @@ var WordContextKey_1;
 let WordContextKey = class WordContextKey {
     static { WordContextKey_1 = this; }
     static { this.AtEnd = ( new RawContextKey('atEndOfWord', false, { type: 'boolean', description: ( localize(
-        1510,
+        1541,
         "A context key that is true when at the end of a word. Note that this is only defined when tab-completions are enabled"
     )) })); }
     constructor(_editor, contextKeyService) {

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

@@ -0,0 +1,68 @@
+.monaco-editor .codicon.codicon-symbol-array,
+.monaco-workbench .codicon.codicon-symbol-array { color: var(--vscode-symbolIcon-arrayForeground); }
+.monaco-editor .codicon.codicon-symbol-boolean,
+.monaco-workbench .codicon.codicon-symbol-boolean { color: var(--vscode-symbolIcon-booleanForeground); }
+.monaco-editor .codicon.codicon-symbol-class,
+.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-color,
+.monaco-workbench .codicon.codicon-symbol-color { color: var(--vscode-symbolIcon-colorForeground); }
+.monaco-editor .codicon.codicon-symbol-constant,
+.monaco-workbench .codicon.codicon-symbol-constant { color: var(--vscode-symbolIcon-constantForeground); }
+.monaco-editor .codicon.codicon-symbol-constructor,
+.monaco-workbench .codicon.codicon-symbol-constructor { color: var(--vscode-symbolIcon-constructorForeground); }
+.monaco-editor .codicon.codicon-symbol-value,
+.monaco-workbench .codicon.codicon-symbol-value,
+.monaco-editor .codicon.codicon-symbol-enum,
+.monaco-workbench .codicon.codicon-symbol-enum { color: var(--vscode-symbolIcon-enumeratorForeground); }
+.monaco-editor .codicon.codicon-symbol-enum-member,
+.monaco-workbench .codicon.codicon-symbol-enum-member { color: var(--vscode-symbolIcon-enumeratorMemberForeground); }
+.monaco-editor .codicon.codicon-symbol-event,
+.monaco-workbench .codicon.codicon-symbol-event { color: var(--vscode-symbolIcon-eventForeground); }
+.monaco-editor .codicon.codicon-symbol-field,
+.monaco-workbench .codicon.codicon-symbol-field { color: var(--vscode-symbolIcon-fieldForeground); }
+.monaco-editor .codicon.codicon-symbol-file,
+.monaco-workbench .codicon.codicon-symbol-file { color: var(--vscode-symbolIcon-fileForeground); }
+.monaco-editor .codicon.codicon-symbol-folder,
+.monaco-workbench .codicon.codicon-symbol-folder { color: var(--vscode-symbolIcon-folderForeground); }
+.monaco-editor .codicon.codicon-symbol-function,
+.monaco-workbench .codicon.codicon-symbol-function { color: var(--vscode-symbolIcon-functionForeground); }
+.monaco-editor .codicon.codicon-symbol-interface,
+.monaco-workbench .codicon.codicon-symbol-interface { color: var(--vscode-symbolIcon-interfaceForeground); }
+.monaco-editor .codicon.codicon-symbol-key,
+.monaco-workbench .codicon.codicon-symbol-key { color: var(--vscode-symbolIcon-keyForeground); }
+.monaco-editor .codicon.codicon-symbol-keyword,
+.monaco-workbench .codicon.codicon-symbol-keyword { color: var(--vscode-symbolIcon-keywordForeground); }
+.monaco-editor .codicon.codicon-symbol-module,
+.monaco-workbench .codicon.codicon-symbol-module { color: var(--vscode-symbolIcon-moduleForeground); }
+.monaco-editor .codicon.codicon-symbol-namespace,
+.monaco-workbench .codicon.codicon-symbol-namespace { color: var(--vscode-symbolIcon-namespaceForeground); }
+.monaco-editor .codicon.codicon-symbol-null,
+.monaco-workbench .codicon.codicon-symbol-null { color: var(--vscode-symbolIcon-nullForeground); }
+.monaco-editor .codicon.codicon-symbol-number,
+.monaco-workbench .codicon.codicon-symbol-number { color: var(--vscode-symbolIcon-numberForeground); }
+.monaco-editor .codicon.codicon-symbol-object,
+.monaco-workbench .codicon.codicon-symbol-object { color: var(--vscode-symbolIcon-objectForeground); }
+.monaco-editor .codicon.codicon-symbol-operator,
+.monaco-workbench .codicon.codicon-symbol-operator { color: var(--vscode-symbolIcon-operatorForeground); }
+.monaco-editor .codicon.codicon-symbol-package,
+.monaco-workbench .codicon.codicon-symbol-package { color: var(--vscode-symbolIcon-packageForeground); }
+.monaco-editor .codicon.codicon-symbol-property,
+.monaco-workbench .codicon.codicon-symbol-property { color: var(--vscode-symbolIcon-propertyForeground); }
+.monaco-editor .codicon.codicon-symbol-reference,
+.monaco-workbench .codicon.codicon-symbol-reference { color: var(--vscode-symbolIcon-referenceForeground); }
+.monaco-editor .codicon.codicon-symbol-snippet,
+.monaco-workbench .codicon.codicon-symbol-snippet { color: var(--vscode-symbolIcon-snippetForeground); }
+.monaco-editor .codicon.codicon-symbol-string,
+.monaco-workbench .codicon.codicon-symbol-string { color: var(--vscode-symbolIcon-stringForeground); }
+.monaco-editor .codicon.codicon-symbol-struct,
+.monaco-workbench .codicon.codicon-symbol-struct { color: var(--vscode-symbolIcon-structForeground); }
+.monaco-editor .codicon.codicon-symbol-text,
+.monaco-workbench .codicon.codicon-symbol-text { color: var(--vscode-symbolIcon-textForeground); }
+.monaco-editor .codicon.codicon-symbol-type-parameter,
+.monaco-workbench .codicon.codicon-symbol-type-parameter { color: var(--vscode-symbolIcon-typeParameterForeground); }
+.monaco-editor .codicon.codicon-symbol-unit,
+.monaco-workbench .codicon.codicon-symbol-unit { color: var(--vscode-symbolIcon-unitForeground); }
+.monaco-editor .codicon.codicon-symbol-variable,
+.monaco-workbench .codicon.codicon-symbol-variable { color: var(--vscode-symbolIcon-variableForeground); }

package/vscode/src/vs/editor/contrib/symbolIcons/browser/symbolIcons.js

@@ -1,5 +1,5 @@
 
-import './symbolIcons.css.js';
+import './symbolIcons.css';
 import { localize } from '../../../../nls.js';
 import { registerColor } from '../../../../platform/theme/common/colorUtils.js';
 import { foreground } from '../../../../platform/theme/common/colors/baseColors.js';
@@ -14,11 +14,11 @@ import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
 
 registerColor('symbolIcon.arrayForeground', foreground, ( localize(
-    1511,
+    1542,
     'The foreground color for array symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
 registerColor('symbolIcon.booleanForeground', foreground, ( localize(
-    1512,
+    1543,
     'The foreground color for boolean symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
 registerColor('symbolIcon.classForeground', {
@@ -27,15 +27,15 @@ registerColor('symbolIcon.classForeground', {
     hcDark: '#EE9D28',
     hcLight: '#D67E00'
 }, ( localize(
-    1513,
+    1544,
     'The foreground color for class symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
 registerColor('symbolIcon.colorForeground', foreground, ( localize(
-    1514,
+    1545,
     'The foreground color for color symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
 registerColor('symbolIcon.constantForeground', foreground, ( localize(
-    1515,
+    1546,
     'The foreground color for constant symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
 registerColor('symbolIcon.constructorForeground', {
@@ -44,7 +44,7 @@ registerColor('symbolIcon.constructorForeground', {
     hcDark: '#B180D7',
     hcLight: '#652D90'
 }, ( localize(
-    1516,
+    1547,
     'The foreground color for constructor symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
 const SYMBOL_ICON_ENUMERATOR_FOREGROUND = registerColor('symbolIcon.enumeratorForeground', {
@@ -53,16 +53,16 @@ const SYMBOL_ICON_ENUMERATOR_FOREGROUND = registerColor('symbolIcon.enumeratorFo
     hcDark: '#EE9D28',
     hcLight: '#D67E00'
 }, ( localize(
-    1517,
+    1548,
     'The foreground color for enumerator symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
-registerColor('symbolIcon.enumeratorMemberForeground', {
+const SYMBOL_ICON_ENUMERATOR_MEMBER_FOREGROUND = registerColor('symbolIcon.enumeratorMemberForeground', {
     dark: '#75BEFF',
     light: '#007ACC',
     hcDark: '#75BEFF',
     hcLight: '#007ACC'
 }, ( localize(
-    1518,
+    1549,
     'The foreground color for enumerator member symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
 registerColor('symbolIcon.eventForeground', {
@@ -71,7 +71,7 @@ registerColor('symbolIcon.eventForeground', {
     hcDark: '#EE9D28',
     hcLight: '#D67E00'
 }, ( localize(
-    1519,
+    1550,
     'The foreground color for event symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
 registerColor('symbolIcon.fieldForeground', {
@@ -80,15 +80,15 @@ registerColor('symbolIcon.fieldForeground', {
     hcDark: '#75BEFF',
     hcLight: '#007ACC'
 }, ( localize(
-    1520,
+    1551,
     'The foreground color for field symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
-registerColor('symbolIcon.fileForeground', foreground, ( localize(
-    1521,
+const SYMBOL_ICON_FILE_FOREGROUND = registerColor('symbolIcon.fileForeground', foreground, ( localize(
+    1552,
     'The foreground color for file symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
-registerColor('symbolIcon.folderForeground', foreground, ( localize(
-    1522,
+const SYMBOL_ICON_FOLDER_FOREGROUND = registerColor('symbolIcon.folderForeground', foreground, ( localize(
+    1553,
     'The foreground color for folder symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
 registerColor('symbolIcon.functionForeground', {
@@ -97,7 +97,7 @@ registerColor('symbolIcon.functionForeground', {
     hcDark: '#B180D7',
     hcLight: '#652D90'
 }, ( localize(
-    1523,
+    1554,
     'The foreground color for function symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
 registerColor('symbolIcon.interfaceForeground', {
@@ -106,15 +106,15 @@ registerColor('symbolIcon.interfaceForeground', {
     hcDark: '#75BEFF',
     hcLight: '#007ACC'
 }, ( localize(
-    1524,
+    1555,
     'The foreground color for interface symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
 registerColor('symbolIcon.keyForeground', foreground, ( localize(
-    1525,
+    1556,
     'The foreground color for key symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
 registerColor('symbolIcon.keywordForeground', foreground, ( localize(
-    1526,
+    1557,
     'The foreground color for keyword symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
 const SYMBOL_ICON_METHOD_FOREGROUND = registerColor('symbolIcon.methodForeground', {
@@ -123,77 +123,77 @@ const SYMBOL_ICON_METHOD_FOREGROUND = registerColor('symbolIcon.methodForeground
     hcDark: '#B180D7',
     hcLight: '#652D90'
 }, ( localize(
-    1527,
+    1558,
     'The foreground color for method symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
 registerColor('symbolIcon.moduleForeground', foreground, ( localize(
-    1528,
+    1559,
     'The foreground color for module symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
 registerColor('symbolIcon.namespaceForeground', foreground, ( localize(
-    1529,
+    1560,
     'The foreground color for namespace symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
 registerColor('symbolIcon.nullForeground', foreground, ( localize(
-    1530,
+    1561,
     'The foreground color for null symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
 registerColor('symbolIcon.numberForeground', foreground, ( localize(
-    1531,
+    1562,
     'The foreground color for number symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
 registerColor('symbolIcon.objectForeground', foreground, ( localize(
-    1532,
+    1563,
     'The foreground color for object symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
 registerColor('symbolIcon.operatorForeground', foreground, ( localize(
-    1533,
+    1564,
     'The foreground color for operator symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
 registerColor('symbolIcon.packageForeground', foreground, ( localize(
-    1534,
+    1565,
     'The foreground color for package symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
 registerColor('symbolIcon.propertyForeground', foreground, ( localize(
-    1535,
+    1566,
     'The foreground color for property symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
 registerColor('symbolIcon.referenceForeground', foreground, ( localize(
-    1536,
+    1567,
     'The foreground color for reference symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
 registerColor('symbolIcon.snippetForeground', foreground, ( localize(
-    1537,
+    1568,
     'The foreground color for snippet symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
 registerColor('symbolIcon.stringForeground', foreground, ( localize(
-    1538,
+    1569,
     'The foreground color for string symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
 registerColor('symbolIcon.structForeground', foreground, ( localize(
-    1539,
+    1570,
     'The foreground color for struct symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
 registerColor('symbolIcon.textForeground', foreground, ( localize(
-    1540,
+    1571,
     'The foreground color for text symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
 registerColor('symbolIcon.typeParameterForeground', foreground, ( localize(
-    1541,
+    1572,
     'The foreground color for type parameter symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
 registerColor('symbolIcon.unitForeground', foreground, ( localize(
-    1542,
+    1573,
     'The foreground color for unit symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
-registerColor('symbolIcon.variableForeground', {
+const SYMBOL_ICON_VARIABLE_FOREGROUND = registerColor('symbolIcon.variableForeground', {
     dark: '#75BEFF',
     light: '#007ACC',
     hcDark: '#75BEFF',
     hcLight: '#007ACC',
 }, ( localize(
-    1543,
+    1574,
     'The foreground color for variable symbols. These symbols appear in the outline, breadcrumb, and suggest widget.'
 )));
 
-export { SYMBOL_ICON_ENUMERATOR_FOREGROUND, SYMBOL_ICON_METHOD_FOREGROUND };
+export { SYMBOL_ICON_ENUMERATOR_FOREGROUND, SYMBOL_ICON_ENUMERATOR_MEMBER_FOREGROUND, SYMBOL_ICON_FILE_FOREGROUND, SYMBOL_ICON_FOLDER_FOREGROUND, SYMBOL_ICON_METHOD_FOREGROUND, SYMBOL_ICON_VARIABLE_FOREGROUND };

package/vscode/src/vs/editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode.js

@@ -11,7 +11,7 @@ class ToggleTabFocusModeAction extends Action2 {
     constructor() {
         super({
             id: ToggleTabFocusModeAction.ID,
-            title: ( localize2(1544, 'Toggle Tab Key Moves Focus')),
+            title: ( localize2(1575, 'Toggle Tab Key Moves Focus')),
             precondition: undefined,
             keybinding: {
                 primary: KeyMod$1.CtrlCmd | KeyCode.KeyM,
@@ -20,7 +20,7 @@ class ToggleTabFocusModeAction extends Action2 {
             },
             metadata: {
                 description: ( localize2(
-                    1545,
+                    1576,
                     "Determines whether the tab key moves focus around the workbench or inserts the tab character in the current editor. This is also called tab trapping, tab navigation, or tab focus mode."
                 )),
             },
@@ -32,10 +32,10 @@ class ToggleTabFocusModeAction extends Action2 {
         const newValue = !oldValue;
         TabFocus.setTabFocusMode(newValue);
         if (newValue) {
-            alert(( localize(1546, "Pressing Tab will now move focus to the next focusable element")));
+            alert(( localize(1577, "Pressing Tab will now move focus to the next focusable element")));
         }
         else {
-            alert(( localize(1547, "Pressing Tab will now insert the tab character")));
+            alert(( localize(1578, "Pressing Tab will now insert the tab character")));
         }
     }
 }

package/vscode/src/vs/editor/contrib/tokenization/browser/tokenization.js

@@ -7,7 +7,7 @@ class ForceRetokenizeAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.forceRetokenize',
-            label: ( localize2(1548, "Developer: Force Retokenize")),
+            label: ( localize2(1579, "Developer: Force Retokenize")),
             precondition: undefined
         });
     }

package/vscode/src/vs/editor/contrib/unicodeHighlighter/browser/bannerController.css

@@ -0,0 +1,66 @@
+.editor-banner {
+	box-sizing: border-box;
+	cursor: default;
+	width: 100%;
+	font-size: 12px;
+	display: flex;
+	overflow: visible;
+	height: 26px;
+	background: var(--vscode-banner-background);
+}
+.editor-banner .icon-container {
+	display: flex;
+	flex-shrink: 0;
+	align-items: center;
+	padding: 0 6px 0 10px;
+}
+.editor-banner .icon-container.custom-icon {
+	background-repeat: no-repeat;
+	background-position: center center;
+	background-size: 16px;
+	width: 16px;
+	padding: 0;
+	margin: 0 6px 0 10px;
+}
+.editor-banner .message-container {
+	display: flex;
+	align-items: center;
+	line-height: 26px;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	overflow: hidden;
+}
+.editor-banner .message-container p {
+	margin-block-start: 0;
+	margin-block-end: 0;
+}
+.editor-banner .message-actions-container {
+	flex-grow: 1;
+	flex-shrink: 0;
+	line-height: 26px;
+	margin: 0 4px;
+}
+.editor-banner .message-actions-container a.monaco-button {
+	width: inherit;
+	margin: 2px 8px;
+	padding: 0px 12px;
+}
+.editor-banner .message-actions-container a {
+	padding: 3px;
+	margin-left: 12px;
+	text-decoration: underline;
+}
+.editor-banner .action-container {
+	padding: 0 10px 0 6px;
+}
+.editor-banner {
+	background-color: var(--vscode-banner-background);
+}
+.editor-banner,
+.editor-banner .action-container .codicon,
+.editor-banner .message-actions-container .monaco-link {
+	color: var(--vscode-banner-foreground);
+}
+.editor-banner .icon-container .codicon {
+	color: var(--vscode-banner-iconForeground);
+}

package/vscode/src/vs/editor/contrib/unicodeHighlighter/browser/bannerController.js

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import './bannerController.css.js';
+import './bannerController.css';
 import { $, clearNode, append } from '../../../../base/browser/dom.js';
 import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { Action } from '../../../../base/common/actions.js';

package/vscode/src/vs/editor/contrib/unicodeHighlighter/browser/unicodeHighlighter.css

@@ -0,0 +1,5 @@
+.monaco-editor .unicode-highlight {
+	border: 1px solid var(--vscode-editorUnicodeHighlight-border);
+	background-color: var(--vscode-editorUnicodeHighlight-background);
+	box-sizing: border-box;
+}

package/vscode/src/vs/editor/contrib/unicodeHighlighter/browser/unicodeHighlighter.d.ts

@@ -13,6 +13,7 @@ import { IConfigurationService } from "../../../../platform/configuration/common
 import { IInstantiationService } from "../../../../platform/instantiation/common/instantiation.js";
 import { IOpenerService } from "../../../../platform/opener/common/opener.service.js";
 import { IWorkspaceTrustManagementService } from "../../../../platform/workspace/common/workspaceTrust.service.js";
+import { Action2 } from "../../../../platform/actions/common/actions.js";
 export declare const warningIcon: import("../../../../base/common/themables.js").ThemeIcon;
 export declare class UnicodeHighlighter extends Disposable implements IEditorContribution {
     private readonly _editor;
@@ -68,30 +69,30 @@ export declare class DisableHighlightingInStringsAction extends EditorAction imp
     run(accessor: ServicesAccessor | undefined, editor: ICodeEditor, args: any): Promise<void>;
     runAction(configurationService: IConfigurationService): Promise<void>;
 }
-export declare class DisableHighlightingOfAmbiguousCharactersAction extends EditorAction implements IDisableUnicodeHighlightAction {
+export declare class DisableHighlightingOfAmbiguousCharactersAction extends Action2 implements IDisableUnicodeHighlightAction {
     static ID: string;
     readonly shortLabel: string;
     constructor();
     run(accessor: ServicesAccessor | undefined, editor: ICodeEditor, args: any): Promise<void>;
     runAction(configurationService: IConfigurationService): Promise<void>;
 }
-export declare class DisableHighlightingOfInvisibleCharactersAction extends EditorAction implements IDisableUnicodeHighlightAction {
+export declare class DisableHighlightingOfInvisibleCharactersAction extends Action2 implements IDisableUnicodeHighlightAction {
     static ID: string;
     readonly shortLabel: string;
     constructor();
     run(accessor: ServicesAccessor | undefined, editor: ICodeEditor, args: any): Promise<void>;
     runAction(configurationService: IConfigurationService): Promise<void>;
 }
-export declare class DisableHighlightingOfNonBasicAsciiCharactersAction extends EditorAction implements IDisableUnicodeHighlightAction {
+export declare class DisableHighlightingOfNonBasicAsciiCharactersAction extends Action2 implements IDisableUnicodeHighlightAction {
     static ID: string;
     readonly shortLabel: string;
     constructor();
     run(accessor: ServicesAccessor | undefined, editor: ICodeEditor, args: any): Promise<void>;
     runAction(configurationService: IConfigurationService): Promise<void>;
 }
-export declare class ShowExcludeOptions extends EditorAction {
+export declare class ShowExcludeOptions extends Action2 {
     static ID: string;
     constructor();
-    run(accessor: ServicesAccessor | undefined, editor: ICodeEditor, args: any): Promise<void>;
+    run(accessor: ServicesAccessor | undefined, args: any): Promise<void>;
 }
 export {};