@codingame/monaco-vscode-api 7.1.0 → 8.0.0

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

@@ -8,31 +8,18 @@ import { Schemas } from '../../../../base/common/network.js';
 import { URI } from '../../../../base/common/uri.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
 import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
-import { resolveColorValue } from '../../../../platform/theme/common/colorUtils.js';
-import '../../../../platform/theme/common/colors/baseColors.js';
-import '../../../../platform/theme/common/colors/chartsColors.js';
-import { editorForeground } from '../../../../platform/theme/common/colors/editorColors.js';
-import '../../../../platform/theme/common/colors/inputColors.js';
-import '../../../../platform/theme/common/colors/listColors.js';
-import '../../../../platform/theme/common/colors/menuColors.js';
-import '../../../../platform/theme/common/colors/minimapColors.js';
-import '../../../../platform/theme/common/colors/miscColors.js';
-import '../../../../platform/theme/common/colors/quickpickColors.js';
-import '../../../../platform/theme/common/colors/searchColors.js';
-import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
 import { CommentFormActions } from './commentFormActions.js';
 import { ICommentService } from './commentService.service.js';
 import { CommentContextKeys } from '../common/commentContextKeys.js';
 import { MIN_EDITOR_HEIGHT, SimpleCommentEditor, calculateEditorHeight } from './simpleCommentEditor.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
-const _moduleId = "vs/workbench/contrib/comments/browser/commentReply";
 let INMEM_MODEL_ID = 0;
 const COMMENTEDITOR_DECORATION_KEY = 'commenteditordecoration';
 let CommentReply = class CommentReply extends Disposable {
-    constructor(owner, container, _parentEditor, _commentThread, _scopedInstatiationService, _contextKeyService, _commentMenus, _commentOptions, _pendingComment, _parentThread, focus, _actionRunDelegate, commentService, themeService, configurationService, keybindingService, hoverService, textModelService) {
+    constructor(owner, container, _parentEditor, _commentThread, _scopedInstatiationService, _contextKeyService, _commentMenus, _commentOptions, _pendingComment, _parentThread, focus, _actionRunDelegate, commentService, configurationService, keybindingService, hoverService, textModelService) {
         super();
         this.owner = owner;
         this._parentEditor = _parentEditor;
@@ -45,7 +32,6 @@ let CommentReply = class CommentReply extends Disposable {
         this._parentThread = _parentThread;
         this._actionRunDelegate = _actionRunDelegate;
         this.commentService = commentService;
-        this.themeService = themeService;
         this.keybindingService = keybindingService;
         this.hoverService = hoverService;
         this.textModelService = textModelService;
@@ -93,7 +79,7 @@ let CommentReply = class CommentReply extends Disposable {
         else if (hasExistingComments) {
             this.createReplyButton(this.commentEditor, this.form);
         }
-        else if (focus && (!this._commentThread.comments || this._commentThread.comments.length === 0)) {
+        else if (focus && (this._commentThread.comments && this._commentThread.comments.length === 0)) {
             this.expandReplyArea();
         }
         this._error = append(this.form, $('.validation-error.hidden'));
@@ -170,31 +156,11 @@ let CommentReply = class CommentReply extends Disposable {
         this._pendingComment = undefined;
     }
     setCommentEditorDecorations() {
-        const model = this.commentEditor.getModel();
-        if (model) {
-            const valueLength = model.getValueLength();
-            const hasExistingComments = this._commentThread.comments && this._commentThread.comments.length > 0;
-            const placeholder = valueLength > 0
-                ? ''
-                : hasExistingComments
-                    ? (this._commentOptions?.placeHolder || ( localizeWithPath(_moduleId, 0, "Reply...")))
-                    : (this._commentOptions?.placeHolder || ( localizeWithPath(_moduleId, 1, "Type a new comment")));
-            const decorations = [{
-                    range: {
-                        startLineNumber: 0,
-                        endLineNumber: 0,
-                        startColumn: 0,
-                        endColumn: 1
-                    },
-                    renderOptions: {
-                        after: {
-                            contentText: placeholder,
-                            color: `${resolveColorValue(editorForeground, this.themeService.getColorTheme())?.transparent(0.4)}`
-                        }
-                    }
-                }];
-            this.commentEditor.setDecorationsByType('review-zone-widget', COMMENTEDITOR_DECORATION_KEY, decorations);
-        }
+        const hasExistingComments = this._commentThread.comments && this._commentThread.comments.length > 0;
+        const placeholder = hasExistingComments
+            ? (this._commentOptions?.placeHolder || ( localize(7989, "Reply...")))
+            : (this._commentOptions?.placeHolder || ( localize(7990, "Type a new comment")));
+        this.commentEditor.updateOptions({ placeholder });
     }
     createTextModelListener(commentEditor, commentForm) {
         this._commentThreadDisposables.push(commentEditor.onDidFocusEditorWidget(() => {
@@ -310,8 +276,8 @@ let CommentReply = class CommentReply extends Disposable {
     }
     createReplyButton(commentEditor, commentForm) {
         this._reviewThreadReplyButton = append(commentForm, $(`button.review-thread-reply-button.${MOUSE_CURSOR_TEXT_CSS_CLASS_NAME}`));
-        this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), this._reviewThreadReplyButton, this._commentOptions?.prompt || ( localizeWithPath(_moduleId, 0, "Reply..."))));
-        this._reviewThreadReplyButton.textContent = this._commentOptions?.prompt || ( localizeWithPath(_moduleId, 0, "Reply..."));
+        this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), this._reviewThreadReplyButton, this._commentOptions?.prompt || ( localize(7990, "Reply..."))));
+        this._reviewThreadReplyButton.textContent = this._commentOptions?.prompt || ( localize(7990, "Reply..."));
         this._register(addDisposableListener(this._reviewThreadReplyButton, 'click', _ => this.clearAndExpandReplyArea()));
         this._register(addDisposableListener(this._reviewThreadReplyButton, 'focus', _ => this.clearAndExpandReplyArea()));
         commentEditor.onDidBlurEditorWidget(() => {
@@ -327,10 +293,9 @@ let CommentReply = class CommentReply extends Disposable {
 };
 CommentReply = ( (__decorate([
     ( (__param(12, ICommentService))),
-    ( (__param(13, IThemeService))),
-    ( (__param(14, IConfigurationService))),
-    ( (__param(15, IKeybindingService))),
-    ( (__param(16, IHoverService))),
-    ( (__param(17, ITextModelService)))
+    ( (__param(13, IConfigurationService))),
+    ( (__param(14, IKeybindingService))),
+    ( (__param(15, IHoverService))),
+    ( (__param(16, ITextModelService)))
 ], CommentReply)));
 export { COMMENTEDITOR_DECORATION_KEY, CommentReply };

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

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { addDisposableListener, EventType, append, $, getClientArea, getDomNodePagePosition } from '../../../../base/browser/dom.js';
-import { localizeWithPath } from '../../../../nls.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
+import { localize } from '../../../../nls.js';
+import { Disposable, DisposableMap, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { CommentMode } from '../../../../editor/common/languages.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { ICommentService } from './commentService.service.js';
@@ -11,7 +11,6 @@ import { CommentNode } from './commentNode.js';
 import { MarkdownRenderer } from '../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.service.js';
 import { ILanguageService } from '../../../../editor/common/languages/language.js';
-const _moduleId = "vs/workbench/contrib/comments/browser/commentThreadBody";
 let CommentThreadBody = class CommentThreadBody extends Disposable {
     get length() {
         return this._commentThread.comments ? this._commentThread.comments.length : 0;
@@ -37,7 +36,7 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
         this._focusedComment = undefined;
         this._onDidResize = ( (new Emitter()));
         this.onDidResize = this._onDidResize.event;
-        this._commentDisposable = ( (new Map()));
+        this._commentDisposable = ( (new DisposableMap()));
         this._register(addDisposableListener(container, EventType.FOCUS_IN, e => {
             this.commentService.setActiveEditingCommentThread(this._commentThread);
         }));
@@ -46,6 +45,11 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
     focus() {
         this._commentsElement.focus();
     }
+    ensureFocusIntoNewEditingComment() {
+        if (this._commentElements.length === 1 && this._commentElements[0].isEditing) {
+            this._commentElements[0].setFocus(true);
+        }
+    }
     async display() {
         this._commentsElement = append(this.container, $('div.comments-container'));
         this._commentsElement.setAttribute('role', 'presentation');
@@ -67,6 +71,7 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
                 this._setFocusedComment(event.equals(KeyCode.UpArrow) ? moveFocusWithinBounds(-1) : moveFocusWithinBounds(1));
             }
         }));
+        this._commentDisposable.clearAndDisposeAll();
         this._commentElements = [];
         if (this._commentThread.comments) {
             for (const comment of this._commentThread.comments) {
@@ -140,8 +145,7 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
         }
         for (let i = commentElementsToDel.length - 1; i >= 0; i--) {
             const commentToDelete = commentElementsToDel[i];
-            this._commentDisposable.get(commentToDelete)?.dispose();
-            this._commentDisposable.delete(commentToDelete);
+            this._commentDisposable.deleteAndDispose(commentToDelete);
             this._commentElements.splice(commentElementsToDelIndex[i], 1);
             commentToDelete.domNode.remove();
         }
@@ -186,9 +190,8 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
     _updateAriaLabel() {
         if (this._commentThread.isDocumentCommentThread()) {
             if (this._commentThread.range) {
-                this._commentsElement.ariaLabel = ( localizeWithPath(
-                    _moduleId,
-                    0,
+                this._commentsElement.ariaLabel = ( localize(
+                    11501,
                     "Comment thread with {0} comments on lines {1} through {2}. {3}.",
                     this._commentThread.comments?.length,
                     this._commentThread.range.startLineNumber,
@@ -197,9 +200,8 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
                 ));
             }
             else {
-                this._commentsElement.ariaLabel = ( localizeWithPath(
-                    _moduleId,
-                    1,
+                this._commentsElement.ariaLabel = ( localize(
+                    11502,
                     "Comment thread with {0} comments on the entire document. {1}.",
                     this._commentThread.comments?.length,
                     this._commentThread.label
@@ -207,9 +209,8 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
             }
         }
         else {
-            this._commentsElement.ariaLabel = ( localizeWithPath(
-                _moduleId,
-                2,
+            this._commentsElement.ariaLabel = ( localize(
+                11503,
                 "Comment thread with {0} comments. {1}.",
                 this._commentThread.comments?.length,
                 this._commentThread.label
@@ -230,8 +231,10 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
     }
     createNewCommentNode(comment) {
         const newCommentNode = this._scopedInstatiationService.createInstance(CommentNode, this._parentEditor, this._commentThread, comment, this._pendingEdits ? this._pendingEdits[comment.uniqueIdInThread] : undefined, this.owner, this.parentResourceUri, this._parentCommentThreadWidget, this._markdownRenderer);
-        this._register(newCommentNode);
-        this._commentDisposable.set(newCommentNode, newCommentNode.onDidClick(clickedNode => this._setFocusedComment(this._commentElements.findIndex(commentNode => commentNode.comment.uniqueIdInThread === clickedNode.comment.uniqueIdInThread))));
+        const disposables = ( (new DisposableStore()));
+        disposables.add(newCommentNode.onDidClick(clickedNode => this._setFocusedComment(this._commentElements.findIndex(commentNode => commentNode.comment.uniqueIdInThread === clickedNode.comment.uniqueIdInThread))));
+        disposables.add(newCommentNode);
+        this._commentDisposable.set(newCommentNode, disposables);
         return newCommentNode;
     }
     dispose() {
@@ -240,7 +243,7 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
             this._resizeObserver.disconnect();
             this._resizeObserver = null;
         }
-        this._commentDisposable.forEach(v => v.dispose());
+        this._commentDisposable.dispose();
     }
 };
 CommentThreadBody = ( (__decorate([

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

@@ -4,14 +4,13 @@ import { Action, ActionRunner } from '../../../../base/common/actions.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import { escape } from '../../../../base/common/strings.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { MarshalledId } from '../../../../base/common/marshallingIds.js';
 import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
-const _moduleId = "vs/workbench/contrib/comments/browser/commentThreadHeader";
-const collapseIcon = registerIcon('review-comment-collapse', Codicon.chevronUp, ( localizeWithPath(_moduleId, 0, 'Icon to collapse a review comment.')));
+const collapseIcon = registerIcon('review-comment-collapse', Codicon.chevronUp, ( localize(11504, 'Icon to collapse a review comment.')));
 const COLLAPSE_ACTION_CLASS = 'expand-review-action ' + ThemeIcon.asClassName(collapseIcon);
 class CommentThreadHeader extends Disposable {
     constructor(container, _delegate, _commentMenus, _commentThread, _contextKeyService, instantiationService, _contextMenuService) {
@@ -36,7 +35,7 @@ class CommentThreadHeader extends Disposable {
             actionViewItemProvider: createActionViewItem.bind(undefined, this.instantiationService)
         })));
         this._register(this._actionbarWidget);
-        this._collapseAction = ( (new Action('review.expand', ( localizeWithPath(_moduleId, 1, "Collapse")), COLLAPSE_ACTION_CLASS, true, () => this._delegate.collapse())));
+        this._collapseAction = ( (new Action('review.expand', ( localize(11505, "Collapse")), COLLAPSE_ACTION_CLASS, true, () => this._delegate.collapse())));
         const menu = this._commentMenus.getCommentThreadTitleActions(this._contextKeyService);
         this._register(menu);
         this.setActionBarActions(menu);
@@ -64,7 +63,7 @@ class CommentThreadHeader extends Disposable {
         label = this._commentThread.label;
         if (label === undefined) {
             if (!(this._commentThread.comments && this._commentThread.comments.length)) {
-                label = ( localizeWithPath(_moduleId, 2, "Start discussion"));
+                label = ( localize(11506, "Start discussion"));
             }
         }
         if (label) {

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

@@ -27,11 +27,10 @@ import { IContextMenuService } from '../../../../platform/contextview/browser/co
 import { registerNavigableContainer } from '../../../browser/actions/widgetNavigationCommands.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { COMMENTS_SECTION } from '../common/commentsConfiguration.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 import { AccessibilityCommandId } from '../../accessibility/common/accessibilityCommands.js';
-const _moduleId = "vs/workbench/contrib/comments/browser/commentThreadWidget";
 let CommentThreadWidget = class CommentThreadWidget extends Disposable {
     get commentThread() {
         return this._commentThread;
@@ -103,25 +102,18 @@ let CommentThreadWidget = class CommentThreadWidget extends Disposable {
         this.currentThreadListeners();
     }
     _setAriaLabel() {
-        let ariaLabel = ( localizeWithPath(_moduleId, 0, "Comment"));
+        let ariaLabel = ( localize(11238, "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 = ( localizeWithPath(
-                _moduleId,
-                1,
-                "{0}, use ({1}) for accessibility help",
-                ariaLabel,
-                keybinding
-            ));
+            ariaLabel = ( localize(11239, "{0}, use ({1}) for accessibility help", ariaLabel, keybinding));
         }
         else {
-            ariaLabel = ( localizeWithPath(
-                _moduleId,
-                2,
+            ariaLabel = ( localize(
+                11240,
                 "{0}, run the command Open Accessibility Help which is currently not triggerable via keybinding.",
                 ariaLabel
             ));
@@ -258,6 +250,9 @@ let CommentThreadWidget = class CommentThreadWidget extends Disposable {
             this._commentReply?.layout(widthInPixel);
         }
     }
+    ensureFocusIntoNewEditingComment() {
+        this._body.ensureFocusIntoNewEditingComment();
+    }
     focusCommentEditor() {
         this._commentReply?.expandReplyAreaAndFocusCommentEditor();
     }

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

@@ -115,29 +115,41 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
     revealRange() {
     }
     reveal(commentUniqueId, focus = CommentWidgetFocus.None) {
+        this.makeVisible(commentUniqueId, focus);
+        const comment = this._commentThread.comments?.find(comment => comment.uniqueIdInThread === commentUniqueId);
+        this.commentService.setActiveCommentAndThread(this.uniqueOwner, { thread: this._commentThread, comment });
+    }
+    _expandAndShowZoneWidget() {
         if (!this._isExpanded) {
             this.show(this.arrowPosition(this._commentThread.range), 2);
         }
-        if (commentUniqueId !== undefined) {
-            const height = this.editor.getLayoutInfo().height;
-            const coords = this._commentThreadWidget.getCommentCoords(commentUniqueId);
-            if (coords) {
-                let scrollTop = 1;
-                if (this._commentThread.range) {
-                    const commentThreadCoords = coords.thread;
-                    const commentCoords = coords.comment;
-                    scrollTop = this.editor.getTopForLineNumber(this._commentThread.range.startLineNumber) - height / 2 + commentCoords.top - commentThreadCoords.top;
-                }
-                this.editor.setScrollTop(scrollTop);
-                if (focus === CommentWidgetFocus.Widget) {
-                    this._commentThreadWidget.focus();
-                }
-                else if (focus === CommentWidgetFocus.Editor) {
-                    this._commentThreadWidget.focusCommentEditor();
-                }
-                return;
+    }
+    _setFocus(focus) {
+        if (focus === CommentWidgetFocus.Widget) {
+            this._commentThreadWidget.focus();
+        }
+        else if (focus === CommentWidgetFocus.Editor) {
+            this._commentThreadWidget.focusCommentEditor();
+        }
+    }
+    _goToComment(commentUniqueId, focus) {
+        const height = this.editor.getLayoutInfo().height;
+        const coords = this._commentThreadWidget.getCommentCoords(commentUniqueId);
+        if (coords) {
+            let scrollTop = 1;
+            if (this._commentThread.range) {
+                const commentThreadCoords = coords.thread;
+                const commentCoords = coords.comment;
+                scrollTop = this.editor.getTopForLineNumber(this._commentThread.range.startLineNumber) - height / 2 + commentCoords.top - commentThreadCoords.top;
             }
+            this.editor.setScrollTop(scrollTop);
+            this._setFocus(focus);
+        }
+        else {
+            this._goToThread(focus);
         }
+    }
+    _goToThread(focus) {
         const rangeToReveal = this._commentThread.range
             ? ( new Range(
             this._commentThread.range.startLineNumber,
@@ -147,12 +159,14 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
         ))
             : ( new Range(1, 1, 1, 1));
         this.editor.revealRangeInCenter(rangeToReveal);
-        if (focus === CommentWidgetFocus.Widget) {
-            this._commentThreadWidget.focus();
-        }
-        else if (focus === CommentWidgetFocus.Editor) {
-            this._commentThreadWidget.focusCommentEditor();
+        this._setFocus(focus);
+    }
+    makeVisible(commentUniqueId, focus = CommentWidgetFocus.None) {
+        this._expandAndShowZoneWidget();
+        if (commentUniqueId !== undefined) {
+            this._goToComment(commentUniqueId, focus);
         }
+        this._goToThread(focus);
     }
     getPendingComments() {
         return {
@@ -217,8 +231,11 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
     collapse() {
         this._commentThread.collapsibleState = CommentThreadCollapsibleState.Collapsed;
     }
-    expand() {
+    expand(setActive) {
         this._commentThread.collapsibleState = CommentThreadCollapsibleState.Expanded;
+        if (setActive) {
+            this.commentService.setActiveCommentAndThread(this.uniqueOwner, { thread: this._commentThread });
+        }
     }
     getGlyphPosition() {
         if (this._commentGlyph) {
@@ -277,7 +294,7 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
             this.show(this.arrowPosition(range), 2);
         }
         if (shouldReveal) {
-            this.reveal();
+            this.makeVisible();
         }
         this.bindCommentThreadListeners();
     }
@@ -301,6 +318,7 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
         this._commentThreadDisposables.push(this._commentThread.onDidChangeCollapsibleState(state => {
             if (state === CommentThreadCollapsibleState.Expanded && !this._isExpanded) {
                 this.show(this.arrowPosition(this._commentThread.range), 2);
+                this._commentThreadWidget.ensureFocusIntoNewEditingComment();
                 return;
             }
             if (state === CommentThreadCollapsibleState.Collapsed && this._isExpanded) {

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

@@ -2,66 +2,55 @@ import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextke
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ctxCommentEditorFocused } from './simpleCommentEditor.js';
 import { CommentContextKeys } from '../common/commentContextKeys.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
 import { CommentCommandId } from '../common/commentCommandIds.js';
 import { ToggleTabFocusModeAction } from '../../../../editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode.js';
 import { AccessibleViewType, AccessibleViewProviderId } from '../../../../platform/accessibility/browser/accessibleView.js';
-const _moduleId = "vs/workbench/contrib/comments/browser/commentsAccessibility";
+import { Disposable } from '../../../../base/common/lifecycle.js';
 var CommentAccessibilityHelpNLS;
 ( ((function(CommentAccessibilityHelpNLS) {
-    CommentAccessibilityHelpNLS.intro = ( localizeWithPath(
-        _moduleId,
-        0,
+    CommentAccessibilityHelpNLS.intro = ( localize(
+        5291,
         "The editor contains commentable range(s). Some useful commands include:"
     ));
-    CommentAccessibilityHelpNLS.tabFocus = ( localizeWithPath(
-        _moduleId,
-        1,
-        "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}",
+    CommentAccessibilityHelpNLS.tabFocus = ( localize(
+        5292,
+        "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 = ( localizeWithPath(_moduleId, 2, "Some useful comment commands include:"));
-    CommentAccessibilityHelpNLS.escape = ( localizeWithPath(_moduleId, 3, "- Dismiss Comment (Escape)"));
-    CommentAccessibilityHelpNLS.nextRange = ( localizeWithPath(
-        _moduleId,
-        4,
-        "- Go to Next Commenting Range{0}",
+    CommentAccessibilityHelpNLS.commentCommands = ( localize(5293, "Some useful comment commands include:"));
+    CommentAccessibilityHelpNLS.escape = ( localize(5294, "- Dismiss Comment (Escape)"));
+    CommentAccessibilityHelpNLS.nextRange = ( localize(
+        5295,
+        "- Go to Next Commenting Range{0}.",
         `<keybinding:${CommentCommandId.NextRange}>`
     ));
-    CommentAccessibilityHelpNLS.previousRange = ( localizeWithPath(
-        _moduleId,
-        5,
-        "- Go to Previous Commenting Range{0}",
+    CommentAccessibilityHelpNLS.previousRange = ( localize(
+        5296,
+        "- Go to Previous Commenting Range{0}.",
         `<keybinding:${CommentCommandId.PreviousRange}>`
     ));
-    CommentAccessibilityHelpNLS.nextCommentThread = ( localizeWithPath(
-        _moduleId,
-        6,
-        "- Go to Next Comment Thread{0}",
+    CommentAccessibilityHelpNLS.nextCommentThread = ( localize(
+        5297,
+        "- Go to Next Comment Thread{0}.",
         `<keybinding:${CommentCommandId.NextThread}>`
     ));
-    CommentAccessibilityHelpNLS.previousCommentThread = ( localizeWithPath(
-        _moduleId,
-        7,
-        "- Go to Previous Comment Thread{0}",
+    CommentAccessibilityHelpNLS.previousCommentThread = ( localize(
+        5298,
+        "- Go to Previous Comment Thread{0}.",
         `<keybinding:${CommentCommandId.PreviousThread}>`
     ));
-    CommentAccessibilityHelpNLS.addComment = ( localizeWithPath(
-        _moduleId,
-        8,
-        "- Add Comment on Current Selection{0}",
+    CommentAccessibilityHelpNLS.addComment = ( localize(
+        5299,
+        "- Add Comment on Current Selection{0}.",
         `<keybinding:${CommentCommandId.Add}>`
     ));
-    CommentAccessibilityHelpNLS.submitComment = ( localizeWithPath(
-        _moduleId,
-        9,
-        "- Submit Comment{0}",
-        `<keybinding:${CommentCommandId.Submit}>`
-    ));
+    CommentAccessibilityHelpNLS.submitComment = ( localize(5300, "- Submit Comment{0}.", `<keybinding:${CommentCommandId.Submit}>`));
 })(CommentAccessibilityHelpNLS || (CommentAccessibilityHelpNLS = {}))));
-class CommentsAccessibilityHelpProvider {
+class CommentsAccessibilityHelpProvider extends Disposable {
     constructor() {
+        super(...arguments);
         this.id = AccessibleViewProviderId.Comments;
         this.verbositySettingKey = AccessibilityVerbositySettingId.Comments;
         this.options = { type: AccessibleViewType.Help };
@@ -83,6 +72,5 @@ class CommentsAccessibilityHelp {
     getProvider(accessor) {
         return accessor.get(IInstantiationService).createInstance(CommentsAccessibilityHelpProvider);
     }
-    dispose() { }
 }
 export { CommentAccessibilityHelpNLS, CommentsAccessibilityHelp, CommentsAccessibilityHelpProvider };

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

@@ -12,7 +12,7 @@ import { Range } from '../../../../editor/common/core/range.js';
 import { EditorType } from '../../../../editor/common/editorCommon.js';
 import { ModelDecorationOptions, TextModel } from '../../../../editor/common/model/textModel.js';
 import { CommentThreadState } from '../../../../editor/common/languages.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.service.js';
@@ -38,7 +38,6 @@ import { AccessibilityCommandId } from '../../accessibility/common/accessibility
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.service.js';
 import { URI } from '../../../../base/common/uri.js';
-const _moduleId = "vs/workbench/contrib/comments/browser/commentsController";
 const ID = 'editor.contrib.review';
 class CommentingRangeDecoration {
     get id() {
@@ -772,7 +771,7 @@ let CommentController = class CommentController {
             const commentRangeEnd = range?.getEndPosition().lineNumber;
             if (commentRangeStart && commentRangeEnd) {
                 const oneLine = commentRangeStart === commentRangeEnd;
-                oneLine ? status(( localizeWithPath(_moduleId, 0, "Line {0}", commentRangeStart))) : status(( localizeWithPath(_moduleId, 1, "Lines {0} to {1}", commentRangeStart, commentRangeEnd)));
+                oneLine ? status(( localize(5285, "Line {0}", commentRangeStart))) : status(( localize(5286, "Lines {0} to {1}", commentRangeStart, commentRangeEnd)));
             }
         }
     }
@@ -819,8 +818,7 @@ let CommentController = class CommentController {
         const pendingCommentText = (this._pendingNewCommentCache[uniqueOwner] && this._pendingNewCommentCache[uniqueOwner][thread.threadId])
             ?? continueOnCommentText;
         const pendingEdits = this._pendingEditsCache[uniqueOwner] && this._pendingEditsCache[uniqueOwner][thread.threadId];
-        const isThreadTemplateOrEmpty = (thread.isTemplate || (!thread.comments || (thread.comments.length === 0)));
-        const shouldReveal = thread.canReply && isThreadTemplateOrEmpty && (!thread.editorId || (thread.editorId === editorId));
+        const shouldReveal = thread.canReply && thread.isTemplate && (!thread.comments || (thread.comments.length === 0)) && (!thread.editorId || (thread.editorId === editorId));
         await this.displayCommentThread(uniqueOwner, thread, shouldReveal, pendingCommentText, pendingEdits);
         this._commentInfos.filter(info => info.uniqueOwner === uniqueOwner)[0].threads.push(thread);
         this.tryUpdateReservedSpace();
@@ -944,23 +942,21 @@ let CommentController = class CommentController {
                     if (verbose) {
                         const keybinding = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getAriaLabel();
                         if (keybinding) {
-                            status(( localizeWithPath(
-                                _moduleId,
-                                2,
+                            status(( localize(
+                                5287,
                                 "Editor has commenting ranges, run the command Open Accessibility Help ({0}), for more information.",
                                 keybinding
                             )));
                         }
                         else {
-                            status(( localizeWithPath(
-                                _moduleId,
-                                3,
+                            status(( localize(
+                                5288,
                                 "Editor has commenting ranges, run the command Open Accessibility Help, which is currently not triggerable via keybinding, for more information."
                             )));
                         }
                     }
                     else {
-                        status(( localizeWithPath(_moduleId, 4, "Editor has commenting ranges.")));
+                        status(( localize(5289, "Editor has commenting ranges.")));
                     }
                 }
             }
@@ -1049,7 +1045,7 @@ let CommentController = class CommentController {
             const existingCommentsAtLine = this._commentWidgets.filter(widget => widget.getGlyphPosition() === (commentRange ? commentRange.endLineNumber : 0));
             if (existingCommentsAtLine.length) {
                 const allExpanded = existingCommentsAtLine.every(widget => widget.expanded);
-                existingCommentsAtLine.forEach(allExpanded ? widget => widget.collapse() : widget => widget.expand());
+                existingCommentsAtLine.forEach(allExpanded ? widget => widget.collapse() : widget => widget.expand(true));
                 this.processNextThreadToAdd();
                 return;
             }
@@ -1110,7 +1106,7 @@ let CommentController = class CommentController {
             }
             else {
                 const picks = this.getCommentProvidersQuickPicks(newCommentInfos);
-                return this.quickInputService.pick(picks, { placeHolder: ( localizeWithPath(_moduleId, 5, "Select Comment Provider")), matchOnDescription: true }).then(pick => {
+                return this.quickInputService.pick(picks, { placeHolder: ( localize(5290, "Select Comment Provider")), matchOnDescription: true }).then(pick => {
                     if (!pick) {
                         return;
                     }

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

@@ -1,9 +1,8 @@
 import { groupBy } from '../../../../base/common/arrays.js';
 import { URI } from '../../../../base/common/uri.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { ResourceWithCommentThreads } from '../common/commentModel.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
-const _moduleId = "vs/workbench/contrib/comments/browser/commentsModel";
 class CommentsModel extends Disposable {
     get resourceCommentThreads() { return this._resourceCommentThreads; }
     constructor() {
@@ -86,7 +85,7 @@ class CommentsModel extends Disposable {
     }
     getMessage() {
         if (!this._resourceCommentThreads.length) {
-            return ( localizeWithPath(_moduleId, 0, "There are no comments in this workspace yet."));
+            return ( localize(5310, "There are no comments in this workspace yet."));
         }
         else {
             return '';