mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-18 09:34:34 +07:00
extract variable: ensure replace all occurrences survive parenthesis around value (IDEA-122041)
This commit is contained in:
+13
@@ -0,0 +1,13 @@
|
||||
class Test {
|
||||
|
||||
Test foo(long l) {
|
||||
return this;
|
||||
}
|
||||
|
||||
{
|
||||
Test t = new Test()
|
||||
.foo(-(5<caret>L))
|
||||
.foo(7L)
|
||||
.foo(-(5L));
|
||||
}
|
||||
}
|
||||
+15
@@ -0,0 +1,15 @@
|
||||
class Test {
|
||||
|
||||
Test foo(long l) {
|
||||
return this;
|
||||
}
|
||||
|
||||
public static final long LONG = 5L;
|
||||
|
||||
{
|
||||
Test t = new Test()
|
||||
.foo(-LONG)
|
||||
.foo(7L)
|
||||
.foo(-LONG);
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -42,7 +42,7 @@ public abstract class AbstractJavaInplaceIntroduceTest extends AbstractInplaceIn
|
||||
}
|
||||
|
||||
@Nullable
|
||||
protected static PsiExpression getExpressionFromEditor() {
|
||||
protected PsiExpression getExpressionFromEditor() {
|
||||
final PsiExpression expression = PsiTreeUtil.getParentOfType(getFile().findElementAt(getEditor().getCaretModel().getOffset()), PsiExpression.class);
|
||||
if (expression instanceof PsiReferenceExpression && expression.getParent() instanceof PsiMethodCallExpression) {
|
||||
return (PsiExpression)expression.getParent();
|
||||
|
||||
@@ -19,10 +19,13 @@ import com.intellij.openapi.editor.Editor;
|
||||
import com.intellij.openapi.project.Project;
|
||||
import com.intellij.openapi.util.Pass;
|
||||
import com.intellij.psi.PsiExpression;
|
||||
import com.intellij.psi.PsiLiteralExpression;
|
||||
import com.intellij.psi.PsiLocalVariable;
|
||||
import com.intellij.psi.util.PsiTreeUtil;
|
||||
import com.intellij.refactoring.introduce.inplace.AbstractInplaceIntroducer;
|
||||
import com.intellij.refactoring.introduceField.IntroduceConstantHandler;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
/**
|
||||
* User: anna
|
||||
@@ -43,6 +46,28 @@ public class InplaceIntroduceConstantTest extends AbstractJavaInplaceIntroduceTe
|
||||
});
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
protected PsiExpression getExpressionFromEditor() {
|
||||
final PsiExpression expression = super.getExpressionFromEditor();
|
||||
if (expression != null) {
|
||||
return expression;
|
||||
}
|
||||
final PsiExpression expr = PsiTreeUtil.getParentOfType(getFile().findElementAt(getEditor().getCaretModel().getOffset()), PsiExpression.class);
|
||||
return expr instanceof PsiLiteralExpression ? expr : null;
|
||||
}
|
||||
|
||||
public void testReplaceAllInsideParenthesized() throws Exception {
|
||||
|
||||
doTest(new Pass<AbstractInplaceIntroducer>() {
|
||||
@Override
|
||||
public void pass(AbstractInplaceIntroducer inplaceIntroduceFieldPopup) {
|
||||
inplaceIntroduceFieldPopup.setReplaceAllOccurrences(true);
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public void testReplaceAllWithClassRefType() throws Exception {
|
||||
|
||||
doTest(new Pass<AbstractInplaceIntroducer>() {
|
||||
|
||||
Reference in New Issue
Block a user