@codingame/monaco-vscode-api 7.1.0 → 7.1.1

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

@@ -1,10 +1,10 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { append, $ } from '../../../../base/browser/dom.js';
-import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
+import { localize2, localize } from '../../../../nls.js';
 import { renderMarkdown } from '../../../../base/browser/markdownRenderer.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.service.js';
-import { ResourceWithCommentThreads, CommentNode } from '../common/commentModel.js';
+import { CommentNode, ResourceWithCommentThreads } from '../common/commentModel.js';
 import { TreeVisibility } from '../../../../base/browser/ui/tree/tree.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
@@ -31,10 +31,9 @@ import { IContextMenuService } from '../../../../platform/contextview/browser/co
 import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
-const _moduleId = "vs/workbench/contrib/comments/browser/commentsTreeViewer";
 const COMMENTS_VIEW_ID = 'workbench.panel.comments';
 const COMMENTS_VIEW_STORAGE_ID = 'Comments';
-const COMMENTS_VIEW_TITLE = ( localize2WithPath(_moduleId, 0, "Comments"));
+const COMMENTS_VIEW_TITLE = ( localize2(5319, "Comments"));
 class CommentsModelVirualDelegate {
     static { this.RESOURCE_ID = 'resource-with-comments'; }
     static { this.COMMENT_ID = 'comment-node'; }
@@ -88,7 +87,7 @@ let CommentsMenus = class CommentsMenus {
     }
     getResourceActions(element) {
         const actions = this.getActions(MenuId.CommentsViewThreadActions, element);
-        return { menu: actions.menu, actions: actions.primary };
+        return { actions: actions.primary };
     }
     getResourceContextActions(element) {
         return this.getActions(MenuId.CommentsViewThreadActions, element).secondary;
@@ -107,12 +106,11 @@ let CommentsMenus = class CommentsMenus {
             ['canReply', element.thread.canReply]
         ];
         const contextKeyService = this.contextKeyService.createOverlay(overlay);
-        const menu = this.menuService.createMenu(menuId, contextKeyService);
+        const menu = this.menuService.getMenuActions(menuId, contextKeyService, { shouldForwardArgs: true });
         const primary = [];
         const secondary = [];
         const result = { primary, secondary, menu };
-        createAndFillInContextMenuActions(menu, { shouldForwardArgs: true }, result, 'inline');
-        menu.dispose();
+        createAndFillInContextMenuActions(menu, result, 'inline');
         return result;
     }
     dispose() {
@@ -174,13 +172,13 @@ let CommentNodeRenderer = class CommentNodeRenderer {
     }
     getCountString(commentCount) {
         if (commentCount > 2) {
-            return ( localizeWithPath(_moduleId, 1, "{0} replies", commentCount - 1));
+            return ( localize(5320, "{0} replies", commentCount - 1));
         }
         else if (commentCount === 2) {
-            return ( localizeWithPath(_moduleId, 2, "1 reply"));
+            return ( localize(5321, "1 reply"));
         }
         else {
-            return ( localizeWithPath(_moduleId, 3, "1 comment"));
+            return ( localize(5322, "1 comment"));
         }
     }
     getRenderedComment(commentBody, disposables) {
@@ -195,7 +193,7 @@ let CommentNodeRenderer = class CommentNodeRenderer {
         for (let i = 0; i < images.length; i++) {
             const image = images[i];
             const textDescription = $('');
-            textDescription.textContent = image.alt ? ( localizeWithPath(_moduleId, 4, "Image: {0}", image.alt)) : ( localizeWithPath(_moduleId, 5, "Image"));
+            textDescription.textContent = image.alt ? ( localize(5323, "Image: {0}", image.alt)) : ( localize(5324, "Image"));
             image.parentNode.replaceChild(textDescription, image);
         }
         return renderedComment;
@@ -213,7 +211,7 @@ let CommentNodeRenderer = class CommentNodeRenderer {
         const commentCount = node.element.replies.length + 1;
         if (node.element.threadRelevance === CommentThreadApplicability.Outdated) {
             templateData.threadMetadata.relevance.style.display = '';
-            templateData.threadMetadata.relevance.innerText = ( localizeWithPath(_moduleId, 6, "Outdated"));
+            templateData.threadMetadata.relevance.innerText = ( localize(5325, "Outdated"));
             templateData.threadMetadata.separator.style.display = 'none';
         }
         else {
@@ -247,12 +245,11 @@ let CommentNodeRenderer = class CommentNodeRenderer {
         }
         if (node.element.range) {
             if (node.element.range.startLineNumber === node.element.range.endLineNumber) {
-                templateData.threadMetadata.range.textContent = ( localizeWithPath(_moduleId, 7, "[Ln {0}]", node.element.range.startLineNumber));
+                templateData.threadMetadata.range.textContent = ( localize(5326, "[Ln {0}]", node.element.range.startLineNumber));
             }
             else {
-                templateData.threadMetadata.range.textContent = ( localizeWithPath(
-                    _moduleId,
-                    8,
+                templateData.threadMetadata.range.textContent = ( localize(
+                    5327,
                     "[Ln {0}-{1}]",
                     node.element.range.startLineNumber,
                     node.element.range.endLineNumber
@@ -273,7 +270,7 @@ let CommentNodeRenderer = class CommentNodeRenderer {
         templateData.repliesMetadata.container.style.display = '';
         templateData.repliesMetadata.count.textContent = this.getCountString(commentCount);
         const lastComment = node.element.replies[node.element.replies.length - 1].comment;
-        templateData.repliesMetadata.lastReplyDetail.textContent = ( localizeWithPath(_moduleId, 9, "Last reply from {0}", lastComment.userName));
+        templateData.repliesMetadata.lastReplyDetail.textContent = ( localize(5328, "Last reply from {0}", lastComment.userName));
         templateData.repliesMetadata.timestamp.setTimestamp(lastComment.timestamp ? ( (new Date(lastComment.timestamp))) : undefined);
     }
     getCommentThreadWidgetStateColor(state, theme) {

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

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/panel.css.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { append, $, isActiveElement } from '../../../../base/browser/dom.js';
 import { basename } from '../../../../base/common/resources.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -34,9 +34,9 @@ import { CommentsModel } from './commentsModel.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
 import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
 import { AccessibleViewAction } from '../../accessibility/browser/accessibleViewActions.js';
-const _moduleId = "vs/workbench/contrib/comments/browser/commentsView";
 const CONTEXT_KEY_HAS_COMMENTS = ( (new RawContextKey('commentsView.hasComments', false)));
 const CONTEXT_KEY_SOME_COMMENTS_EXPANDED = ( (new RawContextKey('commentsView.someCommentsExpanded', false)));
+const CONTEXT_KEY_COMMENT_FOCUSED = ( (new RawContextKey('commentsView.commentFocused', false)));
 const VIEW_STORAGE_ID = 'commentsViewState';
 function createResourceCommentsIterator(model) {
     return (
@@ -101,8 +101,8 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
         super({
             ...options,
             filterOptions: {
-                placeholder: ( localizeWithPath(_moduleId, 0, "Filter (e.g. text, author)")),
-                ariaLabel: ( localizeWithPath(_moduleId, 1, "Filter comments")),
+                placeholder: ( localize(5329, "Filter (e.g. text, author)")),
+                ariaLabel: ( localize(5330, "Filter comments")),
                 history: viewState['filterHistory'] || [],
                 text: viewState['filter'] || '',
                 focusContextKey: CommentsViewFilterFocusContextKey.key
@@ -118,6 +118,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
         this.onDidChangeVisibility = this.onDidChangeBodyVisibility;
         this.hasCommentsContextKey = CONTEXT_KEY_HAS_COMMENTS.bindTo(contextKeyService);
         this.someCommentsExpandedContextKey = CONTEXT_KEY_SOME_COMMENTS_EXPANDED.bindTo(contextKeyService);
+        this.commentsFocusedContextKey = CONTEXT_KEY_COMMENT_FOCUSED.bindTo(contextKeyService);
         this.stateMemento = stateMemento;
         this.viewState = viewState;
         this.filters = this._register(( (new CommentsFilters({
@@ -185,7 +186,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
         this.tree?.filterComments();
         this.cachedFilterStats = undefined;
         const { total, filtered } = this.getFilterStats();
-        this.filterWidget.updateBadge(total === filtered || total === 0 ? undefined : ( localizeWithPath(_moduleId, 2, "Showing {0} of {1}", filtered, total)));
+        this.filterWidget.updateBadge(total === filtered || total === 0 ? undefined : ( localize(5331, "Showing {0} of {1}", filtered, total)));
         this.filterWidget.checkMoreFilters(!this.filters.showResolved || !this.filters.showUnresolved);
     }
     renderBody(container) {
@@ -266,9 +267,8 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
         let accessibleViewHint = '';
         if (forAriaLabel && this.configurationService.getValue(AccessibilityVerbositySettingId.Comments)) {
             const kbLabel = this.keybindingService.lookupKeybinding(AccessibleViewAction.id)?.getAriaLabel();
-            accessibleViewHint = kbLabel ? ( localizeWithPath(_moduleId, 3, "Inspect this in the accessible view ({0}).\n", kbLabel)) : ( localizeWithPath(
-                _moduleId,
-                4,
+            accessibleViewHint = kbLabel ? ( localize(5332, "Inspect this in the accessible view ({0}).\n", kbLabel)) : ( localize(
+                5333,
                 "Inspect this in the accessible view via the command Open Accessible View which is currently not triggerable via keybinding.\n"
             ));
         }
@@ -276,9 +276,8 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
         const replies = this.getRepliesAsString(element, forAriaLabel);
         if (element.range) {
             if (element.threadRelevance === CommentThreadApplicability.Outdated) {
-                return accessibleViewHint + ( localizeWithPath(
-                    _moduleId,
-                    5,
+                return accessibleViewHint + ( localize(
+                    5334,
                     "Outdated from {0} at line {1} column {2} in {3},{4} comment: {5}",
                     element.comment.userName,
                     element.range.startLineNumber,
@@ -289,9 +288,8 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
                 )) + replies;
             }
             else {
-                return accessibleViewHint + ( localizeWithPath(
-                    _moduleId,
-                    6,
+                return accessibleViewHint + ( localize(
+                    5335,
                     "{0} at line {1} column {2} in {3},{4} comment: {5}",
                     element.comment.userName,
                     element.range.startLineNumber,
@@ -304,9 +302,8 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
         }
         else {
             if (element.threadRelevance === CommentThreadApplicability.Outdated) {
-                return accessibleViewHint + ( localizeWithPath(
-                    _moduleId,
-                    7,
+                return accessibleViewHint + ( localize(
+                    5336,
                     "Outdated from {0} in {1},{2} comment: {3}",
                     element.comment.userName,
                     basename(element.resource),
@@ -315,9 +312,8 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
                 )) + replies;
             }
             else {
-                return accessibleViewHint + ( localizeWithPath(
-                    _moduleId,
-                    8,
+                return accessibleViewHint + ( localize(
+                    5337,
                     "{0} in {1},{2} comment: {3}",
                     element.comment.userName,
                     basename(element.resource),
@@ -331,16 +327,15 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
         if (!node.replies.length || forAriaLabel) {
             return '';
         }
-        return '\n' + ( (node.replies.map(reply => ( localizeWithPath(
-            _moduleId,
-            9,
+        return '\n' + ( (node.replies.map(reply => ( localize(
+            5338,
             "{0} {1}",
             reply.comment.userName,
             (typeof reply.comment.body === 'string') ? reply.comment.body : reply.comment.body.value
         ))))).join('\n');
     }
     getReplyCountAsString(node, forAriaLabel) {
-        return node.replies.length && !forAriaLabel ? ( localizeWithPath(_moduleId, 10, " {0} replies,", node.replies.length)) : '';
+        return node.replies.length && !forAriaLabel ? ( localize(5339, " {0} replies,", node.replies.length)) : '';
     }
     createTree() {
         this.treeLabels = this._register(this.instantiationService.createInstance(ResourceLabels, this));
@@ -356,12 +351,11 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
             accessibilityProvider: {
                 getAriaLabel: (element) => {
                     if (element instanceof CommentsModel) {
-                        return ( localizeWithPath(_moduleId, 11, "Comments for current workspace"));
+                        return ( localize(5340, "Comments for current workspace"));
                     }
                     if (element instanceof ResourceWithCommentThreads) {
-                        return ( localizeWithPath(
-                            _moduleId,
-                            12,
+                        return ( localize(
+                            5341,
                             "Comments in {0}, full path {1}",
                             basename(element.resource),
                             element.resource.fsPath
@@ -386,6 +380,8 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
         this._register(this.tree.onDidChangeCollapseState(() => {
             this.updateSomeCommentsExpanded();
         }));
+        this._register(this.tree.onDidFocus(() => this.commentsFocusedContextKey.set(true)));
+        this._register(this.tree.onDidBlur(() => this.commentsFocusedContextKey.set(false)));
     }
     openFile(element, pinned, preserveFocus, sideBySide) {
         if (!element) {
@@ -483,4 +479,4 @@ CommentsPanel = ( (__decorate([
     ( (__param(13, IUriIdentityService))),
     ( (__param(14, IStorageService)))
 ], CommentsPanel)));
-export { CONTEXT_KEY_HAS_COMMENTS, CONTEXT_KEY_SOME_COMMENTS_EXPANDED, CommentsPanel };
+export { CONTEXT_KEY_COMMENT_FOCUSED, CONTEXT_KEY_HAS_COMMENTS, CONTEXT_KEY_SOME_COMMENTS_EXPANDED, CommentsPanel };

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

@@ -1,6 +1,6 @@
 import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { ContextKeyExpr, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { CommentsViewFilterFocusContextKey } from './comments.js';
@@ -10,7 +10,6 @@ import { KeybindingWeight } from '../../../../platform/keybinding/common/keybind
 import { COMMENTS_VIEW_ID } from './commentsTreeViewer.js';
 import { FocusedViewContext } from '../../../common/contextkeys.js';
 import { viewFilterSubmenu } from '../../../browser/parts/views/viewFilter.js';
-const _moduleId = "vs/workbench/contrib/comments/browser/commentsViewActions";
 const CONTEXT_KEY_SHOW_RESOLVED = ( (new RawContextKey('commentsView.showResolvedFilter', true)));
 const CONTEXT_KEY_SHOW_UNRESOLVED = ( (new RawContextKey('commentsView.showUnResolvedFilter', true)));
 class CommentsFilters extends Disposable {
@@ -47,7 +46,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'commentsFocusViewFromFilter',
-            title: ( localizeWithPath(_moduleId, 0, "Focus Comments view")),
+            title: ( localize(9994, "Focus Comments view")),
             keybinding: {
                 when: CommentsViewFilterFocusContextKey,
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -64,7 +63,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'commentsClearFilterText',
-            title: ( localizeWithPath(_moduleId, 1, "Clear filter text")),
+            title: ( localize(9995, "Clear filter text")),
             keybinding: {
                 when: CommentsViewFilterFocusContextKey,
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -81,7 +80,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'commentsFocusFilter',
-            title: ( localizeWithPath(_moduleId, 2, "Focus comments filter")),
+            title: ( localize(9996, "Focus comments filter")),
             keybinding: {
                 when: ( (FocusedViewContext.isEqualTo(COMMENTS_VIEW_ID))),
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -98,11 +97,11 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: `workbench.actions.${COMMENTS_VIEW_ID}.toggleUnResolvedComments`,
-            title: ( localizeWithPath(_moduleId, 3, "Show Unresolved")),
-            category: ( localizeWithPath(_moduleId, 4, "Comments")),
+            title: ( localize(9997, "Show Unresolved")),
+            category: ( localize(9998, "Comments")),
             toggled: {
                 condition: CONTEXT_KEY_SHOW_UNRESOLVED,
-                title: ( localizeWithPath(_moduleId, 5, "Show Unresolved")),
+                title: ( localize(9999, "Show Unresolved")),
             },
             menu: {
                 id: viewFilterSubmenu,
@@ -121,11 +120,11 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: `workbench.actions.${COMMENTS_VIEW_ID}.toggleResolvedComments`,
-            title: ( localizeWithPath(_moduleId, 6, "Show Resolved")),
-            category: ( localizeWithPath(_moduleId, 4, "Comments")),
+            title: ( localize(10000, "Show Resolved")),
+            category: ( localize(10000, "Comments")),
             toggled: {
                 condition: CONTEXT_KEY_SHOW_RESOLVED,
-                title: ( localizeWithPath(_moduleId, 7, "Show Resolved")),
+                title: ( localize(10001, "Show Resolved")),
             },
             menu: {
                 id: viewFilterSubmenu,

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

@@ -1,13 +1,12 @@
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { append, $, asCSSUrl } from '../../../../base/browser/dom.js';
 import { Action } from '../../../../base/common/actions.js';
 import { URI } from '../../../../base/common/uri.js';
 import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
-const _moduleId = "vs/workbench/contrib/comments/browser/reactionsAction";
 class ToggleReactionsAction extends Action {
     static { this.ID = 'toolbar.toggle.pickReactions'; }
     constructor(toggleDropdownMenu, title) {
-        super(ToggleReactionsAction.ID, title || ( localizeWithPath(_moduleId, 0, "Pick Reactions...")), 'toggle-reactions', true);
+        super(ToggleReactionsAction.ID, title || ( localize(11548, "Pick Reactions...")), 'toggle-reactions', true);
         this._menuActions = [];
         this.toggleDropdownMenu = toggleDropdownMenu;
     }
@@ -50,18 +49,17 @@ class ReactionActionViewItem extends ActionViewItem {
     }
     getTooltip() {
         const action = this.action;
-        const toggleMessage = action.enabled ? ( localizeWithPath(_moduleId, 1, "Toggle reaction, ")) : '';
+        const toggleMessage = action.enabled ? ( localize(11549, "Toggle reaction, ")) : '';
         if (action.count === undefined) {
-            return ( localizeWithPath(_moduleId, 2, "{0}{1} reaction", toggleMessage, action.label));
+            return ( localize(11550, "{0}{1} reaction", toggleMessage, action.label));
         }
         else if (action.reactors === undefined || action.reactors.length === 0) {
             if (action.count === 1) {
-                return ( localizeWithPath(_moduleId, 3, "{0}1 reaction with {1}", toggleMessage, action.label));
+                return ( localize(11551, "{0}1 reaction with {1}", toggleMessage, action.label));
             }
             else if (action.count > 1) {
-                return ( localizeWithPath(
-                    _moduleId,
-                    4,
+                return ( localize(
+                    11552,
                     "{0}{1} reactions with {2}",
                     toggleMessage,
                     action.count,
@@ -71,9 +69,8 @@ class ReactionActionViewItem extends ActionViewItem {
         }
         else {
             if (action.reactors.length <= 10 && action.reactors.length === action.count) {
-                return ( localizeWithPath(
-                    _moduleId,
-                    5,
+                return ( localize(
+                    11553,
                     "{0}{1} reacted with {2}",
                     toggleMessage,
                     action.reactors.join(', '),
@@ -82,9 +79,8 @@ class ReactionActionViewItem extends ActionViewItem {
             }
             else if (action.count > 1) {
                 const displayedReactors = action.reactors.slice(0, 10);
-                return ( localizeWithPath(
-                    _moduleId,
-                    6,
+                return ( localize(
+                    11554,
                     "{0}{1} and {2} more reacted with {3}",
                     toggleMessage,
                     displayedReactors.join(', '),

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

@@ -98,6 +98,7 @@ let SimpleCommentEditor = class SimpleCommentEditor extends CodeEditorWidget {
             autoClosingBrackets: configurationService.getValue('editor.autoClosingBrackets'),
             quickSuggestions: false,
             accessibilitySupport: configurationService.getValue('editor.accessibilitySupport'),
+            fontFamily: configurationService.getValue('editor.fontFamily'),
         };
     }
 };

package/vscode/src/vs/workbench/contrib/comments/common/commentContextKeys.js

@@ -1,24 +1,18 @@
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
-const _moduleId = "vs/workbench/contrib/comments/common/commentContextKeys";
 var CommentContextKeys;
 ( ((function(CommentContextKeys) {
     CommentContextKeys.activeCursorHasCommentingRange = ( (new RawContextKey('activeCursorHasCommentingRange', false, {
-        description: ( localizeWithPath(
-         _moduleId,
-         0,
-         "Whether the position at the active cursor has a commenting range"
-        )),
+        description: ( localize(5301, "Whether the position at the active cursor has a commenting range")),
         type: 'boolean'
     })));
     CommentContextKeys.activeEditorHasCommentingRange = ( (new RawContextKey('activeEditorHasCommentingRange', false, {
-        description: ( localizeWithPath(_moduleId, 1, "Whether the active editor has a commenting range")),
+        description: ( localize(5302, "Whether the active editor has a commenting range")),
         type: 'boolean'
     })));
     CommentContextKeys.WorkspaceHasCommenting = ( (new RawContextKey('workspaceHasCommenting', false, {
-        description: ( localizeWithPath(
-         _moduleId,
-         2,
+        description: ( localize(
+         5303,
          "Whether the open workspace has either comments or commenting ranges."
         )),
         type: 'boolean'
@@ -26,16 +20,16 @@ var CommentContextKeys;
     CommentContextKeys.commentThreadIsEmpty = ( (new RawContextKey(
      'commentThreadIsEmpty',
      false,
-     { type: 'boolean', description: ( localizeWithPath(_moduleId, 3, "Set when the comment thread has no comments")) }
+     { type: 'boolean', description: ( localize(5304, "Set when the comment thread has no comments")) }
     )));
-    CommentContextKeys.commentIsEmpty = ( (new RawContextKey('commentIsEmpty', false, { type: 'boolean', description: ( localizeWithPath(_moduleId, 4, "Set when the comment has no input")) })));
-    CommentContextKeys.commentContext = ( (new RawContextKey('comment', undefined, { type: 'string', description: ( localizeWithPath(_moduleId, 5, "The context value of the comment")) })));
-    CommentContextKeys.commentThreadContext = ( (new RawContextKey('commentThread', undefined, { type: 'string', description: ( localizeWithPath(_moduleId, 6, "The context value of the comment thread")) })));
+    CommentContextKeys.commentIsEmpty = ( (new RawContextKey('commentIsEmpty', false, { type: 'boolean', description: ( localize(5305, "Set when the comment has no input")) })));
+    CommentContextKeys.commentContext = ( (new RawContextKey('comment', undefined, { type: 'string', description: ( localize(5306, "The context value of the comment")) })));
+    CommentContextKeys.commentThreadContext = ( (new RawContextKey('commentThread', undefined, { type: 'string', description: ( localize(5307, "The context value of the comment thread")) })));
     CommentContextKeys.commentControllerContext = ( (new RawContextKey(
      'commentController',
      undefined,
-     { type: 'string', description: ( localizeWithPath(_moduleId, 7, "The comment controller id associated with a comment thread")) }
+     { type: 'string', description: ( localize(5308, "The comment controller id associated with a comment thread")) }
     )));
-    CommentContextKeys.commentFocused = ( (new RawContextKey('commentFocused', false, { type: 'boolean', description: ( localizeWithPath(_moduleId, 8, "Set when the comment is focused")) })));
+    CommentContextKeys.commentFocused = ( (new RawContextKey('commentFocused', false, { type: 'boolean', description: ( localize(5309, "Set when the comment is focused")) })));
 })(CommentContextKeys || (CommentContextKeys = {}))));
 export { CommentContextKeys };

package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditorInput.js

@@ -6,7 +6,7 @@ import { Schemas } from '../../../../base/common/network.js';
 import { basename } from '../../../../base/common/path.js';
 import { dirname, isEqual } from '../../../../base/common/resources.js';
 import { assertIsDefined } from '../../../../base/common/types.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { IFileDialogService } from '../../../../platform/dialogs/common/dialogs.service.js';
 import { IFileService } from '../../../../platform/files/common/files.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -23,7 +23,6 @@ import { IFilesConfigurationService } from '../../../services/filesConfiguration
 import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.service.js';
 import { IUntitledTextEditorService } from '../../../services/untitled/common/untitledTextEditorService.service.js';
 var CustomEditorInput_1;
-const _moduleId = "vs/workbench/contrib/customEditor/browser/customEditorInput";
 let CustomEditorInput = class CustomEditorInput extends LazilyResolvedWebviewEditorInput {
     static { CustomEditorInput_1 = this; }
     static create(instantiationService, resource, viewType, group, options) {
@@ -304,14 +303,13 @@ let CustomEditorInput = class CustomEditorInput extends LazilyResolvedWebviewEdi
     }
     claim(claimant, targetWindow, scopedContextKeyService) {
         if (this.doCanMove(targetWindow.vscodeWindowId) !== true) {
-            throw createEditorOpenError(localizeWithPath(
-                _moduleId,
-                0,
+            throw createEditorOpenError(localize(
+                9509,
                 "Unable to open the editor in this window, it contains modifications that can only be saved in the original window."
             ), [
                 toAction({
                     id: 'openInOriginalWindow',
-                    label: localizeWithPath(_moduleId, 1, "Open in Original Window"),
+                    label: localize(9510, "Open in Original Window"),
                     run: async () => {
                         const originalPart = this.editorGroupsService.getPart(this.layoutService.getContainer(getWindow(this.webview.container).window));
                         const currentPart = this.editorGroupsService.getPart(this.layoutService.getContainer(targetWindow.window));
@@ -336,9 +334,8 @@ let CustomEditorInput = class CustomEditorInput extends LazilyResolvedWebviewEdi
         if (this.isModified() && this._modelRef?.object.canHotExit === false) {
             const sourceWindowId = getWindow(this.webview.container).vscodeWindowId;
             if (sourceWindowId !== targetWindowId) {
-                return ( localizeWithPath(
-                    _moduleId,
-                    2,
+                return ( localize(
+                    9511,
                     "Unable to move '{0}': The editor contains changes that can only be saved in its current window.",
                     this.getName()
                 ));

package/vscode/src/vs/workbench/contrib/debug/browser/baseDebugView.js

@@ -10,7 +10,7 @@ import { createSingleCallFunction } from '../../../../base/common/functional.js'
 import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { toDisposable, DisposableStore, dispose } from '../../../../base/common/lifecycle.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
 import { IContextViewService } from '../../../../platform/contextview/browser/contextView.service.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
@@ -20,7 +20,6 @@ import { IDebugService } from '../common/debug.service.js';
 import { Expression, Variable, ExpressionContainer } from '../common/debugModel.js';
 import { IDebugVisualizerService } from '../common/debugVisualizers.service.js';
 import { ReplEvaluationResult } from '../common/replModel.js';
-const _moduleId = "vs/workbench/contrib/debug/browser/baseDebugView";
 const MAX_VALUE_RENDER_LENGTH_IN_VIEWLET = 1024;
 const booleanRegex = /^(true|false)$/i;
 const stringRegex = /^(['"]).*\1$/;
@@ -171,7 +170,7 @@ let AbstractExpressionsRenderer = class AbstractExpressionsRenderer {
         const name = append(expression, $('span.name'));
         const lazyButton = append(expression, $('span.lazy-button'));
         lazyButton.classList.add(...ThemeIcon.asClassNameArray(Codicon.eye));
-        templateDisposable.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), lazyButton, ( localizeWithPath(_moduleId, 0, "Click to expand"))));
+        templateDisposable.add(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), lazyButton, ( localize(10238, "Click to expand"))));
         const type = append(expression, $('span.type'));
         const value = append(expression, $('span.value'));
         const label = templateDisposable.add(( (new HighlightedLabel(name))));