@codingame/monaco-vscode-api 1.83.2 → 1.83.3

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

@@ -1,10 +1,10 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { IQuickInputService, ItemActivation } from 'monaco-editor/esm/vs/platform/quickinput/common/quickInput.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.js';
 import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
 import { Extensions } from 'monaco-editor/esm/vs/platform/quickinput/common/quickAccess.js';
-import { AbstractGotoSymbolQuickAccessProvider } from 'monaco-editor/esm/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.js';
+import { AbstractGotoSymbolQuickAccessProvider } from '../../../../../editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
 import { Disposable, toDisposable, DisposableStore, MutableDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { timeout } from 'monaco-editor/esm/vs/base/common/async.js';
@@ -137,7 +137,7 @@ let GotoSymbolQuickAccessProvider = class GotoSymbolQuickAccessProvider extends
                     return true;
                 });
                 if (filteredItems.length === 0) {
-                    const label = ( localize('empty', 'No matching entries'));
+                    const label = localizeWithPath('vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess', 'empty', 'No matching entries');
                     picker.items = [{ label, index: -1, kind: 14  }];
                     picker.ariaLabel = label;
                 }
@@ -181,11 +181,8 @@ class GotoSymbolAction extends Action2 {
         super({
             id: GotoSymbolAction.ID,
             title: {
-                value: ( localize('gotoSymbol', "Go to Symbol in Editor...")),
-                mnemonicTitle: ( localize(
-                    { key: 'miGotoSymbolInEditor', comment: ['&& denotes a mnemonic'] },
-                    "Go to &&Symbol in Editor..."
-                )),
+                value: localizeWithPath('vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess', 'gotoSymbol', "Go to Symbol in Editor..."),
+                mnemonicTitle: localizeWithPath('vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess', { key: 'miGotoSymbolInEditor', comment: ['&& denotes a mnemonic'] }, "Go to &&Symbol in Editor..."),
                 original: 'Go to Symbol in Editor...'
             },
             f1: true,
@@ -210,16 +207,16 @@ registerAction2(GotoSymbolAction);
     ctor: GotoSymbolQuickAccessProvider,
     prefix: AbstractGotoSymbolQuickAccessProvider.PREFIX,
     contextKey: 'inFileSymbolsPicker',
-    placeholder: ( localize('gotoSymbolQuickAccessPlaceholder', "Type the name of a symbol to go to.")),
+    placeholder: localizeWithPath('vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess', 'gotoSymbolQuickAccessPlaceholder', "Type the name of a symbol to go to."),
     helpEntries: [
         {
-            description: ( localize('gotoSymbolQuickAccess', "Go to Symbol in Editor")),
+            description: localizeWithPath('vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess', 'gotoSymbolQuickAccess', "Go to Symbol in Editor"),
             prefix: AbstractGotoSymbolQuickAccessProvider.PREFIX,
             commandId: GotoSymbolAction.ID,
             commandCenterOrder: 40
         },
         {
-            description: ( localize('gotoSymbolByCategoryQuickAccess', "Go to Symbol in Editor by Category")),
+            description: localizeWithPath('vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess', 'gotoSymbolByCategoryQuickAccess', "Go to Symbol in Editor by Category"),
             prefix: AbstractGotoSymbolQuickAccessProvider.PREFIX_BY_CATEGORY
         }
     ]

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

@@ -12,7 +12,7 @@ import { applyCodeAction, ApplyCodeActionReason, getCodeActions } from 'monaco-e
 import { CodeActionKind, CodeActionTriggerSource } from 'monaco-editor/esm/vs/editor/contrib/codeAction/common/types.js';
 import { formatDocumentWithSelectedProvider, formatDocumentRangesWithSelectedProvider } from 'monaco-editor/esm/vs/editor/contrib/format/browser/format.js';
 import { SnippetController2 } from 'monaco-editor/esm/vs/editor/contrib/snippet/browser/snippetController2.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
 import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
 import { Progress } from 'monaco-editor/esm/vs/platform/progress/common/progress.js';
@@ -180,12 +180,7 @@ let FormatOnSaveParticipant = class FormatOnSaveParticipant {
         const overrides = { overrideIdentifier: textEditorModel.getLanguageId(), resource: textEditorModel.uri };
         const nestedProgress = ( new Progress(provider => {
             progress.report({
-                message: ( localize(
-                    { key: 'formatting2', comment: ['[configure]({1}) is a link. Only translate `configure`. Do not change brackets and parentheses or {1}'] },
-                    "Running '{0}' Formatter ([configure]({1})).",
-                    provider.displayName || provider.extensionId && provider.extensionId.value || '???',
-                    'command:workbench.action.openSettings?%5B%22editor.formatOnSave%22%5D'
-                ))
+                message: localizeWithPath('vs/workbench/contrib/codeEditor/browser/saveParticipants', { key: 'formatting2', comment: ['[configure]({1}) is a link. Only translate `configure`. Do not change brackets and parentheses or {1}'] }, "Running '{0}' Formatter ([configure]({1})).", provider.displayName || provider.extensionId && provider.extensionId.value || '???', 'command:workbench.action.openSettings?%5B%22editor.formatOnSave%22%5D')
             });
         }));
         const enabled = this.configurationService.getValue('editor.formatOnSave', overrides);
@@ -262,7 +257,7 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant {
         const excludedActions = ( ( Object.keys(setting))
             .filter(x => convertedSetting[x] === 'never' || false)
             .map(x => ( new CodeActionKind(x))));
-        progress.report({ message: ( localize('codeaction', "Quick Fixes")) });
+        progress.report({ message: localizeWithPath('vs/workbench/contrib/codeEditor/browser/saveParticipants', 'codeaction', "Quick Fixes") });
         const filteredSaveList = codeActionsOnSave.filter(x => convertedSetting[x.value] === 'always' || (convertedSetting[x.value] === 'explicit') && env.reason === 1 );
         await this.applyOnSaveActions(textEditorModel, filteredSaveList, excludedActions, progress, token);
     }
@@ -279,12 +274,7 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant {
             }
             _report() {
                 progress.report({
-                    message: ( localize(
-                        { key: 'codeaction.get2', comment: ['[configure]({1}) is a link. Only translate `configure`. Do not change brackets and parentheses or {1}'] },
-                        "Getting code actions from '{0}' ([configure]({1})).",
-                        ( [...this._names].map(name => `'${name}'`)).join(', '),
-                        'command:workbench.action.openSettings?%5B%22editor.codeActionsOnSave%22%5D'
-                    ))
+                    message: localizeWithPath('vs/workbench/contrib/codeEditor/browser/saveParticipants', { key: 'codeaction.get2', comment: ['[configure]({1}) is a link. Only translate `configure`. Do not change brackets and parentheses or {1}'] }, "Getting code actions from '{0}' ([configure]({1})).", ( [...this._names].map(name => `'${name}'`)).join(', '), 'command:workbench.action.openSettings?%5B%22editor.codeActionsOnSave%22%5D')
                 });
             }
             report(provider) {
@@ -302,7 +292,7 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant {
             }
             try {
                 for (const action of actionsToRun.validActions) {
-                    progress.report({ message: ( localize('codeAction.apply', "Applying code action '{0}'.", action.action.title)) });
+                    progress.report({ message: localizeWithPath('vs/workbench/contrib/codeEditor/browser/saveParticipants', 'codeAction.apply', "Applying code action '{0}'.", action.action.title) });
                     await this.instantiationService.invokeFunction(applyCodeAction, action, ApplyCodeActionReason.OnSave, {}, token);
                     if (token.isCancellationRequested) {
                         return;

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

@@ -1,4 +1,4 @@
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { Action2, MenuId, registerAction2 } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
 import { ContextKeyExpr } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
@@ -9,9 +9,9 @@ class ToggleMinimapAction extends Action2 {
         super({
             id: ToggleMinimapAction.ID,
             title: {
-                value: ( localize('toggleMinimap', "Toggle Minimap")),
+                value: localizeWithPath('vs/workbench/contrib/codeEditor/browser/toggleMinimap', 'toggleMinimap', "Toggle Minimap"),
                 original: 'Toggle Minimap',
-                mnemonicTitle: ( localize({ key: 'miMinimap', comment: ['&& denotes a mnemonic'] }, "&&Minimap"))
+                mnemonicTitle: localizeWithPath('vs/workbench/contrib/codeEditor/browser/toggleMinimap', { key: 'miMinimap', comment: ['&& denotes a mnemonic'] }, "&&Minimap")
             },
             category: Categories.View,
             f1: true,

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { isMacintosh } from 'monaco-editor/esm/vs/base/common/platform.js';
 import { Action2, registerAction2, MenuRegistry, MenuId } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
@@ -12,7 +12,7 @@ class ToggleMultiCursorModifierAction extends Action2 {
     constructor() {
         super({
             id: ToggleMultiCursorModifierAction.ID,
-            title: { value: ( localize('toggleLocation', "Toggle Multi-Cursor Modifier")), original: 'Toggle Multi-Cursor Modifier' },
+            title: { value: localizeWithPath('vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier', 'toggleLocation', "Toggle Multi-Cursor Modifier"), original: 'Toggle Multi-Cursor Modifier' },
             f1: true
         });
     }
@@ -51,7 +51,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarSelectionMenu, {
     group: '4_config',
     command: {
         id: ToggleMultiCursorModifierAction.ID,
-        title: ( localize('miMultiCursorAlt', "Switch to Alt+Click for Multi-Cursor"))
+        title: localizeWithPath('vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier', 'miMultiCursorAlt', "Switch to Alt+Click for Multi-Cursor")
     },
     when: ( multiCursorModifier.isEqualTo('ctrlCmd')),
     order: 1
@@ -61,8 +61,8 @@ MenuRegistry.appendMenuItem(MenuId.MenubarSelectionMenu, {
     command: {
         id: ToggleMultiCursorModifierAction.ID,
         title: (isMacintosh
-            ? ( localize('miMultiCursorCmd', "Switch to Cmd+Click for Multi-Cursor"))
-            : ( localize('miMultiCursorCtrl', "Switch to Ctrl+Click for Multi-Cursor")))
+            ? localizeWithPath('vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier', 'miMultiCursorCmd', "Switch to Cmd+Click for Multi-Cursor")
+            : localizeWithPath('vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier', 'miMultiCursorCtrl', "Switch to Ctrl+Click for Multi-Cursor"))
     },
     when: ( multiCursorModifier.isEqualTo('altKey')),
     order: 1

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

@@ -1,4 +1,4 @@
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { Action2, MenuId, registerAction2 } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
 import { ContextKeyExpr } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
@@ -9,11 +9,8 @@ class ToggleRenderControlCharacterAction extends Action2 {
         super({
             id: ToggleRenderControlCharacterAction.ID,
             title: {
-                value: ( localize('toggleRenderControlCharacters', "Toggle Control Characters")),
-                mnemonicTitle: ( localize(
-                    { key: 'miToggleRenderControlCharacters', comment: ['&& denotes a mnemonic'] },
-                    "Render &&Control Characters"
-                )),
+                value: localizeWithPath('vs/workbench/contrib/codeEditor/browser/toggleRenderControlCharacter', 'toggleRenderControlCharacters', "Toggle Control Characters"),
+                mnemonicTitle: localizeWithPath('vs/workbench/contrib/codeEditor/browser/toggleRenderControlCharacter', { key: 'miToggleRenderControlCharacters', comment: ['&& denotes a mnemonic'] }, "Render &&Control Characters"),
                 original: 'Toggle Control Characters'
             },
             category: Categories.View,

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

@@ -1,4 +1,4 @@
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { Action2, MenuId, registerAction2 } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
 import { ContextKeyExpr } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
@@ -9,11 +9,8 @@ class ToggleRenderWhitespaceAction extends Action2 {
         super({
             id: ToggleRenderWhitespaceAction.ID,
             title: {
-                value: ( localize('toggleRenderWhitespace', "Toggle Render Whitespace")),
-                mnemonicTitle: ( localize(
-                    { key: 'miToggleRenderWhitespace', comment: ['&& denotes a mnemonic'] },
-                    "&&Render Whitespace"
-                )),
+                value: localizeWithPath('vs/workbench/contrib/codeEditor/browser/toggleRenderWhitespace', 'toggleRenderWhitespace', "Toggle Render Whitespace"),
+                mnemonicTitle: localizeWithPath('vs/workbench/contrib/codeEditor/browser/toggleRenderWhitespace', { key: 'miToggleRenderWhitespace', comment: ['&& denotes a mnemonic'] }, "&&Render Whitespace"),
                 original: 'Toggle Render Whitespace'
             },
             category: Categories.View,

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

@@ -4,7 +4,7 @@ import { Disposable, DisposableStore } from 'monaco-editor/esm/vs/base/common/li
 import { registerEditorContribution, registerDiffEditorContribution, registerEditorAction, EditorAction } from 'monaco-editor/esm/vs/editor/browser/editorExtensions.js';
 import { ICodeEditorService } from 'monaco-editor/esm/vs/editor/browser/services/codeEditorService.js';
 import { MenuRegistry, MenuId } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
-import { ContextKeyExpr, RawContextKey, IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
+import { RawContextKey, ContextKeyExpr, IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
 import { EditorContextKeys } from 'monaco-editor/esm/vs/editor/common/editorContextKeys.js';
 import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
 import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
@@ -14,7 +14,11 @@ 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, ( nls.localize('editorWordWrap', 'Whether the editor is currently using word wrapping.'))));
+const EDITOR_WORD_WRAP = ( new RawContextKey(
+    'editorWordWrap',
+    false,
+    nls.localizeWithPath('vs/workbench/contrib/codeEditor/browser/toggleWordWrap', 'editorWordWrap', 'Whether the editor is currently using word wrapping.')
+));
 function writeTransientState(model, state, codeEditorService) {
     codeEditorService.setTransientModelProperty(model, transientWordWrapState, state);
 }
@@ -26,7 +30,7 @@ class ToggleWordWrapAction extends EditorAction {
     constructor() {
         super({
             id: TOGGLE_WORD_WRAP_ID,
-            label: ( nls.localize('toggle.wordwrap', "View: Toggle Word Wrap")),
+            label: nls.localizeWithPath('vs/workbench/contrib/codeEditor/browser/toggleWordWrap', 'toggle.wordwrap', "View: Toggle Word Wrap"),
             alias: 'View: Toggle Word Wrap',
             precondition: undefined,
             kbOpts: {
@@ -245,7 +249,7 @@ registerEditorAction(ToggleWordWrapAction);
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
         id: TOGGLE_WORD_WRAP_ID,
-        title: ( nls.localize('unwrapMinified', "Disable wrapping for this file")),
+        title: nls.localizeWithPath('vs/workbench/contrib/codeEditor/browser/toggleWordWrap', 'unwrapMinified', "Disable wrapping for this file"),
         icon: Codicon.wordWrap
     },
     group: 'navigation',
@@ -255,7 +259,7 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
         id: TOGGLE_WORD_WRAP_ID,
-        title: ( nls.localize('wrapMinified', "Enable wrapping for this file")),
+        title: nls.localizeWithPath('vs/workbench/contrib/codeEditor/browser/toggleWordWrap', 'wrapMinified', "Enable wrapping for this file"),
         icon: Codicon.wordWrap
     },
     group: 'navigation',
@@ -265,10 +269,7 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
 MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
     command: {
         id: TOGGLE_WORD_WRAP_ID,
-        title: ( nls.localize(
-            { key: 'miToggleWordWrap', comment: ['&& denotes a mnemonic'] },
-            "&&Word Wrap"
-        )),
+        title: nls.localizeWithPath('vs/workbench/contrib/codeEditor/browser/toggleWordWrap', { key: 'miToggleWordWrap', comment: ['&& denotes a mnemonic'] }, "&&Word Wrap"),
         toggled: EDITOR_WORD_WRAP,
         precondition: CAN_TOGGLE_WORD_WRAP
     },

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

@@ -1,21 +1,12 @@
 import * as languages from 'monaco-editor/esm/vs/editor/common/languages.js';
 import * as nls from 'monaco-editor/esm/vs/nls.js';
 import { registerColor, disabledForeground, contrastBorder, listFocusOutline, transparent } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
-const resolvedCommentViewIcon = registerColor('commentsView.resolvedIcon', { dark: disabledForeground, light: disabledForeground, hcDark: contrastBorder, hcLight: contrastBorder }, ( nls.localize('resolvedCommentIcon', 'Icon color for resolved comments.')));
-const unresolvedCommentViewIcon = registerColor('commentsView.unresolvedIcon', { dark: listFocusOutline, light: listFocusOutline, hcDark: contrastBorder, hcLight: contrastBorder }, ( nls.localize('unresolvedCommentIcon', 'Icon color for unresolved comments.')));
-const resolvedCommentBorder = registerColor('editorCommentsWidget.resolvedBorder', { dark: resolvedCommentViewIcon, light: resolvedCommentViewIcon, hcDark: contrastBorder, hcLight: contrastBorder }, ( nls.localize(
-    'resolvedCommentBorder',
-    'Color of borders and arrow for resolved comments.'
-)));
-const unresolvedCommentBorder = registerColor('editorCommentsWidget.unresolvedBorder', { dark: unresolvedCommentViewIcon, light: unresolvedCommentViewIcon, hcDark: contrastBorder, hcLight: contrastBorder }, ( nls.localize(
-    'unresolvedCommentBorder',
-    'Color of borders and arrow for unresolved comments.'
-)));
-registerColor('editorCommentsWidget.rangeBackground', { dark: ( transparent(unresolvedCommentBorder, .1)), light: ( transparent(unresolvedCommentBorder, .1)), hcDark: ( transparent(unresolvedCommentBorder, .1)), hcLight: ( transparent(unresolvedCommentBorder, .1)) }, ( nls.localize('commentThreadRangeBackground', 'Color of background for comment ranges.')));
-registerColor('editorCommentsWidget.rangeActiveBackground', { dark: ( transparent(unresolvedCommentBorder, .1)), light: ( transparent(unresolvedCommentBorder, .1)), hcDark: ( transparent(unresolvedCommentBorder, .1)), hcLight: ( transparent(unresolvedCommentBorder, .1)) }, ( nls.localize(
-    'commentThreadActiveRangeBackground',
-    'Color of background for currently selected or hovered comment range.'
-)));
+const resolvedCommentViewIcon = registerColor('commentsView.resolvedIcon', { dark: disabledForeground, light: disabledForeground, hcDark: contrastBorder, hcLight: contrastBorder }, nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentColors', 'resolvedCommentIcon', 'Icon color for resolved comments.'));
+const unresolvedCommentViewIcon = registerColor('commentsView.unresolvedIcon', { dark: listFocusOutline, light: listFocusOutline, hcDark: contrastBorder, hcLight: contrastBorder }, nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentColors', 'unresolvedCommentIcon', 'Icon color for unresolved comments.'));
+const resolvedCommentBorder = registerColor('editorCommentsWidget.resolvedBorder', { dark: resolvedCommentViewIcon, light: resolvedCommentViewIcon, hcDark: contrastBorder, hcLight: contrastBorder }, nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentColors', 'resolvedCommentBorder', 'Color of borders and arrow for resolved comments.'));
+const unresolvedCommentBorder = registerColor('editorCommentsWidget.unresolvedBorder', { dark: unresolvedCommentViewIcon, light: unresolvedCommentViewIcon, hcDark: contrastBorder, hcLight: contrastBorder }, nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentColors', 'unresolvedCommentBorder', 'Color of borders and arrow for unresolved comments.'));
+registerColor('editorCommentsWidget.rangeBackground', { dark: ( transparent(unresolvedCommentBorder, .1)), light: ( transparent(unresolvedCommentBorder, .1)), hcDark: ( transparent(unresolvedCommentBorder, .1)), hcLight: ( transparent(unresolvedCommentBorder, .1)) }, nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentColors', 'commentThreadRangeBackground', 'Color of background for comment ranges.'));
+registerColor('editorCommentsWidget.rangeActiveBackground', { dark: ( transparent(unresolvedCommentBorder, .1)), light: ( transparent(unresolvedCommentBorder, .1)), hcDark: ( transparent(unresolvedCommentBorder, .1)), hcLight: ( transparent(unresolvedCommentBorder, .1)) }, nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentColors', 'commentThreadActiveRangeBackground', 'Color of background for currently selected or hovered comment range.'));
 const commentThreadStateBorderColors = ( new Map([
     [languages.CommentThreadState.Unresolved, unresolvedCommentBorder],
     [languages.CommentThreadState.Resolved, resolvedCommentBorder],

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

@@ -5,26 +5,11 @@ import { ModelDecorationOptions } from 'monaco-editor/esm/vs/editor/common/model
 import { registerColor, opaque, listInactiveSelectionBackground, editorBackground, darken, editorForeground } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
 import { themeColorFromId } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
 import { CommentThreadState } from 'monaco-editor/esm/vs/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 }, ( nls.localize(
-    'editorGutterCommentRangeForeground',
-    'Editor gutter decoration color for commenting ranges. This color should be opaque.'
-)));
-const overviewRulerCommentForeground = registerColor('editorOverviewRuler.commentForeground', { dark: overviewRulerCommentingRangeForeground, light: overviewRulerCommentingRangeForeground, hcDark: overviewRulerCommentingRangeForeground, hcLight: overviewRulerCommentingRangeForeground }, ( nls.localize(
-    'editorOverviewRuler.commentForeground',
-    'Editor overview ruler decoration color for resolved comments. This color should be opaque.'
-)));
-const overviewRulerCommentUnresolvedForeground = registerColor('editorOverviewRuler.commentUnresolvedForeground', { dark: overviewRulerCommentForeground, light: overviewRulerCommentForeground, hcDark: overviewRulerCommentForeground, hcLight: overviewRulerCommentForeground }, ( nls.localize(
-    'editorOverviewRuler.commentUnresolvedForeground',
-    '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 }, ( nls.localize(
-    'editorGutterCommentGlyphForeground',
-    'Editor gutter decoration color for commenting glyphs.'
-)));
-registerColor('editorGutter.commentUnresolvedGlyphForeground', { dark: editorGutterCommentGlyphForeground, light: editorGutterCommentGlyphForeground, hcDark: editorGutterCommentGlyphForeground, hcLight: editorGutterCommentGlyphForeground }, ( nls.localize(
-    'editorGutterCommentUnresolvedGlyphForeground',
-    'Editor gutter decoration color for commenting glyphs for unresolved comment threads.'
-)));
+const overviewRulerCommentingRangeForeground = registerColor('editorGutter.commentRangeForeground', { dark: opaque(listInactiveSelectionBackground, editorBackground), light: ( darken(opaque(listInactiveSelectionBackground, editorBackground), .05)), hcDark: Color.white, hcLight: Color.black }, nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentGlyphWidget', 'editorGutterCommentRangeForeground', 'Editor gutter decoration color for commenting ranges. This color should be opaque.'));
+const overviewRulerCommentForeground = registerColor('editorOverviewRuler.commentForeground', { dark: overviewRulerCommentingRangeForeground, light: overviewRulerCommentingRangeForeground, hcDark: overviewRulerCommentingRangeForeground, hcLight: overviewRulerCommentingRangeForeground }, nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentGlyphWidget', 'editorOverviewRuler.commentForeground', 'Editor overview ruler decoration color for resolved comments. This color should be opaque.'));
+const overviewRulerCommentUnresolvedForeground = registerColor('editorOverviewRuler.commentUnresolvedForeground', { dark: overviewRulerCommentForeground, light: overviewRulerCommentForeground, hcDark: overviewRulerCommentForeground, hcLight: overviewRulerCommentForeground }, nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentGlyphWidget', 'editorOverviewRuler.commentUnresolvedForeground', '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 }, nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentGlyphWidget', 'editorGutterCommentGlyphForeground', 'Editor gutter decoration color for commenting glyphs.'));
+registerColor('editorGutter.commentUnresolvedGlyphForeground', { dark: editorGutterCommentGlyphForeground, light: editorGutterCommentGlyphForeground, hcDark: editorGutterCommentGlyphForeground, hcLight: editorGutterCommentGlyphForeground }, nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentGlyphWidget', 'editorGutterCommentUnresolvedGlyphForeground', 'Editor gutter decoration color for commenting glyphs for unresolved comment threads.'));
 class CommentGlyphWidget {
     static { this.description = 'comment-glyph-widget'; }
     constructor(editor, lineNumber) {

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

@@ -300,7 +300,7 @@ let CommentNode = class CommentNode extends Disposable {
     createReactionPicker(reactionGroup) {
         const toggleReactionAction = this._register(( new ToggleReactionsAction(() => {
             toggleReactionActionViewItem?.show();
-        }, ( nls.localize('commentToggleReaction', "Toggle Reaction")))));
+        }, nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentNode', 'commentToggleReaction', "Toggle Reaction"))));
         let reactionMenuActions = [];
         if (reactionGroup && reactionGroup.length) {
             reactionMenuActions = ( reactionGroup.map((reaction) => {
@@ -315,15 +315,8 @@ let CommentNode = class CommentNode extends Disposable {
                         }
                         catch (e) {
                             const error = e.message
-                                ? ( nls.localize(
-                                'commentToggleReactionError',
-                                "Toggling the comment reaction failed: {0}.",
-                                e.message
-                            ))
-                                : ( nls.localize(
-                                'commentToggleReactionDefaultError',
-                                "Toggling the comment reaction failed"
-                            ));
+                                ? nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentNode', 'commentToggleReactionError', "Toggling the comment reaction failed: {0}.", e.message)
+                                : nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentNode', 'commentToggleReactionDefaultError', "Toggling the comment reaction failed");
                             this.notificationService.error(error);
                         }
                     }

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

@@ -151,8 +151,8 @@ let CommentReply = class CommentReply extends Disposable {
             const placeholder = valueLength > 0
                 ? ''
                 : hasExistingComments
-                    ? (this._commentOptions?.placeHolder || ( nls.localize('reply', "Reply...")))
-                    : (this._commentOptions?.placeHolder || ( nls.localize('newComment', "Type a new comment")));
+                    ? (this._commentOptions?.placeHolder || nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentReply', 'reply', "Reply..."))
+                    : (this._commentOptions?.placeHolder || nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentReply', 'newComment', "Type a new comment"));
             const decorations = [{
                     range: {
                         startLineNumber: 0,
@@ -270,8 +270,8 @@ let CommentReply = class CommentReply extends Disposable {
     }
     createReplyButton(commentEditor, commentForm) {
         this._reviewThreadReplyButton = dom.append(commentForm, dom.$(`button.review-thread-reply-button.${MOUSE_CURSOR_TEXT_CSS_CLASS_NAME}`));
-        this._reviewThreadReplyButton.title = this._commentOptions?.prompt || ( nls.localize('reply', "Reply..."));
-        this._reviewThreadReplyButton.textContent = this._commentOptions?.prompt || ( nls.localize('reply', "Reply..."));
+        this._reviewThreadReplyButton.title = this._commentOptions?.prompt || nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentReply', 'reply', "Reply...");
+        this._reviewThreadReplyButton.textContent = this._commentOptions?.prompt || nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentReply', 'reply', "Reply...");
         this._register(dom.addDisposableListener(this._reviewThreadReplyButton, 'click', _ => this.clearAndExpandReplyArea()));
         this._register(dom.addDisposableListener(this._reviewThreadReplyButton, 'focus', _ => this.clearAndExpandReplyArea()));
         commentEditor.onDidBlurEditorWidget(() => {

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

@@ -182,31 +182,14 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
     _updateAriaLabel() {
         if (this._commentThread.isDocumentCommentThread()) {
             if (this._commentThread.range) {
-                this._commentsElement.ariaLabel = ( nls.localize(
-                    'commentThreadAria.withRange',
-                    "Comment thread with {0} comments on lines {1} through {2}. {3}.",
-                    this._commentThread.comments?.length,
-                    this._commentThread.range.startLineNumber,
-                    this._commentThread.range.endLineNumber,
-                    this._commentThread.label
-                ));
+                this._commentsElement.ariaLabel = nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentThreadBody', 'commentThreadAria.withRange', "Comment thread with {0} comments on lines {1} through {2}. {3}.", this._commentThread.comments?.length, this._commentThread.range.startLineNumber, this._commentThread.range.endLineNumber, this._commentThread.label);
             }
             else {
-                this._commentsElement.ariaLabel = ( nls.localize(
-                    'commentThreadAria.document',
-                    "Comment thread with {0} comments on the entire document. {1}.",
-                    this._commentThread.comments?.length,
-                    this._commentThread.label
-                ));
+                this._commentsElement.ariaLabel = nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentThreadBody', 'commentThreadAria.document', "Comment thread with {0} comments on the entire document. {1}.", this._commentThread.comments?.length, this._commentThread.label);
             }
         }
         else {
-            this._commentsElement.ariaLabel = ( nls.localize(
-                'commentThreadAria',
-                "Comment thread with {0} comments. {1}.",
-                this._commentThread.comments?.length,
-                this._commentThread.label
-            ));
+            this._commentsElement.ariaLabel = nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentThreadBody', 'commentThreadAria', "Comment thread with {0} comments. {1}.", this._commentThread.comments?.length, this._commentThread.label);
         }
     }
     _setFocusedComment(value) {

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

@@ -9,7 +9,7 @@ import { createActionViewItem } from 'monaco-editor/esm/vs/platform/actions/brow
 import { registerIcon } from 'monaco-editor/esm/vs/platform/theme/common/iconRegistry.js';
 import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
 import { StandardMouseEvent } from 'monaco-editor/esm/vs/base/browser/mouseEvent.js';
-const collapseIcon = registerIcon('review-comment-collapse', Codicon.chevronUp, ( nls.localize('collapseIcon', 'Icon to collapse a review comment.')));
+const collapseIcon = registerIcon('review-comment-collapse', Codicon.chevronUp, nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentThreadHeader', 'collapseIcon', 'Icon to collapse a review comment.'));
 const COLLAPSE_ACTION_CLASS = 'expand-review-action ' + ThemeIcon.asClassName(collapseIcon);
 class CommentThreadHeader extends Disposable {
     constructor(container, _delegate, _commentMenus, _commentThread, _contextKeyService, instantiationService, _contextMenuService) {
@@ -33,7 +33,13 @@ class CommentThreadHeader extends Disposable {
             actionViewItemProvider: createActionViewItem.bind(undefined, this.instantiationService)
         }));
         this._register(this._actionbarWidget);
-        this._collapseAction = ( new Action('review.expand', ( nls.localize('label.collapse', "Collapse")), COLLAPSE_ACTION_CLASS, true, () => this._delegate.collapse()));
+        this._collapseAction = ( new Action(
+            'review.expand',
+            nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentThreadHeader', 'label.collapse', "Collapse"),
+            COLLAPSE_ACTION_CLASS,
+            true,
+            () => this._delegate.collapse()
+        ));
         const menu = this._commentMenus.getCommentThreadTitleActions(this._contextKeyService);
         this.setActionBarActions(menu);
         this._register(menu);
@@ -60,7 +66,7 @@ class CommentThreadHeader extends Disposable {
         label = this._commentThread.label;
         if (label === undefined) {
             if (!(this._commentThread.comments && this._commentThread.comments.length)) {
-                label = ( nls.localize('startThread', "Start discussion"));
+                label = nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentThreadHeader', 'startThread', "Start discussion");
             }
         }
         if (label) {

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

@@ -17,7 +17,7 @@ import { IContextMenuService } from 'monaco-editor/esm/vs/platform/contextview/b
 import { registerNavigableContainer } from '../../../browser/actions/widgetNavigationCommands.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
 import { COMMENTS_SECTION } from '../common/commentsConfiguration.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
 let CommentThreadWidget = class CommentThreadWidget extends Disposable {
     get commentThread() {
@@ -88,26 +88,17 @@ let CommentThreadWidget = class CommentThreadWidget extends Disposable {
         this.currentThreadListeners();
     }
     _setAriaLabel() {
-        let ariaLabel = ( localize('commentLabel', "Comment"));
+        let ariaLabel = localizeWithPath('vs/workbench/contrib/comments/browser/commentThreadWidget', 'commentLabel', "Comment");
         let keybinding;
         const verbose = this.configurationService.getValue("accessibility.verbosity.comments" );
         if (verbose) {
             keybinding = this._keybindingService.lookupKeybinding("editor.action.accessibilityHelp" , this._contextKeyService)?.getLabel() ?? undefined;
         }
         if (keybinding) {
-            ariaLabel = ( localize(
-                'commentLabelWithKeybinding',
-                "{0}, use ({1}) for accessibility help",
-                ariaLabel,
-                keybinding
-            ));
+            ariaLabel = localizeWithPath('vs/workbench/contrib/comments/browser/commentThreadWidget', 'commentLabelWithKeybinding', "{0}, use ({1}) for accessibility help", ariaLabel, keybinding);
         }
         else {
-            ariaLabel = ( localize(
-                'commentLabelWithKeybindingNoKeybinding',
-                "{0}, run the command Open Accessibility Help which is currently not triggerable via keybinding.",
-                ariaLabel
-            ));
+            ariaLabel = localizeWithPath('vs/workbench/contrib/comments/browser/commentThreadWidget', 'commentLabelWithKeybindingNoKeybinding', "{0}, run the command Open Accessibility Help which is currently not triggerable via keybinding.", ariaLabel);
         }
         this._body.container.ariaLabel = ariaLabel;
     }