@codingame/monaco-vscode-api 9.0.2 → 10.0.0

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

@@ -2,7 +2,6 @@ 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';
@@ -11,7 +10,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 { EditorOption, EDITOR_FONT_DEFAULTS } from '../../../../editor/common/config/editorOptions.js';
+import { 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';
@@ -35,7 +34,7 @@ function parseMouseDownInfoFromEvent(e) {
     if (!e.event.leftButton) {
         return null;
     }
-    if (e.target.type !== MouseTargetType.GUTTER_LINE_DECORATIONS) {
+    if (e.target.type !== 4 ) {
         return null;
     }
     const data = e.target.detail;
@@ -91,7 +90,7 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
         this.create();
         this._globalToDispose.add(this.themeService.onDidColorThemeChange(this._applyTheme, this));
         this._globalToDispose.add(this.editor.onDidChangeConfiguration(e => {
-            if (e.hasChanged(EditorOption.fontInfo)) {
+            if (e.hasChanged(52 )) {
                 this._applyTheme(this.themeService.getColorTheme());
             }
         }));
@@ -124,9 +123,9 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
             this.show(this.arrowPosition(this._commentThread.range), 2);
         }
     }
-    _setFocus(focus) {
+    _setFocus(commentUniqueId, focus) {
         if (focus === CommentWidgetFocus.Widget) {
-            this._commentThreadWidget.focus();
+            this._commentThreadWidget.focus(commentUniqueId);
         }
         else if (focus === CommentWidgetFocus.Editor) {
             this._commentThreadWidget.focusCommentEditor();
@@ -143,7 +142,7 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
                 scrollTop = this.editor.getTopForLineNumber(this._commentThread.range.startLineNumber) - height / 2 + commentCoords.top - commentThreadCoords.top;
             }
             this.editor.setScrollTop(scrollTop);
-            this._setFocus(focus);
+            this._setFocus(commentUniqueId, focus);
         }
         else {
             this._goToThread(focus);
@@ -159,14 +158,16 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
         ))
             : ( new Range(1, 1, 1, 1));
         this.editor.revealRangeInCenter(rangeToReveal);
-        this._setFocus(focus);
+        this._setFocus(undefined, focus);
     }
     makeVisible(commentUniqueId, focus = CommentWidgetFocus.None) {
         this._expandAndShowZoneWidget();
         if (commentUniqueId !== undefined) {
             this._goToComment(commentUniqueId, focus);
         }
-        this._goToThread(focus);
+        else {
+            this._goToThread(focus);
+        }
     }
     getPendingComments() {
         return {
@@ -277,8 +278,21 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
         if (range) {
             this._commentGlyph = ( new CommentGlyphWidget(this.editor, range?.endLineNumber ?? -1));
             this._commentGlyph.setThreadState(this._commentThread.state);
+            this._globalToDispose.add(this._commentGlyph.onDidChangeLineNumber(async (e) => {
+                if (!this._commentThread.range) {
+                    return;
+                }
+                const shift = e - (this._commentThread.range.endLineNumber);
+                const newRange = ( new Range(
+                    this._commentThread.range.startLineNumber + shift,
+                    this._commentThread.range.startColumn,
+                    this._commentThread.range.endLineNumber + shift,
+                    this._commentThread.range.endColumn
+                ));
+                this._commentThread.range = newRange;
+            }));
         }
-        await this._commentThreadWidget.display(this.editor.getOption(EditorOption.lineHeight), shouldReveal);
+        await this._commentThreadWidget.display(this.editor.getOption(69 ), shouldReveal);
         this._disposables.add(this._commentThreadWidget.onDidResize(dimension => {
             this._refresh(dimension);
         }));
@@ -294,19 +308,6 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
         this._commentThreadDisposables.push(this._commentThread.onDidChangeComments(async (_) => {
             await this.update(this._commentThread);
         }));
-        this._commentThreadDisposables.push(this._commentThread.onDidChangeRange(range => {
-            const lineNumber = this._commentThread.range?.startLineNumber ?? 1;
-            let shouldMoveWidget = false;
-            if (this._commentGlyph) {
-                if (this._commentGlyph.getPosition().position.lineNumber !== lineNumber) {
-                    shouldMoveWidget = true;
-                    this._commentGlyph.setLineNumber(lineNumber);
-                }
-            }
-            if (shouldMoveWidget && this._isExpanded) {
-                this.show(this.arrowPosition(this._commentThread.range), 2);
-            }
-        }));
         this._commentThreadDisposables.push(this._commentThread.onDidChangeCollapsibleState(state => {
             if (state === CommentThreadCollapsibleState.Expanded && !this._isExpanded) {
                 this.show(this.arrowPosition(this._commentThread.range), 2);
@@ -346,8 +347,8 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
         }
         if (this._isExpanded) {
             this._commentThreadWidget.layout();
-            const headHeight = Math.ceil(this.editor.getOption(EditorOption.lineHeight) * 1.2);
-            const lineHeight = this.editor.getOption(EditorOption.lineHeight);
+            const headHeight = Math.ceil(this.editor.getOption(69 ) * 1.2);
+            const lineHeight = this.editor.getOption(69 );
             const arrowHeight = Math.round(lineHeight / 3);
             const frameThickness = Math.round(lineHeight / 9) * 2;
             const computedLinesNumber = Math.ceil(((headHeight + dimensions.height + arrowHeight + frameThickness + 8) ) / lineHeight);
@@ -369,7 +370,7 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
             arrowColor: borderColor,
             frameColor: borderColor
         });
-        const fontInfo = this.editor.getOption(EditorOption.fontInfo);
+        const fontInfo = this.editor.getOption(52 );
         this._commentThreadWidget.applyTheme(theme, fontInfo);
     }
     show(rangeOrPos, heightInLines) {

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

@@ -3,57 +3,68 @@ import { IInstantiationService } from '../../../../platform/instantiation/common
 import { ctxCommentEditorFocused } from './simpleCommentEditor.js';
 import { CommentContextKeys } from '../common/commentContextKeys.js';
 import { localize } from '../../../../nls.js';
-import { AccessibilityVerbositySettingId } from '../../accessibility/browser/accessibilityConfiguration.js';
-import { CommentCommandId } from '../common/commentCommandIds.js';
 import { ToggleTabFocusModeAction } from '../../../../editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode.js';
-import { AccessibleViewType, AccessibleViewProviderId } from '../../../../platform/accessibility/browser/accessibleView.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 var CommentAccessibilityHelpNLS;
 ( ((function(CommentAccessibilityHelpNLS) {
     CommentAccessibilityHelpNLS.intro = ( localize(
-        5332,
+        5377,
         "The editor contains commentable range(s). Some useful commands include:"
     ));
     CommentAccessibilityHelpNLS.tabFocus = ( localize(
-        5333,
+        5378,
         "This widget contains a text area, for composition of new comments, and actions, that can be tabbed to once tab moves focus mode has been enabled with the command Toggle Tab Key Moves Focus{0}.",
         `<keybinding:${ToggleTabFocusModeAction.ID}>`
     ));
-    CommentAccessibilityHelpNLS.commentCommands = ( localize(5334, "Some useful comment commands include:"));
-    CommentAccessibilityHelpNLS.escape = ( localize(5335, "- Dismiss Comment (Escape)"));
+    CommentAccessibilityHelpNLS.commentCommands = ( localize(5379, "Some useful comment commands include:"));
+    CommentAccessibilityHelpNLS.escape = ( localize(5380, "- Dismiss Comment (Escape)"));
     CommentAccessibilityHelpNLS.nextRange = ( localize(
-        5336,
+        5381,
         "- Go to Next Commenting Range{0}.",
-        `<keybinding:${CommentCommandId.NextRange}>`
+        `<keybinding:${"editor.action.nextCommentingRange" }>`
     ));
     CommentAccessibilityHelpNLS.previousRange = ( localize(
-        5337,
+        5382,
         "- Go to Previous Commenting Range{0}.",
-        `<keybinding:${CommentCommandId.PreviousRange}>`
+        `<keybinding:${"editor.action.previousCommentingRange" }>`
     ));
     CommentAccessibilityHelpNLS.nextCommentThread = ( localize(
-        5338,
+        5383,
         "- Go to Next Comment Thread{0}.",
-        `<keybinding:${CommentCommandId.NextThread}>`
+        `<keybinding:${"editor.action.nextCommentThreadAction" }>`
     ));
     CommentAccessibilityHelpNLS.previousCommentThread = ( localize(
-        5339,
+        5384,
         "- Go to Previous Comment Thread{0}.",
-        `<keybinding:${CommentCommandId.PreviousThread}>`
+        `<keybinding:${"editor.action.previousCommentThreadAction" }>`
+    ));
+    CommentAccessibilityHelpNLS.nextCommentedRange = ( localize(
+        5385,
+        "- Go to Next Commented Range{0}.",
+        `<keybinding:${"editor.action.nextCommentedRangeAction" }>`
+    ));
+    CommentAccessibilityHelpNLS.previousCommentedRange = ( localize(
+        5386,
+        "- Go to Previous Commented Range{0}.",
+        `<keybinding:${"editor.action.previousCommentedRangeAction" }>`
     ));
     CommentAccessibilityHelpNLS.addComment = ( localize(
-        5340,
+        5387,
         "- Add Comment on Current Selection{0}.",
-        `<keybinding:${CommentCommandId.Add}>`
+        `<keybinding:${"workbench.action.addComment" }>`
+    ));
+    CommentAccessibilityHelpNLS.submitComment = ( localize(
+        5388,
+        "- Submit Comment{0}.",
+        `<keybinding:${"editor.action.submitComment" }>`
     ));
-    CommentAccessibilityHelpNLS.submitComment = ( localize(5341, "- Submit Comment{0}.", `<keybinding:${CommentCommandId.Submit}>`));
 })(CommentAccessibilityHelpNLS || (CommentAccessibilityHelpNLS = {}))));
 class CommentsAccessibilityHelpProvider extends Disposable {
     constructor() {
         super(...arguments);
-        this.id = AccessibleViewProviderId.Comments;
-        this.verbositySettingKey = AccessibilityVerbositySettingId.Comments;
-        this.options = { type: AccessibleViewType.Help };
+        this.id = "comments" ;
+        this.verbositySettingKey = "accessibility.verbosity.comments" ;
+        this.options = { type: "help"  };
     }
     provideContent() {
         return [CommentAccessibilityHelpNLS.tabFocus, CommentAccessibilityHelpNLS.commentCommands, CommentAccessibilityHelpNLS.escape, CommentAccessibilityHelpNLS.addComment, CommentAccessibilityHelpNLS.submitComment, CommentAccessibilityHelpNLS.nextRange, CommentAccessibilityHelpNLS.previousRange].join('\n');
@@ -66,7 +77,7 @@ class CommentsAccessibilityHelp {
     constructor() {
         this.priority = 110;
         this.name = 'comments';
-        this.type = AccessibleViewType.Help;
+        this.type = "help" ;
         this.when = ( (ContextKeyExpr.or(ctxCommentEditorFocused, CommentContextKeys.commentFocused)));
     }
     getProvider(accessor) {

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

@@ -22,7 +22,6 @@ 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';
@@ -33,8 +32,6 @@ 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';
@@ -393,6 +390,29 @@ class CommentingRangeDecorator {
         this.commentingRangeDecorations = [];
     }
 }
+function moveToNextCommentInThread(commentInfo, type) {
+    if (!commentInfo?.comment || !commentInfo?.thread?.comments) {
+        return;
+    }
+    const currentIndex = commentInfo.thread.comments?.indexOf(commentInfo.comment);
+    if (currentIndex === undefined || currentIndex < 0) {
+        return;
+    }
+    if (type === 'previous' && currentIndex === 0) {
+        return;
+    }
+    if (type === 'next' && currentIndex === commentInfo.thread.comments.length - 1) {
+        return;
+    }
+    const comment = commentInfo.thread.comments?.[type === 'previous' ? currentIndex - 1 : currentIndex + 1];
+    if (!comment) {
+        return;
+    }
+    return {
+        ...commentInfo,
+        comment,
+    };
+}
 function revealCommentThread(commentService, editorService, uriIdentityService, commentThread, comment, focusReply, pinned, preserveFocus, sideBySide) {
     if (!commentThread.resource) {
         return;
@@ -462,6 +482,7 @@ let CommentController = class CommentController {
         this._pendingEditsCache = {};
         this._computePromise = null;
         this._activeCursorHasCommentingRange = CommentContextKeys.activeCursorHasCommentingRange.bindTo(contextKeyService);
+        this._activeCursorHasComment = CommentContextKeys.activeCursorHasComment.bindTo(contextKeyService);
         this._activeEditorHasCommentingRange = CommentContextKeys.activeEditorHasCommentingRange.bindTo(contextKeyService);
         if (editor instanceof EmbeddedCodeEditorWidget) {
             return;
@@ -589,7 +610,11 @@ let CommentController = class CommentController {
         }
     }
     onEditorChangeCursorPosition(e) {
-        const decorations = e ? this.editor?.getDecorationsInRange(Range.fromPositions(e, { column: -1, lineNumber: e.lineNumber })) : undefined;
+        if (!e) {
+            return;
+        }
+        const range = Range.fromPositions(e, { column: -1, lineNumber: e.lineNumber });
+        const decorations = this.editor?.getDecorationsInRange(range);
         let hasCommentingRange = false;
         if (decorations) {
             for (const decoration of decorations) {
@@ -603,6 +628,7 @@ let CommentController = class CommentController {
             }
         }
         this._activeCursorHasCommentingRange.set(hasCommentingRange);
+        this._activeCursorHasComment.set(this.getCommentsAtLine(range).length > 0);
     }
     isEditorInlineOriginal(testEditor) {
         if (this.configurationService.getValue('diffEditor.renderSideBySide')) {
@@ -693,10 +719,10 @@ let CommentController = class CommentController {
             }
         }
     }
-    nextCommentThread() {
-        this._findNearestCommentThread();
+    nextCommentThread(focusThread) {
+        this._findNearestCommentThread(focusThread);
     }
-    _findNearestCommentThread(reverse) {
+    _findNearestCommentThread(focusThread, reverse) {
         if (!this._commentWidgets.length || !this.editor?.hasModel()) {
             return;
         }
@@ -743,18 +769,14 @@ let CommentController = class CommentController {
             }
             return false;
         });
-        let nextWidget;
-        if (idx === this._commentWidgets.length) {
-            nextWidget = this._commentWidgets[0];
-        }
-        else {
-            nextWidget = sortedWidgets[idx];
+        const nextWidget = sortedWidgets[idx];
+        if (nextWidget !== undefined) {
+            this.editor.setSelection(nextWidget.commentThread.range ?? ( (new Range(1, 1, 1, 1))));
+            nextWidget.reveal(undefined, focusThread ? CommentWidgetFocus.Widget : CommentWidgetFocus.None);
         }
-        this.editor.setSelection(nextWidget.commentThread.range ?? ( (new Range(1, 1, 1, 1))));
-        nextWidget.reveal(undefined, CommentWidgetFocus.Widget);
     }
-    previousCommentThread() {
-        this._findNearestCommentThread(true);
+    previousCommentThread(focusThread) {
+        this._findNearestCommentThread(focusThread, true);
     }
     _findNearestCommentingRange(reverse) {
         if (!this.editor?.hasModel()) {
@@ -772,7 +794,7 @@ let CommentController = class CommentController {
             const commentRangeEnd = range?.getEndPosition().lineNumber;
             if (commentRangeStart && commentRangeEnd) {
                 const oneLine = commentRangeStart === commentRangeEnd;
-                oneLine ? status(( localize(5326, "Line {0}", commentRangeStart))) : status(( localize(5327, "Lines {0} to {1}", commentRangeStart, commentRangeEnd)));
+                oneLine ? status(( localize(5371, "Line {0}", commentRangeStart))) : status(( localize(5372, "Lines {0} to {1}", commentRangeStart, commentRangeEnd)));
             }
         }
     }
@@ -939,25 +961,25 @@ let CommentController = class CommentController {
                     commentInfo => commentInfo.commentingRanges.ranges.length > 0 || commentInfo.commentingRanges.fileComments
                 )))) {
                     this._hasRespondedToEditorChange = true;
-                    const verbose = this.configurationService.getValue(AccessibilityVerbositySettingId.Comments);
+                    const verbose = this.configurationService.getValue("accessibility.verbosity.comments" );
                     if (verbose) {
-                        const keybinding = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getAriaLabel();
+                        const keybinding = this.keybindingService.lookupKeybinding("editor.action.accessibilityHelp" )?.getAriaLabel();
                         if (keybinding) {
                             status(( localize(
-                                5328,
+                                5373,
                                 "Editor has commenting ranges, run the command Open Accessibility Help ({0}), for more information.",
                                 keybinding
                             )));
                         }
                         else {
                             status(( localize(
-                                5329,
+                                5374,
                                 "Editor has commenting ranges, run the command Open Accessibility Help, which is currently not triggerable via keybinding, for more information."
                             )));
                         }
                     }
                     else {
-                        status(( localize(5330, "Editor has commenting ranges.")));
+                        status(( localize(5375, "Editor has commenting ranges.")));
                     }
                 }
             }
@@ -1040,10 +1062,13 @@ let CommentController = class CommentController {
             this.addOrToggleCommentAtLine(range, e);
         }
     }
+    getCommentsAtLine(commentRange) {
+        return this._commentWidgets.filter(widget => widget.getGlyphPosition() === (commentRange ? commentRange.endLineNumber : 0));
+    }
     async addOrToggleCommentAtLine(commentRange, e) {
         if (!this._addInProgress) {
             this._addInProgress = true;
-            const existingCommentsAtLine = this._commentWidgets.filter(widget => widget.getGlyphPosition() === (commentRange ? commentRange.endLineNumber : 0));
+            const existingCommentsAtLine = this.getCommentsAtLine(commentRange);
             if (existingCommentsAtLine.length) {
                 const allExpanded = existingCommentsAtLine.every(widget => widget.expanded);
                 existingCommentsAtLine.forEach(allExpanded ? widget => widget.collapse() : widget => widget.expand(true));
@@ -1107,7 +1132,7 @@ let CommentController = class CommentController {
             }
             else {
                 const picks = this.getCommentProvidersQuickPicks(newCommentInfos);
-                return this.quickInputService.pick(picks, { placeHolder: ( localize(5331, "Select Comment Provider")), matchOnDescription: true }).then(pick => {
+                return this.quickInputService.pick(picks, { placeHolder: ( localize(5376, "Select Comment Provider")), matchOnDescription: true }).then(pick => {
                     if (!pick) {
                         return;
                     }
@@ -1160,7 +1185,7 @@ let CommentController = class CommentController {
         return;
     }
     getExistingCommentEditorOptions(editor) {
-        const lineDecorationsWidth = editor.getOption(EditorOption.lineDecorationsWidth);
+        const lineDecorationsWidth = editor.getOption(68 );
         let extraEditorClassName = [];
         const configuredExtraClassName = editor.getRawOptions().extraEditorClassName;
         if (configuredExtraClassName) {
@@ -1175,7 +1200,7 @@ let CommentController = class CommentController {
             extraEditorClassName.splice(inlineCommentPos, 1);
         }
         const options = editor.getOptions();
-        if (options.get(EditorOption.folding) && options.get(EditorOption.showFoldingControls) !== 'never') {
+        if (options.get(45 ) && options.get(113 ) !== 'never') {
             lineDecorationsWidth += 11;
         }
         lineDecorationsWidth -= 24;
@@ -1184,7 +1209,7 @@ let CommentController = class CommentController {
     getWithCommentsLineDecorationWidth(editor, startingLineDecorationsWidth) {
         let lineDecorationsWidth = startingLineDecorationsWidth;
         const options = editor.getOptions();
-        if (options.get(EditorOption.folding) && options.get(EditorOption.showFoldingControls) !== 'never') {
+        if (options.get(45 ) && options.get(113 ) !== 'never') {
             lineDecorationsWidth -= 11;
         }
         lineDecorationsWidth += 24;
@@ -1341,4 +1366,4 @@ CommentController = ( (__decorate([
     ( (__param(10, IKeybindingService))),
     ( (__param(11, IAccessibilityService)))
 ], CommentController)));
-export { CommentController, ID, revealCommentThread };
+export { CommentController, ID, moveToNextCommentInThread, revealCommentThread };

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

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

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

@@ -5,7 +5,6 @@ import { renderMarkdown } from '../../../../base/browser/markdownRenderer.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.service.js';
 import { CommentNode, ResourceWithCommentThreads } 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';
@@ -26,14 +25,13 @@ 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';
 import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
 const COMMENTS_VIEW_ID = 'workbench.panel.comments';
 const COMMENTS_VIEW_STORAGE_ID = 'Comments';
-const COMMENTS_VIEW_TITLE = ( localize2(5299, "Comments"));
+const COMMENTS_VIEW_TITLE = ( localize2(5344, "Comments"));
 class CommentsModelVirtualDelegate {
     static { this.RESOURCE_ID = 'resource-with-comments'; }
     static { this.COMMENT_ID = 'comment-node'; }
@@ -172,13 +170,13 @@ let CommentNodeRenderer = class CommentNodeRenderer {
     }
     getCountString(commentCount) {
         if (commentCount > 2) {
-            return ( localize(5300, "{0} replies", commentCount - 1));
+            return ( localize(5345, "{0} replies", commentCount - 1));
         }
         else if (commentCount === 2) {
-            return ( localize(5301, "1 reply"));
+            return ( localize(5346, "1 reply"));
         }
         else {
-            return ( localize(5302, "1 comment"));
+            return ( localize(5347, "1 comment"));
         }
     }
     getRenderedComment(commentBody, disposables) {
@@ -193,7 +191,7 @@ let CommentNodeRenderer = class CommentNodeRenderer {
         for (let i = 0; i < images.length; i++) {
             const image = images[i];
             const textDescription = $('');
-            textDescription.textContent = image.alt ? ( localize(5303, "Image: {0}", image.alt)) : ( localize(5304, "Image"));
+            textDescription.textContent = image.alt ? ( localize(5348, "Image: {0}", image.alt)) : ( localize(5349, "Image"));
             image.parentNode.replaceChild(textDescription, image);
         }
         while ((renderedComment.element.children.length > 1) && (renderedComment.element.firstElementChild?.tagName === 'HR')) {
@@ -214,7 +212,7 @@ let CommentNodeRenderer = class CommentNodeRenderer {
         const commentCount = node.element.replies.length + 1;
         if (node.element.threadRelevance === CommentThreadApplicability.Outdated) {
             templateData.threadMetadata.relevance.style.display = '';
-            templateData.threadMetadata.relevance.innerText = ( localize(5305, "Outdated"));
+            templateData.threadMetadata.relevance.innerText = ( localize(5350, "Outdated"));
             templateData.threadMetadata.separator.style.display = 'none';
         }
         else {
@@ -248,11 +246,11 @@ let CommentNodeRenderer = class CommentNodeRenderer {
         }
         if (node.element.range) {
             if (node.element.range.startLineNumber === node.element.range.endLineNumber) {
-                templateData.threadMetadata.range.textContent = ( localize(5306, "[Ln {0}]", node.element.range.startLineNumber));
+                templateData.threadMetadata.range.textContent = ( localize(5351, "[Ln {0}]", node.element.range.startLineNumber));
             }
             else {
                 templateData.threadMetadata.range.textContent = ( localize(
-                    5307,
+                    5352,
                     "[Ln {0}-{1}]",
                     node.element.range.startLineNumber,
                     node.element.range.endLineNumber
@@ -264,7 +262,7 @@ let CommentNodeRenderer = class CommentNodeRenderer {
         templateData.actionBar.context = {
             commentControlHandle: node.element.controllerHandle,
             commentThreadHandle: node.element.threadHandle,
-            $mid: MarshalledId.CommentThread
+            $mid: 7
         };
         if (!node.element.hasReply()) {
             templateData.repliesMetadata.container.style.display = 'none';
@@ -273,7 +271,7 @@ let CommentNodeRenderer = class CommentNodeRenderer {
         templateData.repliesMetadata.container.style.display = '';
         templateData.repliesMetadata.count.textContent = this.getCountString(commentCount);
         const lastComment = node.element.replies[node.element.replies.length - 1].comment;
-        templateData.repliesMetadata.lastReplyDetail.textContent = ( localize(5308, "Last reply from {0}", lastComment.userName));
+        templateData.repliesMetadata.lastReplyDetail.textContent = ( localize(5353, "Last reply from {0}", lastComment.userName));
         templateData.repliesMetadata.timestamp.setTimestamp(lastComment.timestamp ? ( (new Date(lastComment.timestamp))) : undefined);
     }
     getCommentThreadWidgetStateColor(state, theme) {
@@ -290,18 +288,13 @@ 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 TreeVisibility.Visible;
+            return 1 ;
         }
         if (element instanceof ResourceWithCommentThreads) {
             return this.filterResourceMarkers(element);
@@ -314,10 +307,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: FilterDataType.Resource, uriMatches: uriMatches || [] } };
+                return { visibility: true, data: { type: 0 , uriMatches: uriMatches || [] } };
             }
         }
-        return TreeVisibility.Recurse;
+        return 2 ;
     }
     filterCommentNode(comment, parentVisibility) {
         const matchesResolvedState = (comment.threadState === undefined) || (this.options.showResolved && CommentThreadState.Resolved === comment.threadState) ||
@@ -336,12 +329,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: FilterDataType.Comment, textMatches } };
+            return { visibility: true, data: { type: 1 , textMatches } };
         }
-        if (textMatches.length && this.options.textFilter.negate && parentVisibility === TreeVisibility.Recurse) {
+        if (textMatches.length && this.options.textFilter.negate && parentVisibility === 2 ) {
             return false;
         }
-        if ((textMatches.length === 0) && this.options.textFilter.negate && parentVisibility === TreeVisibility.Recurse) {
+        if ((textMatches.length === 0) && this.options.textFilter.negate && parentVisibility === 2 ) {
             return true;
         }
         return parentVisibility;
@@ -419,7 +412,7 @@ let CommentsList = class CommentsList extends WorkbenchObjectTree {
             getActionsContext: () => ({
                 commentControlHandle: node.controllerHandle,
                 commentThreadHandle: node.threadHandle,
-                $mid: MarshalledId.CommentThread,
+                $mid: 7 ,
                 thread: node.thread
             })
         });