Allow specific comments to be focused on (microsoft#228770)

Part of microsoft#226091
sebthom · Sep 16, 2024 · dc8e741 · dc8e741
1 parent a9d2b65
commit dc8e741
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/src/vs/workbench/contrib/comments/browser/commentThreadBody.ts b/src/vs/workbench/contrib/comments/browser/commentThreadBody.ts
@@ -66,7 +66,14 @@ export class CommentThreadBody<T extends IRange | ICellRange = IRange> extends D
 		this._markdownRenderer = this._register(new MarkdownRenderer(this._options, this.languageService, this.openerService));
 	}
 
-	focus() {
+	focus(commentUniqueId?: number) {
+		if (commentUniqueId !== undefined) {
+			const comment = this._commentElements.find(commentNode => commentNode.comment.uniqueIdInThread === commentUniqueId);
+			if (comment) {
+				comment.focus();
+				return;
+			}
+		}
 		this._commentsElement.focus();
 	}
 

diff --git a/src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts b/src/vs/workbench/contrib/comments/browser/commentThreadWidget.ts
@@ -370,8 +370,8 @@ export class CommentThreadWidget<T extends IRange | ICellRange = IRange> extends
 		this._commentReply?.expandReplyAreaAndFocusCommentEditor();
 	}
 
-	focus() {
-		this._body.focus();
+	focus(commentUniqueId: number | undefined) {
+		this._body.focus(commentUniqueId);
 	}
 
 	async submitComment() {

diff --git a/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts b/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts
@@ -198,9 +198,9 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget
 		}
 	}
 
-	private _setFocus(focus: CommentWidgetFocus) {
+	private _setFocus(commentUniqueId: number | undefined, focus: CommentWidgetFocus) {
 		if (focus === CommentWidgetFocus.Widget) {
-			this._commentThreadWidget.focus();
+			this._commentThreadWidget.focus(commentUniqueId);
 		} else if (focus === CommentWidgetFocus.Editor) {
 			this._commentThreadWidget.focusCommentEditor();
 		}
@@ -217,7 +217,7 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget
 				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);
 		}
@@ -229,7 +229,7 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget
 			: new Range(1, 1, 1, 1);
 
 		this.editor.revealRangeInCenter(rangeToReveal);
-		this._setFocus(focus);
+		this._setFocus(undefined, focus);
 	}
 
 	public makeVisible(commentUniqueId?: number, focus: CommentWidgetFocus = CommentWidgetFocus.None) {