Use the exact file copy operation that matched instead of guessing ra…

…ndomly
KirillOsenkov · Aug 1, 2024 · 49b51e1 · 49b51e1
1 parent a714006
commit 49b51e1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/StructuredLogger/Analyzers/FileCopyMap.cs b/src/StructuredLogger/Analyzers/FileCopyMap.cs
@@ -320,7 +320,13 @@ private void TryExplainSingleFileCopy(Project project, string filePath, IList<Se
 
         private void TryExplainSingleFileCopy(FileData fileData, IList<SearchResult> resultSet)
         {
-            var fileCopyInfo = fileData.Incoming.FirstOrDefault() ?? fileData.Outgoing.FirstOrDefault();
+            var singleResult = resultSet.Single();
+
+            var fileCopyInfo =
+                singleResult.AssociatedFileCopy ??
+                fileData.Incoming.FirstOrDefault() ??
+                fileData.Outgoing.FirstOrDefault();
+
             var project = fileCopyInfo.Project;
 
             var sourceFilePath = fileData.FilePath;
@@ -473,6 +479,7 @@ private void GetResults(FileData fileData, IList<SearchResult> resultSet, NodeQu
 
                 var message = incoming.FileCopyOperation.Message;
                 var result = new SearchResult(message);
+                result.AssociatedFileCopy = incoming;
                 result.AddMatch(message.Text, matchText);
                 result.RootFolder = "Incoming";
                 resultSet.Add(result);
@@ -491,6 +498,7 @@ private void GetResults(FileData fileData, IList<SearchResult> resultSet, NodeQu
 
                 var message = outgoing.FileCopyOperation.Message;
                 var result = new SearchResult(message);
+                result.AssociatedFileCopy = outgoing;
                 result.AddMatch(message.Text, matchText);
                 result.RootFolder = "Outgoing";
                 resultSet.Add(result);

diff --git a/src/StructuredLogger/Search/SearchResult.cs b/src/StructuredLogger/Search/SearchResult.cs
@@ -18,6 +18,8 @@ public class SearchResult
 
         public string RootFolder { get; set; }
 
+        public FileCopyInfo AssociatedFileCopy { get; set; }
+
         public static SearchResult EmptyQueryMatch { get; } = new SearchResult();
 
         public SearchResult()