diff --git a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java index 8d122c93729f..91aed4ee92c1 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java @@ -787,8 +787,8 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager { final PsiAssignmentExpression assignmentExpression = (PsiAssignmentExpression)expr.getParent(); if (expr == assignmentExpression.getRExpression()) { final PsiExpression leftExpression = assignmentExpression.getLExpression(); - if (leftExpression instanceof PsiReferenceExpression && ((PsiReferenceExpression) leftExpression).getQualifier() == null) { - String name = leftExpression.getText(); + if (leftExpression instanceof PsiReferenceExpression) { + String name = ((PsiReferenceExpression)leftExpression).getReferenceName(); if (name != null) { final PsiElement resolve = ((PsiReferenceExpression)leftExpression).resolve(); if (resolve instanceof PsiVariable) { @@ -800,7 +800,8 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager { } } } - else if (expr.getParent() instanceof PsiLocalVariable) { + //skip places where name for this local variable is calculated, otherwise grab the name + else if (expr.getParent() instanceof PsiLocalVariable && variableKind != VariableKind.LOCAL_VARIABLE) { PsiVariable variable = (PsiVariable)expr.getParent(); String variableName = variable.getName(); if (variableName != null) { diff --git a/java/java-tests/testData/refactoring/extractMethod/ArrayAccessWithTopExpression_after.java b/java/java-tests/testData/refactoring/extractMethod/ArrayAccessWithTopExpression_after.java index 11b7df990b29..b3cad8ff539e 100644 --- a/java/java-tests/testData/refactoring/extractMethod/ArrayAccessWithTopExpression_after.java +++ b/java/java-tests/testData/refactoring/extractMethod/ArrayAccessWithTopExpression_after.java @@ -6,7 +6,7 @@ class Test { newMethod(doubles[0] / i); } - private void newMethod(double v) { - double progressResult = v; + private void newMethod(double progressResult1) { + double progressResult = progressResult1; } } \ No newline at end of file diff --git a/java/java-tests/testData/refactoring/extractMethod/FoldedWithConflictedNames_after.java b/java/java-tests/testData/refactoring/extractMethod/FoldedWithConflictedNames_after.java index baeca2f0e4a9..c40e376fa754 100644 --- a/java/java-tests/testData/refactoring/extractMethod/FoldedWithConflictedNames_after.java +++ b/java/java-tests/testData/refactoring/extractMethod/FoldedWithConflictedNames_after.java @@ -9,8 +9,8 @@ class Test { newMethod(array[i], array2, i); } - private void newMethod(int i, int[] array2, int i2) { - int sum = i2; - sum += array2[i2]; + private void newMethod(int sum1, int[] array2, int i) { + int sum = sum1; + sum += array2[i]; } } \ No newline at end of file diff --git a/java/java-tests/testData/refactoring/extractMethod/FoldedWithNestedExpressions_after.java b/java/java-tests/testData/refactoring/extractMethod/FoldedWithNestedExpressions_after.java index 4cc18b440aff..eff12d28a3c3 100644 --- a/java/java-tests/testData/refactoring/extractMethod/FoldedWithNestedExpressions_after.java +++ b/java/java-tests/testData/refactoring/extractMethod/FoldedWithNestedExpressions_after.java @@ -4,8 +4,8 @@ class Test { System.out.println(s1); } - private String newMethod(String s, String s2) { - System.out.println(s2); - return s2; + private String newMethod(String s, String s11) { + System.out.println(s11); + return s11; } } \ No newline at end of file diff --git a/java/java-tests/testData/refactoring/introduceField/after1.java b/java/java-tests/testData/refactoring/introduceField/after1.java index 7773423f553d..3d0240c0cc4e 100644 --- a/java/java-tests/testData/refactoring/introduceField/after1.java +++ b/java/java-tests/testData/refactoring/introduceField/after1.java @@ -1,8 +1,8 @@ class InStaticInitializer { - public static final String s = "Hello World"; + public static final String hello_world = "Hello World"; static { - System.out.println(s); + System.out.println(hello_world); } //Field must be placed before initializer or illegal forward reference will happen } \ No newline at end of file diff --git a/java/java-tests/testData/refactoring/introduceField/afterEnclosingAnonymous.java b/java/java-tests/testData/refactoring/introduceField/afterEnclosingAnonymous.java index 0d6d8e781e65..adf720fbc9dd 100644 --- a/java/java-tests/testData/refactoring/introduceField/afterEnclosingAnonymous.java +++ b/java/java-tests/testData/refactoring/introduceField/afterEnclosingAnonymous.java @@ -1,12 +1,12 @@ class TestRefactoring { - public final Integer integer; + public final Integer toField; public TestRefactoring() { - integer = new Integer("0"); + toField = new Integer("0"); Runnable r = new Runnable() { @Override public void run() { - System.out.println(integer); + System.out.println(toField); } }; } diff --git a/java/java-tests/testData/refactoring/introduceField/afterForcedFieldType.java b/java/java-tests/testData/refactoring/introduceField/afterForcedFieldType.java index 8bcac867be28..abc5b8ca19fe 100644 --- a/java/java-tests/testData/refactoring/introduceField/afterForcedFieldType.java +++ b/java/java-tests/testData/refactoring/introduceField/afterForcedFieldType.java @@ -1,7 +1,7 @@ public class FieldTest { - public final int integer; + public final int ii; void foo() { - integer = new Integer(0); + ii = new Integer(0); } } \ No newline at end of file diff --git a/java/java-tests/testData/refactoring/introduceField/afterLocalVarAnnotations.java b/java/java-tests/testData/refactoring/introduceField/afterLocalVarAnnotations.java index 911e2e37e985..3969118e744c 100644 --- a/java/java-tests/testData/refactoring/introduceField/afterLocalVarAnnotations.java +++ b/java/java-tests/testData/refactoring/introduceField/afterLocalVarAnnotations.java @@ -1,6 +1,6 @@ class Test { @Deprecated - public final String string = ""; + public final String fo = ""; void foo() { } diff --git a/java/java-tests/testData/refactoring/introduceField/afterSimplifiedDiamond.java b/java/java-tests/testData/refactoring/introduceField/afterSimplifiedDiamond.java index 437c1910fccb..075c578bb44b 100644 --- a/java/java-tests/testData/refactoring/introduceField/afterSimplifiedDiamond.java +++ b/java/java-tests/testData/refactoring/introduceField/afterSimplifiedDiamond.java @@ -1,8 +1,8 @@ import java.util.*; class Foo { - public final ArrayList strings = new ArrayList<>(); + public final ArrayList l = new ArrayList<>(); { - List l = strings; + List l = this.l; } } \ No newline at end of file diff --git a/java/java-tests/testData/refactoring/introduceField/afterStaticFieldInInnerClass.java b/java/java-tests/testData/refactoring/introduceField/afterStaticFieldInInnerClass.java index 1a3c2aa1d290..7e776d21f169 100644 --- a/java/java-tests/testData/refactoring/introduceField/afterStaticFieldInInnerClass.java +++ b/java/java-tests/testData/refactoring/introduceField/afterStaticFieldInInnerClass.java @@ -1,9 +1,9 @@ public class A { private static final class Inner { - public final String string; + public final String str; public Inner(Integer param) { - string = param.toString(); + str = param.toString(); } } } diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/JavaAutoPopupTest.groovy b/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/JavaAutoPopupTest.groovy index 7fd98675c9cf..0604b83d0eec 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/JavaAutoPopupTest.groovy +++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/JavaAutoPopupTest.groovy @@ -518,7 +518,7 @@ class Foo { void "test vertical arrows in non-focused lookup"() { String toType = "ArrayIndexOutOfBoundsException ind" - testArrows toType, LookupImpl.FocusDegree.UNFOCUSED, 0, 1 + testArrows toType, LookupImpl.FocusDegree.UNFOCUSED, 0, 2 UISettings.instance.cycleScrolling = false try {