[clangd] Make TestTU build with preamble, and fix the fallout.
Our testing didn't reflect reality: live clangd almost always uses a
preamble, and sometimes the preamble behaves differently.
This patch fixes a common test helper to be more realistic.
Preamble doesn't preserve information about which tokens come from the
command-line (this gets inlined into a source file). So remove logic
that attempts to treat symbols with such names differently.
A SymbolCollectorTest tries to verify that locals in headers are not
indexed, with preamble enabled this is only meaningful for locals of
auto-typed functions (otherwise the bodies aren't parsed).
Tests were relying on the fact that the findAnyDecl helper actually did expose
symbols from headers. Resolve by making all these functions consistently
able to find symbols in headers/preambles.
llvm-svn: 346488
diff --git a/clang-tools-extra/clangd/AST.cpp b/clang-tools-extra/clangd/AST.cpp
index bf0e786..12c8f9f 100644
--- a/clang-tools-extra/clangd/AST.cpp
+++ b/clang-tools-extra/clangd/AST.cpp
@@ -20,11 +20,9 @@
namespace clangd {
// Returns true if the complete name of decl \p D is spelled in the source code.
-// This is not the case for
-// * symbols formed via macro concatenation, the spelling location will
-// be "<scratch space>"
-// * symbols controlled and defined by a compile command-line option
-// `-DName=foo`, the spelling location will be "<command line>".
+// This is not the case for symbols formed via macro concatenation.
+// (We used to attempt to treat names spelled on the command-line this way too,
+// but the preamble doesn't preserve the required information).
bool isSpelledInSourceCode(const Decl *D) {
const auto &SM = D->getASTContext().getSourceManager();
auto Loc = D->getLocation();
@@ -32,8 +30,7 @@
// macros, we should use the location where the whole definition occurs.
if (Loc.isMacroID()) {
std::string PrintLoc = SM.getSpellingLoc(Loc).printToString(SM);
- if (StringRef(PrintLoc).startswith("<scratch") ||
- StringRef(PrintLoc).startswith("<command line>"))
+ if (StringRef(PrintLoc).startswith("<scratch"))
return false;
}
return true;