Adopt comment thread state API proposal

Part of microsoft/vscode#127473

Author: alexr00

package.json

@@ -11,7 +11,8 @@
 		"url": "https://github.com/Microsoft/vscode-pull-request-github/issues"
 	},
 	"enabledApiProposals": [
-		"tokenInformation"
+		"tokenInformation",
+		"commentsResolvedState"
 	],
 	"version": "0.40.0",
 	"publisher": "GitHub",

src/@types/vscode.proposed.commentsResolvedState.d.ts

@@ -0,0 +1,19 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+declare module 'vscode' {
+
+	// https://github.com/microsoft/vscode/issues/127473
+
+	export enum CommentThreadState {
+		Unresolved = 0,
+		Resolved = 1
+	}
+
+	// TODO@API doc
+	export interface CommentThread {
+		state?: CommentThreadState;
+	}
+}

src/github/prComment.ts

@@ -41,7 +41,7 @@ export interface GHPRCommentThread extends vscode.CommentThread {
 	/**
 	 * Whether the thread has been marked as resolved.
 	 */
-	isResolved: boolean;
+	state: vscode.CommentThreadState;
 
 	dispose: () => void;
 }

src/github/utils.ts

@@ -47,7 +47,7 @@ export function createVSCodeCommentThreadForReviewThread(
 	(vscodeThread as GHPRCommentThread).gitHubThreadId = thread.id;
 
 	vscodeThread.comments = thread.comments.map(comment => new GHPRComment(comment, vscodeThread as GHPRCommentThread));
-	(vscodeThread as GHPRCommentThread).isResolved = thread.isResolved;
+	vscodeThread.state = isResolvedToResolvedState(thread.isResolved);
 
 	if (thread.viewerCanResolve && !thread.isResolved) {
 		vscodeThread.contextValue = 'canResolve';
@@ -61,6 +61,9 @@ export function createVSCodeCommentThreadForReviewThread(
 	return vscodeThread as GHPRCommentThread;
 }
 
+function isResolvedToResolvedState(isResolved: boolean) {
+	return isResolved ? vscode.CommentThreadState.Resolved : vscode.CommentThreadState.Unresolved;
+}
 
 export const COMMENT_EXPAND_STATE_SETTING = 'commentExpandState';
 export const COMMENT_EXPAND_STATE_COLLAPSE_VALUE = 'collapseAll';
@@ -84,8 +87,9 @@ export function updateThread(vscodeThread: GHPRCommentThread, reviewThread: IRev
 		vscodeThread.contextValue = 'canUnresolve';
 	}
 
-	if (vscodeThread.isResolved !== reviewThread.isResolved) {
-		vscodeThread.isResolved = reviewThread.isResolved;
+	const newResolvedState = isResolvedToResolvedState(reviewThread.isResolved);
+	if (vscodeThread.state !== newResolvedState) {
+		vscodeThread.state = newResolvedState;
 	}
 	vscodeThread.collapsibleState = getCommentCollapsibleState(reviewThread.isResolved, expand);
 
@@ -94,7 +98,7 @@ export function updateThread(vscodeThread: GHPRCommentThread, reviewThread: IRev
 }
 
 export function updateCommentThreadLabel(thread: GHPRCommentThread) {
-	if (thread.isResolved) {
+	if (thread.state === vscode.CommentThreadState.Resolved) {
 		thread.label = 'This thread has been marked as resolved';
 		return;
 	}

src/test/view/reviewCommentController.test.ts

@@ -140,7 +140,7 @@ describe('ReviewCommentController', function () {
 			comments: [],
 			collapsibleState: vscode.CommentThreadCollapsibleState.Expanded,
 			label: 'Start discussion',
-			isResolved: false,
+			state: vscode.CommentThreadState.Unresolved,
 			canReply: false,
 			dispose: () => {},
 		};