// Record existing #includes - both written and resolved paths. Only #includes
// in the main file are collected.
- void InclusionDirective(SourceLocation HashLoc, const Token & /*IncludeTok*/,
+ void InclusionDirective(SourceLocation HashLoc, const Token &IncludeTok,
llvm::StringRef FileName, bool IsAngled,
CharSourceRange FilenameRange, const FileEntry *File,
llvm::StringRef /*SearchPath*/,
Inc.Resolved = std::string(File ? File->tryGetRealPathName() : "");
Inc.HashOffset = SM.getFileOffset(HashLoc);
Inc.FileKind = FileKind;
+ Inc.Directive = IncludeTok.getIdentifierInfo()->getPPKeywordID();
}
if (File) {
auto *IncludingFileEntry = SM.getFileEntryForID(SM.getFileID(HashLoc));
#include "Protocol.h"
#include "SourceCode.h"
#include "index/Symbol.h"
+#include "clang/Basic/TokenKinds.h"
#include "clang/Format/Format.h"
#include "clang/Lex/HeaderSearch.h"
#include "clang/Lex/PPCallbacks.h"
#include "llvm/ADT/StringSet.h"
#include "llvm/Support/Error.h"
#include "llvm/Support/VirtualFileSystem.h"
+#include <string>
namespace clang {
namespace clangd {
// An #include directive that we found in the main file.
struct Inclusion {
- Range R; // Inclusion range.
- std::string Written; // Inclusion name as written e.g. <vector>.
- Path Resolved; // Resolved path of included file. Empty if not resolved.
+ Range R; // Inclusion range.
+ tok::PPKeywordKind Directive; // Directive used for inclusion, e.g. import
+ std::string Written; // Inclusion name as written e.g. <vector>.
+ Path Resolved; // Resolved path of included file. Empty if not resolved.
unsigned HashOffset = 0; // Byte offset from start of file to #.
SrcMgr::CharacteristicKind FileKind = SrcMgr::C_User;
};
#include "Compiler.h"
#include "TestFS.h"
#include "TestTU.h"
+#include "clang/Basic/TokenKinds.h"
#include "clang/Frontend/CompilerInstance.h"
#include "clang/Frontend/CompilerInvocation.h"
#include "clang/Frontend/FrontendActions.h"
MATCHER_P(Written, Name, "") { return arg.Written == Name; }
MATCHER_P(Resolved, Name, "") { return arg.Resolved == Name; }
MATCHER_P(IncludeLine, N, "") { return arg.R.start.line == N; }
+MATCHER_P(Directive, D, "") { return arg.Directive == D; }
MATCHER_P2(Distance, File, D, "") {
if (arg.getKey() != File)
UnorderedElementsAre(Distance(MainFile, 0u)));
}
+TEST_F(HeadersTest, IncludeDirective) {
+ FS.Files[MainFile] = R"cpp(
+#include "foo.h"
+#import "foo.h"
+#include_next "foo.h"
+)cpp";
+
+ EXPECT_THAT(collectIncludes().MainFileIncludes,
+ UnorderedElementsAre(Directive(tok::pp_include),
+ Directive(tok::pp_import),
+ Directive(tok::pp_include_next)));
+}
+
TEST_F(HeadersTest, InsertInclude) {
std::string Path = testPath("sub/bar.h");
FS.Files[Path] = "";