#include "clang/Basic/SourceManager.h"
#include "clang/Basic/Version.h"
#include "clang/Format/Format.h"
+#include "clang/Frontend/TextDiagnosticPrinter.h"
#include "clang/Rewrite/Core/Rewriter.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/FileSystem.h"
IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts = new DiagnosticOptions();
DiagOpts->ShowColors = (ShowColors && !NoShowColors);
+ TextDiagnosticPrinter *DiagsBuffer =
+ new TextDiagnosticPrinter(llvm::errs(), &*DiagOpts, false);
+
IntrusiveRefCntPtr<DiagnosticIDs> DiagID(new DiagnosticIDs());
IntrusiveRefCntPtr<DiagnosticsEngine> Diags(
- new DiagnosticsEngine(DiagID, &*DiagOpts));
+ new DiagnosticsEngine(DiagID, &*DiagOpts, DiagsBuffer));
IntrusiveRefCntPtr<llvm::vfs::InMemoryFileSystem> InMemoryFileSystem(
new llvm::vfs::InMemoryFileSystem);
FileID FileID = createInMemoryFile(AssumedFileName, Code.get(), Sources,
Files, InMemoryFileSystem.get());
- FileManager &FileMgr = Sources.getFileManager();
- llvm::ErrorOr<const FileEntry *> FileEntryPtr =
- FileMgr.getFile(AssumedFileName);
+ const unsigned ID = Diags->getCustomDiagID(
+ WarningsAsErrors ? clang::DiagnosticsEngine::Error
+ : clang::DiagnosticsEngine::Warning,
+ "code should be clang-formatted [-Wclang-format-violations]");
unsigned Errors = 0;
+ DiagsBuffer->BeginSourceFile(LangOptions(), nullptr);
if (WarnFormat && !NoWarnFormat) {
for (const auto &R : Replaces) {
- PresumedLoc PLoc = Sources.getPresumedLoc(
- Sources.getLocForStartOfFile(FileID).getLocWithOffset(R.getOffset()));
-
- SourceLocation LineBegin =
- Sources.translateFileLineCol(FileEntryPtr.get(), PLoc.getLine(), 1);
- SourceLocation NextLineBegin = Sources.translateFileLineCol(
- FileEntryPtr.get(), PLoc.getLine() + 1, 1);
-
- const char *StartBuf = Sources.getCharacterData(LineBegin);
- const char *EndBuf = Sources.getCharacterData(NextLineBegin);
-
- StringRef Line(StartBuf, (EndBuf - StartBuf) - 1);
-
- SMDiagnostic Diags(
- llvm::SourceMgr(), SMLoc(), AssumedFileName, PLoc.getLine(),
- PLoc.getColumn(),
- WarningsAsErrors ? SourceMgr::DiagKind::DK_Error
- : SourceMgr::DiagKind::DK_Warning,
- "code should be clang-formatted [-Wclang-format-violations]", Line,
- ArrayRef<std::pair<unsigned, unsigned>>());
-
- Diags.print(nullptr, llvm::errs(), (ShowColors && !NoShowColors));
+ Diags->Report(
+ Sources.getLocForStartOfFile(FileID).getLocWithOffset(R.getOffset()),
+ ID);
Errors++;
if (ErrorLimit && Errors >= ErrorLimit)
break;
}
}
+ DiagsBuffer->EndSourceFile();
return WarningsAsErrors;
}