@codingame/monaco-vscode-api 25.1.2 → 26.0.0

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

@@ -44,7 +44,7 @@ import { threadHasMeaningfulComments } from './commentsModel.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
 
 registerCss(review);
-const ID = 'editor.contrib.review';
+const ID = "editor.contrib.review";
 class CommentingRangeDecoration {
     get id() {
         return this._decorationId;
@@ -54,11 +54,22 @@ class CommentingRangeDecoration {
     }
     get range() {
         return {
-            startLineNumber: this._startLineNumber, startColumn: 1,
-            endLineNumber: this._endLineNumber, endColumn: 1
+            startLineNumber: this._startLineNumber,
+            startColumn: 1,
+            endLineNumber: this._endLineNumber,
+            endColumn: 1
         };
     }
-    constructor(_editor, _ownerId, _extensionId, _label, _range, options, commentingRangesInfo, isHover = false) {
+    constructor(
+        _editor,
+        _ownerId,
+        _extensionId,
+        _label,
+        _range,
+        options,
+        commentingRangesInfo,
+        isHover = false
+    ) {
         this._editor = _editor;
         this._ownerId = _ownerId;
         this._extensionId = _extensionId;
@@ -86,7 +97,9 @@ class CommentingRangeDecoration {
     }
 }
 class CommentingRangeDecorator {
-    static { this.description = 'commenting-range-decorator'; }
+    static {
+        this.description = "commenting-range-decorator";
+    }
     constructor() {
         this.commentingRangeDecorations = [];
         this.decorationIds = [];
@@ -96,7 +109,7 @@ class CommentingRangeDecorator {
         const decorationOptions = {
             description: CommentingRangeDecorator.description,
             isWholeLine: true,
-            linesDecorationsClassName: 'comment-range-glyph comment-diff-added'
+            linesDecorationsClassName: "comment-range-glyph comment-diff-added"
         };
         this.decorationOptions = ModelDecorationOptions.createDynamic(decorationOptions);
         const hoverDecorationOptions = {
@@ -118,7 +131,10 @@ class CommentingRangeDecorator {
         }
         this._lastHover = hoverLine ?? -1;
     }
-    updateSelection(cursorLine, range = ( new Range(0, 0, 0, 0))) {
+    updateSelection(
+        cursorLine,
+        range = ( new Range(0, 0, 0, 0))
+    ) {
         this._lastSelection = range.isEmpty() ? undefined : range;
         this._lastSelectionCursor = range.isEmpty() ? undefined : cursorLine;
         if (this._editor && this._infos) {
@@ -133,9 +149,16 @@ class CommentingRangeDecorator {
         }
     }
     _lineHasThread(editor, lineRange) {
-        return editor.getDecorationsInRange(lineRange)?.find(decoration => decoration.options.description === CommentGlyphWidget.description);
-    }
-    _doUpdate(editor, commentInfos, emphasisLine = -1, selectionRange = this._lastSelection) {
+        return editor.getDecorationsInRange(lineRange)?.find(
+            decoration => decoration.options.description === CommentGlyphWidget.description
+        );
+    }
+    _doUpdate(
+        editor,
+        commentInfos,
+        emphasisLine = -1,
+        selectionRange = this._lastSelection
+    ) {
         const model = editor.getModel();
         if (!model) {
             return;
@@ -151,9 +174,8 @@ class CommentingRangeDecorator {
                     range.endColumn
                 ));
                 let intersectingSelectionRange = selectionRange ? rangeObject.intersectRanges(selectionRange) : undefined;
-                if ((selectionRange && (emphasisLine >= 0) && intersectingSelectionRange)
-                    && !((intersectingSelectionRange.startLineNumber === intersectingSelectionRange.endLineNumber)
-                        && (emphasisLine === intersectingSelectionRange.startLineNumber))) {
+                if (
+                (selectionRange && (emphasisLine >= 0) && intersectingSelectionRange) && !((intersectingSelectionRange.startLineNumber === intersectingSelectionRange.endLineNumber) && (emphasisLine === intersectingSelectionRange.startLineNumber))) {
                     let intersectingEmphasisRange;
                     if (emphasisLine <= intersectingSelectionRange.startLineNumber) {
                         intersectingEmphasisRange = intersectingSelectionRange.collapseToStart();
@@ -163,8 +185,7 @@ class CommentingRangeDecorator {
                             intersectingSelectionRange.endLineNumber,
                             1
                         ));
-                    }
-                    else {
+                    } else {
                         intersectingEmphasisRange = ( new Range(
                             intersectingSelectionRange.endLineNumber,
                             1,
@@ -200,9 +221,15 @@ class CommentingRangeDecorator {
                             true
                         )));
                     }
-                    const beforeRangeEndLine = Math.min(intersectingEmphasisRange.startLineNumber, intersectingSelectionRange.startLineNumber) - 1;
+                    const beforeRangeEndLine = Math.min(
+                        intersectingEmphasisRange.startLineNumber,
+                        intersectingSelectionRange.startLineNumber
+                    ) - 1;
                     const hasBeforeRange = rangeObject.startLineNumber <= beforeRangeEndLine;
-                    const afterRangeStartLine = Math.max(intersectingEmphasisRange.endLineNumber, intersectingSelectionRange.endLineNumber) + 1;
+                    const afterRangeStartLine = Math.max(
+                        intersectingEmphasisRange.endLineNumber,
+                        intersectingSelectionRange.endLineNumber
+                    ) + 1;
                     const hasAfterRange = rangeObject.endLineNumber >= afterRangeStartLine;
                     if (hasBeforeRange) {
                         const beforeRange = ( new Range(range.startLineNumber, 1, beforeRangeEndLine, 1));
@@ -230,8 +257,7 @@ class CommentingRangeDecorator {
                             true
                         )));
                     }
-                }
-                else if ((rangeObject.startLineNumber <= emphasisLine) && (emphasisLine <= rangeObject.endLineNumber)) {
+                } else if ((rangeObject.startLineNumber <= emphasisLine) && (emphasisLine <= rangeObject.endLineNumber)) {
                     if (rangeObject.startLineNumber < emphasisLine) {
                         const beforeRange = ( new Range(range.startLineNumber, 1, emphasisLine - 1, 1));
                         commentingRangeDecorations.push(( new CommentingRangeDecoration(
@@ -271,8 +297,7 @@ class CommentingRangeDecorator {
                             true
                         )));
                     }
-                }
-                else {
+                } else {
                     commentingRangeDecorations.push(( new CommentingRangeDecoration(
                         editor,
                         info.uniqueOwner,
@@ -285,7 +310,7 @@ class CommentingRangeDecorator {
                 }
             });
         }
-        editor.changeDecorations((accessor) => {
+        editor.changeDecorations(accessor => {
             this.decorationIds = accessor.deltaDecorations(this.decorationIds, commentingRangeDecorations);
             commentingRangeDecorations.forEach((decoration, index) => decoration.id = this.decorationIds[index]);
         });
@@ -334,10 +359,15 @@ class CommentingRangeDecorator {
                         range.endLineNumber > alreadyFoundInfo.range.endLineNumber ? range.endLineNumber : alreadyFoundInfo.range.endLineNumber,
                         range.endColumn > alreadyFoundInfo.range.endColumn ? range.endColumn : alreadyFoundInfo.range.endColumn
                     ));
-                    foundHoverActions.set(action.ownerId, { range: newRange, action });
-                }
-                else {
-                    foundHoverActions.set(action.ownerId, { range, action });
+                    foundHoverActions.set(action.ownerId, {
+                        range: newRange,
+                        action
+                    });
+                } else {
+                    foundHoverActions.set(action.ownerId, {
+                        range,
+                        action
+                    });
                 }
             }
         }
@@ -345,8 +375,7 @@ class CommentingRangeDecorator {
         return Array.from(( foundHoverActions.values())).filter(action => {
             if (( seenOwners.has(action.action.ownerId))) {
                 return false;
-            }
-            else {
+            } else {
                 seenOwners.add(action.action.ownerId);
                 return true;
             }
@@ -360,8 +389,7 @@ class CommentingRangeDecorator {
             for (let i = this.commentingRangeDecorations.length - 1; i >= 0; i--) {
                 decorations.push(this.commentingRangeDecorations[i]);
             }
-        }
-        else {
+        } else {
             decorations = this.commentingRangeDecorations;
         }
         for (const decoration of decorations) {
@@ -404,22 +432,32 @@ function moveToNextCommentInThread(commentInfo, type) {
     if (currentIndex === undefined || currentIndex < 0) {
         return;
     }
-    if (type === 'previous' && currentIndex === 0) {
+    if (type === "previous" && currentIndex === 0) {
         return;
     }
-    if (type === 'next' && currentIndex === commentInfo.thread.comments.length - 1) {
+    if (type === "next" && currentIndex === commentInfo.thread.comments.length - 1) {
         return;
     }
-    const comment = commentInfo.thread.comments?.[type === 'previous' ? currentIndex - 1 : currentIndex + 1];
+    const comment = commentInfo.thread.comments?.[type === "previous" ? currentIndex - 1 : currentIndex + 1];
     if (!comment) {
         return;
     }
     return {
         ...commentInfo,
-        comment,
+        comment
     };
 }
-function revealCommentThread(commentService, editorService, uriIdentityService, commentThread, comment, focusReply, pinned, preserveFocus, sideBySide) {
+function revealCommentThread(
+    commentService,
+    editorService,
+    uriIdentityService,
+    commentThread,
+    comment,
+    focusReply,
+    pinned,
+    preserveFocus,
+    sideBySide
+) {
     if (!commentThread.resource) {
         return;
     }
@@ -429,8 +467,7 @@ function revealCommentThread(commentService, editorService, uriIdentityService,
     const range = commentThread.range;
     const focus = focusReply ? CommentWidgetFocus.Editor : (preserveFocus ? CommentWidgetFocus.None : CommentWidgetFocus.Widget);
     const activeEditor = editorService.activeTextEditorControl;
-    const currentActiveResources = isDiffEditor(activeEditor) ? [activeEditor.getOriginalEditor(), activeEditor.getModifiedEditor()]
-        : (activeEditor ? [activeEditor] : []);
+    const currentActiveResources = isDiffEditor(activeEditor) ? [activeEditor.getOriginalEditor(), activeEditor.getModifiedEditor()] : (activeEditor ? [activeEditor] : []);
     const threadToReveal = commentThread.threadId;
     const commentToReveal = comment?.uniqueIdInThread;
     const resource = ( URI.parse(commentThread.resource));
@@ -462,7 +499,21 @@ function revealCommentThread(commentService, editorService, uriIdentityService,
     });
 }
 let CommentController = class CommentController {
-    constructor(editor, commentService, instantiationService, codeEditorService, contextMenuService, quickInputService, viewsService, configurationService, contextKeyService, editorService, keybindingService, accessibilityService, notificationService) {
+    constructor(
+        editor,
+        commentService,
+        instantiationService,
+        codeEditorService,
+        contextMenuService,
+        quickInputService,
+        viewsService,
+        configurationService,
+        contextKeyService,
+        editorService,
+        keybindingService,
+        accessibilityService,
+        notificationService
+    ) {
         this.commentService = commentService;
         this.instantiationService = instantiationService;
         this.codeEditorService = codeEditorService;
@@ -491,6 +542,7 @@ let CommentController = class CommentController {
         this._activeCursorHasCommentingRange = CommentContextKeys.activeCursorHasCommentingRange.bindTo(contextKeyService);
         this._activeCursorHasComment = CommentContextKeys.activeCursorHasComment.bindTo(contextKeyService);
         this._activeEditorHasCommentingRange = CommentContextKeys.activeEditorHasCommentingRange.bindTo(contextKeyService);
+        this._commentWidgetVisible = CommentContextKeys.commentWidgetVisible.bindTo(contextKeyService);
         if (editor instanceof EmbeddedCodeEditorWidget) {
             return;
         }
@@ -499,8 +551,7 @@ let CommentController = class CommentController {
         this.globalToDispose.add(this._commentingRangeDecorator.onDidChangeDecorationsCount(count => {
             if (count === 0) {
                 this.clearEditorListeners();
-            }
-            else if (this._editorDisposables.length === 0) {
+            } else if (this._editorDisposables.length === 0) {
                 this.registerEditorListeners();
             }
         }));
@@ -509,16 +560,19 @@ let CommentController = class CommentController {
             if (ownerId) {
                 delete this._pendingNewCommentCache[ownerId];
                 delete this._pendingEditsCache[ownerId];
-            }
-            else {
+            } else {
                 this._pendingNewCommentCache = {};
                 this._pendingEditsCache = {};
             }
             this.beginCompute();
         }));
-        this.globalToDispose.add(this.commentService.onDidSetDataProvider(_ => this.beginComputeAndHandleEditorChange()));
-        this.globalToDispose.add(this.commentService.onDidUpdateCommentingRanges(_ => this.beginComputeAndHandleEditorChange()));
-        this.globalToDispose.add(this.commentService.onDidSetResourceCommentInfos(async (e) => {
+        this.globalToDispose.add(
+            this.commentService.onDidSetDataProvider(_ => this.beginComputeAndHandleEditorChange())
+        );
+        this.globalToDispose.add(
+            this.commentService.onDidUpdateCommentingRanges(_ => this.beginComputeAndHandleEditorChange())
+        );
+        this.globalToDispose.add(this.commentService.onDidSetResourceCommentInfos(async e => {
             const editorURI = this.editor && this.editor.hasModel() && this.editor.getModel().uri;
             if (editorURI && ( editorURI.toString()) === ( e.resource.toString())) {
                 await this.setComments(e.commentInfos.filter(commentInfo => commentInfo !== null));
@@ -528,8 +582,7 @@ let CommentController = class CommentController {
             if (e) {
                 this.registerEditorListeners();
                 this.beginCompute();
-            }
-            else {
+            } else {
                 this.tryUpdateReservedSpace();
                 this.clearEditorListeners();
                 this._commentingRangeDecorator.update(this.editor, []);
@@ -541,12 +594,14 @@ let CommentController = class CommentController {
         this.globalToDispose.add(this.editor.onWillChangeModel(e => this.onWillChangeModel(e)));
         this.globalToDispose.add(this.editor.onDidChangeModel(_ => this.onModelChanged()));
         this.globalToDispose.add(this.configurationService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration('diffEditor.renderSideBySide')) {
+            if (e.affectsConfiguration("diffEditor.renderSideBySide")) {
                 this.beginCompute();
             }
         }));
         this.onModelChanged();
-        this.globalToDispose.add(this.codeEditorService.registerDecorationType('comment-controller', COMMENTEDITOR_DECORATION_KEY, {}));
+        this.globalToDispose.add(
+            this.codeEditorService.registerDecorationType("comment-controller", COMMENTEDITOR_DECORATION_KEY, {})
+        );
         this.globalToDispose.add(this.commentService.registerContinueOnCommentProvider({
             provideContinueOnComments: () => {
                 const pendingComments = [];
@@ -560,10 +615,9 @@ let CommentController = class CommentController {
                         let lastCommentBody;
                         if (zone.commentThread.comments && zone.commentThread.comments.length) {
                             const lastComment = zone.commentThread.comments[zone.commentThread.comments.length - 1];
-                            if (typeof lastComment.body === 'string') {
+                            if (typeof lastComment.body === "string") {
                                 lastCommentBody = lastComment.body;
-                            }
-                            else {
+                            } else {
                                 lastCommentBody = lastComment.body.value;
                             }
                         }
@@ -589,10 +643,18 @@ let CommentController = class CommentController {
         }
         this._editorDisposables.push(this.editor.onMouseMove(e => this.onEditorMouseMove(e)));
         this._editorDisposables.push(this.editor.onMouseLeave(() => this.onEditorMouseLeave()));
-        this._editorDisposables.push(this.editor.onDidChangeCursorPosition(e => this.onEditorChangeCursorPosition(e.position)));
-        this._editorDisposables.push(this.editor.onDidFocusEditorWidget(() => this.onEditorChangeCursorPosition(this.editor?.getPosition() ?? null)));
-        this._editorDisposables.push(this.editor.onDidChangeCursorSelection(e => this.onEditorChangeCursorSelection(e)));
-        this._editorDisposables.push(this.editor.onDidBlurEditorWidget(() => this.onEditorChangeCursorSelection()));
+        this._editorDisposables.push(
+            this.editor.onDidChangeCursorPosition(e => this.onEditorChangeCursorPosition(e.position))
+        );
+        this._editorDisposables.push(this.editor.onDidFocusEditorWidget(
+            () => this.onEditorChangeCursorPosition(this.editor?.getPosition() ?? null)
+        ));
+        this._editorDisposables.push(
+            this.editor.onDidChangeCursorSelection(e => this.onEditorChangeCursorSelection(e))
+        );
+        this._editorDisposables.push(
+            this.editor.onDidBlurEditorWidget(() => this.onEditorChangeCursorSelection())
+        );
     }
     clearEditorListeners() {
         dispose(this._editorDisposables);
@@ -605,8 +667,7 @@ let CommentController = class CommentController {
         const position = e.target.position?.lineNumber;
         if (e.event.leftButton.valueOf() && position && this.mouseDownInfo) {
             this._commentingRangeDecorator.updateSelection(position, ( new Range(this.mouseDownInfo.lineNumber, 1, position, 1)));
-        }
-        else {
+        } else {
             this._commentingRangeDecorator.updateHover(position);
         }
     }
@@ -620,7 +681,10 @@ let CommentController = class CommentController {
         if (!e) {
             return;
         }
-        const range = Range.fromPositions(e, { column: -1, lineNumber: e.lineNumber });
+        const range = Range.fromPositions(e, {
+            column: -1,
+            lineNumber: e.lineNumber
+        });
         const decorations = this.editor?.getDecorationsInRange(range);
         let hasCommentingRange = false;
         if (decorations) {
@@ -628,8 +692,7 @@ let CommentController = class CommentController {
                 if (decoration.options.description === CommentGlyphWidget.description) {
                     hasCommentingRange = false;
                     break;
-                }
-                else if (decoration.options.description === CommentingRangeDecorator.description) {
+                } else if (decoration.options.description === CommentingRangeDecorator.description) {
                     hasCommentingRange = true;
                 }
             }
@@ -638,7 +701,7 @@ let CommentController = class CommentController {
         this._activeCursorHasComment.set(this.getCommentsAtLine(range).length > 0);
     }
     isEditorInlineOriginal(testEditor) {
-        if (this.configurationService.getValue('diffEditor.renderSideBySide')) {
+        if (this.configurationService.getValue("diffEditor.renderSideBySide")) {
             return false;
         }
         const foundEditor = this.editorService.visibleTextEditorControls.find(editor => {
@@ -658,7 +721,7 @@ let CommentController = class CommentController {
             }
             return Promise.resolve([]);
         });
-        this._computeAndSetPromise = this._computePromise.then(async (commentInfos) => {
+        this._computeAndSetPromise = this._computePromise.then(async commentInfos => {
             await this.setComments(coalesce(commentInfos));
             this._computePromise = null;
         }, error => console.log(error));
@@ -676,9 +739,14 @@ let CommentController = class CommentController {
             }).then(commentInfos => {
                 if (this.commentService.isCommentingEnabled) {
                     const meaningfulCommentInfos = coalesce(commentInfos);
-                    this._commentingRangeDecorator.update(this.editor, meaningfulCommentInfos, this.editor?.getPosition()?.lineNumber, this.editor?.getSelection() ?? undefined);
+                    this._commentingRangeDecorator.update(
+                        this.editor,
+                        meaningfulCommentInfos,
+                        this.editor?.getPosition()?.lineNumber,
+                        this.editor?.getSelection() ?? undefined
+                    );
                 }
-            }, (err) => {
+            }, err => {
                 onUnexpectedError(err);
                 return null;
             });
@@ -691,14 +759,12 @@ let CommentController = class CommentController {
         const commentThreadWidget = this._commentWidgets.filter(widget => widget.commentThread.threadId === threadId);
         if (commentThreadWidget.length === 1) {
             commentThreadWidget[0].reveal(commentUniqueId, focus);
-        }
-        else if (fetchOnceIfNotExist) {
+        } else if (fetchOnceIfNotExist) {
             if (this._computeAndSetPromise) {
                 this._computeAndSetPromise.then(_ => {
                     this.revealCommentThread(threadId, commentUniqueId, false, focus);
                 });
-            }
-            else {
+            } else {
                 this.beginCompute().then(_ => {
                     this.revealCommentThread(threadId, commentUniqueId, false, focus);
                 });
@@ -710,6 +776,26 @@ let CommentController = class CommentController {
             widget.collapse(true);
         }
     }
+    async collapseVisibleComments() {
+        if (!this.editor) {
+            return;
+        }
+        const visibleRanges = this.editor.getVisibleRanges();
+        for (const widget of this._commentWidgets) {
+            if (widget.expanded && widget.commentThread.range) {
+                const isVisible = ( visibleRanges.some(
+                    visibleRange => Range.areIntersectingOrTouching(visibleRange, widget.commentThread.range)
+                ));
+                if (isVisible) {
+                    await widget.collapse(true);
+                }
+            }
+        }
+    }
+    _updateCommentWidgetVisibleContext() {
+        const hasExpanded = ( this._commentWidgets.some(widget => widget.expanded));
+        this._commentWidgetVisible.set(hasExpanded);
+    }
     expandAll() {
         for (const widget of this._commentWidgets) {
             widget.expand();
@@ -775,7 +861,10 @@ let CommentController = class CommentController {
         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);
+            nextWidget.reveal(
+                undefined,
+                focusThread ? CommentWidgetFocus.Widget : CommentWidgetFocus.None
+            );
         }
     }
     previousCommentThread(focusThread) {
@@ -797,7 +886,7 @@ let CommentController = class CommentController {
             const commentRangeEnd = range?.getEndPosition().lineNumber;
             if (commentRangeStart && commentRangeEnd) {
                 const oneLine = commentRangeStart === commentRangeEnd;
-                oneLine ? status(( localize(6350, "Line {0}", commentRangeStart))) : status(( localize(6351, "Lines {0} to {1}", commentRangeStart, commentRangeEnd)));
+                oneLine ? status(( localize(6659, "Line {0}", commentRangeStart))) : status(( localize(6660, "Lines {0} to {1}", commentRangeStart, commentRangeEnd)));
             }
         }
     }
@@ -820,11 +909,15 @@ let CommentController = class CommentController {
         }
     }
     async handleCommentAdded(editorId, uniqueOwner, thread) {
-        const matchedZones = this._commentWidgets.filter(zoneWidget => zoneWidget.uniqueOwner === uniqueOwner && zoneWidget.commentThread.threadId === thread.threadId);
+        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));
+        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;
@@ -832,8 +925,7 @@ let CommentController = class CommentController {
         const continueOnCommentIndex = this._inProcessContinueOnComments.get(uniqueOwner)?.findIndex(pending => {
             if (pending.range === undefined) {
                 return thread.range === undefined;
-            }
-            else {
+            } else {
                 return Range.lift(pending.range).equalsRange(thread.range);
             }
         });
@@ -841,8 +933,7 @@ let CommentController = class CommentController {
         if ((continueOnCommentIndex !== undefined) && continueOnCommentIndex >= 0) {
             continueOnCommentText = this._inProcessContinueOnComments.get(uniqueOwner)?.splice(continueOnCommentIndex, 1)[0].comment.body;
         }
-        const pendingCommentText = (this._pendingNewCommentCache[uniqueOwner] && this._pendingNewCommentCache[uniqueOwner][thread.threadId])
-            ?? continueOnCommentText;
+        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);
@@ -873,7 +964,7 @@ let CommentController = class CommentController {
         this.localToDispose.add(this.editor.onDidChangeModelContent(async () => {
             this.beginComputeCommentingRanges();
         }));
-        this.localToDispose.add(this.commentService.onDidUpdateCommentThreads(async (e) => {
+        this.localToDispose.add(this.commentService.onDidUpdateCommentThreads(async e => {
             const editorURI = this.editor && this.editor.hasModel() && this.editor.getModel().uri;
             if (!editorURI || !this.commentService.isCommentingEnabled) {
                 return;
@@ -890,7 +981,9 @@ let CommentController = class CommentController {
             const changed = e.changed.filter(thread => thread.resource && thread.resource === ( editorURI.toString()));
             const pending = e.pending.filter(pending => ( pending.uri.toString()) === ( editorURI.toString()));
             removed.forEach(thread => {
-                const matchedZones = this._commentWidgets.filter(zoneWidget => zoneWidget.uniqueOwner === e.uniqueOwner && zoneWidget.commentThread.threadId === thread.threadId && zoneWidget.commentThread.threadId !== '');
+                const matchedZones = this._commentWidgets.filter(
+                    zoneWidget => zoneWidget.uniqueOwner === e.uniqueOwner && zoneWidget.commentThread.threadId === thread.threadId && zoneWidget.commentThread.threadId !== ""
+                );
                 if (matchedZones.length) {
                     const matchedZone = matchedZones[0];
                     const index = this._commentWidgets.indexOf(matchedZone);
@@ -906,7 +999,9 @@ let CommentController = class CommentController {
                 }
             });
             for (const thread of changed) {
-                const matchedZones = this._commentWidgets.filter(zoneWidget => zoneWidget.uniqueOwner === e.uniqueOwner && zoneWidget.commentThread.threadId === thread.threadId);
+                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);
@@ -925,28 +1020,44 @@ let CommentController = class CommentController {
         this.beginComputeAndHandleEditorChange();
     }
     async resumePendingComment(editorURI, thread) {
-        const matchedZones = this._commentWidgets.filter(zoneWidget => zoneWidget.uniqueOwner === thread.uniqueOwner && Range.lift(zoneWidget.commentThread.range)?.equalsRange(thread.range));
+        const matchedZones = this._commentWidgets.filter(
+            zoneWidget => zoneWidget.uniqueOwner === thread.uniqueOwner && Range.lift(zoneWidget.commentThread.range)?.equalsRange(thread.range)
+        );
         if (thread.isReply && matchedZones.length) {
-            this.commentService.removeContinueOnComment({ uniqueOwner: thread.uniqueOwner, uri: editorURI, range: thread.range, isReply: true });
+            this.commentService.removeContinueOnComment({
+                uniqueOwner: thread.uniqueOwner,
+                uri: editorURI,
+                range: thread.range,
+                isReply: true
+            });
             matchedZones[0].setPendingComment(thread.comment);
-        }
-        else if (matchedZones.length) {
-            this.commentService.removeContinueOnComment({ uniqueOwner: thread.uniqueOwner, uri: editorURI, range: thread.range, isReply: false });
+        } else if (matchedZones.length) {
+            this.commentService.removeContinueOnComment({
+                uniqueOwner: thread.uniqueOwner,
+                uri: editorURI,
+                range: thread.range,
+                isReply: false
+            });
             const existingPendingComment = matchedZones[0].getPendingComments().newComment;
             let pendingComment;
             if (!existingPendingComment || thread.comment.body.includes(existingPendingComment.body)) {
                 pendingComment = thread.comment;
-            }
-            else if (existingPendingComment.body.includes(thread.comment.body)) {
+            } else if (existingPendingComment.body.includes(thread.comment.body)) {
                 pendingComment = existingPendingComment;
-            }
-            else {
-                pendingComment = { body: `${existingPendingComment}\n${thread.comment.body}`, cursor: thread.comment.cursor };
+            } else {
+                pendingComment = {
+                    body: `${existingPendingComment}\n${thread.comment.body}`,
+                    cursor: thread.comment.cursor
+                };
             }
             matchedZones[0].setPendingComment(pendingComment);
-        }
-        else if (!thread.isReply) {
-            const threadStillAvailable = this.commentService.removeContinueOnComment({ uniqueOwner: thread.uniqueOwner, uri: editorURI, range: thread.range, isReply: false });
+        } else if (!thread.isReply) {
+            const threadStillAvailable = this.commentService.removeContinueOnComment({
+                uniqueOwner: thread.uniqueOwner,
+                uri: editorURI,
+                range: thread.range,
+                isReply: false
+            });
             if (!threadStillAvailable) {
                 return;
             }
@@ -954,7 +1065,11 @@ let CommentController = class CommentController {
                 this._inProcessContinueOnComments.set(thread.uniqueOwner, []);
             }
             this._inProcessContinueOnComments.get(thread.uniqueOwner)?.push(thread);
-            await this.commentService.createCommentThreadTemplate(thread.uniqueOwner, thread.uri, thread.range ? Range.lift(thread.range) : undefined);
+            await this.commentService.createCommentThreadTemplate(
+                thread.uniqueOwner,
+                thread.uri,
+                thread.range ? Range.lift(thread.range) : undefined
+            );
         }
     }
     beginComputeAndHandleEditorChange() {
@@ -969,20 +1084,18 @@ let CommentController = class CommentController {
                         const keybinding = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getAriaLabel();
                         if (keybinding) {
                             status(( localize(
-                                6352,
+                                6661,
                                 "Editor has commenting ranges, run the command Open Accessibility Help ({0}), for more information.",
                                 keybinding
                             )));
-                        }
-                        else {
+                        } else {
                             status(( localize(
-                                6353,
+                                6662,
                                 "Editor has commenting ranges, run the command Open Accessibility Help, which is currently not triggerable via keybinding, for more information."
                             )));
                         }
-                    }
-                    else {
-                        status(( localize(6354, "Editor has commenting ranges.")));
+                    } else {
+                        status(( localize(6663, "Editor has commenting ranges.")));
                     }
                 }
             }
@@ -991,10 +1104,9 @@ let CommentController = class CommentController {
     async openCommentsView(thread) {
         if (thread.comments && (thread.comments.length > 0) && threadHasMeaningfulComments(thread)) {
             const openViewState = this.configurationService.getValue(COMMENTS_SECTION).openView;
-            if (openViewState === 'file') {
+            if (openViewState === "file") {
                 return this.viewsService.openView(COMMENTS_VIEW_ID);
-            }
-            else if (openViewState === 'firstFile' || (openViewState === 'firstFileUnresolved' && thread.state === CommentThreadState.Unresolved)) {
+            } else if (openViewState === "firstFile" || (openViewState === "firstFileUnresolved" && thread.state === CommentThreadState.Unresolved)) {
                 const hasShownView = this.viewsService.getViewWithId(COMMENTS_VIEW_ID)?.hasRendered;
                 if (!hasShownView) {
                     return this.viewsService.openView(COMMENTS_VIEW_ID);
@@ -1013,15 +1125,29 @@ let CommentController = class CommentController {
         }
         let continueOnCommentReply;
         if (thread.range && !pendingComment) {
-            continueOnCommentReply = this.commentService.removeContinueOnComment({ uniqueOwner, uri: editor.uri, range: thread.range, isReply: true });
+            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?.comment, pendingEdits);
+        const zoneWidget = this.instantiationService.createInstance(
+            ReviewZoneWidget,
+            this.editor,
+            uniqueOwner,
+            thread,
+            pendingComment ?? continueOnCommentReply?.comment,
+            pendingEdits
+        );
         await zoneWidget.display(thread.range, shouldReveal);
         this._commentWidgets.push(zoneWidget);
+        zoneWidget.onDidChangeExpandedState(() => this._updateCommentWidgetVisibleContext());
+        zoneWidget.onDidClose(() => this._updateCommentWidgetVisibleContext());
         this.openCommentsView(thread);
     }
     onEditorMouseDown(e) {
-        this.mouseDownInfo = (e.target.element?.className.indexOf('comment-range-glyph') ?? -1) >= 0 ? parseMouseDownInfoFromEvent(e) : null;
+        this.mouseDownInfo = (e.target.element?.className.indexOf("comment-range-glyph") ?? -1) >= 0 ? parseMouseDownInfoFromEvent(e) : null;
     }
     onEditorMouseUp(e) {
         const matchedLineNumber = isMouseUpEventDragFromMouseDown(this.mouseDownInfo, e);
@@ -1029,7 +1155,7 @@ let CommentController = class CommentController {
         if (!this.editor || matchedLineNumber === null || !e.target.element) {
             return;
         }
-        const mouseUpIsOnDecorator = (e.target.element.className.indexOf('comment-range-glyph') >= 0);
+        const mouseUpIsOnDecorator = (e.target.element.className.indexOf("comment-range-glyph") >= 0);
         const lineNumber = e.target.position.lineNumber;
         let range;
         let selection;
@@ -1041,8 +1167,7 @@ let CommentController = class CommentController {
                     lineNumber,
                     1
                 ));
-            }
-            else {
+            } else {
                 selection = ( new Range(
                     matchedLineNumber,
                     1,
@@ -1050,15 +1175,13 @@ let CommentController = class CommentController {
                     this.editor.getModel().getLineLength(lineNumber) + 1
                 ));
             }
-        }
-        else if (mouseUpIsOnDecorator) {
+        } else if (mouseUpIsOnDecorator) {
             selection = this.editor.getSelection();
         }
         if (selection && (selection.startLineNumber <= lineNumber) && (lineNumber <= selection.endLineNumber)) {
             range = selection;
             this.editor.setSelection(( new Range(selection.endLineNumber, 1, selection.endLineNumber, 1)));
-        }
-        else if (mouseUpIsOnDecorator) {
+        } else if (mouseUpIsOnDecorator) {
             range = ( new Range(lineNumber, 1, lineNumber, 1));
         }
         if (range) {
@@ -1066,7 +1189,9 @@ let CommentController = class CommentController {
         }
     }
     getCommentsAtLine(commentRange) {
-        return this._commentWidgets.filter(widget => widget.getGlyphPosition() === (commentRange ? commentRange.endLineNumber : 0));
+        return this._commentWidgets.filter(
+            widget => widget.getGlyphPosition() === (commentRange ? commentRange.endLineNumber : 0)
+        );
     }
     async addOrToggleCommentAtLine(commentRange, e) {
         if (!this._addInProgress) {
@@ -1074,15 +1199,15 @@ let CommentController = class CommentController {
             const existingCommentsAtLine = this.getCommentsAtLine(commentRange);
             if (existingCommentsAtLine.length) {
                 const allExpanded = existingCommentsAtLine.every(widget => widget.expanded);
-                existingCommentsAtLine.forEach(allExpanded ? widget => widget.collapse(true) : widget => widget.expand(true));
+                existingCommentsAtLine.forEach(
+                    allExpanded ? widget => widget.collapse(true) : widget => widget.expand(true)
+                );
                 this.processNextThreadToAdd();
                 return;
-            }
-            else {
+            } else {
                 this.addCommentAtLine(commentRange, e);
             }
-        }
-        else {
+        } else {
             this._emptyThreadsToAddQueue.push([commentRange, e]);
         }
     }
@@ -1118,10 +1243,9 @@ let CommentController = class CommentController {
             this._addInProgress = false;
             if (!newCommentInfos.length) {
                 if (range) {
-                    this.notificationService.error(( localize(6355, "The cursor must be within a commenting range to add a comment.")));
-                }
-                else {
-                    this.notificationService.error(( localize(6356, "File comments are not allowed on this file.")));
+                    this.notificationService.error(( localize(6664, "The cursor must be within a commenting range to add a comment.")));
+                } else {
+                    this.notificationService.error(( localize(6665, "File comments are not allowed on this file.")));
                 }
             }
             return Promise.resolve();
@@ -1132,19 +1256,25 @@ let CommentController = class CommentController {
                     getAnchor: () => e.event,
                     getActions: () => this.getContextMenuActions(newCommentInfos, range),
                     getActionsContext: () => newCommentInfos.length ? newCommentInfos[0] : undefined,
-                    onHide: () => { this._addInProgress = false; }
+                    onHide: () => {
+                        this._addInProgress = false;
+                    }
                 });
                 return Promise.resolve();
-            }
-            else {
+            } else {
                 const picks = this.getCommentProvidersQuickPicks(newCommentInfos);
-                return this.quickInputService.pick(picks, { placeHolder: ( localize(6357, "Select Comment Provider")), matchOnDescription: true }).then(pick => {
+                return this.quickInputService.pick(picks, {
+                    placeHolder: ( localize(6666, "Select Comment Provider")),
+                    matchOnDescription: true
+                }).then(pick => {
                     if (!pick) {
                         return;
                     }
                     const commentInfos = newCommentInfos.filter(info => info.action.ownerId === pick.id);
                     if (commentInfos.length) {
-                        const { ownerId } = commentInfos[0].action;
+                        const {
+                            ownerId
+                        } = commentInfos[0].action;
                         const clippedRange = range && commentInfos[0].range ? this.clipUserRangeToCommentRange(range, commentInfos[0].range) : range;
                         this.addCommentAtLine2(clippedRange, ownerId);
                     }
@@ -1152,17 +1282,22 @@ let CommentController = class CommentController {
                     this._addInProgress = false;
                 });
             }
-        }
-        else {
-            const { ownerId } = newCommentInfos[0].action;
+        } else {
+            const {
+                ownerId
+            } = newCommentInfos[0].action;
             const clippedRange = range && newCommentInfos[0].range ? this.clipUserRangeToCommentRange(range, newCommentInfos[0].range) : range;
             this.addCommentAtLine2(clippedRange, ownerId);
         }
         return Promise.resolve();
     }
     getCommentProvidersQuickPicks(commentInfos) {
-        const picks = ( commentInfos.map((commentInfo) => {
-            const { ownerId, extensionId, label } = commentInfo.action;
+        const picks = ( commentInfos.map(commentInfo => {
+            const {
+                ownerId,
+                extensionId,
+                label
+            } = commentInfo.action;
             return {
                 label: label ?? extensionId ?? ownerId,
                 id: ownerId
@@ -1173,8 +1308,12 @@ let CommentController = class CommentController {
     getContextMenuActions(commentInfos, commentRange) {
         const actions = [];
         commentInfos.forEach(commentInfo => {
-            const { ownerId, extensionId, label } = commentInfo.action;
-            actions.push(( new Action('addCommentThread', `${label || extensionId}`, undefined, true, () => {
+            const {
+                ownerId,
+                extensionId,
+                label
+            } = commentInfo.action;
+            actions.push(( new Action("addCommentThread", `${label || extensionId}`, undefined, true, () => {
                 const clippedRange = commentInfo.range ? this.clipUserRangeToCommentRange(commentRange, commentInfo.range) : commentRange;
                 this.addCommentAtLine2(clippedRange, ownerId);
                 return Promise.resolve();
@@ -1195,27 +1334,33 @@ let CommentController = class CommentController {
         let extraEditorClassName = [];
         const configuredExtraClassName = editor.getRawOptions().extraEditorClassName;
         if (configuredExtraClassName) {
-            extraEditorClassName = configuredExtraClassName.split(' ');
+            extraEditorClassName = configuredExtraClassName.split(" ");
         }
-        return { lineDecorationsWidth, extraEditorClassName };
+        return {
+            lineDecorationsWidth,
+            extraEditorClassName
+        };
     }
     getWithoutCommentsEditorOptions(editor, extraEditorClassName, startingLineDecorationsWidth) {
         let lineDecorationsWidth = startingLineDecorationsWidth;
-        const inlineCommentPos = extraEditorClassName.findIndex(name => name === 'inline-comment');
+        const inlineCommentPos = extraEditorClassName.findIndex(name => name === "inline-comment");
         if (inlineCommentPos >= 0) {
             extraEditorClassName.splice(inlineCommentPos, 1);
         }
         const options = editor.getOptions();
-        if (options.get(EditorOption.folding) && options.get(EditorOption.showFoldingControls) !== 'never') {
+        if (options.get(EditorOption.folding) && options.get(EditorOption.showFoldingControls) !== "never") {
             lineDecorationsWidth += 11;
         }
         lineDecorationsWidth -= 24;
-        return { extraEditorClassName, lineDecorationsWidth };
+        return {
+            extraEditorClassName,
+            lineDecorationsWidth
+        };
     }
     getWithCommentsLineDecorationWidth(editor, startingLineDecorationsWidth) {
         let lineDecorationsWidth = startingLineDecorationsWidth;
         const options = editor.getOptions();
-        if (options.get(EditorOption.folding) && options.get(EditorOption.showFoldingControls) !== 'never') {
+        if (options.get(EditorOption.folding) && options.get(EditorOption.showFoldingControls) !== "never") {
             lineDecorationsWidth -= 11;
         }
         lineDecorationsWidth += 24;
@@ -1223,12 +1368,15 @@ let CommentController = class CommentController {
         return this._commentingRangeAmountReserved;
     }
     getWithCommentsEditorOptions(editor, extraEditorClassName, startingLineDecorationsWidth) {
-        extraEditorClassName.push('inline-comment');
-        return { lineDecorationsWidth: this.getWithCommentsLineDecorationWidth(editor, startingLineDecorationsWidth), extraEditorClassName };
+        extraEditorClassName.push("inline-comment");
+        return {
+            lineDecorationsWidth: this.getWithCommentsLineDecorationWidth(editor, startingLineDecorationsWidth),
+            extraEditorClassName
+        };
     }
     updateEditorLayoutOptions(editor, extraEditorClassName, lineDecorationsWidth) {
         editor.updateOptions({
-            extraEditorClassName: extraEditorClassName.join(' '),
+            extraEditorClassName: extraEditorClassName.join(" "),
             lineDecorationsWidth: lineDecorationsWidth
         });
     }
@@ -1245,7 +1393,9 @@ let CommentController = class CommentController {
             return;
         }
         const hasCommentsOrRangesInInfo = ( this._commentInfos.some(info => {
-            const hasRanges = Boolean(info.commentingRanges && (Array.isArray(info.commentingRanges) ? info.commentingRanges : info.commentingRanges.ranges).length);
+            const hasRanges = Boolean(
+                info.commentingRanges && (Array.isArray(info.commentingRanges) ? info.commentingRanges : info.commentingRanges.ranges).length
+            );
             return hasRanges || (info.threads.length > 0);
         }));
         uri = uri ?? this.editor.getModel()?.uri;
@@ -1254,19 +1404,31 @@ let CommentController = class CommentController {
         if (hasCommentsOrRanges && this.commentService.isCommentingEnabled) {
             if (!this._commentingRangeSpaceReserved) {
                 this._commentingRangeSpaceReserved = true;
-                const { lineDecorationsWidth, extraEditorClassName } = this.getExistingCommentEditorOptions(this.editor);
+                const {
+                    lineDecorationsWidth,
+                    extraEditorClassName
+                } = this.getExistingCommentEditorOptions(this.editor);
                 const newOptions = this.getWithCommentsEditorOptions(this.editor, extraEditorClassName, lineDecorationsWidth);
-                this.updateEditorLayoutOptions(this.editor, newOptions.extraEditorClassName, newOptions.lineDecorationsWidth);
-            }
-            else {
+                this.updateEditorLayoutOptions(
+                    this.editor,
+                    newOptions.extraEditorClassName,
+                    newOptions.lineDecorationsWidth
+                );
+            } else {
                 this.ensureCommentingRangeReservedAmount(this.editor);
             }
-        }
-        else if ((!hasCommentsOrRanges || !this.commentService.isCommentingEnabled) && this._commentingRangeSpaceReserved) {
+        } else if ((!hasCommentsOrRanges || !this.commentService.isCommentingEnabled) && this._commentingRangeSpaceReserved) {
             this._commentingRangeSpaceReserved = false;
-            const { lineDecorationsWidth, extraEditorClassName } = this.getExistingCommentEditorOptions(this.editor);
+            const {
+                lineDecorationsWidth,
+                extraEditorClassName
+            } = this.getExistingCommentEditorOptions(this.editor);
             const newOptions = this.getWithoutCommentsEditorOptions(this.editor, extraEditorClassName, lineDecorationsWidth);
-            this.updateEditorLayoutOptions(this.editor, newOptions.extraEditorClassName, newOptions.lineDecorationsWidth);
+            this.updateEditorLayoutOptions(
+                this.editor,
+                newOptions.extraEditorClassName,
+                newOptions.lineDecorationsWidth
+            );
         }
     }
     async setComments(commentInfos) {
@@ -1303,8 +1465,7 @@ let CommentController = class CommentController {
         this._commentThreadRangeDecorator.update(this.editor, this._commentInfos);
         if (hasCommentingRanges) {
             this._activeEditorHasCommentingRange.set(true);
-        }
-        else {
+        } else {
             this._activeEditorHasCommentingRange.set(false);
         }
     }
@@ -1320,10 +1481,9 @@ let CommentController = class CommentController {
                 let lastCommentBody;
                 if (zone.commentThread.comments && zone.commentThread.comments.length) {
                     const lastComment = zone.commentThread.comments[zone.commentThread.comments.length - 1];
-                    if (typeof lastComment.body === 'string') {
+                    if (typeof lastComment.body === "string") {
                         lastCommentBody = lastComment.body;
-                    }
-                    else {
+                    } else {
                         lastCommentBody = lastComment.body.value;
                     }
                 }
@@ -1332,8 +1492,7 @@ let CommentController = class CommentController {
                         this._pendingNewCommentCache[zone.uniqueOwner] = {};
                     }
                     this._pendingNewCommentCache[zone.uniqueOwner][zone.commentThread.threadId] = pendingNewComment;
-                }
-                else {
+                } else {
                     if (providerNewCommentCacheStore) {
                         delete providerNewCommentCacheStore[zone.commentThread.threadId];
                     }
@@ -1345,8 +1504,7 @@ let CommentController = class CommentController {
                         this._pendingEditsCache[zone.uniqueOwner] = {};
                     }
                     this._pendingEditsCache[zone.uniqueOwner][zone.commentThread.threadId] = pendingEdits;
-                }
-                else if (providerEditsCacheStore) {
+                } else if (providerEditsCacheStore) {
                     delete providerEditsCacheStore[zone.commentThread.threadId];
                 }
                 zone.dispose();
@@ -1355,19 +1513,6 @@ let CommentController = class CommentController {
         this._commentWidgets = [];
     }
 };
-CommentController = ( __decorate([
-    ( __param(1, ICommentService)),
-    ( __param(2, IInstantiationService)),
-    ( __param(3, ICodeEditorService)),
-    ( __param(4, IContextMenuService)),
-    ( __param(5, IQuickInputService)),
-    ( __param(6, IViewsService)),
-    ( __param(7, IConfigurationService)),
-    ( __param(8, IContextKeyService)),
-    ( __param(9, IEditorService)),
-    ( __param(10, IKeybindingService)),
-    ( __param(11, IAccessibilityService)),
-    ( __param(12, INotificationService))
-], CommentController));
+CommentController = ( __decorate([( __param(1, ICommentService)), ( __param(2, IInstantiationService)), ( __param(3, ICodeEditorService)), ( __param(4, IContextMenuService)), ( __param(5, IQuickInputService)), ( __param(6, IViewsService)), ( __param(7, IConfigurationService)), ( __param(8, IContextKeyService)), ( __param(9, IEditorService)), ( __param(10, IKeybindingService)), ( __param(11, IAccessibilityService)), ( __param(12, INotificationService))], CommentController));
 
 export { CommentController, ID, moveToNextCommentInThread, revealCommentThread };