diff --git a/clang-tools-extra/clangd/AST.cpp b/clang-tools-extra/clangd/AST.cpp index 642b30ceb80d2..843cac4f36c6d 100644 --- a/clang-tools-extra/clangd/AST.cpp +++ b/clang-tools-extra/clangd/AST.cpp @@ -192,6 +192,7 @@ std::string shortenNamespace(const llvm::StringRef OriginalName, std::string printType(const QualType QT, const DeclContext & Context){ PrintingPolicy PP(Context.getParentASTContext().getPrintingPolicy()); + PP.SuppressUnwrittenScope = 1; PP.SuppressTagKeyword = 1; return shortenNamespace( QT.getAsString(PP), diff --git a/clang-tools-extra/clangd/AST.h b/clang-tools-extra/clangd/AST.h index d5edba7209bbe..f4ca14ad01aa9 100644 --- a/clang-tools-extra/clangd/AST.h +++ b/clang-tools-extra/clangd/AST.h @@ -67,7 +67,8 @@ llvm::Optional getSymbolID(const IdentifierInfo &II, const MacroInfo *MI, const SourceManager &SM); -/// Returns a QualType as string. +/// Returns a QualType as string. The result doesn't contain unwritten scopes +/// like annoymous/inline namespace. std::string printType(const QualType QT, const DeclContext & Context); /// Try to shorten the OriginalName by removing namespaces from the left of diff --git a/clang-tools-extra/clangd/unittests/TweakTests.cpp b/clang-tools-extra/clangd/unittests/TweakTests.cpp index 69f74e9d41b97..971ef3f7d8b04 100644 --- a/clang-tools-extra/clangd/unittests/TweakTests.cpp +++ b/clang-tools-extra/clangd/unittests/TweakTests.cpp @@ -663,6 +663,20 @@ TEST(TweakTest, ExpandAutoType) { const char * x = "test"; )cpp"; checkTransform(ID, Input, Output); + + Input = R"cpp( + namespace { + class Foo {}; + } + au^to f = Foo(); + )cpp"; + Output = R"cpp( + namespace { + class Foo {}; + } + Foo f = Foo(); + )cpp"; + checkTransform(ID, Input, Output); } } // namespace