[clangd] Disable expand auto on decltype(auto)

ilya-biryukov · ilya-biryukov · commit 1b36caf45e5e · 2019-10-08T14:03:45.000Z
Summary: Applying it produces incorrect code at the moment. Reviewers: sammccall Reviewed By: sammccall Subscribers: kuhnel, MaskRay, jkorous, arphaman, kadircet, usaxena95, cfe-commits Tags: #clang Differential Revision: https://reviews.llvm.org/D68630 llvm-svn: 374048
diff --git a/clang-tools-extra/clangd/refactor/tweaks/ExpandAutoType.cpp b/clang-tools-extra/clangd/refactor/tweaks/ExpandAutoType.cpp
@@ -61,7 +61,9 @@ bool ExpandAutoType::prepare(const Selection& Inputs) {
   if (auto *Node = Inputs.ASTSelection.commonAncestor()) {
     if (auto *TypeNode = Node->ASTNode.get<TypeLoc>()) {
       if (const AutoTypeLoc Result = TypeNode->getAs<AutoTypeLoc>()) {
-        CachedLocation = Result;
+        // Code in apply() does handle 'decltype(auto)' yet.
+        if (!Result.getTypePtr()->isDecltypeAuto())
+          CachedLocation = Result;
       }
     }
   }
diff --git a/clang-tools-extra/clangd/unittests/TweakTests.cpp b/clang-tools-extra/clangd/unittests/TweakTests.cpp
@@ -528,6 +528,8 @@ TEST_F(ExpandAutoTypeTest, Test) {
   // replace array types
   EXPECT_EQ(apply(R"cpp(au^to x = "test")cpp"),
             R"cpp(const char * x = "test")cpp");
+
+  EXPECT_UNAVAILABLE("dec^ltype(au^to) x = 10;");
 }
 
 TWEAK_TEST(ExtractFunction);

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,9 @@ bool ExpandAutoType::prepare(const Selection& Inputs) {`
`61`	`61`	`if (auto *Node = Inputs.ASTSelection.commonAncestor()) {`
`62`	`62`	`if (auto *TypeNode = Node->ASTNode.get<TypeLoc>()) {`
`63`	`63`	`if (const AutoTypeLoc Result = TypeNode->getAs<AutoTypeLoc>()) {`
`64`		`- CachedLocation = Result;`
	`64`	`+ // Code in apply() does handle 'decltype(auto)' yet.`
	`65`	`+ if (!Result.getTypePtr()->isDecltypeAuto())`
	`66`	`+ CachedLocation = Result;`
`65`	`67`	`}`
`66`	`68`	`}`
`67`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -528,6 +528,8 @@ TEST_F(ExpandAutoTypeTest, Test) {`
`528`	`528`	`// replace array types`
`529`	`529`	`EXPECT_EQ(apply(R"cpp(au^to x = "test")cpp"),`
`530`	`530`	`R"cpp(const char * x = "test")cpp");`
	`531`	`+`
	`532`	`+ EXPECT_UNAVAILABLE("dec^ltype(au^to) x = 10;");`
`531`	`533`	`}`
`532`	`534`
`533`	`535`	`TWEAK_TEST(ExtractFunction);`