CommentController.activeCommentThread not updated when navigating from ruler or Comments panel (microsoft#223623)

Fixes microsoft#223021

Author: alexr00

src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.ts

@@ -187,39 +187,58 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget
 	}
 
 	public reveal(commentUniqueId?: number, focus: CommentWidgetFocus = CommentWidgetFocus.None) {
+		this.makeVisible(commentUniqueId, focus);
+		const comment = this._commentThread.comments?.find(comment => comment.uniqueIdInThread === commentUniqueId);
+		this.commentService.setActiveCommentAndThread(this.uniqueOwner, { thread: this._commentThread, comment });
+	}
+
+	private _expandAndShowZoneWidget() {
 		if (!this._isExpanded) {
 			this.show(this.arrowPosition(this._commentThread.range), 2);
 		}
+	}
 
-		if (commentUniqueId !== undefined) {
-			const height = this.editor.getLayoutInfo().height;
-			const coords = this._commentThreadWidget.getCommentCoords(commentUniqueId);
-			if (coords) {
-				let scrollTop: number = 1;
-				if (this._commentThread.range) {
-					const commentThreadCoords = coords.thread;
-					const commentCoords = coords.comment;
-					scrollTop = this.editor.getTopForLineNumber(this._commentThread.range.startLineNumber) - height / 2 + commentCoords.top - commentThreadCoords.top;
-				}
-				this.editor.setScrollTop(scrollTop);
-				if (focus === CommentWidgetFocus.Widget) {
-					this._commentThreadWidget.focus();
-				} else if (focus === CommentWidgetFocus.Editor) {
-					this._commentThreadWidget.focusCommentEditor();
-				}
-				return;
+	private _setFocus(focus: CommentWidgetFocus) {
+		if (focus === CommentWidgetFocus.Widget) {
+			this._commentThreadWidget.focus();
+		} else if (focus === CommentWidgetFocus.Editor) {
+			this._commentThreadWidget.focusCommentEditor();
+		}
+	}
+
+	private _goToComment(commentUniqueId: number, focus: CommentWidgetFocus) {
+		const height = this.editor.getLayoutInfo().height;
+		const coords = this._commentThreadWidget.getCommentCoords(commentUniqueId);
+		if (coords) {
+			let scrollTop: number = 1;
+			if (this._commentThread.range) {
+				const commentThreadCoords = coords.thread;
+				const commentCoords = coords.comment;
+				scrollTop = this.editor.getTopForLineNumber(this._commentThread.range.startLineNumber) - height / 2 + commentCoords.top - commentThreadCoords.top;
 			}
+			this.editor.setScrollTop(scrollTop);
+			this._setFocus(focus);
+		} else {
+			this._goToThread(focus);
 		}
+	}
+
+	private _goToThread(focus: CommentWidgetFocus) {
 		const rangeToReveal = this._commentThread.range
 			? new Range(this._commentThread.range.startLineNumber, this._commentThread.range.startColumn, this._commentThread.range.endLineNumber + 1, 1)
 			: new Range(1, 1, 1, 1);
 
 		this.editor.revealRangeInCenter(rangeToReveal);
-		if (focus === CommentWidgetFocus.Widget) {
-			this._commentThreadWidget.focus();
-		} else if (focus === CommentWidgetFocus.Editor) {
-			this._commentThreadWidget.focusCommentEditor();
+		this._setFocus(focus);
+	}
+
+	public makeVisible(commentUniqueId?: number, focus: CommentWidgetFocus = CommentWidgetFocus.None) {
+		this._expandAndShowZoneWidget();
+
+		if (commentUniqueId !== undefined) {
+			this._goToComment(commentUniqueId, focus);
 		}
+		this._goToThread(focus);
 	}
 
 	public getPendingComments(): { newComment: string | undefined; edits: { [key: number]: string } } {
@@ -371,7 +390,7 @@ export class ReviewZoneWidget extends ZoneWidget implements ICommentThreadWidget
 
 		// If this is a new comment thread awaiting user input then we need to reveal it.
 		if (shouldReveal) {
-			this.reveal();
+			this.makeVisible();
 		}
 
 		this.bindCommentThreadListeners();