@codingame/monaco-vscode-api 8.0.4 → 9.0.2

package/vscode/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.js

@@ -147,7 +147,7 @@ let GotoSymbolQuickAccessProvider = class GotoSymbolQuickAccessProvider extends
                     return true;
                 });
                 if (filteredItems.length === 0) {
-                    const label = ( localize(883, 'No matching entries'));
+                    const label = ( localize(885, 'No matching entries'));
                     picker.items = [{ label, index: -1, kind: SymbolKind.String }];
                     picker.ariaLabel = label;
                 }
@@ -191,8 +191,8 @@ class GotoSymbolAction extends Action2 {
         super({
             id: GotoSymbolAction.ID,
             title: {
-                ...( localize2(884, "Go to Symbol in Editor...")),
-                mnemonicTitle: ( localize(885, "Go to &&Symbol in Editor...")),
+                ...( localize2(886, "Go to Symbol in Editor...")),
+                mnemonicTitle: ( localize(887, "Go to &&Symbol in Editor...")),
             },
             f1: true,
             keybinding: {
@@ -219,16 +219,16 @@ registerAction2(GotoSymbolAction);
     ctor: GotoSymbolQuickAccessProvider,
     prefix: AbstractGotoSymbolQuickAccessProvider.PREFIX,
     contextKey: 'inFileSymbolsPicker',
-    placeholder: ( localize(886, "Type the name of a symbol to go to.")),
+    placeholder: ( localize(888, "Type the name of a symbol to go to.")),
     helpEntries: [
         {
-            description: ( localize(887, "Go to Symbol in Editor")),
+            description: ( localize(889, "Go to Symbol in Editor")),
             prefix: AbstractGotoSymbolQuickAccessProvider.PREFIX,
             commandId: GotoSymbolAction.ID,
             commandCenterOrder: 40
         },
         {
-            description: ( localize(888, "Go to Symbol in Editor by Category")),
+            description: ( localize(890, "Go to Symbol in Editor by Category")),
             prefix: AbstractGotoSymbolQuickAccessProvider.PREFIX_BY_CATEGORY
         }
     ]

package/vscode/src/vs/workbench/contrib/codeEditor/browser/saveParticipants.js

@@ -2,6 +2,7 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
+import { StopWatch } from '../../../../base/common/stopwatch.js';
 import { lastNonWhitespaceIndex } from '../../../../base/common/strings.js';
 import { isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
@@ -20,6 +21,7 @@ import { IConfigurationService } from '../../../../platform/configuration/common
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { Progress } from '../../../../platform/progress/common/progress.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 import { Extensions } from '../../../common/contributions.js';
 import { SaveReason } from '../../../common/editor.js';
 import { getModifiedRanges } from '../../format/browser/formatModified.js';
@@ -190,7 +192,7 @@ let FormatOnSaveParticipant = class FormatOnSaveParticipant {
         const nestedProgress = ( (new Progress(provider => {
             progress.report({
                 message: ( localize(
-                    724,
+                    634,
                     "Running '{0}' Formatter ([configure]({1})).",
                     provider.displayName || provider.extensionId && provider.extensionId.value || '???',
                     'command:workbench.action.openSettings?%5B%22editor.formatOnSave%22%5D'
@@ -223,7 +225,7 @@ FormatOnSaveParticipant = ( (__decorate([
     ( (__param(2, IInstantiationService)))
 ], FormatOnSaveParticipant)));
 let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant extends Disposable {
-    constructor(configurationService, instantiationService, languageFeaturesService, hostService, editorService, codeEditorService) {
+    constructor(configurationService, instantiationService, languageFeaturesService, hostService, editorService, codeEditorService, telemetryService) {
         super();
         this.configurationService = configurationService;
         this.instantiationService = instantiationService;
@@ -231,6 +233,7 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant extends Disp
         this.hostService = hostService;
         this.editorService = editorService;
         this.codeEditorService = codeEditorService;
+        this.telemetryService = telemetryService;
         this._register(this.hostService.onDidChangeFocus(() => { this.triggerCodeActionsCommand(); }));
         this._register(this.editorService.onDidActiveEditorChange(() => { this.triggerCodeActionsCommand(); }));
     }
@@ -299,7 +302,7 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant extends Disp
             : ( (( (Object.keys(setting)))
                 .filter(x => setting[x] === 'never' || false)
                 .map(x => ( (new HierarchicalKind(x))))));
-        progress.report({ message: ( localize(725, "Quick Fixes")) });
+        progress.report({ message: ( localize(635, "Quick Fixes")) });
         const filteredSaveList = Array.isArray(setting) ? codeActionsOnSave : codeActionsOnSave.filter(x => setting[x.value] === 'always' || ((setting[x.value] === 'explicit' || setting[x.value] === true) && context.reason === SaveReason.EXPLICIT));
         await this.applyOnSaveActions(textEditorModel, filteredSaveList, excludedActions, progress, token);
     }
@@ -317,7 +320,7 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant extends Disp
             _report() {
                 progress.report({
                     message: ( localize(
-                        726,
+                        636,
                         "Getting code actions from '{0}' ([configure]({1})).",
                         ( ([...this._names].map(name => `'${name}'`))).join(', '),
                         'command:workbench.action.openSettings?%5B%22editor.codeActionsOnSave%22%5D'
@@ -332,14 +335,19 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant extends Disp
             }
         });
         for (const codeActionKind of codeActionsOnSave) {
+            const sw = ( (new StopWatch()));
             const actionsToRun = await this.getActionsToRun(model, codeActionKind, excludes, getActionProgress, token);
+            this.telemetryService.publicLog2('codeAction.appliedOnSave', {
+                codeAction: codeActionKind.value,
+                duration: sw.elapsed()
+            });
             if (token.isCancellationRequested) {
                 actionsToRun.dispose();
                 return;
             }
             try {
                 for (const action of actionsToRun.validActions) {
-                    progress.report({ message: ( localize(727, "Applying code action '{0}'.", action.action.title)) });
+                    progress.report({ message: ( localize(637, "Applying code action '{0}'.", action.action.title)) });
                     await this.instantiationService.invokeFunction(applyCodeAction, action, ApplyCodeActionReason.OnSave, {}, token);
                     if (token.isCancellationRequested) {
                         return;
@@ -367,7 +375,8 @@ CodeActionOnSaveParticipant = ( (__decorate([
     ( (__param(2, ILanguageFeaturesService))),
     ( (__param(3, IHostService))),
     ( (__param(4, IEditorService))),
-    ( (__param(5, ICodeEditorService)))
+    ( (__param(5, ICodeEditorService))),
+    ( (__param(6, ITelemetryService)))
 ], CodeActionOnSaveParticipant)));
 let SaveParticipantsContribution = class SaveParticipantsContribution extends Disposable {
     constructor(instantiationService, textFileService) {

package/vscode/src/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions.js

@@ -5,6 +5,18 @@ import { MenuPreventer } from './menuPreventer.js';
 import { SelectionClipboardContributionID } from './selectionClipboard.js';
 import { TabCompletionController } from '../../snippets/browser/tabCompletion.js';
 import { EditorExtensionsRegistry } from '../../../../editor/browser/editorExtensions.js';
+import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
+import '../../../../platform/theme/common/colorUtils.js';
+import { selectionBackground } from '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import { editorSelectionBackground } from '../../../../platform/theme/common/colors/editorColors.js';
+import { inputBackground, inputForeground } from '../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../platform/theme/common/colors/listColors.js';
+import '../../../../platform/theme/common/colors/menuColors.js';
+import '../../../../platform/theme/common/colors/minimapColors.js';
+import '../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../platform/theme/common/colors/searchColors.js';
 function getSimpleEditorOptions(configurationService) {
     return {
         wordWrap: 'on',
@@ -50,4 +62,24 @@ function getSimpleCodeEditorWidgetOptions() {
         ])
     };
 }
-export { getSimpleCodeEditorWidgetOptions, getSimpleEditorOptions };
+function setupSimpleEditorSelectionStyling(editorContainerSelector) {
+    return registerThemingParticipant((theme, collector) => {
+        const selectionBackgroundColor = theme.getColor(selectionBackground);
+        if (selectionBackgroundColor) {
+            const inputBackgroundColor = theme.getColor(inputBackground);
+            if (inputBackgroundColor) {
+                collector.addRule(`${editorContainerSelector} .monaco-editor-background { background-color: ${inputBackgroundColor}; } `);
+                collector.addRule(`${editorContainerSelector} .monaco-editor .selected-text { background-color: ${( inputBackgroundColor.transparent(0.4))}; }`);
+            }
+            const inputForegroundColor = theme.getColor(inputForeground);
+            if (inputForegroundColor) {
+                collector.addRule(`${editorContainerSelector} .monaco-editor .view-line span.inline-selected-text { color: ${inputForegroundColor}; }`);
+            }
+            collector.addRule(`${editorContainerSelector} .monaco-editor .focused .selected-text { background-color: ${selectionBackgroundColor}; }`);
+        }
+        else {
+            collector.addRule(`${editorContainerSelector} .monaco-editor .focused .selected-text { background-color: ${theme.getColor(editorSelectionBackground)}; }`);
+        }
+    });
+}
+export { getSimpleCodeEditorWidgetOptions, getSimpleEditorOptions, setupSimpleEditorSelectionStyling };

package/vscode/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.js

@@ -1,27 +1,35 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import './suggestEnabledInput.css.js';
 import { append, $ } from '../../../../../base/browser/dom.js';
+import { DEFAULT_FONT_FAMILY } from '../../../../../base/browser/fonts.js';
 import { Widget } from '../../../../../base/browser/ui/widget.js';
 import { Emitter, Event } from '../../../../../base/common/event.js';
+import { HistoryNavigator } from '../../../../../base/common/history.js';
 import { KeyCode } from '../../../../../base/common/keyCodes.js';
 import { mixin } from '../../../../../base/common/objects.js';
 import { isMacintosh } from '../../../../../base/common/platform.js';
 import { URI } from '../../../../../base/common/uri.js';
+import './suggestEnabledInput.css.js';
+import { EditorExtensionsRegistry } from '../../../../../editor/browser/editorExtensions.js';
 import { CodeEditorWidget } from '../../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
 import { EditOperation } from '../../../../../editor/common/core/editOperation.js';
 import { Position } from '../../../../../editor/common/core/position.js';
 import { Range } from '../../../../../editor/common/core/range.js';
+import { ensureValidWordDefinition, getWordAtText } from '../../../../../editor/common/core/wordHelper.js';
 import { CompletionItemKind } from '../../../../../editor/common/languages.js';
+import { ILanguageFeaturesService } from '../../../../../editor/common/services/languageFeatures.js';
 import { IModelService } from '../../../../../editor/common/services/model.js';
 import { ContextMenuController } from '../../../../../editor/contrib/contextmenu/browser/contextmenu.js';
 import { SnippetController2 } from '../../../../../editor/contrib/snippet/browser/snippetController2.js';
 import { SuggestController } from '../../../../../editor/contrib/suggest/browser/suggestController.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.service.js';
 import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.service.js';
+import { registerAndCreateHistoryNavigationContext } from '../../../../../platform/history/browser/contextScopedHistoryWidget.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
 import { asCssVariable, asCssVariableWithDefault } from '../../../../../platform/theme/common/colorUtils.js';
-import { selectionBackground } from '../../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../../platform/theme/common/colors/baseColors.js';
 import '../../../../../platform/theme/common/colors/chartsColors.js';
-import { editorSelectionBackground } from '../../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../../platform/theme/common/colors/editorColors.js';
 import { inputBackground, inputForeground, inputPlaceholderForeground, inputBorder } from '../../../../../platform/theme/common/colors/inputColors.js';
 import '../../../../../platform/theme/common/colors/listColors.js';
 import '../../../../../platform/theme/common/colors/menuColors.js';
@@ -29,18 +37,9 @@ import '../../../../../platform/theme/common/colors/minimapColors.js';
 import '../../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../../platform/theme/common/colors/searchColors.js';
-import { registerThemingParticipant } from '../../../../../platform/theme/common/themeService.js';
 import { MenuPreventer } from '../menuPreventer.js';
-import { getSimpleEditorOptions } from '../simpleEditorOptions.js';
 import { SelectionClipboardContributionID } from '../selectionClipboard.js';
-import { EditorExtensionsRegistry } from '../../../../../editor/browser/editorExtensions.js';
-import { DEFAULT_FONT_FAMILY } from '../../../../../base/browser/fonts.js';
-import { HistoryNavigator } from '../../../../../base/common/history.js';
-import { registerAndCreateHistoryNavigationContext } from '../../../../../platform/history/browser/contextScopedHistoryWidget.js';
-import { ServiceCollection } from '../../../../../platform/instantiation/common/serviceCollection.js';
-import { ILanguageFeaturesService } from '../../../../../editor/common/services/languageFeatures.js';
-import { ensureValidWordDefinition, getWordAtText } from '../../../../../editor/common/core/wordHelper.js';
-import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.service.js';
+import { setupSimpleEditorSelectionStyling, getSimpleEditorOptions } from '../simpleEditorOptions.js';
 let SuggestEnabledInput = class SuggestEnabledInput extends Widget {
     constructor(id, parent, suggestionProvider, ariaLabel, resourceHandle, options, defaultInstantiationService, modelService, contextKeyService, languageFeaturesService, configurationService) {
         super();
@@ -308,27 +307,7 @@ ContextScopedSuggestEnabledInputWithHistory = ( (__decorate([
     ( (__param(4, ILanguageFeaturesService))),
     ( (__param(5, IConfigurationService)))
 ], ContextScopedSuggestEnabledInputWithHistory)));
-registerThemingParticipant((theme, collector) => {
-    const selectionBackgroundColor = theme.getColor(selectionBackground);
-    if (selectionBackgroundColor) {
-        const inputBackgroundColor = theme.getColor(inputBackground);
-        if (inputBackgroundColor) {
-            collector.addRule(`.suggest-input-container .monaco-editor .selected-text { background-color: ${( (inputBackgroundColor.transparent(0.4)))}; }`);
-        }
-        const inputForegroundColor = theme.getColor(inputForeground);
-        if (inputForegroundColor) {
-            collector.addRule(`.suggest-input-container .monaco-editor .view-line span.inline-selected-text { color: ${inputForegroundColor}; }`);
-        }
-        const backgroundColor = theme.getColor(inputBackground);
-        if (backgroundColor) {
-            collector.addRule(`.suggest-input-container .monaco-editor-background { background-color: ${backgroundColor}; } `);
-        }
-        collector.addRule(`.suggest-input-container .monaco-editor .focused .selected-text { background-color: ${selectionBackgroundColor}; }`);
-    }
-    else {
-        collector.addRule(`.suggest-input-container .monaco-editor .focused .selected-text { background-color: ${theme.getColor(editorSelectionBackground)}; }`);
-    }
-});
+setupSimpleEditorSelectionStyling('.suggest-input-container');
 function getSuggestEnabledInputOptions(ariaLabel) {
     return {
         fontSize: 13,

package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMinimap.js

@@ -9,8 +9,8 @@ class ToggleMinimapAction extends Action2 {
         super({
             id: ToggleMinimapAction.ID,
             title: {
-                ...( localize2(728, "Toggle Minimap")),
-                mnemonicTitle: ( localize(729, "&&Minimap")),
+                ...( localize2(638, "Toggle Minimap")),
+                mnemonicTitle: ( localize(639, "&&Minimap")),
             },
             category: Categories.View,
             f1: true,

package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier.js

@@ -15,7 +15,7 @@ class ToggleMultiCursorModifierAction extends Action2 {
     constructor() {
         super({
             id: ToggleMultiCursorModifierAction.ID,
-            title: ( localize2(730, 'Toggle Multi-Cursor Modifier')),
+            title: ( localize2(640, 'Toggle Multi-Cursor Modifier')),
             f1: true
         });
     }
@@ -55,7 +55,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarSelectionMenu, {
     group: '4_config',
     command: {
         id: ToggleMultiCursorModifierAction.ID,
-        title: ( localize(731, "Switch to Alt+Click for Multi-Cursor"))
+        title: ( localize(641, "Switch to Alt+Click for Multi-Cursor"))
     },
     when: ( (multiCursorModifier.isEqualTo('ctrlCmd'))),
     order: 1
@@ -65,8 +65,8 @@ MenuRegistry.appendMenuItem(MenuId.MenubarSelectionMenu, {
     command: {
         id: ToggleMultiCursorModifierAction.ID,
         title: (isMacintosh
-            ? ( localize(732, "Switch to Cmd+Click for Multi-Cursor"))
-            : ( localize(733, "Switch to Ctrl+Click for Multi-Cursor")))
+            ? ( localize(642, "Switch to Cmd+Click for Multi-Cursor"))
+            : ( localize(643, "Switch to Ctrl+Click for Multi-Cursor")))
     },
     when: ( (multiCursorModifier.isEqualTo('altKey'))),
     order: 1

package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleRenderControlCharacter.js

@@ -9,8 +9,8 @@ class ToggleRenderControlCharacterAction extends Action2 {
         super({
             id: ToggleRenderControlCharacterAction.ID,
             title: {
-                ...( localize2(734, "Toggle Control Characters")),
-                mnemonicTitle: ( localize(735, "Render &&Control Characters")),
+                ...( localize2(644, "Toggle Control Characters")),
+                mnemonicTitle: ( localize(645, "Render &&Control Characters")),
             },
             category: Categories.View,
             f1: true,

package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleRenderWhitespace.js

@@ -9,8 +9,8 @@ class ToggleRenderWhitespaceAction extends Action2 {
         super({
             id: ToggleRenderWhitespaceAction.ID,
             title: {
-                ...( localize2(741, "Toggle Render Whitespace")),
-                mnemonicTitle: ( localize(742, "&&Render Whitespace")),
+                ...( localize2(651, "Toggle Render Whitespace")),
+                mnemonicTitle: ( localize(652, "&&Render Whitespace")),
             },
             category: Categories.View,
             f1: true,

package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.js

@@ -20,7 +20,7 @@ const transientWordWrapState = 'transientWordWrapState';
 const isWordWrapMinifiedKey = 'isWordWrapMinified';
 const isDominatedByLongLinesKey = 'isDominatedByLongLines';
 const CAN_TOGGLE_WORD_WRAP = ( (new RawContextKey('canToggleWordWrap', false, true)));
-const EDITOR_WORD_WRAP = ( (new RawContextKey('editorWordWrap', false, ( localize(736, 'Whether the editor is currently using word wrapping.')))));
+const EDITOR_WORD_WRAP = ( (new RawContextKey('editorWordWrap', false, ( localize(646, 'Whether the editor is currently using word wrapping.')))));
 function writeTransientState(model, state, codeEditorService) {
     codeEditorService.setTransientModelProperty(model, transientWordWrapState, state);
 }
@@ -32,7 +32,7 @@ class ToggleWordWrapAction extends EditorAction {
     constructor() {
         super({
             id: TOGGLE_WORD_WRAP_ID,
-            label: ( localize(737, "View: Toggle Word Wrap")),
+            label: ( localize(647, "View: Toggle Word Wrap")),
             alias: 'View: Toggle Word Wrap',
             precondition: undefined,
             kbOpts: {
@@ -251,7 +251,7 @@ registerEditorAction(ToggleWordWrapAction);
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
         id: TOGGLE_WORD_WRAP_ID,
-        title: ( localize(738, "Disable wrapping for this file")),
+        title: ( localize(648, "Disable wrapping for this file")),
         icon: Codicon.wordWrap
     },
     group: 'navigation',
@@ -264,7 +264,7 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
         id: TOGGLE_WORD_WRAP_ID,
-        title: ( localize(739, "Enable wrapping for this file")),
+        title: ( localize(649, "Enable wrapping for this file")),
         icon: Codicon.wordWrap
     },
     group: 'navigation',
@@ -278,7 +278,7 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
 MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
     command: {
         id: TOGGLE_WORD_WRAP_ID,
-        title: ( localize(740, "&&Word Wrap")),
+        title: ( localize(650, "&&Word Wrap")),
         toggled: EDITOR_WORD_WRAP,
         precondition: CAN_TOGGLE_WORD_WRAP
     },

package/vscode/src/vs/workbench/contrib/comments/browser/commentColors.js

@@ -12,14 +12,14 @@ import '../../../../platform/theme/common/colors/minimapColors.js';
 import '../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
-const resolvedCommentViewIcon = registerColor('commentsView.resolvedIcon', { dark: disabledForeground, light: disabledForeground, hcDark: contrastBorder, hcLight: contrastBorder }, ( localize(9987, 'Icon color for resolved comments.')));
-const unresolvedCommentViewIcon = registerColor('commentsView.unresolvedIcon', { dark: listFocusOutline, light: listFocusOutline, hcDark: contrastBorder, hcLight: contrastBorder }, ( localize(9988, 'Icon color for unresolved comments.')));
-registerColor('editorCommentsWidget.replyInputBackground', peekViewTitleBackground, ( localize(9989, 'Background color for comment reply input box.')));
-const resolvedCommentBorder = registerColor('editorCommentsWidget.resolvedBorder', { dark: resolvedCommentViewIcon, light: resolvedCommentViewIcon, hcDark: contrastBorder, hcLight: contrastBorder }, ( localize(9990, 'Color of borders and arrow for resolved comments.')));
-const unresolvedCommentBorder = registerColor('editorCommentsWidget.unresolvedBorder', { dark: unresolvedCommentViewIcon, light: unresolvedCommentViewIcon, hcDark: contrastBorder, hcLight: contrastBorder }, ( localize(9991, 'Color of borders and arrow for unresolved comments.')));
-registerColor('editorCommentsWidget.rangeBackground', ( (transparent(unresolvedCommentBorder, .1))), ( localize(9992, 'Color of background for comment ranges.')));
+const resolvedCommentViewIcon = registerColor('commentsView.resolvedIcon', { dark: disabledForeground, light: disabledForeground, hcDark: contrastBorder, hcLight: contrastBorder }, ( localize(10025, 'Icon color for resolved comments.')));
+const unresolvedCommentViewIcon = registerColor('commentsView.unresolvedIcon', { dark: listFocusOutline, light: listFocusOutline, hcDark: contrastBorder, hcLight: contrastBorder }, ( localize(10026, 'Icon color for unresolved comments.')));
+registerColor('editorCommentsWidget.replyInputBackground', peekViewTitleBackground, ( localize(10027, 'Background color for comment reply input box.')));
+const resolvedCommentBorder = registerColor('editorCommentsWidget.resolvedBorder', { dark: resolvedCommentViewIcon, light: resolvedCommentViewIcon, hcDark: contrastBorder, hcLight: contrastBorder }, ( localize(10028, 'Color of borders and arrow for resolved comments.')));
+const unresolvedCommentBorder = registerColor('editorCommentsWidget.unresolvedBorder', { dark: unresolvedCommentViewIcon, light: unresolvedCommentViewIcon, hcDark: contrastBorder, hcLight: contrastBorder }, ( localize(10029, 'Color of borders and arrow for unresolved comments.')));
+registerColor('editorCommentsWidget.rangeBackground', ( (transparent(unresolvedCommentBorder, .1))), ( localize(10030, 'Color of background for comment ranges.')));
 registerColor('editorCommentsWidget.rangeActiveBackground', ( (transparent(unresolvedCommentBorder, .1))), ( localize(
-    9993,
+    10031,
     'Color of background for currently selected or hovered comment range.'
 )));
 const commentThreadStateBorderColors = ( (new Map([

package/vscode/src/vs/workbench/contrib/comments/browser/commentGlyphWidget.js

@@ -17,20 +17,20 @@ import '../../../../platform/theme/common/colors/searchColors.js';
 import { themeColorFromId } from '../../../../platform/theme/common/themeService.js';
 import { CommentThreadState } from '../../../../editor/common/languages.js';
 const overviewRulerCommentingRangeForeground = registerColor('editorGutter.commentRangeForeground', { dark: opaque(listInactiveSelectionBackground, editorBackground), light: ( (darken(opaque(listInactiveSelectionBackground, editorBackground), .05))), hcDark: Color.white, hcLight: Color.black }, ( localize(
-    10014,
+    10057,
     'Editor gutter decoration color for commenting ranges. This color should be opaque.'
 )));
 const overviewRulerCommentForeground = registerColor('editorOverviewRuler.commentForeground', overviewRulerCommentingRangeForeground, ( localize(
-    10015,
+    10058,
     'Editor overview ruler decoration color for resolved comments. This color should be opaque.'
 )));
 const overviewRulerCommentUnresolvedForeground = registerColor('editorOverviewRuler.commentUnresolvedForeground', overviewRulerCommentForeground, ( localize(
-    10016,
+    10059,
     'Editor overview ruler decoration color for unresolved comments. This color should be opaque.'
 )));
-const editorGutterCommentGlyphForeground = registerColor('editorGutter.commentGlyphForeground', { dark: editorForeground, light: editorForeground, hcDark: Color.black, hcLight: Color.white }, ( localize(10017, 'Editor gutter decoration color for commenting glyphs.')));
+const editorGutterCommentGlyphForeground = registerColor('editorGutter.commentGlyphForeground', { dark: editorForeground, light: editorForeground, hcDark: Color.black, hcLight: Color.white }, ( localize(10060, 'Editor gutter decoration color for commenting glyphs.')));
 registerColor('editorGutter.commentUnresolvedGlyphForeground', editorGutterCommentGlyphForeground, ( localize(
-    10018,
+    10061,
     'Editor gutter decoration color for commenting glyphs for unresolved comment threads.'
 )));
 class CommentGlyphWidget {

package/vscode/src/vs/workbench/contrib/comments/browser/commentNode.js

@@ -316,7 +316,7 @@ let CommentNode = class CommentNode extends Disposable {
     createReactionPicker(reactionGroup) {
         const toggleReactionAction = this._register(( (new ToggleReactionsAction(() => {
             toggleReactionActionViewItem?.show();
-        }, ( localize(11540, "Toggle Reaction"))))));
+        }, ( localize(11603, "Toggle Reaction"))))));
         let reactionMenuActions = [];
         if (reactionGroup && reactionGroup.length) {
             reactionMenuActions = ( (reactionGroup.map((reaction) => {
@@ -332,8 +332,8 @@ let CommentNode = class CommentNode extends Disposable {
                             }
                             catch (e) {
                                 const error = e.message
-                                    ? ( localize(11541, "Toggling the comment reaction failed: {0}.", e.message))
-                                    : ( localize(11542, "Toggling the comment reaction failed"));
+                                    ? ( localize(11604, "Toggling the comment reaction failed: {0}.", e.message))
+                                    : ( localize(11605, "Toggling the comment reaction failed"));
                                 this.notificationService.error(error);
                             }
                         }

package/vscode/src/vs/workbench/contrib/comments/browser/commentReply.js

@@ -158,8 +158,8 @@ let CommentReply = class CommentReply extends Disposable {
     setCommentEditorDecorations() {
         const hasExistingComments = this._commentThread.comments && this._commentThread.comments.length > 0;
         const placeholder = hasExistingComments
-            ? (this._commentOptions?.placeHolder || ( localize(8268, "Reply...")))
-            : (this._commentOptions?.placeHolder || ( localize(8269, "Type a new comment")));
+            ? (this._commentOptions?.placeHolder || ( localize(8067, "Reply...")))
+            : (this._commentOptions?.placeHolder || ( localize(8068, "Type a new comment")));
         this.commentEditor.updateOptions({ placeholder });
     }
     createTextModelListener(commentEditor, commentForm) {
@@ -276,8 +276,8 @@ let CommentReply = class CommentReply extends Disposable {
     }
     createReplyButton(commentEditor, commentForm) {
         this._reviewThreadReplyButton = append(commentForm, $(`button.review-thread-reply-button.${MOUSE_CURSOR_TEXT_CSS_CLASS_NAME}`));
-        this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), this._reviewThreadReplyButton, this._commentOptions?.prompt || ( localize(8268, "Reply..."))));
-        this._reviewThreadReplyButton.textContent = this._commentOptions?.prompt || ( localize(8268, "Reply..."));
+        this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), this._reviewThreadReplyButton, this._commentOptions?.prompt || ( localize(8067, "Reply..."))));
+        this._reviewThreadReplyButton.textContent = this._commentOptions?.prompt || ( localize(8067, "Reply..."));
         this._register(addDisposableListener(this._reviewThreadReplyButton, 'click', _ => this.clearAndExpandReplyArea()));
         this._register(addDisposableListener(this._reviewThreadReplyButton, 'focus', _ => this.clearAndExpandReplyArea()));
         commentEditor.onDidBlurEditorWidget(() => {

package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadBody.js

@@ -191,7 +191,7 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
         if (this._commentThread.isDocumentCommentThread()) {
             if (this._commentThread.range) {
                 this._commentsElement.ariaLabel = ( localize(
-                    11501,
+                    11564,
                     "Comment thread with {0} comments on lines {1} through {2}. {3}.",
                     this._commentThread.comments?.length,
                     this._commentThread.range.startLineNumber,
@@ -201,7 +201,7 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
             }
             else {
                 this._commentsElement.ariaLabel = ( localize(
-                    11502,
+                    11565,
                     "Comment thread with {0} comments on the entire document. {1}.",
                     this._commentThread.comments?.length,
                     this._commentThread.label
@@ -210,7 +210,7 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
         }
         else {
             this._commentsElement.ariaLabel = ( localize(
-                11503,
+                11566,
                 "Comment thread with {0} comments. {1}.",
                 this._commentThread.comments?.length,
                 this._commentThread.label

package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadHeader.js

@@ -2,7 +2,7 @@ import { $, append, addDisposableListener, EventType, getWindow } from '../../..
 import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { Action, ActionRunner } from '../../../../base/common/actions.js';
 import { Codicon } from '../../../../base/common/codicons.js';
-import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { Disposable, toDisposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { escape } from '../../../../base/common/strings.js';
 import { localize } from '../../../../nls.js';
 import { createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
@@ -10,8 +10,12 @@ import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js'
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { MarshalledId } from '../../../../base/common/marshallingIds.js';
 import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
-const collapseIcon = registerIcon('review-comment-collapse', Codicon.chevronUp, ( localize(11504, 'Icon to collapse a review comment.')));
+const collapseIcon = registerIcon('review-comment-collapse', Codicon.chevronUp, ( localize(11567, 'Icon to collapse a review comment.')));
 const COLLAPSE_ACTION_CLASS = 'expand-review-action ' + ThemeIcon.asClassName(collapseIcon);
+const DELETE_ACTION_CLASS = 'expand-review-action ' + ThemeIcon.asClassName(Codicon.trashcan);
+function threadHasComments(comments) {
+    return !!comments && comments.length > 0;
+}
 class CommentThreadHeader extends Disposable {
     constructor(container, _delegate, _commentMenus, _commentThread, _contextKeyService, instantiationService, _contextMenuService) {
         super();
@@ -35,7 +39,17 @@ class CommentThreadHeader extends Disposable {
             actionViewItemProvider: createActionViewItem.bind(undefined, this.instantiationService)
         })));
         this._register(this._actionbarWidget);
-        this._collapseAction = ( (new Action('review.expand', ( localize(11505, "Collapse")), COLLAPSE_ACTION_CLASS, true, () => this._delegate.collapse())));
+        const collapseClass = threadHasComments(this._commentThread.comments) ? COLLAPSE_ACTION_CLASS : DELETE_ACTION_CLASS;
+        this._collapseAction = ( (new Action('review.expand', ( localize(11568, "Collapse")), collapseClass, true, () => this._delegate.collapse())));
+        if (!threadHasComments(this._commentThread.comments)) {
+            const commentsChanged = this._register(( (new MutableDisposable())));
+            commentsChanged.value = this._commentThread.onDidChangeComments(() => {
+                if (threadHasComments(this._commentThread.comments)) {
+                    this._collapseAction.class = COLLAPSE_ACTION_CLASS;
+                    commentsChanged.clear();
+                }
+            });
+        }
         const menu = this._commentMenus.getCommentThreadTitleActions(this._contextKeyService);
         this._register(menu);
         this.setActionBarActions(menu);
@@ -63,7 +77,7 @@ class CommentThreadHeader extends Disposable {
         label = this._commentThread.label;
         if (label === undefined) {
             if (!(this._commentThread.comments && this._commentThread.comments.length)) {
-                label = ( localize(11506, "Start discussion"));
+                label = ( localize(11569, "Start discussion"));
             }
         }
         if (label) {

package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadWidget.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/review.css.js';
-import { $, trackFocus, createStyleSheet, addDisposableListener, EventType } from '../../../../base/browser/dom.js';
+import { $, trackFocus, createStyleSheet, isKeyboardEvent, addDisposableListener, EventType } from '../../../../base/browser/dom.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { Disposable, toDisposable, dispose } from '../../../../base/common/lifecycle.js';
 import { CommentThreadCollapsibleState, CommentThreadState } from '../../../../editor/common/languages.js';
@@ -22,6 +22,7 @@ import '../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
 import { PANEL_BORDER } from '../../../common/theme.js';
+import { Range } from '../../../../editor/common/core/range.js';
 import { commentThreadStateColorVar, commentThreadStateBackgroundColorVar } from './commentColors.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
 import { registerNavigableContainer } from '../../../browser/actions/widgetNavigationCommands.js';
@@ -31,6 +32,8 @@ import { localize } from '../../../../nls.js';
 import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 import { AccessibilityCommandId } from '../../accessibility/common/accessibilityCommands.js';
+import { DomEmitter } from '../../../../base/browser/event.js';
+import { isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
 let CommentThreadWidget = class CommentThreadWidget extends Disposable {
     get commentThread() {
         return this._commentThread;
@@ -100,20 +103,28 @@ let CommentThreadWidget = class CommentThreadWidget extends Disposable {
             commentControllerKey.set(controller.contextValue);
         }
         this.currentThreadListeners();
+        this._register(( (new DomEmitter(this.container, 'keydown'))).event(e => {
+            if (isKeyboardEvent(e) && e.key === 'Escape') {
+                if (Range.isIRange(this.commentThread.range) && isCodeEditor(this._parentEditor)) {
+                    this._parentEditor.setSelection(this.commentThread.range);
+                }
+                this.collapse();
+            }
+        }));
     }
     _setAriaLabel() {
-        let ariaLabel = ( localize(11238, "Comment"));
+        let ariaLabel = ( localize(11299, "Comment"));
         let keybinding;
         const verbose = this.configurationService.getValue(AccessibilityVerbositySettingId.Comments);
         if (verbose) {
             keybinding = this._keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp, this._contextKeyService)?.getLabel() ?? undefined;
         }
         if (keybinding) {
-            ariaLabel = ( localize(11239, "{0}, use ({1}) for accessibility help", ariaLabel, keybinding));
+            ariaLabel = ( localize(11300, "{0}, use ({1}) for accessibility help", ariaLabel, keybinding));
         }
         else {
             ariaLabel = ( localize(
-                11240,
+                11301,
                 "{0}, run the command Open Accessibility Help which is currently not triggerable via keybinding.",
                 ariaLabel
             ));