Support resolving conversations

package.json

@@ -647,6 +647,16 @@
 				"category": "GitHub Pull Requests",
 				"enablement": "!commentIsEmpty"
 			},
+			{
+				"command": "pr.resolveReviewThread",
+				"title": "Resolve Conversation",
+				"category": "GitHub Pull Requests"
+			},
+			{
+				"command": "pr.unresolveReviewThread",
+				"title": "Unresolve Conversation",
+				"category": "GitHub Pull Requests"
+			},
 			{
 				"command": "pr.signinAndRefreshList",
 				"title": "Sign in and Refresh",
@@ -1310,32 +1320,32 @@
 			"comments/commentThread/context": [
 				{
 					"command": "pr.createComment",
-					"group": "inline",
+					"group": "inline@1",
 					"when": "commentController =~ /browse/ && prInDraft"
 				},
 				{
 					"command": "pr.createComment",
-					"group": "inline",
+					"group": "inline@1",
 					"when": "commentController =~ /review/ && reviewInDraftMode"
 				},
 				{
 					"command": "pr.createSingleComment",
-					"group": "inline",
+					"group": "inline@1",
 					"when": "commentController =~ /browse/ && !prInDraft"
 				},
 				{
 					"command": "pr.createSingleComment",
-					"group": "inline",
+					"group": "inline@1",
 					"when": "commentController =~ /review/ && !reviewInDraftMode"
 				},
 				{
 					"command": "pr.startReview",
-					"group": "inline",
+					"group": "inline@2",
 					"when": "commentController =~ /browse/ && !prInDraft"
 				},
 				{
 					"command": "pr.startReview",
-					"group": "inline",
+					"group": "inline@2",
 					"when": "commentController =~ /review/ && !reviewInDraftMode"
 				},
 				{
@@ -1357,6 +1367,16 @@
 					"command": "pr.finishReview",
 					"group": "inline",
 					"when": "commentController =~ /review/ && reviewInDraftMode"
+				},
+				{
+					"command": "pr.resolveReviewThread",
+					"group": "inline@3",
+					"when": "commentController =~ /browse|review/ && commentThread == canResolve"
+				},
+				{
+					"command": "pr.unresolveReviewThread",
+					"group": "inline@3",
+					"when": "commentController =~ /browse|review/ && commentThread == canUnresolve"
 				}
 			],
 			"comments/comment/title": [

src/commands.ts

@@ -672,6 +672,34 @@ export function registerCommands(
 		}),
 	);
 
+	context.subscriptions.push(
+		vscode.commands.registerCommand('pr.resolveReviewThread', async (reply: CommentReply) => {
+			/* __GDPR__
+			"pr.resolveReviewThread" : {}
+			*/
+			telemetry.sendTelemetryEvent('pr.resolveReviewThread');
+			const handler = resolveCommentHandler(reply.thread);
+
+			if (handler) {
+				await handler.resolveReviewThread(reply.thread, reply.text);
+			}
+		})
+	);
+
+	context.subscriptions.push(
+		vscode.commands.registerCommand('pr.unresolveReviewThread', async (reply: CommentReply) => {
+			/* __GDPR__
+			"pr.unresolveReviewThread" : {}
+			*/
+			telemetry.sendTelemetryEvent('pr.unresolveReviewThread');
+			const handler = resolveCommentHandler(reply.thread);
+
+			if (handler) {
+				await handler.unresolveReviewThread(reply.thread, reply.text);
+			}
+		})
+	);
+
 	context.subscriptions.push(
 		vscode.commands.registerCommand('pr.createComment', async (reply: CommentReply) => {
 			/* __GDPR__

src/commentHandlerResolver.ts

@@ -19,6 +19,9 @@ export interface CommentHandler {
 	startReview(thread: GHPRCommentThread, input: string): Promise<void>;
 	finishReview(thread: GHPRCommentThread, input: string): Promise<void>;
 	deleteReview(): Promise<void>;
+
+	resolveReviewThread(thread: GHPRCommentThread, input?: string): Promise<void>;
+	unresolveReviewThread(thread: GHPRCommentThread, input?: string): Promise<void>;
 }
 
 export interface CommentReply {

src/common/comment.ts

@@ -23,6 +23,7 @@ export interface IReviewThread {
 	id: string;
 	isResolved: boolean;
 	viewerCanResolve: boolean;
+	viewerCanUnresolve: boolean;
 	path: string;
 	diffSide: DiffSide;
 	line: number;

src/github/graphql.ts

@@ -166,6 +166,7 @@ export interface ReviewThread {
 	id: string;
 	isResolved: boolean;
 	viewerCanResolve: boolean;
+	viewerCanUnresolve: boolean;
 	path: string;
 	diffSide: DiffSide;
 	line: number;
@@ -210,21 +211,7 @@ export interface PullRequestCommentsResponse {
 	repository: {
 		pullRequest: {
 			reviewThreads: {
-				nodes: [
-					{
-						id: string;
-						isResolved: boolean;
-						viewerCanResolve: boolean;
-						path: string;
-						diffSide: DiffSide;
-						line: number;
-						originalLine: number;
-						isOutdated: boolean;
-						comments: {
-							nodes: ReviewComment[];
-						};
-					},
-				];
+				nodes: ReviewThread[];
 			};
 		};
 	};
@@ -615,3 +602,15 @@ export interface GetChecksResponse {
 		};
 	};
 }
+
+export interface ResolveReviewThreadResponse {
+	resolveReviewThread: {
+		thread: ReviewThread;
+	}
+}
+
+export interface UnresolveReviewThreadResponse {
+	unresolveReviewThread: {
+		thread: ReviewThread;
+	}
+}

src/github/pullRequestModel.ts

@@ -33,9 +33,11 @@ import {
 	PullRequestCommentsResponse,
 	PullRequestResponse,
 	ReactionGroup,
+	ResolveReviewThreadResponse,
 	StartReviewResponse,
 	SubmitReviewResponse,
 	TimelineEventsResponse,
+	UnresolveReviewThreadResponse,
 	UpdatePullRequestResponse,
 } from './graphql';
 import {
@@ -57,6 +59,7 @@ import {
 	parseGraphQLComment,
 	parseGraphQLReaction,
 	parseGraphQLReviewEvent,
+	parseGraphQLReviewThread,
 	parseGraphQLTimelineEvents,
 	parseMergeability,
 } from './utils';
@@ -426,7 +429,7 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 		}
 		const pendingReviewId = await this.getPendingReviewId();
 
-		const { mutate, schema, remote } = await this.githubRepository.ensure();
+		const { mutate, schema } = await this.githubRepository.ensure();
 		const { data } = await mutate<AddReviewThreadResponse>({
 			mutation: schema.AddReviewThread,
 			variables: {
@@ -447,17 +450,7 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 		}
 
 		const thread = data.addPullRequestReviewThread.thread;
-		const newThread = {
-			id: thread.id,
-			isResolved: thread.isResolved,
-			viewerCanResolve: thread.viewerCanResolve,
-			path: thread.path,
-			line: thread.line,
-			originalLine: thread.originalLine,
-			diffSide: thread.diffSide,
-			isOutdated: thread.isOutdated,
-			comments: thread.comments.nodes.map(comment => parseGraphQLComment(comment, thread.isResolved), remote),
-		};
+		const newThread = parseGraphQLReviewThread(thread);
 		this._reviewThreadsCache.push(newThread);
 		this._onDidChangeReviewThreads.fire({ added: [newThread], changed: [], removed: [] });
 		return newThread;
@@ -694,17 +687,7 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 			});
 
 			const reviewThreads = data.repository.pullRequest.reviewThreads.nodes.map(node => {
-				return {
-					id: node.id,
-					isResolved: node.isResolved,
-					viewerCanResolve: node.viewerCanResolve,
-					path: node.path,
-					line: node.line,
-					originalLine: node.originalLine,
-					diffSide: node.diffSide,
-					isOutdated: node.isOutdated,
-					comments: node.comments.nodes.map(comment => parseGraphQLComment(comment, node.isResolved), remote),
-				};
+				return parseGraphQLReviewThread(node);
 			});
 
 			this.diffThreads(reviewThreads);
@@ -1202,4 +1185,42 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 
 		return data;
 	}
+
+	async resolveReviewThread(threadId: string): Promise<void> {
+		const { mutate, schema } = await this.githubRepository.ensure();
+		const { data } = await mutate<ResolveReviewThreadResponse>({
+			mutation: schema.ResolveReviewThread,
+			variables: {
+				input: {
+					threadId,
+				},
+			},
+		});
+
+		const index = this._reviewThreadsCache.findIndex(thread => thread.id === threadId);
+		if (index > -1) {
+			const thread = parseGraphQLReviewThread(data.resolveReviewThread.thread);
+			this._reviewThreadsCache.splice(index, 1, thread);
+			this._onDidChangeReviewThreads.fire({ added: [], changed: [thread], removed: [] });
+		}
+	}
+
+	async unresolveReviewThread(threadId: string): Promise<void> {
+		const { mutate, schema } = await this.githubRepository.ensure();
+		const { data } = await mutate<UnresolveReviewThreadResponse>({
+			mutation: schema.UnresolveReviewThread,
+			variables: {
+				input: {
+					threadId,
+				},
+			},
+		});
+
+		const index = this._reviewThreadsCache.findIndex(thread => thread.id === threadId);
+		if (index > -1) {
+			const thread = parseGraphQLReviewThread(data.unresolveReviewThread.thread);
+			this._reviewThreadsCache.splice(index, 1, thread);
+			this._onDidChangeReviewThreads.fire({ added: [], changed: [thread], removed: [] });
+		}
+	}
 }

src/github/queries.gql

@@ -130,6 +130,7 @@ fragment ReviewThread on PullRequestReviewThread {
 	id
 	isResolved
 	viewerCanResolve
+	viewerCanUnresolve
 	path
 	diffSide
 	line
@@ -246,6 +247,7 @@ query PullRequestComments($owner: String!, $name: String!, $number: Int!, $first
 					id
 					isResolved
 					viewerCanResolve
+					viewerCanUnresolve
 					path
 					diffSide
 					line
@@ -849,3 +851,19 @@ query GetChecks($owner: String!, $name: String!, $number: Int!) {
 		}
 	}
 }
+
+mutation ResolveReviewThread($input: ResolveReviewThreadInput!) {
+	resolveReviewThread(input: $input) {
+		thread {
+			...ReviewThread
+		}
+	}
+}
+
+mutation UnresolveReviewThread($input: UnresolveReviewThreadInput!) {
+	unresolveReviewThread(input: $input) {
+		thread {
+			...ReviewThread
+		}
+	}
+}

src/github/utils.ts

@@ -46,6 +46,12 @@ export function createVSCodeCommentThreadForReviewThread(
 	vscodeThread.comments = thread.comments.map(comment => new GHPRComment(comment, vscodeThread as GHPRCommentThread));
 	(vscodeThread as GHPRCommentThread).isResolved = thread.isResolved;
 
+	if (thread.viewerCanResolve && !thread.isResolved) {
+		vscodeThread.contextValue = 'canResolve';
+	} else if (thread.viewerCanUnresolve && thread.isResolved) {
+		vscodeThread.contextValue = 'canUnresolve';
+	}
+
 	updateCommentThreadLabel(vscodeThread as GHPRCommentThread);
 	const isOnLocalFile = uri.scheme !== 'pr' && uri.scheme !== 'review';
 	vscodeThread.collapsibleState =
@@ -56,7 +62,30 @@ export function createVSCodeCommentThreadForReviewThread(
 	return vscodeThread as GHPRCommentThread;
 }
 
+export function updateThread(vscodeThread: GHPRCommentThread, reviewThread: IReviewThread) {
+	if (reviewThread.viewerCanResolve && !reviewThread.isResolved) {
+		vscodeThread.contextValue = 'canResolve';
+	} else if (reviewThread.viewerCanUnresolve && reviewThread.isResolved) {
+		vscodeThread.contextValue = 'canUnresolve';
+	}
+
+	if (vscodeThread.isResolved !== reviewThread.isResolved) {
+		vscodeThread.isResolved = reviewThread.isResolved;
+		vscodeThread.collapsibleState = reviewThread.isResolved
+			? vscode.CommentThreadCollapsibleState.Collapsed
+			: vscode.CommentThreadCollapsibleState.Expanded;
+	}
+
+	vscodeThread.comments = reviewThread.comments.map(c => new GHPRComment(c, vscodeThread));
+	updateCommentThreadLabel(vscodeThread);
+}
+
 export function updateCommentThreadLabel(thread: GHPRCommentThread) {
+	if (thread.isResolved) {
+		thread.label = 'This thread has been marked as resolved';
+		return;
+	}
+
 	if (thread.comments.length) {
 		const participantsList = uniqBy(thread.comments as vscode.Comment[], comment => comment.author.name)
 			.map(comment => `@${comment.author.name}`)
@@ -305,6 +334,21 @@ export function convertGraphQLEventType(text: string) {
 	}
 }
 
+export function parseGraphQLReviewThread(thread: GraphQL.ReviewThread): IReviewThread {
+	return {
+		id: thread.id,
+		isResolved: thread.isResolved,
+		viewerCanResolve: thread.viewerCanResolve,
+		viewerCanUnresolve: thread.viewerCanUnresolve,
+		path: thread.path,
+		line: thread.line,
+		originalLine: thread.originalLine,
+		diffSide: thread.diffSide,
+		isOutdated: thread.isOutdated,
+		comments: thread.comments.nodes.map(comment => parseGraphQLComment(comment, thread.isResolved)),
+	};
+}
+
 export function parseGraphQLComment(comment: GraphQL.ReviewComment, isResolved: boolean): IComment {
 	const c: IComment = {
 		id: comment.databaseId,

src/test/view/reviewCommentController.test.ts

@@ -146,6 +146,7 @@ describe('ReviewCommentController', function () {
 					id: '1',
 					isResolved: false,
 					viewerCanResolve: false,
+					viewerCanUnresolve: false,
 					path: fileName,
 					diffSide: DiffSide.RIGHT,
 					line: 372,