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

extract method with folded parameter: resolve names conflict (IDEA-156943)

Browse Source
This commit is contained in:
Anna Kozlova
2016-08-15 20:17:11 +03:00
parent 87934ee5d1
commit 16cbb8b787
5 changed files with 50 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/refactoring/extractMethod/InputVariables.java
+4 -2
View File
@@ -33,6 +33,7 @@ import com.intellij.psi.util.TypeConversionUtil;
import com.intellij.refactoring.util.VariableData;
import com.intellij.refactoring.util.duplicates.DuplicatesFinder;
import com.intellij.util.ArrayUtil;
import com.intellij.util.Function;
import com.intellij.util.text.UniqueNameGenerator;
import org.jetbrains.annotations.Nullable;
@@ -96,7 +97,8 @@ public class InputVariables {
UniqueNameGenerator nameGenerator = new UniqueNameGenerator();
final ArrayList<VariableData> inputData = new ArrayList<>(inputVariables.size());
for (PsiVariable var : inputVariables) {
String name = nameGenerator.generateUniqueName(getParameterName(var));
final String defaultName = getParameterName(var);
String name = nameGenerator.generateUniqueName(defaultName);
PsiType type = var.getType();
if (type instanceof PsiEllipsisType) {
type = ((PsiEllipsisType)type).toArrayType();
@@ -135,7 +137,7 @@ public class InputVariables {
data.passAsParameter = true;
inputData.add(data);
if (myFoldingAvailable) myFolding.isParameterFoldable(data, myScope, inputVariables);
if (myFoldingAvailable) myFolding.isParameterFoldable(data, myScope, inputVariables, nameGenerator, defaultName);
}
java/java-analysis-impl/src/com/intellij/refactoring/extractMethod/ParametersFolder.java
+14 -9
View File
@@ -21,6 +21,7 @@
package com.intellij.refactoring.extractMethod;
import com.intellij.codeInsight.PsiEquivalenceUtil;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.Pair;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.JavaCodeStyleManager;
@@ -34,6 +35,7 @@ import com.intellij.psi.util.PsiUtil;
import com.intellij.refactoring.util.RefactoringChangeUtil;
import com.intellij.refactoring.util.VariableData;
import com.intellij.refactoring.util.duplicates.DuplicatesFinder;
import com.intellij.util.text.UniqueNameGenerator;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -43,7 +45,6 @@ public class ParametersFolder {
private final Map<PsiVariable, PsiExpression> myExpressions = new HashMap<>();
private final Map<PsiVariable, String> myArgs = new HashMap<>();
private final Map<PsiVariable, List<PsiExpression>> myMentionedInExpressions = new HashMap<>();
private final Set<String> myUsedNames = new HashSet<>();
private final Set<PsiVariable> myDeleted = new HashSet<>();
private boolean myFoldingSelectedByDefault;
@@ -52,7 +53,6 @@ public class ParametersFolder {
public void clear() {
myExpressions.clear();
myMentionedInExpressions.clear();
myUsedNames.clear();
myDeleted.clear();
}
@@ -120,9 +120,10 @@ public class ParametersFolder {
}
}
public boolean isParameterFoldable(@NotNull VariableData data,
@NotNull LocalSearchScope scope,
@NotNull final List<? extends PsiVariable> inputVariables) {
boolean isParameterFoldable(@NotNull VariableData data,
@NotNull LocalSearchScope scope,
@NotNull final List<? extends PsiVariable> inputVariables,
UniqueNameGenerator nameGenerator, String defaultName) {
final List<PsiExpression> mentionedInExpressions = getMentionedExpressions(data.variable, scope, inputVariables);
if (mentionedInExpressions == null) return false;
@@ -147,10 +148,12 @@ public class ParametersFolder {
data.type = RefactoringChangeUtil.getTypeByExpression(mostRanked);
final JavaCodeStyleManager codeStyleManager = JavaCodeStyleManager.getInstance(mostRanked.getProject());
final SuggestedNameInfo nameInfo = codeStyleManager.suggestVariableName(VariableKind.PARAMETER, null, mostRanked, data.type);
if (nameInfo.names.length > 0) {
if (nameInfo.names.length > 0 &&
!Comparing.equal(nameInfo.names[0], data.name) &&
!Comparing.equal(nameInfo.names[0], defaultName)) {
data.name = nameInfo.names[0];
setUniqueName(data, nameGenerator, scope, mostRanked);
}
setUniqueName(data, scope, mostRanked);
}
return mostRanked != null;
@@ -175,14 +178,16 @@ public class ParametersFolder {
return false;
}
private void setUniqueName(VariableData data, LocalSearchScope scope, PsiExpression expr) {
private static void setUniqueName(VariableData data, UniqueNameGenerator nameGenerator,
LocalSearchScope scope, PsiExpression expr) {
String name = data.name;
int idx = 1;
while (true) {
if (myUsedNames.add(name)) {
if (nameGenerator.isUnique(name, "", "")) {
final PsiVariable definedVariable = PsiResolveHelper.SERVICE.getInstance(expr.getProject()).resolveReferencedVariable(name, expr);
if (definedVariable == null || !scope.containsRange(expr.getContainingFile(), definedVariable.getTextRange())) {
data.name = name;
nameGenerator.addExistingName(name);
break;
}
}
java/java-tests/testData/refactoring/extractMethod/FoldedWithConflictedNames.java
+12
View File
@@ -0,0 +1,12 @@
class Test {
void bar() {
int size = 10;
int array[] = new int[size];
int array2[] = new int[size];
int i = 0;
<selection>int sum = array[i];
sum += array2[i];</selection>
}
}
java/java-tests/testData/refactoring/extractMethod/FoldedWithConflictedNames_after.java
+16
View File
@@ -0,0 +1,16 @@
class Test {
void bar() {
int size = 10;
int array[] = new int[size];
int array2[] = new int[size];
int i = 0;
newMethod(array[i], array2, i);
}
private void newMethod(int i, int[] array2, int i2) {
int sum = i2;
sum += array2[i2];
}
}
java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodTest.java
+4
View File
@@ -374,6 +374,10 @@ public class ExtractMethodTest extends LightCodeInsightTestCase {
doTest();
}
public void testFoldedWithConflictedNames() throws Exception {
doTest();
}
public void testFoldingWithFieldInvolved() throws Exception {
doTest();
}