diff --git a/clang-tools-extra/clangd/SourceCode.h b/clang-tools-extra/clangd/SourceCode.h --- a/clang-tools-extra/clangd/SourceCode.h +++ b/clang-tools-extra/clangd/SourceCode.h @@ -292,10 +292,13 @@ llvm::StringRef Name; const MacroInfo *Info; }; -// Gets the macro at a specified \p Loc. +/// Gets the macro at a specified \p Loc. llvm::Optional locateMacroAt(SourceLocation Loc, Preprocessor &PP); +/// Retruns true if the file is a header. This is inferred from the file name. +bool isHeaderFile(llvm::StringRef FileName); + } // namespace clangd } // namespace clang #endif diff --git a/clang-tools-extra/clangd/SourceCode.cpp b/clang-tools-extra/clangd/SourceCode.cpp --- a/clang-tools-extra/clangd/SourceCode.cpp +++ b/clang-tools-extra/clangd/SourceCode.cpp @@ -17,6 +17,7 @@ #include "clang/Basic/SourceLocation.h" #include "clang/Basic/SourceManager.h" #include "clang/Basic/TokenKinds.h" +#include "clang/Driver/Types.h" #include "clang/Format/Format.h" #include "clang/Lex/Lexer.h" #include "clang/Lex/Preprocessor.h" @@ -1122,5 +1123,12 @@ return ER; } +bool isHeaderFile(llvm::StringRef FileName) { + namespace types = clang::driver::types; + auto Lang = types::lookupTypeForExtension( + llvm::sys::path::extension(FileName).substr(1)); + return Lang != types::TY_INVALID && types::onlyPrecompileType(Lang); +} + } // namespace clangd } // namespace clang diff --git a/clang-tools-extra/clangd/index/Background.cpp b/clang-tools-extra/clangd/index/Background.cpp --- a/clang-tools-extra/clangd/index/Background.cpp +++ b/clang-tools-extra/clangd/index/Background.cpp @@ -205,11 +205,7 @@ } void BackgroundIndex::boostRelated(llvm::StringRef Path) { - namespace types = clang::driver::types; - auto Type = - types::lookupTypeForExtension(llvm::sys::path::extension(Path).substr(1)); - // is this a header? - if (Type != types::TY_INVALID && types::onlyPrecompileType(Type)) + if (isHeaderFile(Path)) Queue.boost(filenameWithoutExtension(Path), IndexBoostedFile); } diff --git a/clang-tools-extra/clangd/unittests/SourceCodeTests.cpp b/clang-tools-extra/clangd/unittests/SourceCodeTests.cpp --- a/clang-tools-extra/clangd/unittests/SourceCodeTests.cpp +++ b/clang-tools-extra/clangd/unittests/SourceCodeTests.cpp @@ -701,6 +701,20 @@ collectIdentifierRanges("Foo", Code.code(), LangOpts)); } +TEST(SourceCodeTests, isHeaderFile) { + EXPECT_TRUE(isHeaderFile("foo.h")); + EXPECT_TRUE(isHeaderFile("foo.hh")); + EXPECT_TRUE(isHeaderFile("foo.hpp")); + + EXPECT_FALSE(isHeaderFile("foo.cpp")); + EXPECT_FALSE(isHeaderFile("foo.c++")); + EXPECT_FALSE(isHeaderFile("foo.cxx")); + EXPECT_FALSE(isHeaderFile("foo.cc")); + EXPECT_FALSE(isHeaderFile("foo.c")); + EXPECT_FALSE(isHeaderFile("foo.mm")); + EXPECT_FALSE(isHeaderFile("foo.m")); +} + } // namespace } // namespace clangd } // namespace clang