GHPRI doesn't render suggestions in comments containing one-line dele…

…tions (#5212) Fixes #5211
microsoft · Aug 29, 2023 · 07a58cb · 07a58cb
1 parent 69a3e04
commit 07a58cb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/github/prComment.ts b/src/github/prComment.ts
@@ -186,7 +186,7 @@ export class TemporaryComment extends CommentBase {
 	}
 }
 
-const SUGGESTION_EXPRESSION = /```suggestion(\r\n|\n)([\s\S]*?)(\r\n|\n)```/;
+const SUGGESTION_EXPRESSION = /```suggestion(\r\n|\n)(([\s\S]*?)(\r\n|\n))?```/;
 
 export class GHPRComment extends CommentBase {
 	public commentId: string;
@@ -229,7 +229,7 @@ export class GHPRComment extends CommentBase {
 			contextValues.push('canDelete');
 		}
 
-		if (this.suggestion) {
+		if (this.suggestion !== undefined) {
 			contextValues.push('hasSuggestion');
 		}
 
@@ -258,7 +258,7 @@ export class GHPRComment extends CommentBase {
 			contextValues.push('canDelete');
 		}
 
-		if (this.suggestion) {
+		if (this.suggestion !== undefined) {
 			contextValues.push('hasSuggestion');
 		}
 
@@ -287,8 +287,8 @@ export class GHPRComment extends CommentBase {
 
 	get suggestion(): string | undefined {
 		const suggestionBody = this.rawComment.body.match(SUGGESTION_EXPRESSION);
-		if (suggestionBody?.length === 4) {
-			return `${suggestionBody[2]}\n`;
+		if (suggestionBody?.length === 5) {
+			return suggestionBody[3] ? `${suggestionBody[3]}\n` : '';
 		}
 	}
 
@@ -301,7 +301,7 @@ export class GHPRComment extends CommentBase {
 			return `***
 Suggested change:
 \`\`\`
-${args[1]}
+${args[2] ?? ''}
 \`\`\`
 ***`;
 		});

diff --git a/src/view/reviewCommentController.ts b/src/view/reviewCommentController.ts
@@ -897,7 +897,7 @@ export class ReviewCommentController
 	async applySuggestion(comment: GHPRComment) {
 		const range = comment.parent.range;
 		const suggestion = comment.suggestion;
-		if (!suggestion || !range) {
+		if ((suggestion === undefined) || !range) {
 			throw new Error('Comment doesn\'t contain a suggestion');
 		}