@codingame/monaco-vscode-api 5.3.0 → 6.0.1

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

@@ -1,16 +1,12 @@
-import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { IAccessibleViewService } from '../../accessibility/browser/accessibleView.service.js';
-import { AccessibilityHelpAction } from '../../accessibility/browser/accessibleViewActions.js';
 import { ctxCommentEditorFocused } from './simpleCommentEditor.js';
 import { CommentContextKeys } from '../common/commentContextKeys.js';
 import { localizeWithPath } from '../../../../nls.js';
-import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
-import { format } from '../../../../base/common/strings.js';
-import { getActiveElement } from '../../../../base/browser/dom.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";
 var CommentAccessibilityHelpNLS;
 ( ((function(CommentAccessibilityHelpNLS) {
@@ -19,97 +15,74 @@ var CommentAccessibilityHelpNLS;
         0,
         "The editor contains commentable range(s). Some useful commands include:"
     ));
-    CommentAccessibilityHelpNLS.introWidget = ( localizeWithPath(
+    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 ({0})."
+        "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.introWidgetNoKb = ( localizeWithPath(
+    CommentAccessibilityHelpNLS.commentCommands = ( localizeWithPath(_moduleId, 2, "Some useful comment commands include:"));
+    CommentAccessibilityHelpNLS.escape = ( localizeWithPath(_moduleId, 3, "- Dismiss Comment (Escape)"));
+    CommentAccessibilityHelpNLS.nextRange = ( localizeWithPath(
         _moduleId,
-        2,
-        "This widget contains a text area, for composition of new comments, and actions, that can be tabbed to once tab moves focus mode has been enabled with the command Toggle Tab Key Moves Focus, which is currently not triggerable via keybinding."
+        4,
+        "- Go to Next Commenting Range{0}",
+        `<keybinding:${CommentCommandId.NextRange}>`
     ));
-    CommentAccessibilityHelpNLS.commentCommands = ( localizeWithPath(_moduleId, 3, "Some useful comment commands include:"));
-    CommentAccessibilityHelpNLS.escape = ( localizeWithPath(_moduleId, 4, "- Dismiss Comment (Escape)"));
-    CommentAccessibilityHelpNLS.nextRange = ( localizeWithPath(_moduleId, 5, "- Go to Next Commenting Range ({0})"));
-    CommentAccessibilityHelpNLS.nextRangeNoKb = ( localizeWithPath(
+    CommentAccessibilityHelpNLS.previousRange = ( localizeWithPath(
         _moduleId,
-        6,
-        "- Go to Next Commenting Range, which is currently not triggerable via keybinding."
+        5,
+        "- Go to Previous Commenting Range{0}",
+        `<keybinding:${CommentCommandId.PreviousRange}>`
     ));
-    CommentAccessibilityHelpNLS.previousRange = ( localizeWithPath(_moduleId, 7, "- Go to Previous Commenting Range ({0})"));
-    CommentAccessibilityHelpNLS.previousRangeNoKb = ( localizeWithPath(
+    CommentAccessibilityHelpNLS.nextCommentThread = ( localizeWithPath(
         _moduleId,
-        8,
-        "- Go to Previous Commenting Range, which is currently not triggerable via keybinding."
-    ));
-    CommentAccessibilityHelpNLS.nextCommentThreadKb = ( localizeWithPath(_moduleId, 9, "- Go to Next Comment Thread ({0})"));
-    CommentAccessibilityHelpNLS.nextCommentThreadNoKb = ( localizeWithPath(
-        _moduleId,
-        10,
-        "- Go to Next Comment Thread, which is currently not triggerable via keybinding."
+        6,
+        "- Go to Next Comment Thread{0}",
+        `<keybinding:${CommentCommandId.NextThread}>`
     ));
-    CommentAccessibilityHelpNLS.previousCommentThreadKb = ( localizeWithPath(_moduleId, 11, "- Go to Previous Comment Thread ({0})"));
-    CommentAccessibilityHelpNLS.previousCommentThreadNoKb = ( localizeWithPath(
+    CommentAccessibilityHelpNLS.previousCommentThread = ( localizeWithPath(
         _moduleId,
-        12,
-        "- Go to Previous Comment Thread, which is currently not triggerable via keybinding."
+        7,
+        "- Go to Previous Comment Thread{0}",
+        `<keybinding:${CommentCommandId.PreviousThread}>`
     ));
-    CommentAccessibilityHelpNLS.addComment = ( localizeWithPath(_moduleId, 13, "- Add Comment ({0})"));
-    CommentAccessibilityHelpNLS.addCommentNoKb = ( localizeWithPath(
+    CommentAccessibilityHelpNLS.addComment = ( localizeWithPath(
         _moduleId,
-        14,
-        "- Add Comment on Current Selection, which is currently not triggerable via keybinding."
+        8,
+        "- Add Comment on Current Selection{0}",
+        `<keybinding:${CommentCommandId.Add}>`
     ));
-    CommentAccessibilityHelpNLS.submitComment = ( localizeWithPath(_moduleId, 15, "- Submit Comment ({0})"));
-    CommentAccessibilityHelpNLS.submitCommentNoKb = ( localizeWithPath(
+    CommentAccessibilityHelpNLS.submitComment = ( localizeWithPath(
         _moduleId,
-        16,
-        "- Submit Comment, accessible via tabbing, as it's currently not triggerable with a keybinding."
+        9,
+        "- Submit Comment{0}",
+        `<keybinding:${CommentCommandId.Submit}>`
     ));
 })(CommentAccessibilityHelpNLS || (CommentAccessibilityHelpNLS = {}))));
-let CommentsAccessibilityHelpProvider = class CommentsAccessibilityHelpProvider {
-    constructor(_keybindingService) {
-        this._keybindingService = _keybindingService;
-        this.id = "comments" ;
-        this.verbositySettingKey = "accessibility.verbosity.comments" ;
-        this.options = { type: "help"  };
-    }
-    _descriptionForCommand(commandId, msg, noKbMsg) {
-        const kb = this._keybindingService.lookupKeybinding(commandId);
-        if (kb) {
-            return format(msg, kb.getAriaLabel());
-        }
-        return format(noKbMsg, commandId);
+class CommentsAccessibilityHelpProvider {
+    constructor() {
+        this.id = AccessibleViewProviderId.Comments;
+        this.verbositySettingKey = AccessibilityVerbositySettingId.Comments;
+        this.options = { type: AccessibleViewType.Help };
     }
     provideContent() {
-        this._element = getActiveElement();
-        const content = [];
-        content.push(this._descriptionForCommand(ToggleTabFocusModeAction.ID, CommentAccessibilityHelpNLS.introWidget, CommentAccessibilityHelpNLS.introWidgetNoKb) + '\n');
-        content.push(CommentAccessibilityHelpNLS.commentCommands);
-        content.push(CommentAccessibilityHelpNLS.escape);
-        content.push(this._descriptionForCommand("workbench.action.addComment" , CommentAccessibilityHelpNLS.addComment, CommentAccessibilityHelpNLS.addCommentNoKb));
-        content.push(this._descriptionForCommand("editor.action.submitComment" , CommentAccessibilityHelpNLS.submitComment, CommentAccessibilityHelpNLS.submitCommentNoKb));
-        content.push(this._descriptionForCommand("editor.action.nextCommentingRange" , CommentAccessibilityHelpNLS.nextRange, CommentAccessibilityHelpNLS.nextRangeNoKb));
-        content.push(this._descriptionForCommand("editor.action.previousCommentingRange" , CommentAccessibilityHelpNLS.previousRange, CommentAccessibilityHelpNLS.previousRangeNoKb));
-        return content.join('\n');
+        return [CommentAccessibilityHelpNLS.tabFocus, CommentAccessibilityHelpNLS.commentCommands, CommentAccessibilityHelpNLS.escape, CommentAccessibilityHelpNLS.addComment, CommentAccessibilityHelpNLS.submitComment, CommentAccessibilityHelpNLS.nextRange, CommentAccessibilityHelpNLS.previousRange].join('\n');
     }
     onClose() {
         this._element?.focus();
     }
-};
-CommentsAccessibilityHelpProvider = ( (__decorate([
-    ( (__param(0, IKeybindingService)))
-], CommentsAccessibilityHelpProvider)));
-class CommentsAccessibilityHelpContribution extends Disposable {
+}
+class CommentsAccessibilityHelp {
     constructor() {
-        super();
-        this._register(AccessibilityHelpAction.addImplementation(110, 'comments', accessor => {
-            const instantiationService = accessor.get(IInstantiationService);
-            const accessibleViewService = accessor.get(IAccessibleViewService);
-            accessibleViewService.show(instantiationService.createInstance(CommentsAccessibilityHelpProvider));
-            return true;
-        }, ( (ContextKeyExpr.or(ctxCommentEditorFocused, CommentContextKeys.commentFocused)))));
+        this.priority = 110;
+        this.name = 'comments';
+        this.type = AccessibleViewType.Help;
+        this.when = ( (ContextKeyExpr.or(ctxCommentEditorFocused, CommentContextKeys.commentFocused)));
+    }
+    getProvider(accessor) {
+        return accessor.get(IInstantiationService).createInstance(CommentsAccessibilityHelpProvider);
     }
+    dispose() { }
 }
-export { CommentAccessibilityHelpNLS, CommentsAccessibilityHelpContribution, CommentsAccessibilityHelpProvider };
+export { CommentAccessibilityHelpNLS, CommentsAccessibilityHelp, CommentsAccessibilityHelpProvider };

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

@@ -22,6 +22,7 @@ import { CommentWidgetFocus, ReviewZoneWidget, parseMouseDownInfoFromEvent, isMo
 import { ACTIVE_GROUP, SIDE_GROUP } from '../../../services/editor/common/editorService.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { EmbeddedCodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/embeddedCodeEditorWidget.js';
+import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
 import { IViewsService } from '../../../services/views/common/viewsService.service.js';
 import { COMMENTS_VIEW_ID } from './commentsTreeViewer.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
@@ -32,6 +33,8 @@ import { IContextKeyService } from '../../../../platform/contextkey/common/conte
 import { CommentThreadRangeDecorator } from './commentThreadRangeDecorator.js';
 import { status } from '../../../../base/browser/ui/aria/aria.js';
 import { CommentContextKeys } from '../common/commentContextKeys.js';
+import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
+import { AccessibilityCommandId } from '../../accessibility/common/accessibilityCommands.js';
 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';
@@ -789,6 +792,36 @@ let CommentController = class CommentController {
             this.tryUpdateReservedSpace(e.newModelUrl);
         }
     }
+    async handleCommentAdded(editorId, uniqueOwner, thread) {
+        const matchedZones = this._commentWidgets.filter(zoneWidget => zoneWidget.uniqueOwner === uniqueOwner && zoneWidget.commentThread.threadId === thread.threadId);
+        if (matchedZones.length) {
+            return;
+        }
+        const matchedNewCommentThreadZones = this._commentWidgets.filter(zoneWidget => zoneWidget.uniqueOwner === uniqueOwner && zoneWidget.commentThread.commentThreadHandle === -1 && Range.equalsRange(zoneWidget.commentThread.range, thread.range));
+        if (matchedNewCommentThreadZones.length) {
+            matchedNewCommentThreadZones[0].update(thread);
+            return;
+        }
+        const continueOnCommentIndex = this._inProcessContinueOnComments.get(uniqueOwner)?.findIndex(pending => {
+            if (pending.range === undefined) {
+                return thread.range === undefined;
+            }
+            else {
+                return Range.lift(pending.range).equalsRange(thread.range);
+            }
+        });
+        let continueOnCommentText;
+        if ((continueOnCommentIndex !== undefined) && continueOnCommentIndex >= 0) {
+            continueOnCommentText = this._inProcessContinueOnComments.get(uniqueOwner)?.splice(continueOnCommentIndex, 1)[0].body;
+        }
+        const pendingCommentText = (this._pendingNewCommentCache[uniqueOwner] && this._pendingNewCommentCache[uniqueOwner][thread.threadId])
+            ?? continueOnCommentText;
+        const pendingEdits = this._pendingEditsCache[uniqueOwner] && this._pendingEditsCache[uniqueOwner][thread.threadId];
+        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();
+    }
     onModelChanged() {
         this.localToDispose.clear();
         this.tryUpdateReservedSpace();
@@ -845,42 +878,17 @@ let CommentController = class CommentController {
                     }
                 }
             });
-            changed.forEach(thread => {
+            for (const thread of changed) {
                 const matchedZones = this._commentWidgets.filter(zoneWidget => zoneWidget.uniqueOwner === e.uniqueOwner && zoneWidget.commentThread.threadId === thread.threadId);
                 if (matchedZones.length) {
                     const matchedZone = matchedZones[0];
                     matchedZone.update(thread);
                     this.openCommentsView(thread);
                 }
-            });
+            }
+            const editorId = this.editor?.getId();
             for (const thread of added) {
-                const matchedZones = this._commentWidgets.filter(zoneWidget => zoneWidget.uniqueOwner === e.uniqueOwner && zoneWidget.commentThread.threadId === thread.threadId);
-                if (matchedZones.length) {
-                    return;
-                }
-                const matchedNewCommentThreadZones = this._commentWidgets.filter(zoneWidget => zoneWidget.uniqueOwner === e.uniqueOwner && zoneWidget.commentThread.commentThreadHandle === -1 && Range.equalsRange(zoneWidget.commentThread.range, thread.range));
-                if (matchedNewCommentThreadZones.length) {
-                    matchedNewCommentThreadZones[0].update(thread);
-                    return;
-                }
-                const continueOnCommentIndex = this._inProcessContinueOnComments.get(e.uniqueOwner)?.findIndex(pending => {
-                    if (pending.range === undefined) {
-                        return thread.range === undefined;
-                    }
-                    else {
-                        return Range.lift(pending.range).equalsRange(thread.range);
-                    }
-                });
-                let continueOnCommentText;
-                if ((continueOnCommentIndex !== undefined) && continueOnCommentIndex >= 0) {
-                    continueOnCommentText = this._inProcessContinueOnComments.get(e.uniqueOwner)?.splice(continueOnCommentIndex, 1)[0].body;
-                }
-                const pendingCommentText = (this._pendingNewCommentCache[e.uniqueOwner] && this._pendingNewCommentCache[e.uniqueOwner][thread.threadId])
-                    ?? continueOnCommentText;
-                const pendingEdits = this._pendingEditsCache[e.uniqueOwner] && this._pendingEditsCache[e.uniqueOwner][thread.threadId];
-                await this.displayCommentThread(e.uniqueOwner, thread, pendingCommentText, pendingEdits);
-                this._commentInfos.filter(info => info.uniqueOwner === e.uniqueOwner)[0].threads.push(thread);
-                this.tryUpdateReservedSpace();
+                await this.handleCommentAdded(editorId, e.uniqueOwner, thread);
             }
             for (const thread of pending) {
                 await this.resumePendingComment(editorURI, thread);
@@ -929,9 +937,9 @@ let CommentController = class CommentController {
                     commentInfo => commentInfo.commentingRanges.ranges.length > 0 || commentInfo.commentingRanges.fileComments
                 )))) {
                     this._hasRespondedToEditorChange = true;
-                    const verbose = this.configurationService.getValue("accessibility.verbosity.comments" );
+                    const verbose = this.configurationService.getValue(AccessibilityVerbositySettingId.Comments);
                     if (verbose) {
-                        const keybinding = this.keybindingService.lookupKeybinding("editor.action.accessibilityHelp" )?.getAriaLabel();
+                        const keybinding = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getAriaLabel();
                         if (keybinding) {
                             status(( localizeWithPath(
                                 _moduleId,
@@ -970,7 +978,7 @@ let CommentController = class CommentController {
         }
         return undefined;
     }
-    async displayCommentThread(uniqueOwner, thread, pendingComment, pendingEdits) {
+    async displayCommentThread(uniqueOwner, thread, shouldReveal, pendingComment, pendingEdits) {
         const editor = this.editor?.getModel();
         if (!editor) {
             return;
@@ -983,7 +991,7 @@ let CommentController = class CommentController {
             continueOnCommentReply = this.commentService.removeContinueOnComment({ uniqueOwner, uri: editor.uri, range: thread.range, isReply: true });
         }
         const zoneWidget = this.instantiationService.createInstance(ReviewZoneWidget, this.editor, uniqueOwner, thread, pendingComment ?? continueOnCommentReply?.body, pendingEdits);
-        await zoneWidget.display(thread.range);
+        await zoneWidget.display(thread.range, shouldReveal);
         this._commentWidgets.push(zoneWidget);
         this.openCommentsView(thread);
     }
@@ -1081,7 +1089,9 @@ let CommentController = class CommentController {
         if (!newCommentInfos.length || !this.editor?.hasModel()) {
             this._addInProgress = false;
             if (!newCommentInfos.length) {
-                throw ( (new Error('There are no commenting ranges at the current position.')));
+                throw ( (new Error(
+                    `There are no commenting ranges at the current position (${range ? 'with range' : 'without range'}).`
+                )));
             }
             return Promise.resolve();
         }
@@ -1123,7 +1133,7 @@ let CommentController = class CommentController {
         const picks = ( (commentInfos.map((commentInfo) => {
             const { ownerId, extensionId, label } = commentInfo.action;
             return {
-                label: label || extensionId,
+                label: label ?? extensionId ?? ownerId,
                 id: ownerId
             };
         })));
@@ -1145,12 +1155,12 @@ let CommentController = class CommentController {
         if (!this.editor) {
             return;
         }
-        this.commentService.createCommentThreadTemplate(ownerId, this.editor.getModel().uri, range);
+        this.commentService.createCommentThreadTemplate(ownerId, this.editor.getModel().uri, range, this.editor.getId());
         this.processNextThreadToAdd();
         return;
     }
     getExistingCommentEditorOptions(editor) {
-        const lineDecorationsWidth = editor.getOption(66 );
+        const lineDecorationsWidth = editor.getOption(EditorOption.lineDecorationsWidth);
         let extraEditorClassName = [];
         const configuredExtraClassName = editor.getRawOptions().extraEditorClassName;
         if (configuredExtraClassName) {
@@ -1165,7 +1175,7 @@ let CommentController = class CommentController {
             extraEditorClassName.splice(inlineCommentPos, 1);
         }
         const options = editor.getOptions();
-        if (options.get(43 ) && options.get(110 ) !== 'never') {
+        if (options.get(EditorOption.folding) && options.get(EditorOption.showFoldingControls) !== 'never') {
             lineDecorationsWidth += 11;
         }
         lineDecorationsWidth -= 24;
@@ -1174,7 +1184,7 @@ let CommentController = class CommentController {
     getWithCommentsLineDecorationWidth(editor, startingLineDecorationsWidth) {
         let lineDecorationsWidth = startingLineDecorationsWidth;
         const options = editor.getOptions();
-        if (options.get(43 ) && options.get(110 ) !== 'never') {
+        if (options.get(EditorOption.folding) && options.get(EditorOption.showFoldingControls) !== 'never') {
             lineDecorationsWidth -= 11;
         }
         lineDecorationsWidth += 24;
@@ -1252,7 +1262,7 @@ let CommentController = class CommentController {
                 if (providerEditsCacheStore) {
                     pendingEdits = providerEditsCacheStore[thread.threadId];
                 }
-                await this.displayCommentThread(info.uniqueOwner, thread, pendingComment, pendingEdits);
+                await this.displayCommentThread(info.uniqueOwner, thread, false, pendingComment, pendingEdits);
             }
             for (const thread of info.pendingCommentThreads ?? []) {
                 this.resumePendingComment(this.editor.getModel().uri, thread);

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

@@ -5,6 +5,7 @@ import { renderMarkdown } from '../../../../base/browser/markdownRenderer.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.service.js';
 import { ResourceWithCommentThreads, CommentNode } from '../common/commentModel.js';
+import { TreeVisibility } from '../../../../base/browser/ui/tree/tree.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { WorkbenchObjectTree } from '../../../../platform/list/browser/listService.js';
@@ -25,6 +26,7 @@ import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { createAndFillInContextMenuActions, createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
 import { IMenuService } from '../../../../platform/actions/common/actions.service.js';
+import { MarshalledId } from '../../../../base/common/marshallingIds.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
 import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
@@ -262,7 +264,7 @@ let CommentNodeRenderer = class CommentNodeRenderer {
         templateData.actionBar.context = {
             commentControlHandle: node.element.controllerHandle,
             commentThreadHandle: node.element.threadHandle,
-            $mid: 7
+            $mid: MarshalledId.CommentThread
         };
         if (!node.element.hasReply()) {
             templateData.repliesMetadata.container.style.display = 'none';
@@ -288,13 +290,18 @@ CommentNodeRenderer = ( (__decorate([
     ( (__param(4, IHoverService))),
     ( (__param(5, IThemeService)))
 ], CommentNodeRenderer)));
+var FilterDataType;
+( ((function(FilterDataType) {
+    FilterDataType[FilterDataType["Resource"] = 0] = "Resource";
+    FilterDataType[FilterDataType["Comment"] = 1] = "Comment";
+})(FilterDataType || (FilterDataType = {}))));
 class Filter {
     constructor(options) {
         this.options = options;
     }
     filter(element, parentVisibility) {
         if (this.options.filter === '' && this.options.showResolved && this.options.showUnresolved) {
-            return 1 ;
+            return TreeVisibility.Visible;
         }
         if (element instanceof ResourceWithCommentThreads) {
             return this.filterResourceMarkers(element);
@@ -307,10 +314,10 @@ class Filter {
         if (this.options.textFilter.text && !this.options.textFilter.negate) {
             const uriMatches = FilterOptions._filter(this.options.textFilter.text, basename(resourceMarkers.resource));
             if (uriMatches) {
-                return { visibility: true, data: { type: 0 , uriMatches: uriMatches || [] } };
+                return { visibility: true, data: { type: FilterDataType.Resource, uriMatches: uriMatches || [] } };
             }
         }
-        return 2 ;
+        return TreeVisibility.Recurse;
     }
     filterCommentNode(comment, parentVisibility) {
         const matchesResolvedState = (comment.threadState === undefined) || (this.options.showResolved && CommentThreadState.Resolved === comment.threadState) ||
@@ -329,12 +336,12 @@ class Filter {
                     || FilterOptions._messageFilter(this.options.textFilter.text, typeof reply.comment.body === 'string' ? reply.comment.body : reply.comment.body.value);
             }))).filter(value => !!value).flat();
         if (textMatches.length && !this.options.textFilter.negate) {
-            return { visibility: true, data: { type: 1 , textMatches } };
+            return { visibility: true, data: { type: FilterDataType.Comment, textMatches } };
         }
-        if (textMatches.length && this.options.textFilter.negate && parentVisibility === 2 ) {
+        if (textMatches.length && this.options.textFilter.negate && parentVisibility === TreeVisibility.Recurse) {
             return false;
         }
-        if ((textMatches.length === 0) && this.options.textFilter.negate && parentVisibility === 2 ) {
+        if ((textMatches.length === 0) && this.options.textFilter.negate && parentVisibility === TreeVisibility.Recurse) {
             return true;
         }
         return parentVisibility;
@@ -411,7 +418,7 @@ let CommentsList = class CommentsList extends WorkbenchObjectTree {
             getActionsContext: () => ({
                 commentControlHandle: node.controllerHandle,
                 commentThreadHandle: node.threadHandle,
-                $mid: 7 ,
+                $mid: MarshalledId.CommentThread,
                 thread: node.thread
             })
         });

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

@@ -23,6 +23,7 @@ import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uri
 import { CommentsViewFilterFocusContextKey } from './comments.js';
 import { CommentsFilters } from './commentsViewActions.js';
 import { Memento } from '../../../common/memento.js';
+import { StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 import { FilterOptions } from './commentsFilterOptions.js';
 import { CommentThreadApplicability } from '../../../../editor/common/languages.js';
@@ -31,6 +32,7 @@ import { revealCommentThread } from './commentsController.js';
 import { registerNavigableContainer } from '../../../browser/actions/widgetNavigationCommands.js';
 import { CommentsModel } from './commentsModel.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
+import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
 import { AccessibleViewAction } from '../../accessibility/browser/accessibleViewActions.js';
 const _moduleId = "vs/workbench/contrib/comments/browser/commentsView";
 const CONTEXT_KEY_HAS_COMMENTS = ( (new RawContextKey('commentsView.hasComments', false)));
@@ -95,7 +97,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
     }
     constructor(options, instantiationService, viewDescriptorService, editorService, configurationService, contextKeyService, contextMenuService, keybindingService, openerService, themeService, commentService, telemetryService, hoverService, uriIdentityService, storageService) {
         const stateMemento = ( (new Memento(VIEW_STORAGE_ID, storageService)));
-        const viewState = stateMemento.getMemento(1 , 1 );
+        const viewState = stateMemento.getMemento(StorageScope.WORKSPACE, StorageTarget.MACHINE);
         super({
             ...options,
             filterOptions: {
@@ -262,7 +264,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
     }
     getScreenReaderInfoForNode(element, forAriaLabel) {
         let accessibleViewHint = '';
-        if (forAriaLabel && this.configurationService.getValue("accessibility.verbosity.comments" )) {
+        if (forAriaLabel && this.configurationService.getValue(AccessibilityVerbositySettingId.Comments)) {
             const kbLabel = this.keybindingService.lookupKeybinding(AccessibleViewAction.id)?.getAriaLabel();
             accessibleViewHint = kbLabel ? ( localizeWithPath(_moduleId, 3, "Inspect this in the accessible view ({0}).\n", kbLabel)) : ( localizeWithPath(
                 _moduleId,

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

@@ -1,3 +1,4 @@
+import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { ContextKeyExpr, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
@@ -5,6 +6,7 @@ import { Emitter } from '../../../../base/common/event.js';
 import { CommentsViewFilterFocusContextKey } from './comments.js';
 import { registerAction2 } from '../../../../platform/actions/common/actions.js';
 import { ViewAction } from '../../../browser/parts/views/viewPane.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { COMMENTS_VIEW_ID } from './commentsTreeViewer.js';
 import { FocusedViewContext } from '../../../common/contextkeys.js';
 import { viewFilterSubmenu } from '../../../browser/parts/views/viewFilter.js';
@@ -48,8 +50,8 @@ registerAction2(class extends ViewAction {
             title: ( localizeWithPath(_moduleId, 0, "Focus Comments view")),
             keybinding: {
                 when: CommentsViewFilterFocusContextKey,
-                weight: 200 ,
-                primary: 2048  | 18
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod$1.CtrlCmd | KeyCode.DownArrow
             },
             viewId: COMMENTS_VIEW_ID
         });
@@ -65,8 +67,8 @@ registerAction2(class extends ViewAction {
             title: ( localizeWithPath(_moduleId, 1, "Clear filter text")),
             keybinding: {
                 when: CommentsViewFilterFocusContextKey,
-                weight: 200 ,
-                primary: 9
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyCode.Escape
             },
             viewId: COMMENTS_VIEW_ID
         });
@@ -82,8 +84,8 @@ registerAction2(class extends ViewAction {
             title: ( localizeWithPath(_moduleId, 2, "Focus comments filter")),
             keybinding: {
                 when: ( (FocusedViewContext.isEqualTo(COMMENTS_VIEW_ID))),
-                weight: 200 ,
-                primary: 2048  | 36
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod$1.CtrlCmd | KeyCode.KeyF
             },
             viewId: COMMENTS_VIEW_ID
         });

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

@@ -1,5 +1,6 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { EditorExtensionsRegistry } from '../../../../editor/browser/editorExtensions.js';
+import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
+import { EditorContributionInstantiation, EditorExtensionsRegistry } from '../../../../editor/browser/editorExtensions.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
 import { CodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/codeEditorWidget.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
@@ -34,12 +35,12 @@ let SimpleCommentEditor = class SimpleCommentEditor extends CodeEditorWidget {
     constructor(domElement, options, scopedContextKeyService, parentThread, instantiationService, codeEditorService, commandService, themeService, notificationService, accessibilityService, languageConfigurationService, languageFeaturesService) {
         const codeEditorWidgetOptions = {
             contributions: [
-                { id: MenuPreventer.ID, ctor: MenuPreventer, instantiation: 2  },
-                { id: ContextMenuController.ID, ctor: ContextMenuController, instantiation: 2  },
-                { id: SuggestController.ID, ctor: SuggestController, instantiation: 0  },
-                { id: SnippetController2.ID, ctor: SnippetController2, instantiation: 4  },
-                { id: TabCompletionController.ID, ctor: TabCompletionController, instantiation: 0  },
-                { id: EditorDictation.ID, ctor: EditorDictation, instantiation: 4  },
+                { id: MenuPreventer.ID, ctor: MenuPreventer, instantiation: EditorContributionInstantiation.BeforeFirstInteraction },
+                { id: ContextMenuController.ID, ctor: ContextMenuController, instantiation: EditorContributionInstantiation.BeforeFirstInteraction },
+                { id: SuggestController.ID, ctor: SuggestController, instantiation: EditorContributionInstantiation.Eager },
+                { id: SnippetController2.ID, ctor: SnippetController2, instantiation: EditorContributionInstantiation.Lazy },
+                { id: TabCompletionController.ID, ctor: TabCompletionController, instantiation: EditorContributionInstantiation.Eager },
+                { id: EditorDictation.ID, ctor: EditorDictation, instantiation: EditorContributionInstantiation.Lazy },
                 ...EditorExtensionsRegistry.getSomeEditorContributions([
                     CopyPasteController.ID,
                     DropIntoEditorController.ID,
@@ -112,7 +113,7 @@ SimpleCommentEditor = ( __decorate([
 ], SimpleCommentEditor));
 function calculateEditorHeight(parentEditor, editor, currentHeight) {
     const layoutInfo = editor.getLayoutInfo();
-    const lineHeight = editor.getOption(67 );
+    const lineHeight = editor.getOption(EditorOption.lineHeight);
     const contentHeight = (editor._getViewModel()?.getLineCount() * lineHeight) ?? editor.getContentHeight();
     if ((contentHeight > layoutInfo.height) ||
         (contentHeight < layoutInfo.height && currentHeight > MIN_EDITOR_HEIGHT)) {

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

@@ -0,0 +1,15 @@
+var CommentCommandId;
+( (function(CommentCommandId) {
+    CommentCommandId["Add"] = "workbench.action.addComment";
+    CommentCommandId["NextThread"] = "editor.action.nextCommentThreadAction";
+    CommentCommandId["PreviousThread"] = "editor.action.previousCommentThreadAction";
+    CommentCommandId["NextRange"] = "editor.action.nextCommentingRange";
+    CommentCommandId["PreviousRange"] = "editor.action.previousCommentingRange";
+    CommentCommandId["ToggleCommenting"] = "workbench.action.toggleCommenting";
+    CommentCommandId["Submit"] = "editor.action.submitComment";
+    CommentCommandId["Hide"] = "workbench.action.hideComment";
+    CommentCommandId["CollapseAll"] = "workbench.action.collapseAllComments";
+    CommentCommandId["ExpandAll"] = "workbench.action.expandAllComments";
+    CommentCommandId["ExpandUnresolved"] = "workbench.action.expandUnresolvedComments";
+})(CommentCommandId || (CommentCommandId = {})));
+export { CommentCommandId };

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

@@ -4,6 +4,7 @@ import { IContextMenuService } from '../../../../platform/contextview/browser/co
 import { ILayoutService } from '../../../../platform/layout/browser/layoutService.service.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { Extensions } from '../../../common/contributions.js';
+import { LifecyclePhase } from '../../../services/lifecycle/common/lifecycle.js';
 let ContextMenuContribution = class ContextMenuContribution {
     constructor(layoutService, contextMenuService) {
         this.disposables = ( new DisposableStore());
@@ -17,4 +18,4 @@ ContextMenuContribution = ( __decorate([
     ( __param(1, IContextMenuService))
 ], ContextMenuContribution));
 ( Registry.as(Extensions.Workbench))
-    .registerWorkbenchContribution(ContextMenuContribution, 4 );
+    .registerWorkbenchContribution(ContextMenuContribution, LifecyclePhase.Eventually);