@codingame/monaco-vscode-api 9.0.2 → 10.0.0

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

@@ -1,14 +1,17 @@
-import { Button } from '../../../../base/browser/ui/button/button.js';
+import { ButtonWithDropdown, Button } from '../../../../base/browser/ui/button/button.js';
+import { ActionRunner } from '../../../../base/common/actions.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { SubmenuItemAction } from '../../../../platform/actions/common/actions.js';
 import { defaultButtonStyles } from '../../../../platform/theme/browser/defaultStyles.js';
-import { CommentCommandId } from '../common/commentCommandIds.js';
 class CommentFormActions {
-    constructor(keybindingService, contextKeyService, container, actionHandler, maxActions) {
+    constructor(keybindingService, contextKeyService, contextMenuService, container, actionHandler, maxActions, supportDropdowns) {
         this.keybindingService = keybindingService;
         this.contextKeyService = contextKeyService;
+        this.contextMenuService = contextMenuService;
         this.container = container;
         this.actionHandler = actionHandler;
         this.maxActions = maxActions;
+        this.supportDropdowns = supportDropdowns;
         this._buttonElements = [];
         this._toDispose = ( new DisposableStore());
         this._actions = [];
@@ -22,13 +25,28 @@ class CommentFormActions {
         for (const group of groups) {
             const [, actions] = group;
             this._actions = actions;
-            for (const action of actions) {
+            for (const current of actions) {
+                const dropDownActions = this.supportDropdowns && current instanceof SubmenuItemAction ? current.actions : [];
+                const action = dropDownActions.length ? dropDownActions[0] : current;
                 let keybinding = this.keybindingService.lookupKeybinding(action.id, this.contextKeyService)?.getLabel();
                 if (!keybinding && isPrimary) {
-                    keybinding = this.keybindingService.lookupKeybinding(CommentCommandId.Submit, this.contextKeyService)?.getLabel();
+                    keybinding = this.keybindingService.lookupKeybinding("editor.action.submitComment" , this.contextKeyService)?.getLabel();
                 }
                 const title = keybinding ? `${action.label} (${keybinding})` : action.label;
-                const button = ( new Button(this.container, { secondary: !isPrimary, title, ...defaultButtonStyles }));
+                const actionHandler = this.actionHandler;
+                const button = dropDownActions.length ? ( new ButtonWithDropdown(this.container, {
+                    contextMenuProvider: this.contextMenuService,
+                    actions: dropDownActions,
+                    actionRunner: new (class extends ActionRunner {
+                        async runAction(action, context) {
+                            return actionHandler(action);
+                        }
+                    }),
+                    secondary: !isPrimary,
+                    title,
+                    addPrimaryActionToDropdown: false,
+                    ...defaultButtonStyles
+                })) : ( new Button(this.container, { secondary: !isPrimary, title, ...defaultButtonStyles }));
                 isPrimary = false;
                 this._buttonElements.push(button.element);
                 this._toDispose.add(button);

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

@@ -1,6 +1,5 @@
 import { localize } from '../../../../nls.js';
 import { Color } from '../../../../base/common/color.js';
-import { ContentWidgetPositionPreference } from '../../../../editor/browser/editorBrowser.js';
 import { OverviewRulerLane } from '../../../../editor/common/model.js';
 import { ModelDecorationOptions } from '../../../../editor/common/model/textModel.js';
 import { registerColor, opaque, darken } from '../../../../platform/theme/common/colorUtils.js';
@@ -16,29 +15,42 @@ import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
 import { themeColorFromId } from '../../../../platform/theme/common/themeService.js';
 import { CommentThreadState } from '../../../../editor/common/languages.js';
+import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
+import { Emitter } from '../../../../base/common/event.js';
 const overviewRulerCommentingRangeForeground = registerColor('editorGutter.commentRangeForeground', { dark: opaque(listInactiveSelectionBackground, editorBackground), light: ( (darken(opaque(listInactiveSelectionBackground, editorBackground), .05))), hcDark: Color.white, hcLight: Color.black }, ( localize(
-    10057,
+    10143,
     'Editor gutter decoration color for commenting ranges. This color should be opaque.'
 )));
 const overviewRulerCommentForeground = registerColor('editorOverviewRuler.commentForeground', overviewRulerCommentingRangeForeground, ( localize(
-    10058,
+    10144,
     'Editor overview ruler decoration color for resolved comments. This color should be opaque.'
 )));
 const overviewRulerCommentUnresolvedForeground = registerColor('editorOverviewRuler.commentUnresolvedForeground', overviewRulerCommentForeground, ( localize(
-    10059,
+    10145,
     'Editor overview ruler decoration color for unresolved comments. This color should be opaque.'
 )));
-const editorGutterCommentGlyphForeground = registerColor('editorGutter.commentGlyphForeground', { dark: editorForeground, light: editorForeground, hcDark: Color.black, hcLight: Color.white }, ( localize(10060, 'Editor gutter decoration color for commenting glyphs.')));
+const editorGutterCommentGlyphForeground = registerColor('editorGutter.commentGlyphForeground', { dark: editorForeground, light: editorForeground, hcDark: Color.black, hcLight: Color.white }, ( localize(10146, 'Editor gutter decoration color for commenting glyphs.')));
 registerColor('editorGutter.commentUnresolvedGlyphForeground', editorGutterCommentGlyphForeground, ( localize(
-    10061,
+    10147,
     'Editor gutter decoration color for commenting glyphs for unresolved comment threads.'
 )));
-class CommentGlyphWidget {
+class CommentGlyphWidget extends Disposable {
     static { this.description = 'comment-glyph-widget'; }
     constructor(editor, lineNumber) {
+        super();
+        this._onDidChangeLineNumber = this._register(( (new Emitter())));
+        this.onDidChangeLineNumber = this._onDidChangeLineNumber.event;
         this._commentsOptions = this.createDecorationOptions();
         this._editor = editor;
         this._commentsDecorations = this._editor.createDecorationsCollection();
+        this._register(this._commentsDecorations.onDidChange(e => {
+            const range = (this._commentsDecorations.length > 0 ? this._commentsDecorations.getRange(0) : null);
+            if (range && range.endLineNumber !== this._lineNumber) {
+                this._lineNumber = range.endLineNumber;
+                this._onDidChangeLineNumber.fire(this._lineNumber);
+            }
+        }));
+        this._register(toDisposable(() => this._commentsDecorations.clear()));
         this.setLineNumber(lineNumber);
     }
     createDecorationOptions() {
@@ -83,11 +95,8 @@ class CommentGlyphWidget {
                 lineNumber: range ? range.endLineNumber : this._lineNumber,
                 column: 1
             },
-            preference: [ContentWidgetPositionPreference.EXACT]
+            preference: [0 ]
         };
     }
-    dispose() {
-        this._commentsDecorations.clear();
-    }
 }
 export { CommentGlyphWidget, overviewRulerCommentingRangeForeground };

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

@@ -2,7 +2,7 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { localize } from '../../../../nls.js';
 import { $, append, addDisposableListener, EventType, scheduleAtNextAnimationFrame, getWindow, getContentWidth, getContentHeight } from '../../../../base/browser/dom.js';
 import { CommentMode } from '../../../../editor/common/languages.js';
-import { ActionsOrientation, ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { Separator, ActionRunner, Action } from '../../../../base/common/actions.js';
 import { Disposable, dispose } from '../../../../base/common/lifecycle.js';
 import { URI } from '../../../../base/common/uri.js';
@@ -14,7 +14,6 @@ import { Emitter } from '../../../../base/common/event.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
 import { ToolBar } from '../../../../base/browser/ui/toolbar/toolbar.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
-import { AnchorAlignment } from '../../../../base/browser/ui/contextview/contextview.js';
 import { ToggleReactionsAction, ReactionAction, ReactionActionViewItem } from './reactionsAction.js';
 import { MenuItemAction, SubmenuItemAction, MenuId } from '../../../../platform/actions/common/actions.js';
 import { MenuEntryActionViewItem, SubmenuEntryActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
@@ -25,10 +24,9 @@ import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionView
 import { DropdownMenuActionViewItem } from '../../../../base/browser/ui/dropdown/dropdownActionViewItem.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
-import { MarshalledId } from '../../../../base/common/marshallingIds.js';
 import { TimestampWidget } from './timestamp.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
-import { Scrollable, ScrollbarVisibility } from '../../../../base/common/scrollable.js';
+import { Scrollable } from '../../../../base/common/scrollable.js';
 import { SmoothScrollableElement } from '../../../../base/browser/ui/scrollbar/scrollableElement.js';
 import { DomEmitter } from '../../../../base/browser/event.js';
 import { CommentContextKeys } from '../common/commentContextKeys.js';
@@ -126,8 +124,8 @@ let CommentNode = class CommentNode extends Disposable {
             scheduleAtNextAnimationFrame: cb => scheduleAtNextAnimationFrame(getWindow(container), cb)
         })));
         this._scrollableElement = this._register(( (new SmoothScrollableElement(body, {
-            horizontal: ScrollbarVisibility.Visible,
-            vertical: ScrollbarVisibility.Visible
+            horizontal: 3 ,
+            vertical: 3
         }, this._scrollable))));
         this._register(this._scrollableElement.onScroll(e => {
             if (e.scrollLeftChanged) {
@@ -231,12 +229,12 @@ let CommentNode = class CommentNode extends Disposable {
         return [{
                 thread: this.commentThread,
                 commentUniqueId: this.comment.uniqueIdInThread,
-                $mid: MarshalledId.CommentNode
+                $mid: 10
             },
             {
                 commentControlHandle: this.commentThread.controllerHandle,
                 commentThreadHandle: this.commentThread.commentThreadHandle,
-                $mid: MarshalledId.CommentThread
+                $mid: 7
             }];
     }
     createToolbar() {
@@ -249,13 +247,13 @@ let CommentNode = class CommentNode extends Disposable {
                             actionViewItemProvider: (action, options) => this.actionViewItemProvider(action, options),
                             actionRunner: this.actionRunner,
                             classNames: ['toolbar-toggle-pickReactions', ...ThemeIcon.asClassNameArray(Codicon.reactions)],
-                            anchorAlignmentProvider: () => AnchorAlignment.RIGHT
+                            anchorAlignmentProvider: () => 1
                         }))
                     );
                 }
                 return this.actionViewItemProvider(action, options);
             },
-            orientation: ActionsOrientation.HORIZONTAL
+            orientation: 0
         })));
         this.toolbar.context = this.commentNodeContext;
         this.toolbar.actionRunner = ( (new CommentsActionRunner()));
@@ -316,7 +314,7 @@ let CommentNode = class CommentNode extends Disposable {
     createReactionPicker(reactionGroup) {
         const toggleReactionAction = this._register(( (new ToggleReactionsAction(() => {
             toggleReactionActionViewItem?.show();
-        }, ( localize(11603, "Toggle Reaction"))))));
+        }, ( localize(11746, "Toggle Reaction"))))));
         let reactionMenuActions = [];
         if (reactionGroup && reactionGroup.length) {
             reactionMenuActions = ( (reactionGroup.map((reaction) => {
@@ -332,8 +330,8 @@ let CommentNode = class CommentNode extends Disposable {
                             }
                             catch (e) {
                                 const error = e.message
-                                    ? ( localize(11604, "Toggling the comment reaction failed: {0}.", e.message))
-                                    : ( localize(11605, "Toggling the comment reaction failed"));
+                                    ? ( localize(11747, "Toggling the comment reaction failed: {0}.", e.message))
+                                    : ( localize(11748, "Toggling the comment reaction failed"));
                                 this.notificationService.error(error);
                             }
                         }
@@ -355,7 +353,7 @@ let CommentNode = class CommentNode extends Disposable {
                 },
                 actionRunner: this.actionRunner,
                 classNames: 'toolbar-toggle-pickReactions',
-                anchorAlignmentProvider: () => AnchorAlignment.RIGHT
+                anchorAlignmentProvider: () => 1
             }
         )));
         return toggleReactionAction;
@@ -370,7 +368,7 @@ let CommentNode = class CommentNode extends Disposable {
                             actionViewItemProvider: (action, options) => this.actionViewItemProvider(action, options),
                             actionRunner: this.actionRunner,
                             classNames: ['toolbar-toggle-pickReactions', ...ThemeIcon.asClassNameArray(Codicon.reactions)],
-                            anchorAlignmentProvider: () => AnchorAlignment.RIGHT
+                            anchorAlignmentProvider: () => 1
                         }))
                     );
                 }
@@ -505,16 +503,22 @@ let CommentNode = class CommentNode extends Disposable {
         this._register(menu.onDidChange(() => {
             this._commentFormActions?.setActions(menu);
         }));
-        this._commentFormActions = ( (new CommentFormActions(this.keybindingService, this._contextKeyService, container, (action) => {
-            const text = this._commentEditor.getValue();
-            action.run({
-                thread: this.commentThread,
-                commentUniqueId: this.comment.uniqueIdInThread,
-                text: text,
-                $mid: MarshalledId.CommentThreadNode
-            });
-            this.removeCommentEditor();
-        })));
+        this._commentFormActions = ( (new CommentFormActions(
+            this.keybindingService,
+            this._contextKeyService,
+            this.contextMenuService,
+            container,
+            (action) => {
+                const text = this._commentEditor.getValue();
+                action.run({
+                    thread: this.commentThread,
+                    commentUniqueId: this.comment.uniqueIdInThread,
+                    text: text,
+                    $mid: 11
+                });
+                this.removeCommentEditor();
+            }
+        )));
         this._register(this._commentFormActions);
         this._commentFormActions.setActions(menu);
     }
@@ -525,16 +529,22 @@ let CommentNode = class CommentNode extends Disposable {
         this._register(menu.onDidChange(() => {
             this._commentEditorActions?.setActions(menu);
         }));
-        this._commentEditorActions = ( (new CommentFormActions(this.keybindingService, this._contextKeyService, container, (action) => {
-            const text = this._commentEditor.getValue();
-            action.run({
-                thread: this.commentThread,
-                commentUniqueId: this.comment.uniqueIdInThread,
-                text: text,
-                $mid: MarshalledId.CommentThreadNode
-            });
-            this._commentEditor?.focus();
-        })));
+        this._commentEditorActions = ( (new CommentFormActions(
+            this.keybindingService,
+            this._contextKeyService,
+            this.contextMenuService,
+            container,
+            (action) => {
+                const text = this._commentEditor.getValue();
+                action.run({
+                    thread: this.commentThread,
+                    commentUniqueId: this.comment.uniqueIdInThread,
+                    text: text,
+                    $mid: 11
+                });
+                this._commentEditor?.focus();
+            }
+        )));
         this._register(this._commentEditorActions);
         this._commentEditorActions.setActions(menu, true);
     }

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

@@ -3,7 +3,6 @@ import { append, $, addDisposableListener } from '../../../../base/browser/dom.j
 import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 import { MOUSE_CURSOR_TEXT_CSS_CLASS_NAME } from '../../../../base/browser/ui/mouseCursor/mouseCursor.js';
 import { Disposable, dispose } from '../../../../base/common/lifecycle.js';
-import { MarshalledId } from '../../../../base/common/marshallingIds.js';
 import { Schemas } from '../../../../base/common/network.js';
 import { URI } from '../../../../base/common/uri.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
@@ -16,10 +15,11 @@ 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';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
 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, configurationService, keybindingService, hoverService, textModelService) {
+    constructor(owner, container, _parentEditor, _commentThread, _scopedInstatiationService, _contextKeyService, _commentMenus, _commentOptions, _pendingComment, _parentThread, focus, _actionRunDelegate, commentService, configurationService, keybindingService, contextMenuService, hoverService, textModelService) {
         super();
         this.owner = owner;
         this._parentEditor = _parentEditor;
@@ -33,6 +33,7 @@ let CommentReply = class CommentReply extends Disposable {
         this._actionRunDelegate = _actionRunDelegate;
         this.commentService = commentService;
         this.keybindingService = keybindingService;
+        this.contextMenuService = contextMenuService;
         this.hoverService = hoverService;
         this.textModelService = textModelService;
         this._commentThreadDisposables = [];
@@ -158,8 +159,8 @@ let CommentReply = class CommentReply extends Disposable {
     setCommentEditorDecorations() {
         const hasExistingComments = this._commentThread.comments && this._commentThread.comments.length > 0;
         const placeholder = hasExistingComments
-            ? (this._commentOptions?.placeHolder || ( localize(8067, "Reply...")))
-            : (this._commentOptions?.placeHolder || ( localize(8068, "Type a new comment")));
+            ? (this._commentOptions?.placeHolder || ( localize(8131, "Reply...")))
+            : (this._commentOptions?.placeHolder || ( localize(8132, "Type a new comment")));
         this.commentEditor.updateOptions({ placeholder });
     }
     createTextModelListener(commentEditor, commentForm) {
@@ -210,13 +211,14 @@ let CommentReply = class CommentReply extends Disposable {
         this._commentFormActions = ( (new CommentFormActions(
             this.keybindingService,
             this._contextKeyService,
+            this.contextMenuService,
             container,
             async (action) => {
                 await this._actionRunDelegate?.();
                 await action.run({
                     thread: this._commentThread,
                     text: this.commentEditor.getValue(),
-                    $mid: MarshalledId.CommentThreadReply
+                    $mid: 9
                 });
                 this.hideReplyArea();
             }
@@ -233,13 +235,14 @@ let CommentReply = class CommentReply extends Disposable {
         this._commentEditorActions = ( (new CommentFormActions(
             this.keybindingService,
             this._contextKeyService,
+            this.contextMenuService,
             container,
             async (action) => {
                 this._actionRunDelegate?.();
                 action.run({
                     thread: this._commentThread,
                     text: this.commentEditor.getValue(),
-                    $mid: MarshalledId.CommentThreadReply
+                    $mid: 9
                 });
                 this.focusCommentEditor();
             }
@@ -276,8 +279,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 || ( localize(8067, "Reply..."))));
-        this._reviewThreadReplyButton.textContent = this._commentOptions?.prompt || ( localize(8067, "Reply..."));
+        this._register(this.hoverService.setupManagedHover(getDefaultHoverDelegate('mouse'), this._reviewThreadReplyButton, this._commentOptions?.prompt || ( localize(8131, "Reply..."))));
+        this._reviewThreadReplyButton.textContent = this._commentOptions?.prompt || ( localize(8131, "Reply..."));
         this._register(addDisposableListener(this._reviewThreadReplyButton, 'click', _ => this.clearAndExpandReplyArea()));
         this._register(addDisposableListener(this._reviewThreadReplyButton, 'focus', _ => this.clearAndExpandReplyArea()));
         commentEditor.onDidBlurEditorWidget(() => {
@@ -295,7 +298,8 @@ CommentReply = ( (__decorate([
     ( (__param(12, ICommentService))),
     ( (__param(13, IConfigurationService))),
     ( (__param(14, IKeybindingService))),
-    ( (__param(15, IHoverService))),
-    ( (__param(16, ITextModelService)))
+    ( (__param(15, IContextMenuService))),
+    ( (__param(16, IHoverService))),
+    ( (__param(17, ITextModelService)))
 ], CommentReply)));
 export { COMMENTEDITOR_DECORATION_KEY, CommentReply };

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

@@ -1,17 +1,18 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { append, $ } from '../../../../base/browser/dom.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
-import { MarshalledId } from '../../../../base/common/marshallingIds.js';
 import { CommentFormActions } from './commentFormActions.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
 let CommentThreadAdditionalActions = class CommentThreadAdditionalActions extends Disposable {
-    constructor(container, _commentThread, _contextKeyService, _commentMenus, _actionRunDelegate, _keybindingService) {
+    constructor(container, _commentThread, _contextKeyService, _commentMenus, _actionRunDelegate, _keybindingService, _contextMenuService) {
         super();
         this._commentThread = _commentThread;
         this._contextKeyService = _contextKeyService;
         this._commentMenus = _commentMenus;
         this._actionRunDelegate = _actionRunDelegate;
         this._keybindingService = _keybindingService;
+        this._contextMenuService = _contextMenuService;
         this._container = append(container, $('.comment-additional-actions'));
         append(this._container, $('.section-separator'));
         this._buttonBar = append(this._container, $('.button-bar'));
@@ -52,15 +53,17 @@ let CommentThreadAdditionalActions = class CommentThreadAdditionalActions extend
         this._commentFormActions = ( new CommentFormActions(
             this._keybindingService,
             this._contextKeyService,
+            this._contextMenuService,
             container,
             async (action) => {
                 this._actionRunDelegate?.();
                 action.run({
                     thread: this._commentThread,
-                    $mid: MarshalledId.CommentThreadInstance
+                    $mid: 8
                 });
             },
-            4
+            4,
+            true
         ));
         this._register(this._commentFormActions);
         this._commentFormActions.setActions(menu,  true);
@@ -68,6 +71,7 @@ let CommentThreadAdditionalActions = class CommentThreadAdditionalActions extend
     }
 };
 CommentThreadAdditionalActions = ( __decorate([
-    ( __param(5, IKeybindingService))
+    ( __param(5, IKeybindingService)),
+    ( __param(6, IContextMenuService))
 ], CommentThreadAdditionalActions));
 export { CommentThreadAdditionalActions };

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

@@ -6,7 +6,6 @@ import { CommentMode } from '../../../../editor/common/languages.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { ICommentService } from './commentService.service.js';
 import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
-import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { CommentNode } from './commentNode.js';
 import { MarkdownRenderer } from '../../../../editor/browser/widget/markdownRenderer/browser/markdownRenderer.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.service.js';
@@ -42,7 +41,14 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
         }));
         this._markdownRenderer = this._register(( (new MarkdownRenderer(this._options, this.languageService, this.openerService))));
     }
-    focus() {
+    focus(commentUniqueId) {
+        if (commentUniqueId !== undefined) {
+            const comment = this._commentElements.find(commentNode => commentNode.comment.uniqueIdInThread === commentUniqueId);
+            if (comment) {
+                comment.focus();
+                return;
+            }
+        }
         this._commentsElement.focus();
     }
     ensureFocusIntoNewEditingComment() {
@@ -57,7 +63,7 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
         this._updateAriaLabel();
         this._register(addDisposableListener(this._commentsElement, EventType.KEY_DOWN, (e) => {
             const event = ( (new StandardKeyboardEvent(e)));
-            if ((event.equals(KeyCode.UpArrow) || event.equals(KeyCode.DownArrow)) && (!this._focusedComment || !this._commentElements[this._focusedComment].isEditing)) {
+            if ((event.equals(16 ) || event.equals(18 )) && (!this._focusedComment || !this._commentElements[this._focusedComment].isEditing)) {
                 const moveFocusWithinBounds = (change) => {
                     if (this._focusedComment === undefined && change >= 0) {
                         return 0;
@@ -68,7 +74,7 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
                     const newIndex = this._focusedComment + change;
                     return Math.min(Math.max(0, newIndex), this._commentElements.length - 1);
                 };
-                this._setFocusedComment(event.equals(KeyCode.UpArrow) ? moveFocusWithinBounds(-1) : moveFocusWithinBounds(1));
+                this._setFocusedComment(event.equals(16 ) ? moveFocusWithinBounds(-1) : moveFocusWithinBounds(1));
             }
         }));
         this._commentDisposable.clearAndDisposeAll();
@@ -191,7 +197,7 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
         if (this._commentThread.isDocumentCommentThread()) {
             if (this._commentThread.range) {
                 this._commentsElement.ariaLabel = ( localize(
-                    11564,
+                    11707,
                     "Comment thread with {0} comments on lines {1} through {2}. {3}.",
                     this._commentThread.comments?.length,
                     this._commentThread.range.startLineNumber,
@@ -201,7 +207,7 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
             }
             else {
                 this._commentsElement.ariaLabel = ( localize(
-                    11565,
+                    11708,
                     "Comment thread with {0} comments on the entire document. {1}.",
                     this._commentThread.comments?.length,
                     this._commentThread.label
@@ -210,7 +216,7 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
         }
         else {
             this._commentsElement.ariaLabel = ( localize(
-                11566,
+                11709,
                 "Comment thread with {0} comments. {1}.",
                 this._commentThread.comments?.length,
                 this._commentThread.label

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

@@ -8,9 +8,8 @@ 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 collapseIcon = registerIcon('review-comment-collapse', Codicon.chevronUp, ( localize(11567, 'Icon to collapse a review comment.')));
+const collapseIcon = registerIcon('review-comment-collapse', Codicon.chevronUp, ( localize(11710, '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) {
@@ -40,7 +39,7 @@ class CommentThreadHeader extends Disposable {
         })));
         this._register(this._actionbarWidget);
         const collapseClass = threadHasComments(this._commentThread.comments) ? COLLAPSE_ACTION_CLASS : DELETE_ACTION_CLASS;
-        this._collapseAction = ( (new Action('review.expand', ( localize(11568, "Collapse")), collapseClass, true, () => this._delegate.collapse())));
+        this._collapseAction = ( (new Action('review.expand', ( localize(11711, "Collapse")), collapseClass, true, () => this._delegate.collapse())));
         if (!threadHasComments(this._commentThread.comments)) {
             const commentsChanged = this._register(( (new MutableDisposable())));
             commentsChanged.value = this._commentThread.onDidChangeComments(() => {
@@ -77,7 +76,7 @@ class CommentThreadHeader extends Disposable {
         label = this._commentThread.label;
         if (label === undefined) {
             if (!(this._commentThread.comments && this._commentThread.comments.length)) {
-                label = ( localize(11569, "Start discussion"));
+                label = ( localize(11712, "Start discussion"));
             }
         }
         if (label) {
@@ -103,7 +102,7 @@ class CommentThreadHeader extends Disposable {
                 return {
                     commentControlHandle: this._commentThread.controllerHandle,
                     commentThreadHandle: this._commentThread.commentThreadHandle,
-                    $mid: MarshalledId.CommentThread
+                    $mid: 7
                 };
             },
         });

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

@@ -29,9 +29,7 @@ import { registerNavigableContainer } from '../../../browser/actions/widgetNavig
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { COMMENTS_SECTION } from '../common/commentsConfiguration.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';
 import { DomEmitter } from '../../../../base/browser/event.js';
 import { isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
 let CommentThreadWidget = class CommentThreadWidget extends Disposable {
@@ -87,7 +85,7 @@ let CommentThreadWidget = class CommentThreadWidget extends Disposable {
         this._register(tracker.onDidFocus(() => this._focusedContextKey.set(true)));
         this._register(tracker.onDidBlur(() => this._focusedContextKey.reset()));
         this._register(this.configurationService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration(AccessibilityVerbositySettingId.Comments)) {
+            if (e.affectsConfiguration("accessibility.verbosity.comments" )) {
                 this._setAriaLabel();
             }
         }));
@@ -113,18 +111,18 @@ let CommentThreadWidget = class CommentThreadWidget extends Disposable {
         }));
     }
     _setAriaLabel() {
-        let ariaLabel = ( localize(11299, "Comment"));
+        let ariaLabel = ( localize(11417, "Comment"));
         let keybinding;
-        const verbose = this.configurationService.getValue(AccessibilityVerbositySettingId.Comments);
+        const verbose = this.configurationService.getValue("accessibility.verbosity.comments" );
         if (verbose) {
-            keybinding = this._keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp, this._contextKeyService)?.getLabel() ?? undefined;
+            keybinding = this._keybindingService.lookupKeybinding("editor.action.accessibilityHelp" , this._contextKeyService)?.getLabel() ?? undefined;
         }
         if (keybinding) {
-            ariaLabel = ( localize(11300, "{0}, use ({1}) for accessibility help", ariaLabel, keybinding));
+            ariaLabel = ( localize(11418, "{0}, use ({1}) for accessibility help", ariaLabel, keybinding));
         }
-        else {
+        else if (verbose) {
             ariaLabel = ( localize(
-                11301,
+                11419,
                 "{0}, run the command Open Accessibility Help which is currently not triggerable via keybinding.",
                 ariaLabel
             ));
@@ -267,8 +265,8 @@ let CommentThreadWidget = class CommentThreadWidget extends Disposable {
     focusCommentEditor() {
         this._commentReply?.expandReplyAreaAndFocusCommentEditor();
     }
-    focus() {
-        this._body.focus();
+    focus(commentUniqueId) {
+        this._body.focus(commentUniqueId);
     }
     async submitComment() {
         const activeComment = this._body.activeComment;