fix comment conflicts (#140)

Author: harjotgill

action.yml

@@ -202,8 +202,8 @@ inputs:
       section in GitHub. Markdown format is preferred for text. Fenced code 
       blocks should be used for complete code suggestions that replace code 
       at those exact line number ranges. It's important that the code 
-      suggestions are complete and correctly formatted so that they can be 
-      committed as-is.
+      suggestions are complete, correctly formatted and without line number 
+      annotations so that they can be committed as-is.
 
         <start_line_number>-<end_line_number>:
         <review markdown>

dist/index.js

@@ -156,7 +156,7 @@ ${tag}`
       for (const comment of comments) {
         if (comment.body.includes(tag)) {
           core.info(
-            `Updating review comment for ${path}:${end_line}: ${message}`
+            `Updating review comment for ${path}:${start_line}-${end_line}: ${message}`
           )
           await octokit.pulls.updateReviewComment({
             owner: repo.owner,
@@ -261,7 +261,7 @@ ${COMMENT_REPLY_TAG}
     }
   }
 
-  async get_comments_at_range(
+  async get_comments_within_range(
     pull_number: number,
     path: string,
     start_line: number,
@@ -279,14 +279,32 @@ ${COMMENT_REPLY_TAG}
     )
   }
 
-  async get_conversation_chains_at_range(
+  async get_comments_at_range(
+    pull_number: number,
+    path: string,
+    start_line: number,
+    end_line: number
+  ) {
+    const comments = await this.list_review_comments(pull_number)
+    return comments.filter(
+      (comment: any) =>
+        comment.path === path &&
+        comment.body !== '' &&
+        ((comment.start_line !== undefined &&
+          comment.start_line === start_line &&
+          comment.line === end_line) ||
+          comment.line === end_line)
+    )
+  }
+
+  async get_conversation_chains_within_range(
     pull_number: number,
     path: string,
     start_line: number,
     end_line: number,
     tag = ''
   ) {
-    const existing_comments = await this.get_comments_at_range(
+    const existing_comments = await this.get_comments_within_range(
       pull_number,
       path,
       start_line,

src/commenter.ts

@@ -400,8 +400,7 @@ ${
 
       let comment_chain = ''
       try {
-        // get existing comments on the line
-        const all_chains = await commenter.get_conversation_chains_at_range(
+        const all_chains = await commenter.get_conversation_chains_within_range(
           context.payload.pull_request.number,
           filename,
           start_line,
@@ -457,8 +456,8 @@ ${comment_chain}
         return
       }
       // parse review
-      const reviewMap = parseOpenAIReview(response, options.debug)
-      for (const [, review] of reviewMap) {
+      const reviews = parseReview(response, options.debug)
+      for (const review of reviews) {
         // check for LGTM
         if (
           !options.review_comment_lgtm &&
@@ -649,11 +648,9 @@ type Review = {
   comment: string
 }
 
-function parseOpenAIReview(
-  response: string,
-  debug = false
-): Map<string, Review> {
-  const reviews = new Map<string, Review>()
+function parseReview(response: string, debug = false): Review[] {
+  // instantiate an array of reviews
+  const reviews: Review[] = []
 
   // Split the response into lines
   const lines = response.split('\n')
@@ -671,9 +668,9 @@ function parseOpenAIReview(
     const lineNumberRangeMatch = line.match(lineNumberRangeRegex)
 
     if (lineNumberRangeMatch) {
-      // If there is a previous comment, store it in the reviews Map
+      // If there is a previous comment, store it in the reviews
       if (currentStartLine !== null && currentEndLine !== null) {
-        reviews.set(`${currentStartLine}-${currentEndLine}`, {
+        reviews.push({
           start_line: currentStartLine,
           end_line: currentEndLine,
           comment: currentComment.trim()
@@ -697,9 +694,9 @@ function parseOpenAIReview(
 
     // Check if the line is a comment separator
     if (line.trim() === commentSeparator) {
-      // If there is a previous comment, store it in the reviews Map
+      // If there is a previous comment, store it in the reviews
       if (currentStartLine !== null && currentEndLine !== null) {
-        reviews.set(`${currentStartLine}-${currentEndLine}`, {
+        reviews.push({
           start_line: currentStartLine,
           end_line: currentEndLine,
           comment: currentComment.trim()
@@ -724,9 +721,9 @@ function parseOpenAIReview(
     }
   }
 
-  // If there is a comment at the end of the response, store it in the reviews Map
+  // If there is a comment at the end of the response, store it in the reviews
   if (currentStartLine !== null && currentEndLine !== null) {
-    reviews.set(`${currentStartLine}-${currentEndLine}`, {
+    reviews.push({
       start_line: currentStartLine,
       end_line: currentEndLine,
       comment: currentComment.trim()