This is an archive of the discontinued LLVM Phabricator instance.

Differential D113555

[clangd] Mark macros from preamble for code completion
ClosedPublic

Authored by kadircet on Nov 10 2021, 3:12 AM.

Details

Reviewers
usaxena95
nridge
Commits
rG7d668ae38d2d: [clangd] Mark macros from preamble for code completion
Summary

If the main file is a header, mark the marcos defined in its preamble
section as code-completion ready.

Fixes https://github.com/clangd/clangd/issues/921.

Diff Detail

Event Timeline

kadircet created this revision.Nov 10 2021, 3:12 AM
Herald added a subscriber: arphaman. · View Herald TranscriptNov 10 2021, 3:12 AM
kadircet requested review of this revision.Nov 10 2021, 3:12 AM
Herald added a project: Restricted Project. · View Herald TranscriptNov 10 2021, 3:12 AM
Herald added subscribers: cfe-commits, MaskRay, ilya-biryukov. · View Herald Transcript
Harbormaster completed remote builds in B133445: Diff 386107.Nov 10 2021, 3:53 AM
usaxena95 accepted this revision.Nov 10 2021, 9:38 AM
usaxena95 added inline comments.
clang-tools-extra/clangd/index/SymbolCollector.cpp
567

Please add a comment about this (maybe similar to the parch description)

This revision is now accepted and ready to land.Nov 10 2021, 9:38 AM
Closed by commit rG7d668ae38d2d: [clangd] Mark macros from preamble for code completion (authored by kadircet). · Explain WhyNov 12 2021, 5:07 AM
This revision was automatically updated to reflect the committed changes.
kadircet marked an inline comment as done.
kadircet added a commit: rG7d668ae38d2d: [clangd] Mark macros from preamble for code completion.

Revision Contents

PathSize
clang-tools-extra/
clangd/
index/
6 lines
unittests/
13 lines

Diff 386807

clang-tools-extra/clangd/index/SymbolCollector.cpp

Show First 20 Lines • Show All 558 Lines • ▼ Show 20 Lines for (const auto &MacroRef : IDToRefs.second) {
auto EndLoc = cantFail(sourceLocationInMainFile(SM, Range.end)); auto EndLoc = cantFail(sourceLocationInMainFile(SM, Range.end));
S.Name = toSourceCode(SM, SourceRange(StartLoc, EndLoc)); S.Name = toSourceCode(SM, SourceRange(StartLoc, EndLoc));
S.SymInfo.Kind = index::SymbolKind::Macro; S.SymInfo.Kind = index::SymbolKind::Macro;
S.SymInfo.SubKind = index::SymbolSubKind::None; S.SymInfo.SubKind = index::SymbolSubKind::None;
S.SymInfo.Properties = index::SymbolPropertySet(); S.SymInfo.Properties = index::SymbolPropertySet();
S.SymInfo.Lang = index::SymbolLanguage::C; S.SymInfo.Lang = index::SymbolLanguage::C;
S.Origin = Opts.Origin; S.Origin = Opts.Origin;
S.CanonicalDeclaration = R.Location; S.CanonicalDeclaration = R.Location;
// Make the macro visible for code completion if main file is an
usaxena95Unsubmitted
Done
ReplyInline Actions

Please add a comment about this (maybe similar to the parch description)

usaxena95: Please add a comment about this (maybe similar to the parch description)
// include-able header.
if (!HeaderFileURIs->getIncludeHeader(SM.getMainFileID()).empty()) {
S.Flags |= Symbol::IndexedForCodeCompletion;
S.Flags |= Symbol::VisibleOutsideFile;
}
Symbols.insert(S); Symbols.insert(S);
} }
} }
} }
} }
bool SymbolCollector::handleMacroOccurrence(const IdentifierInfo *Name, bool SymbolCollector::handleMacroOccurrence(const IdentifierInfo *Name,
const MacroInfo *MI, const MacroInfo *MI,
▲ Show 20 Lines • Show All 339 Lines • Show Last 20 Lines

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

Show First 20 Lines • Show All 721 Lines • ▼ Show 20 Lines ASSERT_THAT(MT.children(), UnorderedElementsAre(Pair("f1", _), Pair("f2", _),
Pair("f3", _))); Pair("f3", _)));
EXPECT_THAT(MT.child("f1").children(), ElementsAre(Pair("symbols", _))); EXPECT_THAT(MT.child("f1").children(), ElementsAre(Pair("symbols", _)));
EXPECT_THAT(MT.child("f1").total(), Gt(0U)); EXPECT_THAT(MT.child("f1").total(), Gt(0U));
EXPECT_THAT(MT.child("f2").children(), ElementsAre(Pair("references", _))); EXPECT_THAT(MT.child("f2").children(), ElementsAre(Pair("references", _)));
EXPECT_THAT(MT.child("f2").total(), Gt(0U)); EXPECT_THAT(MT.child("f2").total(), Gt(0U));
EXPECT_THAT(MT.child("f3").children(), ElementsAre(Pair("relations", _))); EXPECT_THAT(MT.child("f3").children(), ElementsAre(Pair("relations", _)));
EXPECT_THAT(MT.child("f3").total(), Gt(0U)); EXPECT_THAT(MT.child("f3").total(), Gt(0U));
} }
TEST(FileIndexTest, MacrosFromMainFile) {
FileIndex Idx;
TestTU TU;
TU.Code = "#pragma once\n#define FOO";
TU.Filename = "foo.h";
auto AST = TU.build();
Idx.updateMain(testPath(TU.Filename), AST);
auto &FooSymbol = findSymbol(runFuzzyFind(Idx, ""), "FOO");
EXPECT_TRUE(FooSymbol.Flags & Symbol::IndexedForCodeCompletion);
}
} // namespace } // namespace
} // namespace clangd } // namespace clangd
} // namespace clang } // namespace clang