[Clang-Tidy] Preserve Message, FileOffset, FilePath in Clang-Tidy YAML output

[vladimir.plyashkun]

Summary

To get properly integration Clang-Tidy with CLion IDE, next things were implemented:

• Preserve Message, FileOffset, FilePath in the clang-tidy output.
• Export all diagnostics, not just the ones with fixes
• Test-cases

[vladimir.plyashkun]

This is second part of review:
https://reviews.llvm.org/D34404
which is contains changes related to clang-tools-extra repository.

clang-tools-extra/trunk/test/clang-apply-replacements/Inputs/basic/file1.yaml

 ---
 MainSourceFile:     source1.cpp
 Diagnostics:
   - DiagnosticName: test-basic
+    Message: Fix
+    FilePath: $(path)/basic.h
+    FileOffset: 242
     Replacements:
       - FilePath:        $(path)/basic.h
         Offset:          242
         Length:          26
         ReplacementText: 'auto & elem : ints'
       - FilePath:        $(path)/basic.h
         Offset:          276
         Length:          22

clang-tools-extra/trunk/test/clang-apply-replacements/Inputs/basic/file2.yaml

 ---
 MainSourceFile:     source2.cpp
 Diagnostics:
   - DiagnosticName: test-basic
+    Message: Fix
+    FilePath: $(path)/basic.h
+    FileOffset: 148
     Replacements:
       - FilePath:        $(path)/basic.h
         Offset:          148
         Length:          0
         ReplacementText: 'override '
 ...

clang-tools-extra/trunk/test/clang-apply-replacements/Inputs/conflict/file1.yaml

 ---
 MainSourceFile: source1.cpp
 Diagnostics:
   - DiagnosticName: test-conflict
+    Message: Fix
+    FilePath: $(path)/common.h
+    FileOffset: 106
     Replacements:
       - FilePath:        $(path)/common.h
         Offset:          106
         Length:          26
         ReplacementText: 'auto & i : ints'
       - FilePath:        $(path)/common.h
         Offset:          140
         Length:          7
         ReplacementText: i
       - FilePath:        $(path)/common.h
         Offset:          160
         Length:          12
         ReplacementText: ''
 ...

clang-tools-extra/trunk/test/clang-apply-replacements/Inputs/conflict/file2.yaml

 ---
 MainSourceFile: source2.cpp
-Diagnostics:     
+Diagnostics:
   - DiagnosticName:  test-conflict
+    Message: Fix
+    FilePath: $(path)/common.h
+    FileOffset: 106
     Replacements:
       - FilePath:        $(path)/common.h
         Offset:          106
         Length:          26
         ReplacementText: 'int & elem : ints'
       - FilePath:        $(path)/common.h
         Offset:          140
         Length:          7
         ReplacementText: elem
       - FilePath:        $(path)/common.h
         Offset:          169
         Length:          1
         ReplacementText: nullptr
 ...

clang-tools-extra/trunk/test/clang-apply-replacements/Inputs/conflict/file3.yaml

 ---
 MainSourceFile: source1.cpp
 Diagnostics:
   - DiagnosticName:  test-conflict
+    Message: Fix
+    FilePath: $(path)/common.h
+    FileOffset: 169
     Replacements:
       - FilePath:        $(path)/common.h
         Offset:          169
         Length:          0
         ReplacementText: "(int*)"
 ...

clang-tools-extra/trunk/test/clang-apply-replacements/Inputs/crlf/file1.yaml

 ---
 MainSourceFile:      source1.cpp
 Diagnostics:
   - DiagnosticName:  test-crlf
-    Replacements:    
+    Message: Fix
+    FilePath: $(path)/crlf.cpp
+    FileOffset: 79
+    Replacements:
       - FilePath:        $(path)/crlf.cpp
         Offset:          79
         Length:          1
         ReplacementText: nullptr
 ...

clang-tools-extra/trunk/test/clang-apply-replacements/Inputs/format/no.yaml

 ---
 MainSourceFile:  no.cpp
-Diagnostics:     
+Diagnostics:
   - DiagnosticName:  test-no
-    Replacements:    
+    Message: Fix
+    FilePath: $(path)/no.cpp
+    FileOffset: 94
+    Replacements:
       - FilePath:        $(path)/no.cpp
         Offset:          94
         Length:          3
         ReplacementText: 'auto '
 ...

clang-tools-extra/trunk/test/clang-apply-replacements/Inputs/format/yes.yaml

 # These replacements are out of order on purpose to test that they get sorted
 # so that formatting happens correctly.
 ---
 MainSourceFile:  yes.cpp
-Diagnostics:     
+Diagnostics:
   - DiagnosticName:  test-yes
-    Replacements:    
+    Message: Fix
+    FilePath: $(path)/yes.cpp
+    FileOffset: 494
+    Replacements:
       - FilePath:        $(path)/yes.cpp
         Offset:          494
         Length:          1
         ReplacementText: nullptr
       - FilePath:        $(path)/yes.cpp
         Offset:          410
         Length:          1
         ReplacementText: nullptr

clang-tools-extra/trunk/unittests/clang-apply-replacements/ApplyReplacementsTest.cpp

+//===- clang-apply-replacements/ApplyReplacementsTest.cpp
+//----------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "clang-apply-replacements/Tooling/ApplyReplacements.h"
+#include "gtest/gtest.h"
+
+using namespace clang::replace;
+using namespace llvm;
+
+namespace clang {
+namespace tooling {
+
+static TUDiagnostics
+makeTUDiagnostics(const std::string &MainSourceFile, StringRef DiagnosticName,
+                  const DiagnosticMessage &Message,
+                  const StringMap<Replacements> &Replacements,
+                  StringRef BuildDirectory) {
+  TUDiagnostics TUs;
+  TUs.push_back({MainSourceFile,
+                 {{DiagnosticName,
+                   Message,
+                   Replacements,
+                   {},
+                   Diagnostic::Warning,
+                   BuildDirectory}}});
+  return TUs;
+}
+
+// Test to ensure diagnostics with no fixes, will be merged correctly
+// before applying.
+TEST(ApplyReplacementsTest, mergeDiagnosticsWithNoFixes) {
+  IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts(new DiagnosticOptions());
+  DiagnosticsEngine Diagnostics(
+      IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs()), DiagOpts.get());
+  FileManager Files((FileSystemOptions()));
+  SourceManager SM(Diagnostics, Files);
+  TUDiagnostics TUs =
+      makeTUDiagnostics("path/to/source.cpp", "diagnostic", {}, {}, "path/to");
+  FileToReplacementsMap ReplacementsMap;
+
+  EXPECT_TRUE(mergeAndDeduplicate(TUs, ReplacementsMap, SM));
+  EXPECT_TRUE(ReplacementsMap.empty());
+}
+
+} // end namespace tooling
+} // end namespace clang

clang-tools-extra/trunk/unittests/clang-apply-replacements/CMakeLists.txt

 get_filename_component(ClangApplyReplacementsLocation
   "${CMAKE_CURRENT_SOURCE_DIR}/../../clang-apply-replacements/include" REALPATH)
 get_filename_component(CommonIncLocation
   "${CMAKE_CURRENT_SOURCE_DIR}/../include" REALPATH)
 include_directories(
   ${ClangApplyReplacementsLocation}
   ${CommonIncLocation}
   )
 
 add_extra_unittest(ClangApplyReplacementsTests
+  ApplyReplacementsTest.cpp
   ReformattingTest.cpp
   )
 
 target_link_libraries(ClangApplyReplacementsTests
   clangApplyReplacements
   clangToolingCore
   )