@codingame/monaco-vscode-api 1.83.2 → 1.83.3

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

@@ -15,115 +15,64 @@ import { ToggleTabFocusModeAction } from 'monaco-editor/esm/vs/editor/contrib/to
 ( Registry.as(Extensions.Configuration)).registerConfiguration({
     id: 'comments',
     order: 20,
-    title: ( nls.localize('commentsConfigurationTitle', "Comments")),
+    title: nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'commentsConfigurationTitle', "Comments"),
     type: 'object',
     properties: {
         'comments.openPanel': {
             enum: ['neverOpen', 'openOnSessionStart', 'openOnSessionStartWithComments'],
             default: 'openOnSessionStartWithComments',
-            description: ( nls.localize('openComments', "Controls when the comments panel should open.")),
+            description: nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'openComments', "Controls when the comments panel should open."),
             restricted: false,
-            markdownDeprecationMessage: ( nls.localize(
-                'comments.openPanel.deprecated',
-                "This setting is deprecated in favor of `comments.openView`."
-            ))
+            markdownDeprecationMessage: nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'comments.openPanel.deprecated', "This setting is deprecated in favor of `comments.openView`.")
         },
         'comments.openView': {
             enum: ['never', 'file', 'firstFile', 'firstFileUnresolved'],
-            enumDescriptions: [( nls.localize('comments.openView.never', "The comments view will never be opened.")), ( nls.localize(
-                'comments.openView.file',
-                "The comments view will open when a file with comments is active."
-            )), ( nls.localize(
-                'comments.openView.firstFile',
-                "If the comments view has not been opened yet during this session it will open the first time during a session that a file with comments is active."
-            )), ( nls.localize(
-                'comments.openView.firstFileUnresolved',
-                "If the comments view has not been opened yet during this session and the comment is not resolved, it will open the first time during a session that a file with comments is active."
-            ))],
+            enumDescriptions: [nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'comments.openView.never', "The comments view will never be opened."), nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'comments.openView.file', "The comments view will open when a file with comments is active."), nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'comments.openView.firstFile', "If the comments view has not been opened yet during this session it will open the first time during a session that a file with comments is active."), nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'comments.openView.firstFileUnresolved', "If the comments view has not been opened yet during this session and the comment is not resolved, it will open the first time during a session that a file with comments is active.")],
             default: 'firstFile',
-            description: ( nls.localize('comments.openView', "Controls when the comments view should open.")),
+            description: nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'comments.openView', "Controls when the comments view should open."),
             restricted: false
         },
         'comments.useRelativeTime': {
             type: 'boolean',
             default: true,
-            description: ( nls.localize(
-                'useRelativeTime',
-                "Determines if relative time will be used in comment timestamps (ex. '1 day ago')."
-            ))
+            description: nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'useRelativeTime', "Determines if relative time will be used in comment timestamps (ex. '1 day ago').")
         },
         'comments.visible': {
             type: 'boolean',
             default: true,
-            description: ( nls.localize(
-                'comments.visible',
-                "Controls the visibility of the comments bar and comment threads in editors that have commenting ranges and comments. Comments are still accessible via the Comments view and will cause commenting to be toggled on in the same way running the command \"Comments: Toggle Editor Commenting\" toggles comments."
-            ))
+            description: nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'comments.visible', "Controls the visibility of the comments bar and comment threads in editors that have commenting ranges and comments. Comments are still accessible via the Comments view and will cause commenting to be toggled on in the same way running the command \"Comments: Toggle Editor Commenting\" toggles comments.")
         },
         'comments.maxHeight': {
             type: 'boolean',
             default: true,
-            description: ( nls.localize(
-                'comments.maxHeight',
-                "Controls whether the comments widget scrolls or expands."
-            ))
+            description: nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'comments.maxHeight', "Controls whether the comments widget scrolls or expands.")
         },
         'comments.collapseOnResolve': {
             type: 'boolean',
             default: true,
-            description: ( nls.localize(
-                'collapseOnResolve',
-                "Controls whether the comment thread should collapse when the thread is resolved."
-            ))
+            description: nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'collapseOnResolve', "Controls whether the comment thread should collapse when the thread is resolved.")
         }
     }
 });
 var CommentAccessibilityHelpNLS;
 ( (function(CommentAccessibilityHelpNLS) {
-    CommentAccessibilityHelpNLS.intro = ( nls.localize(
-        'intro',
-        "The editor contains commentable range(s). Some useful commands include:"
-    ));
-    CommentAccessibilityHelpNLS.introWidget = ( nls.localize(
-        'introWidget',
-        "This widget contains a text area, for composition of new comments, and actions, that can be tabbed to once tab moves focus mode has been enabled ({0})."
-    ));
-    CommentAccessibilityHelpNLS.introWidgetNoKb = ( nls.localize(
-        'introWidgetNoKb',
-        "This widget contains a text area, for composition of new comments, and actions, that can be tabbed to once tab moves focus mode has been enabled with the command Toggle Tab Key Moves Focus, which is currently not triggerable via keybinding."
-    ));
-    CommentAccessibilityHelpNLS.commentCommands = ( nls.localize('commentCommands', "Some useful comment commands include:"));
-    CommentAccessibilityHelpNLS.escape = ( nls.localize('escape', "- Dismiss Comment (Escape)"));
-    CommentAccessibilityHelpNLS.nextRange = ( nls.localize('next', "- Go to Next Commenting Range ({0})"));
-    CommentAccessibilityHelpNLS.nextRangeNoKb = ( nls.localize(
-        'nextNoKb',
-        "- Go to Next Commenting Range, which is currently not triggerable via keybinding."
-    ));
-    CommentAccessibilityHelpNLS.previousRange = ( nls.localize('previous', "- Go to Previous Commenting Range ({0})"));
-    CommentAccessibilityHelpNLS.previousRangeNoKb = ( nls.localize(
-        'previousNoKb',
-        "- Go to Previous Commenting Range, which is currently not triggerable via keybinding."
-    ));
-    CommentAccessibilityHelpNLS.nextCommentThreadKb = ( nls.localize('nextCommentThreadKb', "- Go to Next Comment Thread ({0})"));
-    CommentAccessibilityHelpNLS.nextCommentThreadNoKb = ( nls.localize(
-        'nextCommentThreadNoKb',
-        "- Go to Next Comment Thread, which is currently not triggerable via keybinding."
-    ));
-    CommentAccessibilityHelpNLS.previousCommentThreadKb = ( nls.localize('previousCommentThreadKb', "- Go to Previous Comment Thread ({0})"));
-    CommentAccessibilityHelpNLS.previousCommentThreadNoKb = ( nls.localize(
-        'previousCommentThreadNoKb',
-        "- Go to Previous Comment Thread, which is currently not triggerable via keybinding."
-    ));
-    CommentAccessibilityHelpNLS.addComment = ( nls.localize('addComment', "- Add Comment ({0})"));
-    CommentAccessibilityHelpNLS.addCommentNoKb = ( nls.localize(
-        'addCommentNoKb',
-        "- Add Comment on Current Selection, which is currently not triggerable via keybinding."
-    ));
-    CommentAccessibilityHelpNLS.submitComment = ( nls.localize('submitComment', "- Submit Comment ({0})"));
-    CommentAccessibilityHelpNLS.submitCommentNoKb = ( nls.localize(
-        'submitCommentNoKb',
-        "- Submit Comment, accessible via tabbing, as it's currently not triggerable with a keybinding."
-    ));
+    CommentAccessibilityHelpNLS.intro = nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'intro', "The editor contains commentable range(s). Some useful commands include:");
+    CommentAccessibilityHelpNLS.introWidget = nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'introWidget', "This widget contains a text area, for composition of new comments, and actions, that can be tabbed to once tab moves focus mode has been enabled ({0}).");
+    CommentAccessibilityHelpNLS.introWidgetNoKb = nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'introWidgetNoKb', "This widget contains a text area, for composition of new comments, and actions, that can be tabbed to once tab moves focus mode has been enabled with the command Toggle Tab Key Moves Focus, which is currently not triggerable via keybinding.");
+    CommentAccessibilityHelpNLS.commentCommands = nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'commentCommands', "Some useful comment commands include:");
+    CommentAccessibilityHelpNLS.escape = nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'escape', "- Dismiss Comment (Escape)");
+    CommentAccessibilityHelpNLS.nextRange = nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'next', "- Go to Next Commenting Range ({0})");
+    CommentAccessibilityHelpNLS.nextRangeNoKb = nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'nextNoKb', "- Go to Next Commenting Range, which is currently not triggerable via keybinding.");
+    CommentAccessibilityHelpNLS.previousRange = nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'previous', "- Go to Previous Commenting Range ({0})");
+    CommentAccessibilityHelpNLS.previousRangeNoKb = nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'previousNoKb', "- Go to Previous Commenting Range, which is currently not triggerable via keybinding.");
+    CommentAccessibilityHelpNLS.nextCommentThreadKb = nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'nextCommentThreadKb', "- Go to Next Comment Thread ({0})");
+    CommentAccessibilityHelpNLS.nextCommentThreadNoKb = nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'nextCommentThreadNoKb', "- Go to Next Comment Thread, which is currently not triggerable via keybinding.");
+    CommentAccessibilityHelpNLS.previousCommentThreadKb = nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'previousCommentThreadKb', "- Go to Previous Comment Thread ({0})");
+    CommentAccessibilityHelpNLS.previousCommentThreadNoKb = nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'previousCommentThreadNoKb', "- Go to Previous Comment Thread, which is currently not triggerable via keybinding.");
+    CommentAccessibilityHelpNLS.addComment = nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'addComment', "- Add Comment ({0})");
+    CommentAccessibilityHelpNLS.addCommentNoKb = nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'addCommentNoKb', "- Add Comment on Current Selection, which is currently not triggerable via keybinding.");
+    CommentAccessibilityHelpNLS.submitComment = nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'submitComment', "- Submit Comment ({0})");
+    CommentAccessibilityHelpNLS.submitCommentNoKb = nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'submitCommentNoKb', "- Submit Comment, accessible via tabbing, as it's currently not triggerable with a keybinding.");
 })(CommentAccessibilityHelpNLS || (CommentAccessibilityHelpNLS = {})));
 class CommentsAccessibilityHelpContribution extends Disposable {
     constructor() {

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

@@ -702,12 +702,7 @@ let CommentController = class CommentController {
             const commentRangeEnd = range?.getEndPosition().lineNumber;
             if (commentRangeStart && commentRangeEnd) {
                 const oneLine = commentRangeStart === commentRangeEnd;
-                oneLine ? status(( nls.localize('commentRange', "Line {0}", commentRangeStart))) : status(( nls.localize(
-                    'commentRangeStart',
-                    "Lines {0} to {1}",
-                    commentRangeStart,
-                    commentRangeEnd
-                )));
+                oneLine ? status(nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsController', 'commentRange', "Line {0}", commentRangeStart)) : status(nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsController', 'commentRangeStart', "Lines {0} to {1}", commentRangeStart, commentRangeEnd));
             }
         }
     }
@@ -823,21 +818,14 @@ let CommentController = class CommentController {
                     if (verbose) {
                         const keybinding = this.keybindingService.lookupKeybinding("editor.action.accessibilityHelp" )?.getAriaLabel();
                         if (keybinding) {
-                            status(( nls.localize(
-                                'hasCommentRangesKb',
-                                "Editor has commenting ranges, run the command Open Accessibility Help ({0}), for more information.",
-                                keybinding
-                            )));
+                            status(nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsController', 'hasCommentRangesKb', "Editor has commenting ranges, run the command Open Accessibility Help ({0}), for more information.", keybinding));
                         }
                         else {
-                            status(( nls.localize(
-                                'hasCommentRangesNoKb',
-                                "Editor has commenting ranges, run the command Open Accessibility Help, which is currently not triggerable via keybinding, for more information."
-                            )));
+                            status(nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsController', 'hasCommentRangesNoKb', "Editor has commenting ranges, run the command Open Accessibility Help, which is currently not triggerable via keybinding, for more information."));
                         }
                     }
                     else {
-                        status(( nls.localize('hasCommentRanges', "Editor has commenting ranges.")));
+                        status(nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsController', 'hasCommentRanges', "Editor has commenting ranges."));
                     }
                 }
             }
@@ -961,7 +949,7 @@ let CommentController = class CommentController {
             }
             else {
                 const picks = this.getCommentProvidersQuickPicks(newCommentInfos);
-                return this.quickInputService.pick(picks, { placeHolder: ( nls.localize('pickCommentService', "Select Comment Provider")), matchOnDescription: true }).then(pick => {
+                return this.quickInputService.pick(picks, { placeHolder: nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsController', 'pickCommentService', "Select Comment Provider"), matchOnDescription: true }).then(pick => {
                     if (!pick) {
                         return;
                     }

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

@@ -21,7 +21,7 @@ import { openLinkFromMarkdown } from 'monaco-editor/esm/vs/editor/contrib/markdo
 const COMMENTS_VIEW_ID = 'workbench.panel.comments';
 const COMMENTS_VIEW_STORAGE_ID = 'Comments';
 const COMMENTS_VIEW_ORIGINAL_TITLE = 'Comments';
-const COMMENTS_VIEW_TITLE = ( nls.localize('comments.view.title', "Comments"));
+const COMMENTS_VIEW_TITLE = nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsTreeViewer', 'comments.view.title', "Comments");
 class CommentsModelVirualDelegate {
     static { this.RESOURCE_ID = 'resource-with-comments'; }
     static { this.COMMENT_ID = 'comment-node'; }
@@ -99,10 +99,10 @@ let CommentNodeRenderer = class CommentNodeRenderer {
     }
     getCountString(commentCount) {
         if (commentCount > 1) {
-            return ( nls.localize('commentsCount', "{0} comments", commentCount));
+            return nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsTreeViewer', 'commentsCount', "{0} comments", commentCount);
         }
         else {
-            return ( nls.localize('commentCount', "1 comment"));
+            return nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsTreeViewer', 'commentCount', "1 comment");
         }
     }
     getRenderedComment(commentBody, disposables) {
@@ -117,7 +117,7 @@ let CommentNodeRenderer = class CommentNodeRenderer {
         for (let i = 0; i < images.length; i++) {
             const image = images[i];
             const textDescription = dom.$('');
-            textDescription.textContent = image.alt ? ( nls.localize('imageWithLabel', "Image: {0}", image.alt)) : ( nls.localize('image', "Image"));
+            textDescription.textContent = image.alt ? nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsTreeViewer', 'imageWithLabel', "Image: {0}", image.alt) : nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsTreeViewer', 'image', "Image");
             image.parentNode.replaceChild(textDescription, image);
         }
         return renderedComment;
@@ -158,15 +158,10 @@ let CommentNodeRenderer = class CommentNodeRenderer {
         }
         if (node.element.range) {
             if (node.element.range.startLineNumber === node.element.range.endLineNumber) {
-                templateData.threadMetadata.range.textContent = ( nls.localize('commentLine', "[Ln {0}]", node.element.range.startLineNumber));
+                templateData.threadMetadata.range.textContent = nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsTreeViewer', 'commentLine', "[Ln {0}]", node.element.range.startLineNumber);
             }
             else {
-                templateData.threadMetadata.range.textContent = ( nls.localize(
-                    'commentRange',
-                    "[Ln {0}-{1}]",
-                    node.element.range.startLineNumber,
-                    node.element.range.endLineNumber
-                ));
+                templateData.threadMetadata.range.textContent = nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsTreeViewer', 'commentRange', "[Ln {0}-{1}]", node.element.range.startLineNumber, node.element.range.endLineNumber);
             }
         }
         if (!node.element.hasReply()) {
@@ -176,7 +171,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 = ( nls.localize('lastReplyFrom', "Last reply from {0}", lastComment.userName));
+        templateData.repliesMetadata.lastReplyDetail.textContent = nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsTreeViewer', 'lastReplyFrom', "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

@@ -54,8 +54,8 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
         super({
             ...options,
             filterOptions: {
-                placeholder: ( nls.localize('comments.filter.placeholder', "Filter (e.g. text, author)")),
-                ariaLabel: ( nls.localize('comments.filter.ariaLabel', "Filter comments")),
+                placeholder: nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsView', 'comments.filter.placeholder', "Filter (e.g. text, author)"),
+                ariaLabel: nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsView', 'comments.filter.ariaLabel', "Filter comments"),
                 history: viewState['filterHistory'] || [],
                 text: viewState['filter'] || '',
                 focusContextKey: CommentsViewFilterFocusContextKey.key
@@ -97,7 +97,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
             return;
         }
         this.totalUnresolved = unresolved;
-        const message = ( nls.localize('totalUnresolvedComments', '{0} Unresolved Comments', this.totalUnresolved));
+        const message = nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsView', 'totalUnresolvedComments', '{0} Unresolved Comments', this.totalUnresolved);
         this.activity.value = this.activityService.showViewActivity(this.id, { badge: ( new NumberBadge(this.totalUnresolved, () => message)) });
     }
     saveState() {
@@ -148,7 +148,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 : ( nls.localize('showing filtered results', "Showing {0} of {1}", filtered, total)));
+        this.filterWidget.updateBadge(total === filtered || total === 0 ? undefined : nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsView', 'showing filtered results', "Showing {0} of {1}", filtered, total));
         this.filterWidget.checkMoreFilters(!this.filters.showResolved || !this.filters.showUnresolved);
     }
     renderBody(container) {
@@ -262,36 +262,17 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
             accessibilityProvider: {
                 getAriaLabel(element) {
                     if (element instanceof CommentsModel) {
-                        return ( nls.localize('rootCommentsLabel', "Comments for current workspace"));
+                        return nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsView', 'rootCommentsLabel', "Comments for current workspace");
                     }
                     if (element instanceof ResourceWithCommentThreads) {
-                        return ( nls.localize(
-                            'resourceWithCommentThreadsLabel',
-                            "Comments in {0}, full path {1}",
-                            basename(element.resource),
-                            element.resource.fsPath
-                        ));
+                        return nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsView', 'resourceWithCommentThreadsLabel', "Comments in {0}, full path {1}", basename(element.resource), element.resource.fsPath);
                     }
                     if (element instanceof CommentNode) {
                         if (element.range) {
-                            return ( nls.localize(
-                                'resourceWithCommentLabel',
-                                "Comment from ${0} at line {1} column {2} in {3}, source: {4}",
-                                element.comment.userName,
-                                element.range.startLineNumber,
-                                element.range.startColumn,
-                                basename(element.resource),
-                                (typeof element.comment.body === 'string') ? element.comment.body : element.comment.body.value
-                            ));
+                            return nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsView', 'resourceWithCommentLabel', "Comment from ${0} at line {1} column {2} in {3}, source: {4}", element.comment.userName, element.range.startLineNumber, element.range.startColumn, basename(element.resource), (typeof element.comment.body === 'string') ? element.comment.body : element.comment.body.value);
                         }
                         else {
-                            return ( nls.localize(
-                                'resourceWithCommentLabelFile',
-                                "Comment from ${0} in {1}, source: {2}",
-                                element.comment.userName,
-                                basename(element.resource),
-                                (typeof element.comment.body === 'string') ? element.comment.body : element.comment.body.value
-                            ));
+                            return nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsView', 'resourceWithCommentLabelFile', "Comment from ${0} in {1}, source: {2}", element.comment.userName, basename(element.resource), (typeof element.comment.body === 'string') ? element.comment.body : element.comment.body.value);
                         }
                     }
                     return '';
@@ -469,7 +450,7 @@ registerAction2(class Collapse extends ViewAction {
         super({
             viewId: COMMENTS_VIEW_ID,
             id: 'comments.collapse',
-            title: ( nls.localize('collapseAll', "Collapse All")),
+            title: nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsView', 'collapseAll', "Collapse All"),
             f1: false,
             icon: Codicon.collapseAll,
             menu: {
@@ -489,7 +470,7 @@ registerAction2(class Expand extends ViewAction {
         super({
             viewId: COMMENTS_VIEW_ID,
             id: 'comments.expand',
-            title: ( nls.localize('expandAll', "Expand All")),
+            title: nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsView', 'expandAll', "Expand All"),
             f1: false,
             icon: Codicon.expandAll,
             menu: {

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

@@ -1,5 +1,5 @@
 import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { ContextKeyExpr, RawContextKey } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
 import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
 import { CommentsViewFilterFocusContextKey } from './comments.js';
@@ -44,7 +44,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'commentsFocusViewFromFilter',
-            title: ( localize('focusCommentsList', "Focus Comments view")),
+            title: localizeWithPath('vs/workbench/contrib/comments/browser/commentsViewActions', 'focusCommentsList', "Focus Comments view"),
             keybinding: {
                 when: CommentsViewFilterFocusContextKey,
                 weight: 200 ,
@@ -61,7 +61,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'commentsClearFilterText',
-            title: ( localize('commentsClearFilterText', "Clear filter text")),
+            title: localizeWithPath('vs/workbench/contrib/comments/browser/commentsViewActions', 'commentsClearFilterText', "Clear filter text"),
             keybinding: {
                 when: CommentsViewFilterFocusContextKey,
                 weight: 200 ,
@@ -78,7 +78,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'commentsFocusFilter',
-            title: ( localize('focusCommentsFilter', "Focus comments filter")),
+            title: localizeWithPath('vs/workbench/contrib/comments/browser/commentsViewActions', 'focusCommentsFilter', "Focus comments filter"),
             keybinding: {
                 when: ( FocusedViewContext.isEqualTo(COMMENTS_VIEW_ID)),
                 weight: 200 ,
@@ -95,11 +95,11 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: `workbench.actions.${COMMENTS_VIEW_ID}.toggleUnResolvedComments`,
-            title: ( localize('toggle unresolved', "Toggle Unresolved Comments")),
-            category: ( localize('comments', "Comments")),
+            title: localizeWithPath('vs/workbench/contrib/comments/browser/commentsViewActions', 'toggle unresolved', "Toggle Unresolved Comments"),
+            category: localizeWithPath('vs/workbench/contrib/comments/browser/commentsViewActions', 'comments', "Comments"),
             toggled: {
                 condition: CONTEXT_KEY_SHOW_UNRESOLVED,
-                title: ( localize('unresolved', "Show Unresolved")),
+                title: localizeWithPath('vs/workbench/contrib/comments/browser/commentsViewActions', 'unresolved', "Show Unresolved"),
             },
             menu: {
                 id: viewFilterSubmenu,
@@ -118,11 +118,11 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: `workbench.actions.${COMMENTS_VIEW_ID}.toggleResolvedComments`,
-            title: ( localize('toggle resolved', "Toggle Resolved Comments")),
-            category: ( localize('comments', "Comments")),
+            title: localizeWithPath('vs/workbench/contrib/comments/browser/commentsViewActions', 'toggle resolved', "Toggle Resolved Comments"),
+            category: localizeWithPath('vs/workbench/contrib/comments/browser/commentsViewActions', 'comments', "Comments"),
             toggled: {
                 condition: CONTEXT_KEY_SHOW_RESOLVED,
-                title: ( localize('resolved', "Show Resolved")),
+                title: localizeWithPath('vs/workbench/contrib/comments/browser/commentsViewActions', 'resolved', "Show Resolved"),
             },
             menu: {
                 id: viewFilterSubmenu,

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

@@ -6,7 +6,7 @@ import { ActionViewItem } from 'monaco-editor/esm/vs/base/browser/ui/actionbar/a
 class ToggleReactionsAction extends Action {
     static { this.ID = 'toolbar.toggle.pickReactions'; }
     constructor(toggleDropdownMenu, title) {
-        super(ToggleReactionsAction.ID, title || ( nls.localize('pickReactions', "Pick Reactions...")), 'toggle-reactions', true);
+        super(ToggleReactionsAction.ID, title || nls.localizeWithPath('vs/workbench/contrib/comments/browser/reactionsAction', 'pickReactions', "Pick Reactions..."), 'toggle-reactions', true);
         this._menuActions = [];
         this.toggleDropdownMenu = toggleDropdownMenu;
     }
@@ -50,32 +50,32 @@ class ReactionActionViewItem extends ActionViewItem {
     }
     getTooltip() {
         const action = this.action;
-        const toggleMessage = action.enabled ? ( nls.localize('comment.toggleableReaction', "Toggle reaction, ")) : '';
+        const toggleMessage = action.enabled ? nls.localizeWithPath('vs/workbench/contrib/comments/browser/reactionsAction', 'comment.toggleableReaction', "Toggle reaction, ") : '';
         if (action.count === undefined) {
-            return ( nls.localize({
+            return nls.localizeWithPath('vs/workbench/contrib/comments/browser/reactionsAction', {
                 key: 'comment.reactionLabelNone', comment: [
                     'This is a tooltip for an emoji button so that the current user can toggle their reaction to a comment.',
                     'The first arg is localized message "Toggle reaction" or empty if the user doesn\'t have permission to toggle the reaction, the second is the name of the reaction.'
                 ]
-            }, "{0}{1} reaction", toggleMessage, action.label));
+            }, "{0}{1} reaction", toggleMessage, action.label);
         }
         else if (action.count === 1) {
-            return ( nls.localize({
+            return nls.localizeWithPath('vs/workbench/contrib/comments/browser/reactionsAction', {
                 key: 'comment.reactionLabelOne', comment: [
                     'This is a tooltip for an emoji that is a "reaction" to a comment where the count of the reactions is 1.',
                     'The emoji is also a button so that the current user can also toggle their own emoji reaction.',
                     'The first arg is localized message "Toggle reaction" or empty if the user doesn\'t have permission to toggle the reaction, the second is the name of the reaction.'
                 ]
-            }, "{0}1 reaction with {1}", toggleMessage, action.label));
+            }, "{0}1 reaction with {1}", toggleMessage, action.label);
         }
         else if (action.count > 1) {
-            return ( nls.localize({
+            return nls.localizeWithPath('vs/workbench/contrib/comments/browser/reactionsAction', {
                 key: 'comment.reactionLabelMany', comment: [
                     'This is a tooltip for an emoji that is a "reaction" to a comment where the count of the reactions is greater than 1.',
                     'The emoji is also a button so that the current user can also toggle their own emoji reaction.',
                     'The first arg is localized message "Toggle reaction" or empty if the user doesn\'t have permission to toggle the reaction, the second is number of users who have reacted with that reaction, and the third is the name of the reaction.'
                 ]
-            }, "{0}{1} reactions with {2}", toggleMessage, action.count, action.label));
+            }, "{0}{1} reactions with {2}", toggleMessage, action.count, action.label);
         }
         return undefined;
     }

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

@@ -3,42 +3,46 @@ import { RawContextKey } from 'monaco-editor/esm/vs/platform/contextkey/common/c
 var CommentContextKeys;
 ( (function(CommentContextKeys) {
     CommentContextKeys.activeCursorHasCommentingRange = ( new RawContextKey('activeCursorHasCommentingRange', false, {
-        description: ( nls.localize(
-         'hasCommentingRange',
-         "Whether the position at the active cursor has a commenting range"
-        )),
+        description: nls.localizeWithPath('vs/workbench/contrib/comments/common/commentContextKeys', 'hasCommentingRange', "Whether the position at the active cursor has a commenting range"),
         type: 'boolean'
     }));
     CommentContextKeys.activeEditorHasCommentingRange = ( new RawContextKey('activeEditorHasCommentingRange', false, {
-        description: ( nls.localize(
-         'editorHasCommentingRange',
-         "Whether the active editor has a commenting range"
-        )),
+        description: nls.localizeWithPath('vs/workbench/contrib/comments/common/commentContextKeys', 'editorHasCommentingRange', "Whether the active editor has a commenting range"),
         type: 'boolean'
     }));
     CommentContextKeys.WorkspaceHasCommenting = ( new RawContextKey('workspaceHasCommenting', false, {
-        description: ( nls.localize(
-         'hasCommentingProvider',
-         "Whether the open workspace has either comments or commenting ranges."
-        )),
+        description: nls.localizeWithPath('vs/workbench/contrib/comments/common/commentContextKeys', 'hasCommentingProvider', "Whether the open workspace has either comments or commenting ranges."),
         type: 'boolean'
     }));
     CommentContextKeys.commentThreadIsEmpty = ( new RawContextKey(
      'commentThreadIsEmpty',
      false,
-     { type: 'boolean', description: ( nls.localize('commentThreadIsEmpty', "Set when the comment thread has no comments")) }
+     { type: 'boolean', description: nls.localizeWithPath('vs/workbench/contrib/comments/common/commentContextKeys', 'commentThreadIsEmpty', "Set when the comment thread has no comments") }
+    ));
+    CommentContextKeys.commentIsEmpty = ( new RawContextKey(
+     'commentIsEmpty',
+     false,
+     { type: 'boolean', description: nls.localizeWithPath('vs/workbench/contrib/comments/common/commentContextKeys', 'commentIsEmpty', "Set when the comment has no input") }
+    ));
+    CommentContextKeys.commentContext = ( new RawContextKey(
+     'comment',
+     undefined,
+     { type: 'string', description: nls.localizeWithPath('vs/workbench/contrib/comments/common/commentContextKeys', 'comment', "The context value of the comment") }
+    ));
+    CommentContextKeys.commentThreadContext = ( new RawContextKey(
+     'commentThread',
+     undefined,
+     { type: 'string', description: nls.localizeWithPath('vs/workbench/contrib/comments/common/commentContextKeys', 'commentThread', "The context value of the comment thread") }
     ));
-    CommentContextKeys.commentIsEmpty = ( new RawContextKey('commentIsEmpty', false, { type: 'boolean', description: ( nls.localize('commentIsEmpty', "Set when the comment has no input")) }));
-    CommentContextKeys.commentContext = ( new RawContextKey('comment', undefined, { type: 'string', description: ( nls.localize('comment', "The context value of the comment")) }));
-    CommentContextKeys.commentThreadContext = ( new RawContextKey('commentThread', undefined, { type: 'string', description: ( nls.localize('commentThread', "The context value of the comment thread")) }));
     CommentContextKeys.commentControllerContext = ( new RawContextKey(
      'commentController',
      undefined,
-     { type: 'string', description: ( nls.localize(
-      'commentController',
-      "The comment controller id associated with a comment thread"
-     )) }
+     { type: 'string', description: nls.localizeWithPath('vs/workbench/contrib/comments/common/commentContextKeys', 'commentController', "The comment controller id associated with a comment thread") }
+    ));
+    CommentContextKeys.commentFocused = ( new RawContextKey(
+     'commentFocused',
+     false,
+     { type: 'boolean', description: nls.localizeWithPath('vs/workbench/contrib/comments/common/commentContextKeys', 'commentFocused', "Set when the comment is focused") }
     ));
-    CommentContextKeys.commentFocused = ( new RawContextKey('commentFocused', false, { type: 'boolean', description: ( nls.localize('commentFocused', "Set when the comment is focused")) }));
 })(CommentContextKeys || (CommentContextKeys = {})));
 export { CommentContextKeys };

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

@@ -1,6 +1,6 @@
 import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
 import { groupBy } from 'monaco-editor/esm/vs/base/common/arrays.js';
-import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 class CommentNode {
     constructor(owner, threadId, resource, comment, range, threadState) {
         this.replies = [];
@@ -105,7 +105,7 @@ class CommentsModel {
     }
     getMessage() {
         if (!this.resourceCommentThreads.length) {
-            return ( localize('noComments', "There are no comments in this workspace yet."));
+            return localizeWithPath('vs/workbench/contrib/comments/common/commentModel', 'noComments', "There are no comments in this workspace yet.");
         }
         else {
             return '';

package/vscode/src/vs/workbench/contrib/customEditor/common/customEditor.js

@@ -6,10 +6,7 @@ import { globMatchesResource, RegisteredEditorPriority, priorityToRank } from '.
 const ICustomEditorService = ( createDecorator('customEditorService'));
 const CONTEXT_ACTIVE_CUSTOM_EDITOR_ID = ( new RawContextKey('activeCustomEditorId', '', {
     type: 'string',
-    description: ( nls.localize(
-        'context.customEditor',
-        "The viewType of the currently active custom editor."
-    )),
+    description: nls.localizeWithPath('vs/workbench/contrib/customEditor/common/customEditor', 'context.customEditor', "The viewType of the currently active custom editor."),
 }));
 const CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE = ( new RawContextKey('focusedCustomEditorIsEditable', false));
 class CustomEditorInfo {