SureYeaah created this revision.
SureYeaah added reviewers: sammccall, kadircet.
Herald added subscribers: cfe-commits, arphaman, jkorous, MaskRay,
ilya-biryukov.
Herald added a project: clang.
- Modified ExtractVariable to stop extraction for MemberExprs and
Assignment Expr
- Fixed unittests
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D64717
Files:
clang-tools-extra/clangd/refactor/tweaks/ExtractVariable.cpp
clang-tools-extra/clangd/unittests/TweakTests.cpp
Index: clang-tools-extra/clangd/unittests/TweakTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/TweakTests.cpp
+++ clang-tools-extra/clangd/unittests/TweakTests.cpp
@@ -299,32 +299,32 @@
return ^1;
}
void f() {
- int a = 5 + [[4 ^* ^xyz^()]];
+ int a = 5 + [[4 * [[xyz()]]]];
// multivariable initialization
if(1)
- int x = ^1, y = ^a + 1, a = ^1, z = a + 1;
+ int x = [[1]], y = [[a + 1]], a = [[1]], z = a + 1;
// if without else
- if(^1) {}
+ if([[1]]) {}
// if with else
- if(a < ^3)
- if(a == ^4)
- a = ^5;
+ if(a < [[3]])
+ if(a == [[4]])
+ a = [[5]];
else
- a = ^6;
- else if (a < ^4)
- a = ^4;
+ a = [[6]];
+ else if (a < [[4]])
+ a = [[4]];
else
- a = ^5;
+ a = [[5]];
// for loop
- for(a = ^1; a > ^3^+^4; a++)
- a = ^2;
+ for(a = [[1]]; a > [[[[3]]+4]]; a++)
+ a = [[2]];
// while
- while(a < ^1)
- ^a++;
+ while(a < [[1]])
+ [[a++]];
// do while
do
- a = ^1;
- while(a < ^3);
+ a = [[1]];
+ while(a < [[3]]);
}
)cpp");
// Should not crash.
@@ -340,8 +340,10 @@
return 1;
class T {
T(int a = ^1) {};
+ T f() { return T(); }
int xyz = ^1;
};
+ [[T.[[^t]]]]();
}
// function default argument
void f(int b = ^1) {
@@ -359,6 +361,10 @@
a = ^a ^+ 1;
// lambda
auto lamb = [&^a, &^b](int r = ^1) {return 1;}
+ // assigment
+ [[a ^= 5]];
+ // DeclRefExpr
+ a = [[b]], b = [[xyz]]();
}
)cpp");
// vector of pairs of input and output strings
Index: clang-tools-extra/clangd/refactor/tweaks/ExtractVariable.cpp
===================================================================
--- clang-tools-extra/clangd/refactor/tweaks/ExtractVariable.cpp
+++ clang-tools-extra/clangd/refactor/tweaks/ExtractVariable.cpp
@@ -77,14 +77,20 @@
return Visitor.ReferencedDecls;
}
-// An expr is not extractable if it's null or an expression of type void
-// FIXME: Ignore assignment (a = 1) Expr since it is extracted as dummy = a =
+// An expr is not extractable if it's null, expression of type void, an
+// assignment expression, Member or a DeclRefExpr
static bool isExtractableExpr(const clang::Expr *Expr) {
if (Expr) {
- const Type *ExprType = Expr->getType().getTypePtrOrNull();
// FIXME: check if we need to cover any other types
- if (ExprType)
- return !ExprType->isVoidType();
+ if(const Type *ExprType = Expr->getType().getTypePtrOrNull())
+ if(ExprType->isVoidType())
+ return false;
+ if(const BinaryOperator *BinOpExpr = llvm::dyn_cast_or_null<BinaryOperator>(Expr))
+ if(BinOpExpr->getOpcode() == BinaryOperatorKind::BO_Assign)
+ return false;
+ if(llvm::isa<DeclRefExpr>(Expr) || llvm::isa<MemberExpr>(Expr))
+ return false;
+ return true;
}
return false;
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
