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

Merging r366541: 

------------------------------------------------------------------------
r366541 | hokein | 2019-07-19 10:33:39 +0200 (Fri, 19 Jul 2019) | 11 lines

[clangd] cleanup: unify the implemenation of checking a location is inside main file.

Summary: We have variant implementations in the codebase, this patch unifies them.

Reviewers: ilya-biryukov, kadircet

Subscribers: MaskRay, jkorous, arphaman, cfe-commits

Tags: #clang

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

llvm-svn: 368669
parent 4b590158

clang-tools-extra/clangd/ClangdUnit.cpp

+2 −3
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ public: 
  bool HandleTopLevelDecl(DeclGroupRef DG) override {

    for (Decl *D : DG) {

      auto &SM = D->getASTContext().getSourceManager();

      if (!SM.isWrittenInMainFile(SM.getExpansionLoc(D->getLocation())))

      if (!isInsideMainFile(D->getLocation(), SM))

        continue;



      // ObjCMethodDecl are not actually top-level decls.
@@ -355,8 +355,7 @@ ParsedAST::build(std::unique_ptr<CompilerInvocation> CI, 
          // those might take us into a preamble file as well.

          bool IsInsideMainFile =

              Info.hasSourceManager() &&

              Info.getSourceManager().isWrittenInMainFile(

                  Info.getSourceManager().getFileLoc(Info.getLocation()));

              isInsideMainFile(Info.getLocation(), Info.getSourceManager());

          if (IsInsideMainFile && tidy::ShouldSuppressDiagnostic(

                                      DiagLevel, Info, *CTContext,

                                      /* CheckMacroExpansion = */ false)) {

clang-tools-extra/clangd/Diagnostics.cpp

+1 −5
Original line number Diff line number Diff line
@@ -140,15 +140,11 @@ void adjustDiagFromHeader(Diag &D, const clang::Diagnostic &Info, 
  D.Message = llvm::Twine("in included file: ", D.Message).str();

}



bool isInsideMainFile(const SourceLocation Loc, const SourceManager &M) {

  return Loc.isValid() && M.isWrittenInMainFile(M.getFileLoc(Loc));

}



bool isInsideMainFile(const clang::Diagnostic &D) {

  if (!D.hasSourceManager())

    return false;



  return isInsideMainFile(D.getLocation(), D.getSourceManager());

  return clangd::isInsideMainFile(D.getLocation(), D.getSourceManager());

}



bool isNote(DiagnosticsEngine::Level L) {

clang-tools-extra/clangd/Headers.cpp

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ public: 
                          llvm::StringRef /*RelativePath*/,

                          const Module * /*Imported*/,

                          SrcMgr::CharacteristicKind FileKind) override {

    if (SM.isWrittenInMainFile(HashLoc)) {

    if (isInsideMainFile(HashLoc, SM)) {

      Out->MainFileIncludes.emplace_back();

      auto &Inc = Out->MainFileIncludes.back();

      Inc.R = halfOpenToRange(SM, FilenameRange);

clang-tools-extra/clangd/IncludeFixer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ public: 
    assert(SemaPtr && "Sema must have been set.");

    if (SemaPtr->isSFINAEContext())

      return TypoCorrection();

    if (!SemaPtr->SourceMgr.isWrittenInMainFile(Typo.getLoc()))

    if (!isInsideMainFile(Typo.getLoc(), SemaPtr->SourceMgr))

      return clang::TypoCorrection();



    auto Extracted = extractUnresolvedNameCheaply(

clang-tools-extra/clangd/Quality.cpp

+3 −4
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include "Quality.h"

#include "AST.h"

#include "FileDistance.h"

#include "SourceCode.h"

#include "URI.h"

#include "index/Symbol.h"

#include "clang/AST/ASTContext.h"
@@ -42,8 +43,7 @@ static bool isReserved(llvm::StringRef Name) { 
static bool hasDeclInMainFile(const Decl &D) {

  auto &SourceMgr = D.getASTContext().getSourceManager();

  for (auto *Redecl : D.redecls()) {

    auto Loc = SourceMgr.getSpellingLoc(Redecl->getLocation());

    if (SourceMgr.isWrittenInMainFile(Loc))

    if (isInsideMainFile(Redecl->getLocation(), SourceMgr))

      return true;

  }

  return false;
@@ -53,8 +53,7 @@ static bool hasUsingDeclInMainFile(const CodeCompletionResult &R) { 
  const auto &Context = R.Declaration->getASTContext();

  const auto &SourceMgr = Context.getSourceManager();

  if (R.ShadowDecl) {

    const auto Loc = SourceMgr.getExpansionLoc(R.ShadowDecl->getLocation());

    if (SourceMgr.isWrittenInMainFile(Loc))

    if (isInsideMainFile(R.ShadowDecl->getLocation(), SourceMgr))

      return true;

  }

  return false;