Remove reuse_review_comments functionality.

maoliver-amd · maoliver-amd · commit 005b25eb1b86 · 2024-12-18T21:42:12.000+11:00
diff --git a/cpp_linter/rest_api/github_api.py b/cpp_linter/rest_api/github_api.py
@@ -334,7 +334,6 @@ def post_feedback(
                 passive_reviews=args.passive_reviews,
                 clang_versions=clang_versions,
                 delete_review_comments=args.delete_review_comments,
-                reuse_review_comments=args.reuse_review_comments,
             )
 
     def make_annotations(
@@ -472,7 +471,6 @@ def post_review(
         passive_reviews: bool,
         clang_versions: ClangVersions,
         delete_review_comments: bool = True,
-        reuse_review_comments: bool = True,
     ):
         url = f"{self.api_url}/repos/{self.repo}/pulls/{self.pull_request}"
         response = self.api_request(url=url)
@@ -507,7 +505,7 @@ def post_review(
         ignored_reviews = []
         if not summary_only:
             ignored_reviews = self._check_reused_comments(
-                delete_review_comments, reuse_review_comments, review_comments
+                delete_review_comments, review_comments
             )
         self._hide_stale_reviews(ignored_reviews=ignored_reviews)
         if len(review_comments.suggestions) == 0 and len(ignored_reviews) > 0:
@@ -727,66 +725,57 @@ def _hide_stale_reviews(self, ignored_reviews: List[str]):
     def _check_reused_comments(
         self,
         delete_review_comments: bool,
-        reuse_review_comments: bool,
         review_comments: ReviewComments,
     ) -> List[str]:
         ignored_reviews = []
         found_threads = self._get_existing_review_comments(
-            no_dismissed=reuse_review_comments and not delete_review_comments
+            no_dismissed=not delete_review_comments
         )
         if found_threads:
-            if reuse_review_comments:
-                # Keep already posted comments if they match new ones
-                existing_review_comments = []
-                for thread in found_threads:
-                    for comment in thread["comments"]["nodes"]:
-                        found = False
-                        if "originalLine" not in comment:
-                            raise ValueError(
-                                "GraphQL response malformed: 'originalLine' missing in comment"
-                            )
-                        line_start = (
-                            comment.get("startLine", None)
-                            or comment.get("originalStartLine", None)
-                            or -1
+            # Keep already posted comments if they match new ones
+            existing_review_comments = []
+            for thread in found_threads:
+                for comment in thread["comments"]["nodes"]:
+                    found = False
+                    if "originalLine" not in comment:
+                        raise ValueError(
+                            "GraphQL response malformed: 'originalLine' missing in comment"
                         )
-                        line_end = comment.get("line", None) or comment["originalLine"]
-                        for suggestion in review_comments.suggestions:
-                            if (
-                                suggestion.file_name == comment["path"]
-                                and suggestion.line_start == line_start
-                                and suggestion.line_end == line_end
-                                and f"{COMMENT_MARKER}{suggestion.comment}"
-                                == comment["body"]
-                                and suggestion not in existing_review_comments
-                                and thread["isResolved"] is False
-                                and thread["isCollapsed"] is False
-                                and comment["pullRequestReview"]["isMinimized"] is False
-                            ):
-                                found = True
-                                logger.info(
-                                    "Using existing review comment: path='%s', line_start='%s', line_end='%s'",
-                                    comment["path"],
-                                    line_start,
-                                    line_end,
-                                )
-                                ignored_reviews.append(
-                                    comment["pullRequestReview"]["id"]
-                                )
-                                existing_review_comments.append(suggestion)
-                                break
-                        if not found:
-                            self._close_review_comment(
-                                thread["id"], comment["id"], delete_review_comments
+                    line_start = (
+                        comment.get("startLine", None)
+                        or comment.get("originalStartLine", None)
+                        or -1
+                    )
+                    line_end = comment.get("line", None) or comment["originalLine"]
+                    for suggestion in review_comments.suggestions:
+                        if (
+                            suggestion.file_name == comment["path"]
+                            and suggestion.line_start == line_start
+                            and suggestion.line_end == line_end
+                            and f"{COMMENT_MARKER}{suggestion.comment}"
+                            == comment["body"]
+                            and suggestion not in existing_review_comments
+                            and thread["isResolved"] is False
+                            and thread["isCollapsed"] is False
+                            and comment["pullRequestReview"]["isMinimized"] is False
+                        ):
+                            found = True
+                            logger.info(
+                                "Using existing review comment: path='%s', line_start='%s', line_end='%s'",
+                                comment["path"],
+                                line_start,
+                                line_end,
                             )
-                review_comments.remove_reused_suggestions(
-                    existing_review_comments=existing_review_comments
-                )
-            else:
-                # Not reusing so close all existing review comments
-                for thread in found_threads:
-                    for comment in thread["comments"]["nodes"]:
+                            ignored_reviews.append(
+                                comment["pullRequestReview"]["id"]
+                            )
+                            existing_review_comments.append(suggestion)
+                            break
+                    if not found:
                         self._close_review_comment(
                             thread["id"], comment["id"], delete_review_comments
                         )
+                review_comments.remove_reused_suggestions(
+                    existing_review_comments=existing_review_comments
+                )
         return ignored_reviews
