Comment thread range improvements

Author: alexr00

src/github/utils.ts

@@ -36,6 +36,15 @@ export interface CommentReactionHandler {
 	toggleReaction(comment: vscode.Comment, reaction: vscode.CommentReaction): Promise<void>;
 }
 
+export function threadRange(startLine: number, endLine: number, endCharacter?: number): vscode.Range {
+	if ((startLine !== endLine) && (endCharacter === undefined)) {
+		endCharacter = 300; // 300 is a "large" number that will select a lot of the line since don't know anything about the line length
+	} else {
+		endCharacter = 0;
+	}
+	return new vscode.Range(startLine, 0, endLine, endCharacter);
+}
+
 export function createVSCodeCommentThreadForReviewThread(
 	uri: vscode.Uri,
 	range: vscode.Range,

src/view/pullRequestCommentController.ts

@@ -19,6 +19,7 @@ import { PullRequestOverviewPanel } from '../github/pullRequestOverview';
 import {
 	CommentReactionHandler,
 	createVSCodeCommentThreadForReviewThread,
+	threadRange,
 	updateCommentReviewState,
 	updateCommentThreadLabel,
 	updateThread,
@@ -169,10 +170,8 @@ export class PullRequestCommentController implements CommentHandler, CommentReac
 							&& (thread.endLine !== null),
 					)
 					.map(thread => {
-						const range = new vscode.Range(
-							new vscode.Position(thread.startLine - 1, 0),
-							new vscode.Position(thread.endLine - 1, 0),
-						);
+						const endLine = thread.endLine - 1;
+						const range = threadRange(thread.startLine - 1, endLine, editor.document.lineAt(endLine).range.end.character);
 
 						return createVSCodeCommentThreadForReviewThread(
 							editor.document.uri,
@@ -260,10 +259,8 @@ export class PullRequestCommentController implements CommentHandler, CommentReac
 				});
 
 				if (matchingEditor) {
-					const range = new vscode.Range(
-						new vscode.Position(thread.startLine - 1, 0),
-						new vscode.Position(thread.endLine - 1, 0),
-					);
+					const endLine = thread.endLine - 1;
+					const range = threadRange(thread.startLine - 1, endLine, matchingEditor.document.lineAt(endLine).range.end.character);
 
 					newThread = createVSCodeCommentThreadForReviewThread(
 						matchingEditor.document.uri,

src/view/reviewCommentController.ts

@@ -21,6 +21,7 @@ import { PullRequestOverviewPanel } from '../github/pullRequestOverview';
 import {
 	CommentReactionHandler,
 	createVSCodeCommentThreadForReviewThread,
+	threadRange,
 	updateCommentReviewState,
 	updateCommentThreadLabel,
 	updateThread,
@@ -99,11 +100,7 @@ export class ReviewCommentController
 			this._repository.rootUri,
 		);
 
-		const range = new vscode.Range(
-			new vscode.Position(thread.originalStartLine - 1, 0),
-			new vscode.Position(thread.originalEndLine - 1, 0),
-		);
-
+		const range = threadRange(thread.originalStartLine - 1, thread.originalEndLine - 1);
 		return createVSCodeCommentThreadForReviewThread(reviewUri, range, thread, this._commentController);
 	}
 
@@ -128,8 +125,7 @@ export class ReviewCommentController
 			endLine = mapOldPositionToNew(localDiff, endLine);
 		}
 
-		const range = new vscode.Range(new vscode.Position(startLine - 1, 0), new vscode.Position(endLine - 1, 0));
-
+		const range = threadRange(startLine - 1, endLine - 1);
 		return createVSCodeCommentThreadForReviewThread(uri, range, thread, this._commentController);
 	}
 
@@ -155,11 +151,7 @@ export class ReviewCommentController
 			this._repository.rootUri,
 		);
 
-		const range = new vscode.Range(
-			new vscode.Position(thread.startLine - 1, 0),
-			new vscode.Position(thread.endLine - 1, 0),
-		);
-
+		const range = threadRange(thread.startLine - 1, thread.endLine - 1);
 		return createVSCodeCommentThreadForReviewThread(reviewUri, range, thread, this._commentController);
 	}