@codingame/monaco-vscode-api 5.3.0 → 6.0.0

package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.js

@@ -1,14 +1,17 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { localizeWithPath } from '../../../../nls.js';
+import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
-import { registerEditorContribution, registerDiffEditorContribution, registerEditorAction, EditorAction } from '../../../../editor/browser/editorExtensions.js';
+import { registerEditorContribution, registerDiffEditorContribution, registerEditorAction, EditorContributionInstantiation, EditorAction } from '../../../../editor/browser/editorExtensions.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
 import { MenuRegistry, MenuId } from '../../../../platform/actions/common/actions.js';
 import { ContextKeyExpr, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
 import { Codicon } from '../../../../base/common/codicons.js';
-import { registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { Event } from '../../../../base/common/event.js';
 import { onDidRegisterWindow, addDisposableListener } from '../../../../base/browser/dom.js';
@@ -35,8 +38,8 @@ class ToggleWordWrapAction extends EditorAction {
             precondition: undefined,
             kbOpts: {
                 kbExpr: null,
-                primary: 512  | 56 ,
-                weight: 100
+                primary: KeyMod$1.Alt | KeyCode.KeyZ,
+                weight: KeybindingWeight.EditorContrib
             }
         });
     }
@@ -52,7 +55,7 @@ class ToggleWordWrapAction extends EditorAction {
             newState = null;
         }
         else {
-            const actualWrappingInfo = editor.getOption(146 );
+            const actualWrappingInfo = editor.getOption(EditorOption.wrappingInfo);
             const wordWrapOverride = (actualWrappingInfo.wrappingColumn === -1 ? 'on' : 'off');
             newState = { wordWrapOverride };
         }
@@ -70,7 +73,7 @@ class ToggleWordWrapAction extends EditorAction {
     }
 }
 function findDiffEditorContainingCodeEditor(editor, codeEditorService) {
-    if (!editor.getOption(61 )) {
+    if (!editor.getOption(EditorOption.inDiffEditor)) {
         return null;
     }
     for (const diffEditor of codeEditorService.listDiffEditors()) {
@@ -90,16 +93,16 @@ let ToggleWordWrapController = class ToggleWordWrapController extends Disposable
         this._contextKeyService = _contextKeyService;
         this._codeEditorService = _codeEditorService;
         const options = this._editor.getOptions();
-        const wrappingInfo = options.get(146 );
+        const wrappingInfo = options.get(EditorOption.wrappingInfo);
         const isWordWrapMinified = this._contextKeyService.createKey(isWordWrapMinifiedKey, wrappingInfo.isWordWrapMinified);
         const isDominatedByLongLines = this._contextKeyService.createKey(isDominatedByLongLinesKey, wrappingInfo.isDominatedByLongLines);
         let currentlyApplyingEditorConfig = false;
         this._register(_editor.onDidChangeConfiguration((e) => {
-            if (!e.hasChanged(146 )) {
+            if (!e.hasChanged(EditorOption.wrappingInfo)) {
                 return;
             }
             const options = this._editor.getOptions();
-            const wrappingInfo = options.get(146 );
+            const wrappingInfo = options.get(EditorOption.wrappingInfo);
             isWordWrapMinified.set(wrappingInfo.isWordWrapMinified);
             isDominatedByLongLines.set(wrappingInfo.isDominatedByLongLines);
             if (!currentlyApplyingEditorConfig) {
@@ -179,7 +182,7 @@ function canToggleWordWrap(codeEditorService, editor) {
     if (!model) {
         return false;
     }
-    if (editor.getOption(61 )) {
+    if (editor.getOption(EditorOption.inDiffEditor)) {
         for (const diffEditor of codeEditorService.listDiffEditors()) {
             if (diffEditor.getOriginalEditor() === editor && !diffEditor.renderSideBySide) {
                 return false;
@@ -216,7 +219,7 @@ let EditorWordWrapContextKeyTracker = class EditorWordWrapContextKeyTracker exte
         if (activeEditor) {
             this._activeEditorListener.add(activeEditor.onDidChangeModel(() => this._updateFromCodeEditor()));
             this._activeEditorListener.add(activeEditor.onDidChangeConfiguration((e) => {
-                if (e.hasChanged(146 )) {
+                if (e.hasChanged(EditorOption.wrappingInfo)) {
                     this._updateFromCodeEditor();
                 }
             }));
@@ -228,7 +231,7 @@ let EditorWordWrapContextKeyTracker = class EditorWordWrapContextKeyTracker exte
             return this._setValues(false, false);
         }
         else {
-            const wrappingInfo = this._activeEditor.getOption(146 );
+            const wrappingInfo = this._activeEditor.getOption(EditorOption.wrappingInfo);
             this._setValues(true, wrappingInfo.wrappingColumn !== -1);
         }
     }
@@ -242,8 +245,8 @@ EditorWordWrapContextKeyTracker = ( (__decorate([
     ( (__param(1, ICodeEditorService))),
     ( (__param(2, IContextKeyService)))
 ], EditorWordWrapContextKeyTracker)));
-registerWorkbenchContribution2(EditorWordWrapContextKeyTracker.ID, EditorWordWrapContextKeyTracker, 3 );
-registerEditorContribution(ToggleWordWrapController.ID, ToggleWordWrapController, 0 );
+registerWorkbenchContribution2(EditorWordWrapContextKeyTracker.ID, EditorWordWrapContextKeyTracker, WorkbenchPhase.AfterRestored);
+registerEditorContribution(ToggleWordWrapController.ID, ToggleWordWrapController, EditorContributionInstantiation.Eager);
 registerDiffEditorContribution(DiffToggleWordWrapController.ID, DiffToggleWordWrapController);
 registerEditorAction(ToggleWordWrapAction);
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {

package/vscode/src/vs/workbench/contrib/codeEditor/browser/workbenchReferenceSearch.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { registerEditorContribution } from '../../../../editor/browser/editorExtensions.js';
+import { registerEditorContribution, EditorContributionInstantiation } from '../../../../editor/browser/editorExtensions.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
 import { ReferencesController } from '../../../../editor/contrib/gotoSymbol/browser/peek/referencesController.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
@@ -20,5 +20,5 @@ WorkbenchReferencesController = ( __decorate([
     ( __param(5, IStorageService)),
     ( __param(6, IConfigurationService))
 ], WorkbenchReferencesController));
-registerEditorContribution(ReferencesController.ID, WorkbenchReferencesController, 4 );
+registerEditorContribution(ReferencesController.ID, WorkbenchReferencesController, EditorContributionInstantiation.Lazy);
 export { WorkbenchReferencesController };

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

@@ -1,6 +1,7 @@
 import { Button } from '../../../../base/browser/ui/button/button.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { defaultButtonStyles } from '../../../../platform/theme/browser/defaultStyles.js';
+import { CommentCommandId } from '../common/commentCommandIds.js';
 class CommentFormActions {
     constructor(keybindingService, contextKeyService, container, actionHandler, maxActions) {
         this.keybindingService = keybindingService;
@@ -24,7 +25,7 @@ class CommentFormActions {
             for (const action of actions) {
                 let keybinding = this.keybindingService.lookupKeybinding(action.id, this.contextKeyService)?.getLabel();
                 if (!keybinding && isPrimary) {
-                    keybinding = this.keybindingService.lookupKeybinding("editor.action.submitComment" , this.contextKeyService)?.getLabel();
+                    keybinding = this.keybindingService.lookupKeybinding(CommentCommandId.Submit, this.contextKeyService)?.getLabel();
                 }
                 const title = keybinding ? `${action.label} (${keybinding})` : action.label;
                 const button = ( new Button(this.container, { secondary: !isPrimary, title, ...defaultButtonStyles }));

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

@@ -1,5 +1,6 @@
 import { localizeWithPath } 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';
@@ -87,7 +88,7 @@ class CommentGlyphWidget {
                 lineNumber: range ? range.endLineNumber : this._lineNumber,
                 column: 1
             },
-            preference: [0 ]
+            preference: [ContentWidgetPositionPreference.EXACT]
         };
     }
     dispose() {

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

@@ -2,7 +2,7 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { localizeWithPath } from '../../../../nls.js';
 import { $, append, addDisposableListener, EventType, scheduleAtNextAnimationFrame, getWindow, getContentWidth, getContentHeight } from '../../../../base/browser/dom.js';
 import { CommentMode } from '../../../../editor/common/languages.js';
-import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { ActionsOrientation, 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,6 +14,7 @@ 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';
@@ -24,9 +25,10 @@ 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 } from '../../../../base/common/scrollable.js';
+import { Scrollable, ScrollbarVisibility } 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';
@@ -125,8 +127,8 @@ let CommentNode = class CommentNode extends Disposable {
             scheduleAtNextAnimationFrame: cb => scheduleAtNextAnimationFrame(getWindow(container), cb)
         })));
         this._scrollableElement = this._register(( (new SmoothScrollableElement(body, {
-            horizontal: 3 ,
-            vertical: 3
+            horizontal: ScrollbarVisibility.Visible,
+            vertical: ScrollbarVisibility.Visible
         }, this._scrollable))));
         this._register(this._scrollableElement.onScroll(e => {
             if (e.scrollLeftChanged) {
@@ -230,12 +232,12 @@ let CommentNode = class CommentNode extends Disposable {
         return [{
                 thread: this.commentThread,
                 commentUniqueId: this.comment.uniqueIdInThread,
-                $mid: 10
+                $mid: MarshalledId.CommentNode
             },
             {
                 commentControlHandle: this.commentThread.controllerHandle,
                 commentThreadHandle: this.commentThread.commentThreadHandle,
-                $mid: 7
+                $mid: MarshalledId.CommentThread
             }];
     }
     createToolbar() {
@@ -248,13 +250,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: () => 1
+                            anchorAlignmentProvider: () => AnchorAlignment.RIGHT
                         }))
                     );
                 }
                 return this.actionViewItemProvider(action, options);
             },
-            orientation: 0
+            orientation: ActionsOrientation.HORIZONTAL
         })));
         this.toolbar.context = this.commentNodeContext;
         this.toolbar.actionRunner = ( (new CommentsActionRunner()));
@@ -354,7 +356,7 @@ let CommentNode = class CommentNode extends Disposable {
                 },
                 actionRunner: this.actionRunner,
                 classNames: 'toolbar-toggle-pickReactions',
-                anchorAlignmentProvider: () => 1
+                anchorAlignmentProvider: () => AnchorAlignment.RIGHT
             }
         )));
         return toggleReactionAction;
@@ -369,7 +371,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: () => 1
+                            anchorAlignmentProvider: () => AnchorAlignment.RIGHT
                         }))
                     );
                 }
@@ -510,7 +512,7 @@ let CommentNode = class CommentNode extends Disposable {
                 thread: this.commentThread,
                 commentUniqueId: this.comment.uniqueIdInThread,
                 text: text,
-                $mid: 11
+                $mid: MarshalledId.CommentThreadNode
             });
             this.removeCommentEditor();
         })));
@@ -530,7 +532,7 @@ let CommentNode = class CommentNode extends Disposable {
                 thread: this.commentThread,
                 commentUniqueId: this.comment.uniqueIdInThread,
                 text: text,
-                $mid: 11
+                $mid: MarshalledId.CommentThreadNode
             });
             this._commentEditor?.focus();
         })));

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

@@ -3,6 +3,7 @@ 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';
@@ -31,7 +32,7 @@ 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, _actionRunDelegate, commentService, themeService, configurationService, keybindingService, hoverService, textModelService) {
+    constructor(owner, container, _parentEditor, _commentThread, _scopedInstatiationService, _contextKeyService, _commentMenus, _commentOptions, _pendingComment, _parentThread, focus, _actionRunDelegate, commentService, themeService, configurationService, keybindingService, hoverService, textModelService) {
         super();
         this.owner = owner;
         this._parentEditor = _parentEditor;
@@ -54,9 +55,9 @@ let CommentReply = class CommentReply extends Disposable {
         this.commentEditor = this._register(this._scopedInstatiationService.createInstance(SimpleCommentEditor, this.form, SimpleCommentEditor.getEditorOptions(configurationService), _contextKeyService, this._parentThread));
         this.commentEditorIsEmpty = CommentContextKeys.commentIsEmpty.bindTo(this._contextKeyService);
         this.commentEditorIsEmpty.set(!this._pendingComment);
-        this.initialize();
+        this.initialize(focus);
     }
-    async initialize() {
+    async initialize(focus) {
         const hasExistingComments = this._commentThread.comments && this._commentThread.comments.length > 0;
         const modeId = generateUuid() + '-' + (hasExistingComments ? this._commentThread.threadId : ++INMEM_MODEL_ID);
         const params = JSON.stringify({
@@ -86,10 +87,13 @@ let CommentReply = class CommentReply extends Disposable {
         }));
         this.createTextModelListener(this.commentEditor, this.form);
         this.setCommentEditorDecorations();
-        if (hasExistingComments) {
+        if (this._pendingComment) {
+            this.expandReplyArea();
+        }
+        else if (hasExistingComments) {
             this.createReplyButton(this.commentEditor, this.form);
         }
-        else if ((this._commentThread.comments && this._commentThread.comments.length === 0) || this._pendingComment) {
+        else if (focus && (this._commentThread.comments && this._commentThread.comments.length === 0)) {
             this.expandReplyArea();
         }
         this._error = append(this.form, $('.validation-error.hidden'));
@@ -109,10 +113,11 @@ let CommentReply = class CommentReply extends Disposable {
     }
     updateCommentThread(commentThread) {
         const isReplying = this.commentEditor.hasTextFocus();
+        const oldAndNewBothEmpty = !this._commentThread.comments?.length && !commentThread.comments?.length;
         if (!this._reviewThreadReplyButton) {
             this.createReplyButton(this.commentEditor, this.form);
         }
-        if (this._commentThread.comments && this._commentThread.comments.length === 0) {
+        if (this._commentThread.comments && this._commentThread.comments.length === 0 && !oldAndNewBothEmpty) {
             this.expandReplyArea();
         }
         if (isReplying) {
@@ -245,7 +250,7 @@ let CommentReply = class CommentReply extends Disposable {
                 await action.run({
                     thread: this._commentThread,
                     text: this.commentEditor.getValue(),
-                    $mid: 9
+                    $mid: MarshalledId.CommentThreadReply
                 });
                 this.hideReplyArea();
             }
@@ -268,7 +273,7 @@ let CommentReply = class CommentReply extends Disposable {
                 action.run({
                     thread: this._commentThread,
                     text: this.commentEditor.getValue(),
-                    $mid: 9
+                    $mid: MarshalledId.CommentThreadReply
                 });
                 this.focusCommentEditor();
             }
@@ -293,7 +298,10 @@ let CommentReply = class CommentReply extends Disposable {
         }
     }
     hideReplyArea() {
-        this.commentEditor.getDomNode().style.outline = '';
+        const domNode = this.commentEditor.getDomNode();
+        if (domNode) {
+            domNode.style.outline = '';
+        }
         this.commentEditor.setValue('');
         this._pendingComment = '';
         this.form.classList.remove('expand');
@@ -318,11 +326,11 @@ let CommentReply = class CommentReply extends Disposable {
     }
 };
 CommentReply = ( (__decorate([
-    ( (__param(11, ICommentService))),
-    ( (__param(12, IThemeService))),
-    ( (__param(13, IConfigurationService))),
-    ( (__param(14, IKeybindingService))),
-    ( (__param(15, IHoverService))),
-    ( (__param(16, ITextModelService)))
+    ( (__param(12, ICommentService))),
+    ( (__param(13, IThemeService))),
+    ( (__param(14, IConfigurationService))),
+    ( (__param(15, IKeybindingService))),
+    ( (__param(16, IHoverService))),
+    ( (__param(17, ITextModelService)))
 ], CommentReply)));
 export { COMMENTEDITOR_DECORATION_KEY, CommentReply };

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

@@ -1,6 +1,7 @@
 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';
 let CommentThreadAdditionalActions = class CommentThreadAdditionalActions extends Disposable {
@@ -56,7 +57,7 @@ let CommentThreadAdditionalActions = class CommentThreadAdditionalActions extend
                 this._actionRunDelegate?.();
                 action.run({
                     thread: this._commentThread,
-                    $mid: 8
+                    $mid: MarshalledId.CommentThreadInstance
                 });
             },
             4

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

@@ -6,6 +6,7 @@ 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';
@@ -52,7 +53,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(16 ) || event.equals(18 )) && (!this._focusedComment || !this._commentElements[this._focusedComment].isEditing)) {
+            if ((event.equals(KeyCode.UpArrow) || event.equals(KeyCode.DownArrow)) && (!this._focusedComment || !this._commentElements[this._focusedComment].isEditing)) {
                 const moveFocusWithinBounds = (change) => {
                     if (this._focusedComment === undefined && change >= 0) {
                         return 0;
@@ -63,7 +64,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(16 ) ? moveFocusWithinBounds(-1) : moveFocusWithinBounds(1));
+                this._setFocusedComment(event.equals(KeyCode.UpArrow) ? moveFocusWithinBounds(-1) : moveFocusWithinBounds(1));
             }
         }));
         this._commentElements = [];

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

@@ -8,6 +8,7 @@ import { localizeWithPath } 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.')));
@@ -36,6 +37,7 @@ class CommentThreadHeader extends Disposable {
         this._register(this._actionbarWidget);
         this._collapseAction = ( (new Action('review.expand', ( localizeWithPath(_moduleId, 1, "Collapse")), COLLAPSE_ACTION_CLASS, true, () => this._delegate.collapse())));
         const menu = this._commentMenus.getCommentThreadTitleActions(this._contextKeyService);
+        this._register(menu);
         this.setActionBarActions(menu);
         this._register(menu);
         this._register(menu.onDidChange(e => {
@@ -87,7 +89,7 @@ class CommentThreadHeader extends Disposable {
                 return {
                     commentControlHandle: this._commentThread.controllerHandle,
                     commentThreadHandle: this._commentThread.commentThreadHandle,
-                    $mid: 7
+                    $mid: MarshalledId.CommentThread
                 };
             },
         });

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

@@ -28,7 +28,9 @@ import { registerNavigableContainer } from '../../../browser/actions/widgetNavig
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { COMMENTS_SECTION } from '../common/commentsConfiguration.js';
 import { localizeWithPath } 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() {
@@ -58,9 +60,9 @@ let CommentThreadWidget = class CommentThreadWidget extends Disposable {
         this._threadIsEmpty.set(!_commentThread.comments || !_commentThread.comments.length);
         this._focusedContextKey = CommentContextKeys.commentFocused.bindTo(this._contextKeyService);
         this._commentMenus = this.commentService.getCommentMenus(this._owner);
-        this._header = ( (new CommentThreadHeader(container, {
+        this._register(this._header = ( (new CommentThreadHeader(container, {
             collapse: this.collapse.bind(this)
-        }, this._commentMenus, this._commentThread, this._contextKeyService, this._scopedInstantiationService, contextMenuService)));
+        }, this._commentMenus, this._commentThread, this._contextKeyService, this._scopedInstantiationService, contextMenuService))));
         this._header.updateCommentThread(this._commentThread);
         const bodyElement = $('.body');
         container.appendChild(bodyElement);
@@ -82,7 +84,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("accessibility.verbosity.comments" )) {
+            if (e.affectsConfiguration(AccessibilityVerbositySettingId.Comments)) {
                 this._setAriaLabel();
             }
         }));
@@ -102,9 +104,9 @@ let CommentThreadWidget = class CommentThreadWidget extends Disposable {
     _setAriaLabel() {
         let ariaLabel = ( localizeWithPath(_moduleId, 0, "Comment"));
         let keybinding;
-        const verbose = this.configurationService.getValue("accessibility.verbosity.comments" );
+        const verbose = this.configurationService.getValue(AccessibilityVerbositySettingId.Comments);
         if (verbose) {
-            keybinding = this._keybindingService.lookupKeybinding("editor.action.accessibilityHelp" , this._contextKeyService)?.getLabel() ?? undefined;
+            keybinding = this._keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp, this._contextKeyService)?.getLabel() ?? undefined;
         }
         if (keybinding) {
             ariaLabel = ( localizeWithPath(
@@ -179,12 +181,12 @@ let CommentThreadWidget = class CommentThreadWidget extends Disposable {
             this.collapse();
         }
     }
-    async display(lineHeight) {
+    async display(lineHeight, focus) {
         const headHeight = Math.max(23, Math.ceil(lineHeight * 1.2));
         this._header.updateHeight(headHeight);
         await this._body.display();
         if (this._commentThread.canReply) {
-            this._createCommentForm();
+            this._createCommentForm(focus);
         }
         this._createAdditionalActions();
         this._register(this._body.onDidResize(dimension => {
@@ -211,7 +213,7 @@ let CommentThreadWidget = class CommentThreadWidget extends Disposable {
             }
             else {
                 if (this._commentThread.canReply) {
-                    this._createCommentForm();
+                    this._createCommentForm(false);
                 }
             }
         }));
@@ -222,8 +224,8 @@ let CommentThreadWidget = class CommentThreadWidget extends Disposable {
             this._header.createThreadLabel();
         }));
     }
-    _createCommentForm() {
-        this._commentReply = this._scopedInstantiationService.createInstance(CommentReply, this._owner, this._body.container, this._parentEditor, this._commentThread, this._scopedInstantiationService, this._contextKeyService, this._commentMenus, this._commentOptions, this._pendingComment, this, this._containerDelegate.actionRunner);
+    _createCommentForm(focus) {
+        this._commentReply = this._scopedInstantiationService.createInstance(CommentReply, this._owner, this._body.container, this._parentEditor, this._commentThread, this._scopedInstantiationService, this._contextKeyService, this._commentMenus, this._commentOptions, this._pendingComment, this, focus, this._containerDelegate.actionRunner);
         this._register(this._commentReply);
     }
     _createAdditionalActions() {

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

@@ -2,6 +2,7 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { Color } from '../../../../base/common/color.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
+import { MouseTargetType } from '../../../../editor/browser/editorBrowser.js';
 import { Range } from '../../../../editor/common/core/range.js';
 import { CommentThreadCollapsibleState } from '../../../../editor/common/languages.js';
 import { ZoneWidget } from '../../../../editor/contrib/zoneWidget/browser/zoneWidget.js';
@@ -10,7 +11,7 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
 import { CommentGlyphWidget } from './commentGlyphWidget.js';
 import { ICommentService } from './commentService.service.js';
-import { EDITOR_FONT_DEFAULTS } from '../../../../editor/common/config/editorOptions.js';
+import { EditorOption, EDITOR_FONT_DEFAULTS } from '../../../../editor/common/config/editorOptions.js';
 import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
 import { CommentThreadWidget } from './commentThreadWidget.js';
 import { commentThreadStateColorVar, commentThreadStateBackgroundColorVar, getCommentThreadStateBorderColor } from './commentColors.js';
@@ -34,7 +35,7 @@ function parseMouseDownInfoFromEvent(e) {
     if (!e.event.leftButton) {
         return null;
     }
-    if (e.target.type !== 4 ) {
+    if (e.target.type !== MouseTargetType.GUTTER_LINE_DECORATIONS) {
         return null;
     }
     const data = e.target.detail;
@@ -86,12 +87,11 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
         }
         this._initialCollapsibleState = _pendingComment ? CommentThreadCollapsibleState.Expanded : _commentThread.initialCollapsibleState;
         _commentThread.initialCollapsibleState = this._initialCollapsibleState;
-        this._isExpanded = this._initialCollapsibleState === CommentThreadCollapsibleState.Expanded;
         this._commentThreadDisposables = [];
         this.create();
         this._globalToDispose.add(this.themeService.onDidColorThemeChange(this._applyTheme, this));
         this._globalToDispose.add(this.editor.onDidChangeConfiguration(e => {
-            if (e.hasChanged(50 )) {
+            if (e.hasChanged(EditorOption.fontInfo)) {
                 this._applyTheme(this.themeService.getColorTheme());
             }
         }));
@@ -264,19 +264,19 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
     _doLayout(heightInPixel, widthInPixel) {
         this._commentThreadWidget.layout(widthInPixel);
     }
-    async display(range) {
+    async display(range, shouldReveal) {
         if (range) {
             this._commentGlyph = ( new CommentGlyphWidget(this.editor, range?.endLineNumber ?? -1));
             this._commentGlyph.setThreadState(this._commentThread.state);
         }
-        await this._commentThreadWidget.display(this.editor.getOption(67 ));
+        await this._commentThreadWidget.display(this.editor.getOption(EditorOption.lineHeight), shouldReveal);
         this._disposables.add(this._commentThreadWidget.onDidResize(dimension => {
             this._refresh(dimension);
         }));
         if ((this._commentThread.collapsibleState === CommentThreadCollapsibleState.Expanded) || (range === undefined)) {
             this.show(this.arrowPosition(range), 2);
         }
-        if (this._commentThread.canReply && this._commentThread.isTemplate && (!this._commentThread.comments || (this._commentThread.comments.length === 0))) {
+        if (shouldReveal) {
             this.reveal();
         }
         this.bindCommentThreadListeners();
@@ -330,14 +330,14 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
         return this._commentThreadWidget.submitComment();
     }
     _refresh(dimensions) {
-        if (dimensions.height === 0 && dimensions.width === 0) {
+        if ((this._isExpanded === undefined) && (dimensions.height === 0) && (dimensions.width === 0)) {
             this.commentThread.collapsibleState = CommentThreadCollapsibleState.Collapsed;
             return;
         }
         if (this._isExpanded) {
             this._commentThreadWidget.layout();
-            const headHeight = Math.ceil(this.editor.getOption(67 ) * 1.2);
-            const lineHeight = this.editor.getOption(67 );
+            const headHeight = Math.ceil(this.editor.getOption(EditorOption.lineHeight) * 1.2);
+            const lineHeight = this.editor.getOption(EditorOption.lineHeight);
             const arrowHeight = Math.round(lineHeight / 3);
             const frameThickness = Math.round(lineHeight / 9) * 2;
             const computedLinesNumber = Math.ceil(((headHeight + dimensions.height + arrowHeight + frameThickness + 8) ) / lineHeight);
@@ -348,9 +348,6 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
             if (this._viewZone && currentPosition && currentPosition.lineNumber !== this._viewZone.afterLineNumber && this._viewZone.afterLineNumber !== 0) {
                 this._viewZone.afterLineNumber = currentPosition.lineNumber;
             }
-            if (!this._commentThread.comments || !this._commentThread.comments.length) {
-                this._commentThreadWidget.focusCommentEditor();
-            }
             const capture = StableEditorScrollState.capture(this.editor);
             this._relayout(computedLinesNumber);
             capture.restore(this.editor);
@@ -362,7 +359,7 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
             arrowColor: borderColor,
             frameColor: borderColor
         });
-        const fontInfo = this.editor.getOption(50 );
+        const fontInfo = this.editor.getOption(EditorOption.fontInfo);
         this._commentThreadWidget.applyTheme(theme, fontInfo);
     }
     show(rangeOrPos, heightInLines) {