Allow CommentNode to change body text and enter edit mode at the same…

… time
joscol · Jul 20, 2022 · ec184dd · ec184dd
1 parent fbb7f41
commit ec184dd
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/vs/workbench/contrib/comments/browser/commentNode.ts b/src/vs/workbench/contrib/comments/browser/commentNode.ts
@@ -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 {