From 37ec65e1d705f56fe5551de1dfcbac1e071588a2 Mon Sep 17 00:00:00 2001 From: Haojian Wu Date: Mon, 10 Jan 2022 10:10:41 +0100 Subject: [PATCH] [clangd] Enable expand-auto for decltype(auto). Based on https://reviews.llvm.org/D116919. Fixes https://github.com/clangd/clangd/issues/121 Differential Revision: https://reviews.llvm.org/D116921 --- clang-tools-extra/clangd/refactor/tweaks/ExpandAutoType.cpp | 4 +--- clang-tools-extra/clangd/unittests/tweaks/ExpandAutoTypeTests.cpp | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/clang-tools-extra/clangd/refactor/tweaks/ExpandAutoType.cpp b/clang-tools-extra/clangd/refactor/tweaks/ExpandAutoType.cpp index 3776e1c..914564e 100644 --- a/clang-tools-extra/clangd/refactor/tweaks/ExpandAutoType.cpp +++ b/clang-tools-extra/clangd/refactor/tweaks/ExpandAutoType.cpp @@ -96,9 +96,7 @@ bool ExpandAutoType::prepare(const Selection& Inputs) { if (auto *Node = Inputs.ASTSelection.commonAncestor()) { if (auto *TypeNode = Node->ASTNode.get()) { if (const AutoTypeLoc Result = TypeNode->getAs()) { - // Code in apply() does handle 'decltype(auto)' yet. - if (!Result.getTypePtr()->isDecltypeAuto() && - !isStructuredBindingType(Node) && + if (!isStructuredBindingType(Node) && !isDeducedAsLambda(Node, Result.getBeginLoc()) && !isTemplateParam(Node)) CachedLocation = Result; diff --git a/clang-tools-extra/clangd/unittests/tweaks/ExpandAutoTypeTests.cpp b/clang-tools-extra/clangd/unittests/tweaks/ExpandAutoTypeTests.cpp index 96574a67..6d9d436 100644 --- a/clang-tools-extra/clangd/unittests/tweaks/ExpandAutoTypeTests.cpp +++ b/clang-tools-extra/clangd/unittests/tweaks/ExpandAutoTypeTests.cpp @@ -71,7 +71,8 @@ TEST_F(ExpandAutoTypeTest, Test) { apply("void ns::Func() { au^to x = new ns::Class::Nested{}; }"), "void ns::Func() { ns::Class::Nested * x = new ns::Class::Nested{}; }"); - EXPECT_UNAVAILABLE("dec^ltype(au^to) x = 10;"); + EXPECT_EQ(apply("dec^ltype(auto) x = 10;"), "int x = 10;"); + EXPECT_EQ(apply("decltype(au^to) x = 10;"), "int x = 10;"); // expanding types in structured bindings is syntactically invalid. EXPECT_UNAVAILABLE("const ^auto &[x,y] = (int[]){1,2};"); -- 2.7.4