Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consistently expand or collapse all comments on a line #176967

Merged
merged 2 commits into from
Mar 13, 2023
Merged

Consistently expand or collapse all comments on a line #176967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3312e33
Remove redundant `show()` / `hide()` in `expand()` / `collapse()`
hermannloose Mar 13, 2023
bd3513a
Consistently expand or collapse all comments on a line
hermannloose Mar 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,10 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget
return this._commentThread;
}

public get expanded(): boolean | undefined {
return this._isExpanded;
}

private _commentOptions: languages.CommentOptions | undefined;

constructor(
Expand Down Expand Up @@ -257,22 +261,12 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget
this.commentService.disposeCommentThread(this.owner, this._commentThread.threadId);
}

public collapse(): Promise<void> {
public collapse() {
this._commentThread.collapsibleState = languages.CommentThreadCollapsibleState.Collapsed;
if (this._commentThread.comments && this._commentThread.comments.length === 0) {
this.deleteCommentThread();
return Promise.resolve();
}

this.hide();
return Promise.resolve();
}

public expand(): Promise<void> {
public expand() {
this._commentThread.collapsibleState = languages.CommentThreadCollapsibleState.Expanded;

this.show(this.arrowPosition(this._commentThread.range), 2);
return Promise.resolve();
}

public getGlyphPosition(): number {
Expand Down
3 changes: 2 additions & 1 deletion src/vs/workbench/contrib/comments/browser/commentsController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,7 +766,8 @@ export class CommentController implements IEditorContribution {
// The widget's position is undefined until the widget has been displayed, so rely on the glyph position instead
const existingCommentsAtLine = this._commentWidgets.filter(widget => widget.getGlyphPosition() === commentRange.endLineNumber);
if (existingCommentsAtLine.length) {
existingCommentsAtLine.forEach(widget => widget.toggleExpand());
const allExpanded = existingCommentsAtLine.every(widget => widget.expanded);
existingCommentsAtLine.forEach(allExpanded ? widget => widget.collapse() : widget => widget.expand());
this.processNextThreadToAdd();
return;
} else {
Expand Down