@codingame/monaco-vscode-api 26.2.2 → 27.0.0

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

@@ -17,7 +17,7 @@ import { MarshalledId } from '../../../../base/common/marshallingIds.js';
 import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
 import { CommentCommandId } from '../common/commentCommandIds.js';
 
-const collapseIcon = registerIcon("review-comment-collapse", Codicon.chevronUp, ( localize(6808, "Icon to collapse a review comment.")));
+const collapseIcon = registerIcon("review-comment-collapse", Codicon.chevronUp, ( localize(7416, "Icon to collapse a review comment.")));
 const COLLAPSE_ACTION_CLASS = "expand-review-action " + ThemeIcon.asClassName(collapseIcon);
 const DELETE_ACTION_CLASS = "expand-review-action " + ThemeIcon.asClassName(Codicon.trashcan);
 function threadHasComments(comments) {
@@ -55,7 +55,7 @@ let CommentThreadHeader = class CommentThreadHeader extends Disposable {
         }));
         this._register(this._actionbarWidget);
         const collapseClass = threadHasComments(this._commentThread.comments) ? COLLAPSE_ACTION_CLASS : DELETE_ACTION_CLASS;
-        this._collapseAction = ( new Action(CommentCommandId.Hide, ( localize(6809, "Collapse")), collapseClass, true, () => this._delegate.collapse()));
+        this._collapseAction = ( new Action(CommentCommandId.Hide, ( localize(7417, "Collapse")), collapseClass, true, () => this._delegate.collapse()));
         if (!threadHasComments(this._commentThread.comments)) {
             const commentsChanged = this._register(( new MutableDisposable()));
             commentsChanged.value = this._commentThread.onDidChangeComments(() => {
@@ -99,7 +99,7 @@ let CommentThreadHeader = class CommentThreadHeader extends Disposable {
         label = this._commentThread.label;
         if (label === undefined) {
             if (!(this._commentThread.comments && this._commentThread.comments.length)) {
-                label = ( localize(6810, "Start discussion"));
+                label = ( localize(7418, "Start discussion"));
             }
         }
         if (label) {

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

@@ -61,7 +61,7 @@ let CommentThreadWidget = class CommentThreadWidget extends Disposable {
         this.configurationService = configurationService;
         this._keybindingService = _keybindingService;
         this._commentThreadDisposables = [];
-        this._onDidResize = ( new Emitter());
+        this._onDidResize = this._register(( new Emitter()));
         this.onDidResize = this._onDidResize.event;
         this._threadIsEmpty = CommentContextKeys.commentThreadIsEmpty.bindTo(this._contextKeyService);
         this._threadIsEmpty.set(!_commentThread.comments || !_commentThread.comments.length);
@@ -125,17 +125,17 @@ let CommentThreadWidget = class CommentThreadWidget extends Disposable {
         return !!this._commentReply?.commentEditor.getValue() || this._body.hasCommentsInEditMode();
     }
     _setAriaLabel() {
-        let ariaLabel = ( localize(6811, "Comment"));
+        let ariaLabel = ( localize(7419, "Comment"));
         let keybinding;
         const verbose = this.configurationService.getValue(AccessibilityVerbositySettingId.Comments);
         if (verbose) {
             keybinding = this._keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp, this._contextKeyService)?.getLabel() ?? undefined;
         }
         if (keybinding) {
-            ariaLabel = ( localize(6812, "{0}, use ({1}) for accessibility help", ariaLabel, keybinding));
+            ariaLabel = ( localize(7420, "{0}, use ({1}) for accessibility help", ariaLabel, keybinding));
         } else if (verbose) {
             ariaLabel = ( localize(
-                6813,
+                7421,
                 "{0}, run the command Open Accessibility Help which is currently not triggerable via keybinding.",
                 ariaLabel
             ));

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

@@ -113,7 +113,7 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
         this._onDidChangeExpandedState = ( new Emitter());
         this._globalToDispose = ( new DisposableStore());
         this._commentThreadDisposables = [];
-        this._contextKeyService = contextKeyService.createScoped(this.domNode);
+        this._contextKeyService = this._globalToDispose.add(contextKeyService.createScoped(this.domNode));
         this._scopedInstantiationService = this._globalToDispose.add(instantiationService.createChild(( new ServiceCollection([IContextKeyService, this._contextKeyService]))));
         const controller = this.commentService.getCommentController(this._uniqueOwner);
         if (controller) {
@@ -298,13 +298,13 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
         if (confirmSetting === "whenHasUnsubmittedComments" && this._commentThreadWidget.hasUnsubmittedComments) {
             const result = await this.dialogService.confirm({
                 message: ( localize(
-                    6814,
+                    7422,
                     "Collapsing this comment thread will discard unsubmitted comments. Are you sure you want to discard these comments?"
                 )),
-                primaryButton: ( localize(6815, "Discard")),
+                primaryButton: ( localize(7423, "Discard")),
                 type: Severity$1.Warning,
                 checkbox: {
-                    label: ( localize(6816, "Never ask me again")),
+                    label: ( localize(7424, "Never ask me again")),
                     checked: false
                 }
             });
@@ -509,6 +509,9 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
         this._globalToDispose.dispose();
         this._commentThreadDisposables.forEach(global => global.dispose());
         this._onDidClose.fire(undefined);
+        this._onDidClose.dispose();
+        this._onDidCreateThread.dispose();
+        this._onDidChangeExpandedState.dispose();
     }
 };
 ReviewZoneWidget = ( __decorate([( __param(5, IInstantiationService)), ( __param(6, IThemeService)), ( __param(7, ICommentService)), ( __param(8, IContextKeyService)), ( __param(9, IConfigurationService)), ( __param(10, IDialogService))], ReviewZoneWidget));

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

@@ -13,52 +13,52 @@ import { Disposable } from '../../../../base/common/lifecycle.js';
 var CommentAccessibilityHelpNLS;
 (function(CommentAccessibilityHelpNLS) {
     CommentAccessibilityHelpNLS.intro = ( localize(
-        6836,
+        7444,
         "The editor contains commentable range(s). Some useful commands include:"
     ));
     CommentAccessibilityHelpNLS.tabFocus = ( localize(
-        6837,
+        7445,
         "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{0}.",
         `<keybinding:${ToggleTabFocusModeAction.ID}>`
     ));
-    CommentAccessibilityHelpNLS.commentCommands = ( localize(6838, "Some useful comment commands include:"));
-    CommentAccessibilityHelpNLS.escape = ( localize(6839, "- Dismiss Comment{0}.", `<keybinding:${CommentCommandId.Hide}>`));
+    CommentAccessibilityHelpNLS.commentCommands = ( localize(7446, "Some useful comment commands include:"));
+    CommentAccessibilityHelpNLS.escape = ( localize(7447, "- Dismiss Comment{0}.", `<keybinding:${CommentCommandId.Hide}>`));
     CommentAccessibilityHelpNLS.nextRange = ( localize(
-        6840,
+        7448,
         "- Go to Next Commenting Range{0}.",
         `<keybinding:${CommentCommandId.NextRange}>`
     ));
     CommentAccessibilityHelpNLS.previousRange = ( localize(
-        6841,
+        7449,
         "- Go to Previous Commenting Range{0}.",
         `<keybinding:${CommentCommandId.PreviousRange}>`
     ));
     CommentAccessibilityHelpNLS.nextCommentThread = ( localize(
-        6842,
+        7450,
         "- Go to Next Comment Thread{0}.",
         `<keybinding:${CommentCommandId.NextThread}>`
     ));
     CommentAccessibilityHelpNLS.previousCommentThread = ( localize(
-        6843,
+        7451,
         "- Go to Previous Comment Thread{0}.",
         `<keybinding:${CommentCommandId.PreviousThread}>`
     ));
     CommentAccessibilityHelpNLS.nextCommentedRange = ( localize(
-        6844,
+        7452,
         "- Go to Next Commented Range{0}.",
         `<keybinding:${CommentCommandId.NextCommentedRange}>`
     ));
     CommentAccessibilityHelpNLS.previousCommentedRange = ( localize(
-        6845,
+        7453,
         "- Go to Previous Commented Range{0}.",
         `<keybinding:${CommentCommandId.PreviousCommentedRange}>`
     ));
     CommentAccessibilityHelpNLS.addComment = ( localize(
-        6846,
+        7454,
         "- Add Comment on Current Selection{0}.",
         `<keybinding:${CommentCommandId.Add}>`
     ));
-    CommentAccessibilityHelpNLS.submitComment = ( localize(6847, "- Submit Comment{0}.", `<keybinding:${CommentCommandId.Submit}>`));
+    CommentAccessibilityHelpNLS.submitComment = ( localize(7455, "- Submit Comment{0}.", `<keybinding:${CommentCommandId.Submit}>`));
 })(CommentAccessibilityHelpNLS || (CommentAccessibilityHelpNLS = {}));
 class CommentsAccessibilityHelpProvider extends Disposable {
     constructor() {

package/vscode/src/vs/workbench/contrib/comments/browser/commentsController.d.ts

@@ -1,3 +1,4 @@
+import { Disposable } from "../../../../base/common/lifecycle.js";
 import { ICodeEditor, IEditorMouseEvent } from "../../../../editor/browser/editorBrowser.js";
 import { ICodeEditorService } from "../../../../editor/browser/services/codeEditorService.service.js";
 import { IRange, Range } from "../../../../editor/common/core/range.js";
@@ -29,7 +30,7 @@ export declare function moveToNextCommentInThread(commentInfo: {
     thread: languages.CommentThread<IRange>;
 } | undefined;
 export declare function revealCommentThread(commentService: ICommentService, editorService: IEditorService, uriIdentityService: IUriIdentityService, commentThread: languages.CommentThread<IRange>, comment: languages.Comment | undefined, focusReply?: boolean, pinned?: boolean, preserveFocus?: boolean, sideBySide?: boolean): void;
-export declare class CommentController implements IEditorContribution {
+export declare class CommentController extends Disposable implements IEditorContribution {
     private readonly commentService;
     private readonly instantiationService;
     private readonly codeEditorService;
@@ -41,7 +42,6 @@ export declare class CommentController implements IEditorContribution {
     private readonly keybindingService;
     private readonly accessibilityService;
     private readonly notificationService;
-    private readonly globalToDispose;
     private readonly localToDispose;
     private editor;
     private _commentWidgets;

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

@@ -6,7 +6,7 @@ import { coalesce } from '../../../../base/common/arrays.js';
 import { findFirstIdxMonotonousOrArrLen } from '../../../../base/common/arraysFind.js';
 import { createCancelablePromise, Delayer } from '../../../../base/common/async.js';
 import { onUnexpectedError } from '../../../../base/common/errors.js';
-import { DisposableStore, dispose } from '../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, dispose } from '../../../../base/common/lifecycle.js';
 import * as review from './media/review.css';
 import { isDiffEditor, isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.service.js';
@@ -421,6 +421,7 @@ class CommentingRangeDecorator {
         return (decorations.length > 0 ? (decorations[0].getActiveRange() ?? undefined) : undefined);
     }
     dispose() {
+        this._onDidChangeDecorationsCount.dispose();
         this.commentingRangeDecorations = [];
     }
 }
@@ -498,7 +499,7 @@ function revealCommentThread(
         }
     });
 }
-let CommentController = class CommentController {
+let CommentController = class CommentController extends Disposable {
     constructor(
         editor,
         commentService,
@@ -514,6 +515,7 @@ let CommentController = class CommentController {
         accessibilityService,
         notificationService
     ) {
+        super();
         this.commentService = commentService;
         this.instantiationService = instantiationService;
         this.codeEditorService = codeEditorService;
@@ -525,8 +527,7 @@ let CommentController = class CommentController {
         this.keybindingService = keybindingService;
         this.accessibilityService = accessibilityService;
         this.notificationService = notificationService;
-        this.globalToDispose = ( new DisposableStore());
-        this.localToDispose = ( new DisposableStore());
+        this.localToDispose = this._register(( new DisposableStore()));
         this.mouseDownInfo = null;
         this._commentingRangeSpaceReserved = false;
         this._commentingRangeAmountReserved = 0;
@@ -547,16 +548,16 @@ let CommentController = class CommentController {
             return;
         }
         this.editor = editor;
-        this._commentingRangeDecorator = ( new CommentingRangeDecorator());
-        this.globalToDispose.add(this._commentingRangeDecorator.onDidChangeDecorationsCount(count => {
+        this._commentingRangeDecorator = this._register(( new CommentingRangeDecorator()));
+        this._register(this._commentingRangeDecorator.onDidChangeDecorationsCount(count => {
             if (count === 0) {
                 this.clearEditorListeners();
             } else if (this._editorDisposables.length === 0) {
                 this.registerEditorListeners();
             }
         }));
-        this.globalToDispose.add(this._commentThreadRangeDecorator = ( new CommentThreadRangeDecorator(this.commentService)));
-        this.globalToDispose.add(this.commentService.onDidDeleteDataProvider(ownerId => {
+        this._register(this._commentThreadRangeDecorator = ( new CommentThreadRangeDecorator(this.commentService)));
+        this._register(this.commentService.onDidDeleteDataProvider(ownerId => {
             if (ownerId) {
                 delete this._pendingNewCommentCache[ownerId];
                 delete this._pendingEditsCache[ownerId];
@@ -566,19 +567,19 @@ let CommentController = class CommentController {
             }
             this.beginCompute();
         }));
-        this.globalToDispose.add(
+        this._register(
             this.commentService.onDidSetDataProvider(_ => this.beginComputeAndHandleEditorChange())
         );
-        this.globalToDispose.add(
+        this._register(
             this.commentService.onDidUpdateCommentingRanges(_ => this.beginComputeAndHandleEditorChange())
         );
-        this.globalToDispose.add(this.commentService.onDidSetResourceCommentInfos(async e => {
+        this._register(this.commentService.onDidSetResourceCommentInfos(async e => {
             const editorURI = this.editor && this.editor.hasModel() && this.editor.getModel().uri;
             if (editorURI && ( editorURI.toString()) === ( e.resource.toString())) {
                 await this.setComments(e.commentInfos.filter(commentInfo => commentInfo !== null));
             }
         }));
-        this.globalToDispose.add(this.commentService.onDidChangeCommentingEnabled(e => {
+        this._register(this.commentService.onDidChangeCommentingEnabled(e => {
             if (e) {
                 this.registerEditorListeners();
                 this.beginCompute();
@@ -591,18 +592,18 @@ let CommentController = class CommentController {
                 this._commentWidgets = [];
             }
         }));
-        this.globalToDispose.add(this.editor.onWillChangeModel(e => this.onWillChangeModel(e)));
-        this.globalToDispose.add(this.editor.onDidChangeModel(_ => this.onModelChanged()));
-        this.globalToDispose.add(this.configurationService.onDidChangeConfiguration(e => {
+        this._register(this.editor.onWillChangeModel(e => this.onWillChangeModel(e)));
+        this._register(this.editor.onDidChangeModel(_ => this.onModelChanged()));
+        this._register(this.configurationService.onDidChangeConfiguration(e => {
             if (e.affectsConfiguration("diffEditor.renderSideBySide")) {
                 this.beginCompute();
             }
         }));
         this.onModelChanged();
-        this.globalToDispose.add(
+        this._register(
             this.codeEditorService.registerDecorationType("comment-controller", COMMENTEDITOR_DECORATION_KEY, {})
         );
-        this.globalToDispose.add(this.commentService.registerContinueOnCommentProvider({
+        this._register(this.commentService.registerContinueOnCommentProvider({
             provideContinueOnComments: () => {
                 const pendingComments = [];
                 if (this._commentWidgets) {
@@ -886,7 +887,7 @@ let CommentController = class CommentController {
             const commentRangeEnd = range?.getEndPosition().lineNumber;
             if (commentRangeStart && commentRangeEnd) {
                 const oneLine = commentRangeStart === commentRangeEnd;
-                oneLine ? status(( localize(6848, "Line {0}", commentRangeStart))) : status(( localize(6849, "Lines {0} to {1}", commentRangeStart, commentRangeEnd)));
+                oneLine ? status(( localize(7456, "Line {0}", commentRangeStart))) : status(( localize(7457, "Lines {0} to {1}", commentRangeStart, commentRangeEnd)));
             }
         }
     }
@@ -897,8 +898,7 @@ let CommentController = class CommentController {
         this._findNearestCommentingRange(true);
     }
     dispose() {
-        this.globalToDispose.dispose();
-        this.localToDispose.dispose();
+        super.dispose();
         dispose(this._editorDisposables);
         dispose(this._commentWidgets);
         this.editor = null;
@@ -1084,18 +1084,18 @@ let CommentController = class CommentController {
                         const keybinding = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getAriaLabel();
                         if (keybinding) {
                             status(( localize(
-                                6850,
+                                7458,
                                 "Editor has commenting ranges, run the command Open Accessibility Help ({0}), for more information.",
                                 keybinding
                             )));
                         } else {
                             status(( localize(
-                                6851,
+                                7459,
                                 "Editor has commenting ranges, run the command Open Accessibility Help, which is currently not triggerable via keybinding, for more information."
                             )));
                         }
                     } else {
-                        status(( localize(6852, "Editor has commenting ranges.")));
+                        status(( localize(7460, "Editor has commenting ranges.")));
                     }
                 }
             }
@@ -1142,8 +1142,10 @@ let CommentController = class CommentController {
         );
         await zoneWidget.display(thread.range, shouldReveal);
         this._commentWidgets.push(zoneWidget);
-        zoneWidget.onDidChangeExpandedState(() => this._updateCommentWidgetVisibleContext());
-        zoneWidget.onDidClose(() => this._updateCommentWidgetVisibleContext());
+        this.localToDispose.add(
+            zoneWidget.onDidChangeExpandedState(() => this._updateCommentWidgetVisibleContext())
+        );
+        this.localToDispose.add(zoneWidget.onDidClose(() => this._updateCommentWidgetVisibleContext()));
         this.openCommentsView(thread);
     }
     onEditorMouseDown(e) {
@@ -1243,9 +1245,9 @@ let CommentController = class CommentController {
             this._addInProgress = false;
             if (!newCommentInfos.length) {
                 if (range) {
-                    this.notificationService.error(( localize(6853, "The cursor must be within a commenting range to add a comment.")));
+                    this.notificationService.error(( localize(7461, "The cursor must be within a commenting range to add a comment.")));
                 } else {
-                    this.notificationService.error(( localize(6854, "File comments are not allowed on this file.")));
+                    this.notificationService.error(( localize(7462, "File comments are not allowed on this file.")));
                 }
             }
             return Promise.resolve();
@@ -1264,7 +1266,7 @@ let CommentController = class CommentController {
             } else {
                 const picks = this.getCommentProvidersQuickPicks(newCommentInfos);
                 return this.quickInputService.pick(picks, {
-                    placeHolder: ( localize(6855, "Select Comment Provider")),
+                    placeHolder: ( localize(7463, "Select Comment Provider")),
                     matchOnDescription: true
                 }).then(pick => {
                     if (!pick) {

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

@@ -113,7 +113,7 @@ class CommentsModel extends Disposable {
     }
     getMessage() {
         if (!this._resourceCommentThreads.length) {
-            return localize(6868, "There are no comments in this workspace yet.");
+            return localize(7476, "There are no comments in this workspace yet.");
         } else {
             return "";
         }

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

@@ -33,7 +33,7 @@ import { IHoverService } from '../../../../platform/hover/browser/hover.service.
 
 const COMMENTS_VIEW_ID = "workbench.panel.comments";
 const COMMENTS_VIEW_STORAGE_ID = "Comments";
-const COMMENTS_VIEW_TITLE = ( localize2(6869, "Comments"));
+const COMMENTS_VIEW_TITLE = ( localize2(7477, "Comments"));
 class CommentsModelVirtualDelegate {
     static {
         this.RESOURCE_ID = "resource-with-comments";
@@ -199,11 +199,11 @@ let CommentNodeRenderer = class CommentNodeRenderer {
     }
     getCountString(commentCount) {
         if (commentCount > 2) {
-            return localize(6870, "{0} replies", commentCount - 1);
+            return localize(7478, "{0} replies", commentCount - 1);
         } else if (commentCount === 2) {
-            return localize(6871, "1 reply");
+            return localize(7479, "1 reply");
         } else {
-            return localize(6872, "1 comment");
+            return localize(7480, "1 comment");
         }
     }
     getRenderedComment(commentBody) {
@@ -212,7 +212,7 @@ let CommentNodeRenderer = class CommentNodeRenderer {
         for (let i = 0; i < images.length; i++) {
             const image = images[i];
             const textDescription = $("");
-            textDescription.textContent = image.alt ? ( localize(6873, "Image: {0}", image.alt)) : ( localize(6874, "Image"));
+            textDescription.textContent = image.alt ? ( localize(7481, "Image: {0}", image.alt)) : ( localize(7482, "Image"));
             image.replaceWith(textDescription);
         }
         const headings = [
@@ -246,7 +246,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 = ( localize(6875, "Outdated"));
+            templateData.threadMetadata.relevance.innerText = ( localize(7483, "Outdated"));
             templateData.threadMetadata.separator.style.display = "none";
         } else {
             templateData.threadMetadata.relevance.innerText = "";
@@ -287,10 +287,10 @@ let CommentNodeRenderer = class CommentNodeRenderer {
         }
         if (node.element.range) {
             if (node.element.range.startLineNumber === node.element.range.endLineNumber) {
-                templateData.threadMetadata.range.textContent = ( localize(6876, "[Ln {0}]", node.element.range.startLineNumber));
+                templateData.threadMetadata.range.textContent = ( localize(7484, "[Ln {0}]", node.element.range.startLineNumber));
             } else {
                 templateData.threadMetadata.range.textContent = ( localize(
-                    6877,
+                    7485,
                     "[Ln {0}-{1}]",
                     node.element.range.startLineNumber,
                     node.element.range.endLineNumber
@@ -314,7 +314,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 = ( localize(6878, "Last reply from {0}", lastComment.userName));
+        templateData.repliesMetadata.lastReplyDetail.textContent = ( localize(7486, "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

@@ -132,8 +132,8 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
         super({
             ...options,
             filterOptions: {
-                placeholder: ( localize(6879, "Filter (e.g. text, author)")),
-                ariaLabel: ( localize(6880, "Filter comments")),
+                placeholder: ( localize(7487, "Filter (e.g. text, author)")),
+                ariaLabel: ( localize(7488, "Filter comments")),
                 history: viewState.filterHistory || [],
                 text: viewState.filter || "",
                 focusContextKey: CommentsViewFilterFocusContextKey.key
@@ -226,7 +226,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
             total,
             filtered
         } = this.getFilterStats();
-        this.filterWidget.updateBadge(total === filtered || total === 0 ? undefined : ( localize(6881, "Showing {0} of {1}", filtered, total)));
+        this.filterWidget.updateBadge(total === filtered || total === 0 ? undefined : ( localize(7489, "Showing {0} of {1}", filtered, total)));
         this.filterWidget.checkMoreFilters(!this.filters.showResolved || !this.filters.showUnresolved);
     }
     renderBody(container) {
@@ -311,11 +311,11 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
     makeCommentLocationLabel(file, range) {
         const fileLabel = basename(file);
         if (!range) {
-            return localize(6882, "in {0}", fileLabel);
+            return localize(7490, "in {0}", fileLabel);
         }
         if (range.startLineNumber === range.endLineNumber) {
             return localize(
-                6883,
+                7491,
                 "at line {0} column {1} in {2}",
                 range.startLineNumber,
                 range.startColumn,
@@ -323,7 +323,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
             );
         } else {
             return localize(
-                6884,
+                7492,
                 "from line {0} to line {1} in {2}",
                 range.startLineNumber,
                 range.endLineNumber,
@@ -347,8 +347,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 ? ( localize(6885, "\nInspect this in the accessible view ({0}).", kbLabel)) : ( localize(
-                6886,
+            accessibleViewHint = kbLabel ? ( localize(7493, "\nInspect this in the accessible view ({0}).", kbLabel)) : ( localize(
+                7494,
                 "\nInspect this in the accessible view via the command Open Accessible View which is currently not triggerable via keybinding."
             ));
         }
@@ -368,7 +368,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
         const labelInfo = this.makeScreenReaderLabelInfo(element, forAriaLabel);
         if (element.threadRelevance === CommentThreadApplicability.Outdated) {
             return ( localize(
-                6887,
+                7495,
                 "Outdated from {0}: {1}\n{2}\n{3}\n{4}",
                 labelInfo.userName,
                 labelInfo.bodyLabel,
@@ -378,7 +378,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
             )) + replies + accessibleViewHint;
         } else {
             return ( localize(
-                6888,
+                7496,
                 "{0}: {1}\n{2}\n{3}\n{4}",
                 labelInfo.userName,
                 labelInfo.bodyLabel,
@@ -393,14 +393,14 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
             return "";
         }
         return "\n" + ( node.replies.map(reply => ( localize(
-            6889,
+            7497,
             "{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 ? ( localize(6890, " {0} replies,", node.replies.length)) : "";
+        return node.replies.length && !forAriaLabel ? ( localize(7498, " {0} replies,", node.replies.length)) : "";
     }
     createTree() {
         this.treeLabels = this._register(this.instantiationService.createInstance(ResourceLabels, this));
@@ -438,11 +438,11 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
                 accessibilityProvider: {
                     getAriaLabel: element => {
                         if (element instanceof CommentsModel) {
-                            return localize(6891, "Comments for current workspace");
+                            return localize(7499, "Comments for current workspace");
                         }
                         if (element instanceof ResourceWithCommentThreads) {
                             return localize(
-                                6892,
+                                7500,
                                 "Comments in {0}, full path {1}",
                                 basename(element.resource),
                                 element.resource.fsPath

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

@@ -72,7 +72,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: "commentsFocusViewFromFilter",
-            title: ( localize(6893, "Focus Comments view")),
+            title: ( localize(7501, "Focus Comments view")),
             keybinding: {
                 when: CommentsViewFilterFocusContextKey,
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -89,7 +89,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: "commentsClearFilterText",
-            title: ( localize(6894, "Clear filter text")),
+            title: ( localize(7502, "Clear filter text")),
             keybinding: {
                 when: CommentsViewFilterFocusContextKey,
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -106,7 +106,7 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: "commentsFocusFilter",
-            title: ( localize(6895, "Focus comments filter")),
+            title: ( localize(7503, "Focus comments filter")),
             keybinding: {
                 when: ( FocusedViewContext.isEqualTo(COMMENTS_VIEW_ID)),
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -123,11 +123,11 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: `workbench.actions.${COMMENTS_VIEW_ID}.toggleUnResolvedComments`,
-            title: ( localize(6896, "Show Unresolved")),
-            category: ( localize(6897, "Comments")),
+            title: ( localize(7504, "Show Unresolved")),
+            category: ( localize(7505, "Comments")),
             toggled: {
                 condition: CONTEXT_KEY_SHOW_UNRESOLVED,
-                title: ( localize(6898, "Show Unresolved"))
+                title: ( localize(7506, "Show Unresolved"))
             },
             menu: {
                 id: viewFilterSubmenu,
@@ -146,11 +146,11 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: `workbench.actions.${COMMENTS_VIEW_ID}.toggleResolvedComments`,
-            title: ( localize(6899, "Show Resolved")),
-            category: ( localize(6897, "Comments")),
+            title: ( localize(7507, "Show Resolved")),
+            category: ( localize(7505, "Comments")),
             toggled: {
                 condition: CONTEXT_KEY_SHOW_RESOLVED,
-                title: ( localize(6900, "Show Resolved"))
+                title: ( localize(7508, "Show Resolved"))
             },
             menu: {
                 id: viewFilterSubmenu,
@@ -168,7 +168,7 @@ registerAction2(class extends ViewAction {
 const commentSortSubmenu = ( new MenuId("submenu.filter.commentSort"));
 MenuRegistry.appendMenuItem(viewFilterSubmenu, {
     submenu: commentSortSubmenu,
-    title: ( localize(6901, "Sort By")),
+    title: ( localize(7509, "Sort By")),
     group: "2_sort",
     icon: Codicon.history,
     when: ( ContextKeyExpr.equals("view", COMMENTS_VIEW_ID))
@@ -177,13 +177,13 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: `workbench.actions.${COMMENTS_VIEW_ID}.toggleSortByUpdatedAt`,
-            title: ( localize(6902, "Updated Time")),
-            category: ( localize(6897, "Comments")),
+            title: ( localize(7510, "Updated Time")),
+            category: ( localize(7505, "Comments")),
             icon: Codicon.history,
             viewId: COMMENTS_VIEW_ID,
             toggled: {
                 condition: ( ContextKeyExpr.equals(CONTEXT_KEY_SORT_BY.key, CommentsSortOrder.UpdatedAtDescending)),
-                title: ( localize(6903, "Updated Time"))
+                title: ( localize(7511, "Updated Time"))
             },
             menu: {
                 id: commentSortSubmenu,
@@ -201,13 +201,13 @@ registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: `workbench.actions.${COMMENTS_VIEW_ID}.toggleSortByResource`,
-            title: ( localize(6904, "Position in File")),
-            category: ( localize(6897, "Comments")),
+            title: ( localize(7512, "Position in File")),
+            category: ( localize(7505, "Comments")),
             icon: Codicon.history,
             viewId: COMMENTS_VIEW_ID,
             toggled: {
                 condition: ( ContextKeyExpr.equals(CONTEXT_KEY_SORT_BY.key, CommentsSortOrder.ResourceAscending)),
-                title: ( localize(6905, "Position in File"))
+                title: ( localize(7513, "Position in File"))
             },
             menu: {
                 id: commentSortSubmenu,