Close comments per file when possible (#96)

Author: fandreuz

run_action.py

@@ -490,8 +490,6 @@ def dismiss_change_requests(
     repo,
     pull_request_id,
     warning_comment_prefix,
-    auto_resolve_conversations,
-    single_comment_markers,
 ):  # pylint: disable=too-many-arguments,too-many-positional-arguments
     """Dismissing stale Clang-Tidy requests for changes"""
 
@@ -541,24 +539,23 @@ def dismiss_change_requests(
         # Avoid triggering abuse detection
         time.sleep(10)
 
-    if auto_resolve_conversations:
-        resolve_conversations(
-            github_token=github_token,
-            repo=repo,
-            pull_request_id=pull_request_id,
-            github_api_timeout=github_api_timeout,
-            single_comment_markers=single_comment_markers,
-        )
-
 
+# pylint: disable=too-many-locals, too-many-arguments, too-many-positional-arguments
 def conversation_threads_to_close(
-    repo, pr_number, github_token, github_api_timeout, single_comment_markers
+    repo,
+    pr_number,
+    github_token,
+    github_api_timeout,
+    single_comment_markers,
+    comment_paths=None,
 ):
     """Generator of unresolved conversation threads to close
 
     Uses the GitHub GraphQL API to get conversation threads for the given PR.
     Then filters for unresolved threads and those that have been created by the action.
     """
+    if comment_paths is None:
+        comment_paths = set()
 
     repo_owner, repo_name = repo.split("/")
     query = """
@@ -577,6 +574,7 @@ def conversation_threads_to_close(
                   author {
                     login
                   }
+                  path
                 }
               }
             }
@@ -616,16 +614,19 @@ def conversation_threads_to_close(
 
     # Iterate through review threads
     for thread in data["data"]["repository"]["pullRequest"]["reviewThreads"]["nodes"]:
+        if thread["isResolved"]:
+            continue
         for comment in thread["comments"]["nodes"]:
             if (
                 comment["id"]
-                and thread["isResolved"] is False
                 # this actor here is somehow different from `github-actions[bot]`
                 # which we get through the Rest API
                 and comment["author"]["login"] == "github-actions"
                 and any(
                     matcher.match(comment["body"].strip()) for matcher in marker_matches
                 )
+                # if the file does not have any comment, we can safely close any conversation
+                and comment["path"] not in comment_paths
             ):
                 yield thread
                 break
@@ -675,12 +676,23 @@ def _print_error_and_raise(msg):
     print("Conversation closed successfully.")
 
 
+# pylint: disable=too-many-arguments, too-many-positional-arguments
 def resolve_conversations(
-    github_token, repo, pull_request_id, github_api_timeout, single_comment_markers
+    github_token,
+    repo,
+    pull_request_id,
+    github_api_timeout,
+    single_comment_markers,
+    comment_paths=None,
 ):
     """Resolving stale conversations"""
     for thread in conversation_threads_to_close(
-        repo, pull_request_id, github_token, github_api_timeout, single_comment_markers
+        repo,
+        pull_request_id,
+        github_token,
+        github_api_timeout,
+        single_comment_markers,
+        comment_paths=comment_paths,
     ):
         close_conversation(
             thread_id=thread["id"],
@@ -806,9 +818,15 @@ def main():
             args.repository,
             args.pull_request_id,
             warning_comment_prefix=warning_comment_prefix,
-            auto_resolve_conversations=args.auto_resolve_conversations == "true",
-            single_comment_markers=single_comment_markers,
         )
+        if args.auto_resolve_conversations == "true":
+            resolve_conversations(
+                github_token=github_token,
+                repo=args.repository,
+                pull_request_id=args.pull_request_id,
+                github_api_timeout=github_api_timeout,
+                single_comment_markers=single_comment_markers,
+            )
         return 0
 
     clang_tidy_fixes["Diagnostics"] = reorder_diagnostics(
@@ -823,6 +841,16 @@ def main():
             single_comment_markers=single_comment_markers,
         )
     )
+    if args.auto_resolve_conversations == "true":
+        comment_paths = set(comment["path"] for comment in review_comments)
+        resolve_conversations(
+            github_token=github_token,
+            repo=args.repository,
+            pull_request_id=args.pull_request_id,
+            github_api_timeout=github_api_timeout,
+            single_comment_markers=single_comment_markers,
+            comment_paths=comment_paths,
+        )
 
     existing_pull_request_comments = list(
         get_pull_request_comments(