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.

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

Allow CommentNode to change body text and enter edit mode at the same time #155767

Merged
merged 1 commit into from
Jul 25, 2022
Merged
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions src/vs/workbench/contrib/comments/browser/commentNode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -528,16 +528,18 @@ export class CommentNode<T extends IRange | ICellRange> extends Disposable {
this.updateCommentBody(newComment.body);
}

if (newComment.mode !== undefined && newComment.mode !== this.comment.mode) {
const isChangingMode: boolean = newComment.mode !== undefined && newComment.mode !== this.comment.mode;

this.comment = newComment;

if (isChangingMode) {
if (newComment.mode === languages.CommentMode.Editing) {
this.switchToEditMode();
} else {
this.removeCommentEditor();
}
}

this.comment = newComment;

if (newComment.label) {
this._isPendingLabel.innerText = newComment.label;
} else {
Expand Down