Replacements in different files do not overlap.

[angelgarcia]

Summary

Prevent clang-tidy from discarding fixes that are in different files but happen to have the same file offset.

[klimek]

lg

[bkramer]

Is there a way to unittest this?

[angelgarcia]

Add a test.

[bkramer]

test looks good too, thanks!

[angelgarcia]

Use "not" instead of "!".

[angelgarcia]

In both files.

clang-tidy/ClangTidyDiagnosticConsumer.cpp

void ClangTidyDiagnosticConsumer::removeIncompatibleErrors(
   for (const auto &Error : Errors) {
     int Size = 0;
     for (const auto &Replace : Error.Fix)
       Size += Replace.getLength();
     Sizes.push_back(Size);
   }
 
   // Build events from error intervals.
-  std::vector<Event> Events;
+  std::map<std::string, std::vector<Event>> FileEvents;
   for (unsigned I = 0; I < Errors.size(); ++I) {
     for (const auto &Replace : Errors[I].Fix) {
       unsigned Begin = Replace.getOffset();
       unsigned End = Begin + Replace.getLength();
+      const std::string &FilePath = Replace.getFilePath();
       // FIXME: Handle empty intervals, such as those from insertions.
       if (Begin == End)
         continue;
-      Events.push_back(Event(Begin, End, Event::ET_Begin, I, Sizes[I]));
-      Events.push_back(Event(Begin, End, Event::ET_End, I, Sizes[I]));
+      FileEvents[FilePath].push_back(
+          Event(Begin, End, Event::ET_Begin, I, Sizes[I]));
+      FileEvents[FilePath].push_back(
+          Event(Begin, End, Event::ET_End, I, Sizes[I]));
     }
   }
-  std::sort(Events.begin(), Events.end());
 
-  // Sweep.
   std::vector<bool> Apply(Errors.size(), true);
+  for (auto &FileAndEvents : FileEvents) {
+    std::vector<Event> &Events = FileAndEvents.second;
+    // Sweep.
+    std::sort(Events.begin(), Events.end());
     int OpenIntervals = 0;
     for (const auto &Event : Events) {
       if (Event.Type == Event::ET_End)
         --OpenIntervals;
       // This has to be checked after removing the interval from the count if it
       // is an end event, or before adding it if it is a begin event.
       if (OpenIntervals != 0)
         Apply[Event.ErrorId] = false;
       if (Event.Type == Event::ET_Begin)
         ++OpenIntervals;
     }
     assert(OpenIntervals == 0 && "Amount of begin/end points doesn't match");
+  }
 
   for (unsigned I = 0; I < Errors.size(); ++I) {
     if (!Apply[I]) {
       Errors[I].Fix.clear();
       Errors[I].Notes.push_back(
           ClangTidyMessage("this fix will not be applied because"
                            " it overlaps with another fix"));
     }

test/clang-tidy/Inputs/overlapping/o.h

+// run: ! clang-tidy -checks=-*,llvm-include-order -header-filter=.* %s \
+// run:   -- -isystem %S/Inputs/Headers -I %S/Inputs/overlapping | \
+// run:   grep "note: this fix will not be applied because it overlaps with another fix"
+
+#include "b.h"
+#include "a.h"
+
+// The comments above are there to match the offset of the #include with the
+// offset of the #includes in the .cpp file.

test/clang-tidy/overlapping.cpp

+// RUN: ! clang-tidy -checks=-*,llvm-include-order -header-filter=.* %s \
+// RUN:   -- -isystem %S/Inputs/Headers -I %S/Inputs/overlapping | \
+// RUN:   grep "note: this fix will not be applied because it overlaps with another fix"
+
+#include <s.h>
+#include "o.h"
+
+// Test that clang-tidy takes into account in which file we are doing the
+// replacements to determine if they overlap or not. In the file "o.h" there is
+// a similar error at the same file offset, but they do not overlap.