Commit f44fc886 authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Merging r368549: 

------------------------------------------------------------------------
r368549 | hokein | 2019-08-12 11:35:04 +0200 (Mon, 12 Aug 2019) | 11 lines

[clangd] Drop diags from non-written #include.

Summary: This would fix that we show weird diagnostics on random lines of the main file.

Reviewers: ilya-biryukov

Subscribers: MaskRay, jkorous, arphaman, kadircet, cfe-commits

Tags: #clang

Differential Revision: https://reviews.llvm.org/D66074
------------------------------------------------------------------------

llvm-svn: 368683
parent fcfd891f

clang-tools-extra/clangd/Diagnostics.cpp

+6 −2
Original line number Diff line number Diff line
@@ -122,8 +122,12 @@ bool adjustDiagFromHeader(Diag &D, const clang::Diagnostic &Info, 
    return SM.getIncludeLoc(SM.getFileID(SLoc));

  };

  for (auto IncludeLocation = GetIncludeLoc(DiagLoc); IncludeLocation.isValid();

       IncludeLocation = GetIncludeLoc(IncludeLocation))

       IncludeLocation = GetIncludeLoc(IncludeLocation)) {

    if (clangd::isInsideMainFile(IncludeLocation, SM)) {

      IncludeInMainFile = IncludeLocation;

      break;

    }

  }

  if (IncludeInMainFile.isInvalid())

    return false;

clang-tools-extra/clangd/unittests/DiagnosticsTests.cpp

+9 −0
Original line number Diff line number Diff line
@@ -948,6 +948,15 @@ TEST(IgnoreDiags, FromNonWrittenSources) { 
  EXPECT_THAT(TU.build().getDiagnostics(), UnorderedElementsAre());

}



TEST(IgnoreDiags, FromNonWrittenInclude) {

  TestTU TU = TestTU::withCode("");

  TU.ExtraArgs.push_back("--include=a.h");

  TU.AdditionalFiles = {{"a.h", "void main();"}};

  // The diagnostic "main must return int" is from the header, we don't attempt

  // to render it in the main file as there is no written location there.

  EXPECT_THAT(TU.build().getDiagnostics(), UnorderedElementsAre());

}



} // namespace



} // namespace clangd