cpp-linter · 2bndy5 · Dec 2, 2024 · Dec 2, 2024 · Dec 5, 2024 · Dec 5, 2024
diff --git a/cpp_linter/clang_tools/patcher.py b/cpp_linter/clang_tools/patcher.py
@@ -42,6 +42,27 @@
         return result
 
 
+class ExistingSuggestion(Suggestion):
+    def __init__(self, file_name) -> None:
+        super().__init__(file_name)
+        #: The review ID corresponding to this review comment.
+        self.review_id: str = ""
+        self.review_is_minimized: bool = False
+        """Is the review minimized?
+        This applies to entire review, not the thread or comments within."""
+
+
+class ExistingThread:
+    def __init__(self) -> None:
+        self.comments: List[ExistingSuggestion] = []
+        #: Is the review thread resolved?
+        self.is_resolved: bool = False
+        #: Is the review thread collapsed?
+        self.is_collapsed: bool = False
+        #: The review thread's ``node_id``.
+        self.id: str = ""
+
+
 class ReviewComments:
     """A data structure to contain PR review comments from a specific clang tool."""
 
@@ -66,6 +87,12 @@
         """The full patch of all the suggestions (including those that will not
         fit within the diff)"""
 
+        self.tool_reused: Dict[str, int] = {
+            "clang-tidy": 0,
+            "clang-format": 0,
+        }
+        """The total number of reused concerns from previous reviews."""
+
     def merge_similar_suggestion(self, suggestion: Suggestion) -> bool:
         """Merge a given ``suggestion`` into a similar `Suggestion`
 
@@ -105,10 +132,10 @@
         posted_tool_advice = {"clang-tidy": 0, "clang-format": 0}
         for comment in self.suggestions:
             comments.append(comment.serialize_to_github_payload())
-            if "### clang-format" in comment.comment:
-                posted_tool_advice["clang-format"] += 1
-            if "### clang-tidy" in comment.comment:
-                posted_tool_advice["clang-tidy"] += 1
+            posted_tool_advice["clang-tidy"] += comment.comment.count("### clang-tidy")
+            posted_tool_advice["clang-format"] += comment.comment.count(
+                "### clang-format"
+            )
 
         for tool_name in ("clang-tidy", "clang-format"):
             tool_version = tidy_version
@@ -117,15 +144,18 @@
             if tool_version is None or self.tool_total[tool_name] is None:
                 continue  # if tool wasn't used
             summary += f"### Used {tool_name} v{tool_version}\n\n"
-            if (
-                len(comments)
-                and posted_tool_advice[tool_name] != self.tool_total[tool_name]
+            if len(comments) and (
+                posted_tool_advice[tool_name] != self.tool_total[tool_name]
+                or self.tool_reused[tool_name] != 0
             ):
                 summary += (
                     f"Only {posted_tool_advice[tool_name]} out of "
-                    + f"{self.tool_total[tool_name]} {tool_name}"
-                    + " concerns fit within this pull request's diff.\n"
+                    + f"{self.tool_total[tool_name]} _new_ {tool_name}"
+                    + " concerns fit within this pull request's diff."
                 )
+                if self.tool_reused[tool_name] != 0:
+                    summary += f" {self.tool_reused[tool_name]} concerns were suppressed as duplicates."
+                summary += "\n"
             if self.full_patch[tool_name]:
                 summary += (
                     f"\n<details><summary>Click here for the full {tool_name} patch"
@@ -136,6 +166,30 @@
                 summary += f"No concerns from {tool_name}.\n"
         return (summary, comments)
 
+    def remove_reused_suggestions(self, existing_review_comments: List[Suggestion]):
+        """Remove any reused ``Suggestion`` from the internal list and update counts"""
+        if not existing_review_comments:
+            return
+        review_comments_suggestions = self.suggestions
+        self.suggestions = []
+        clang_tidy_comments = 0
+        clang_format_comments = 0
+        for suggestion in review_comments_suggestions:
+            if suggestion not in existing_review_comments:
+                clang_tidy_comments += suggestion.comment.count("### clang-tidy")
+                clang_format_comments += suggestion.comment.count("### clang-format")
+                self.suggestions.append(suggestion)
+        if clang_tidy_comments > 0 and self.tool_total["clang-tidy"] is not None:
+            self.tool_reused["clang-tidy"] = (
+                self.tool_total["clang-tidy"] - clang_tidy_comments
+            )
+            self.tool_total["clang-tidy"] = clang_tidy_comments
+        if clang_format_comments > 0 and self.tool_total["clang-format"] is not None:
+            self.tool_reused["clang-format"] = (
+                self.tool_total["clang-format"] - clang_format_comments
+            )
+            self.tool_total["clang-format"] = clang_format_comments
+
 
 class PatchMixin(ABC):
     """An abstract mixin that unified parsing of the suggestions into

diff --git a/cpp_linter/cli.py b/cpp_linter/cli.py
@@ -69,6 +69,8 @@ class Args(UserDict):
     ignore_format: str = ""
     #: See :std:option:`--passive-reviews`.
     passive_reviews: bool = False
+    #: See :std:option:`--delete-review-comments`.
+    delete_review_comments: bool = False
 
 
 _parser_args: Dict[Sequence[str], Any] = {}
@@ -358,6 +360,16 @@ class Args(UserDict):
     help="""Set to ``true`` to prevent Pull Request
 reviews from requesting or approving changes.""",
 )
+_parser_args[("-C", "--delete-review-comments")] = dict(
+    default="false",
+    type=lambda input: input.lower() == "true",
+    help="""Set to ``true`` to delete existing outdated/unused
+Pull request review comments, ``false`` to just set them to resolved.
+This only affects review comments made when either
+:std:option:`--tidy-review` or :std:option:`--format-review` is enabled.
+
+Defaults to ``%(default)s``.""",
+)
 
 
 def _parse_jobs(val: str) -> Optional[int]: