MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

qualify conflicting fields name (IDEA-123969)

Browse Source
This commit is contained in:
Anna Kozlova
2014-04-29 18:54:58 +04:00
parent f58394cd59
commit 547c62c168
8 changed files with 88 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java
+4 -10
View File
@@ -60,10 +60,7 @@ import com.intellij.refactoring.RefactoringBundle;
import com.intellij.refactoring.introduce.inplace.AbstractInplaceIntroducer;
import com.intellij.refactoring.introduceVariable.IntroduceVariableBase;
import com.intellij.refactoring.rename.RenameJavaVariableProcessor;
import com.intellij.refactoring.util.CommonRefactoringUtil;
import com.intellij.refactoring.util.EnumConstantsUtil;
import com.intellij.refactoring.util.RefactoringChangeUtil;
import com.intellij.refactoring.util.RefactoringUtil;
import com.intellij.refactoring.util.*;
import com.intellij.refactoring.util.occurrences.OccurrenceManager;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.VisibilityUtil;
@@ -715,9 +712,8 @@ public abstract class BaseExpressionToFieldHandler extends IntroduceHandlerBase
if (!CommonRefactoringUtil.checkReadOnlyStatus(myProject, destClass.getContainingFile())) return;
if (initializer != null) {
ChangeContextUtil.encodeContextInfo(initializer, true);
}
ChangeContextUtil.encodeContextInfo(destClass, true);
myField = mySettings.isIntroduceEnumConstant() ? EnumConstantsUtil.createEnumConstant(destClass, myFieldName, initializer) :
createField(myFieldName, myType, initializer, initializerPlace == InitializationPlace.IN_FIELD_DECLARATION && initializer != null,
myParentClass);
@@ -847,9 +843,7 @@ public abstract class BaseExpressionToFieldHandler extends IntroduceHandlerBase
}
}
if (initializer != null) {
ChangeContextUtil.clearContextInfo(initializer);
}
ChangeContextUtil.decodeContextInfo(destClass, destClass, null);
}
catch (IncorrectOperationException e) {
LOG.error(e);
java/java-impl/src/com/intellij/refactoring/introduceField/LocalToFieldHandler.java
+3
View File
@@ -15,6 +15,7 @@
*/
package com.intellij.refactoring.introduceField;
import com.intellij.codeInsight.ChangeContextUtil;
import com.intellij.codeInsight.CodeInsightUtil;
import com.intellij.codeInsight.TestFrameworks;
import com.intellij.codeInsight.navigation.NavigationUtil;
@@ -282,6 +283,7 @@ public abstract class LocalToFieldHandler {
public void run() {
try {
ChangeContextUtil.encodeContextInfo(myDestinationClass, true);
final boolean rebindNeeded2 = !myVariableName.equals(myFieldName) || myRebindNeeded;
final PsiReference[] refs;
if (rebindNeeded2) {
@@ -342,6 +344,7 @@ public abstract class LocalToFieldHandler {
}
}
//RefactoringUtil.renameVariableReferences(local, pPrefix + fieldName, GlobalSearchScope.projectScope(myProject));
ChangeContextUtil.decodeContextInfo(myDestinationClass, myDestinationClass, null);
}
}
catch (IncorrectOperationException e) {
java/java-tests/testData/refactoring/introduceField/afterConflictingFieldInContainingClass.java
+12
View File
@@ -0,0 +1,12 @@
class A {
private final int aField = 1;
class B {
public final int aField = 2;
int method() {
return A.this.aField + aField;
}
}
}
java/java-tests/testData/refactoring/introduceField/afterConflictingFieldInContainingClassLocal.java
+12
View File
@@ -0,0 +1,12 @@
class A {
private final int aField = 1;
class B {
public final int aField = 2;
int method() {
return A.this.aField + aField;
}
}
}
java/java-tests/testData/refactoring/introduceField/beforeConflictingFieldInContainingClass.java
+10
View File
@@ -0,0 +1,10 @@
class A {
private final int aField = 1;
class B {
int method() {
return aField + <selection>2</selection>;
}
}
}
java/java-tests/testData/refactoring/introduceField/beforeConflictingFieldInContainingClassLocal.java
+11
View File
@@ -0,0 +1,11 @@
class A {
private final int aField = 1;
class B {
int method() {
int <selection>i</selection> = 2;
return aField + i;
}
}
}
java/java-tests/testSrc/com/intellij/refactoring/IntroduceFieldInSameClassTest.java
+29
View File
@@ -1,7 +1,9 @@
package com.intellij.refactoring;
import com.intellij.JavaTestUtil;
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiExpression;
import com.intellij.psi.PsiPrimitiveType;
import com.intellij.psi.PsiType;
import com.intellij.refactoring.introduceField.BaseExpressionToFieldHandler;
@@ -27,6 +29,33 @@ public class IntroduceFieldInSameClassTest extends LightCodeInsightTestCase {
checkResultByFile("/refactoring/introduceField/after1.java");
}
public void testConflictingFieldInContainingClass () throws Exception {
configureByFile("/refactoring/introduceField/beforeConflictingFieldInContainingClass.java");
new MockIntroduceFieldHandler(BaseExpressionToFieldHandler.InitializationPlace.IN_FIELD_DECLARATION, false){
@Override
protected String getNewName(Project project, PsiExpression expr, PsiType type) {
return "aField";
}
}.invoke(getProject(), myEditor, myFile, null);
checkResultByFile("/refactoring/introduceField/afterConflictingFieldInContainingClass.java");
}
public void testConflictingFieldInContainingClassLocal () throws Exception {
configureByFile("/refactoring/introduceField/beforeConflictingFieldInContainingClassLocal.java");
new MockIntroduceFieldHandler(BaseExpressionToFieldHandler.InitializationPlace.IN_FIELD_DECLARATION, false){
@Override
protected String getNewName(Project project, PsiExpression expr, PsiType type) {
return "aField";
}
@Override
protected int getChosenClassIndex(List<PsiClass> classes) {
return 0;
}
}.invoke(getProject(), myEditor, myFile, null);
checkResultByFile("/refactoring/introduceField/afterConflictingFieldInContainingClassLocal.java");
}
public void testInElseClause() throws Exception {
configureByFile("/refactoring/introduceField/beforeElseClause.java");
performRefactoring(BaseExpressionToFieldHandler.InitializationPlace.IN_CURRENT_METHOD, true);
java/java-tests/testSrc/com/intellij/refactoring/MockIntroduceFieldHandler.java
+7 -2
View File
@@ -23,13 +23,18 @@ public class MockIntroduceFieldHandler extends IntroduceFieldHandler {
@Override
protected Settings showRefactoringDialog(Project project, Editor editor, PsiClass parentClass, PsiExpression expr, PsiType type,
PsiExpression[] occurrences, PsiElement anchorElement, PsiElement anchorElementIfAll) {
SuggestedNameInfo name = JavaCodeStyleManager.getInstance(project).suggestVariableName(VariableKind.FIELD, null, expr, type);
return new Settings(name.names[0], expr, occurrences, true, myDeclareStatic, true, myInitializationPlace,
final String fieldName = getNewName(project, expr, type);
return new Settings(fieldName, expr, occurrences, true, myDeclareStatic, true, myInitializationPlace,
PsiModifier.PUBLIC,
null,
getFieldType(type), true, (TargetDestination)null, false, false);
}
protected String getNewName(Project project, PsiExpression expr, PsiType type) {
SuggestedNameInfo name = JavaCodeStyleManager.getInstance(project).suggestVariableName(VariableKind.FIELD, null, expr, type);
return name.names[0];
}
protected PsiType getFieldType(PsiType type) {
return type;
}