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: ensure call arguments are not changed during body substitution

Browse Source
This commit is contained in:
Anna Kozlova
2016-06-20 10:29:14 +03:00
parent 275798b5e1
commit a664f8b8d6
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/refactoring/extractMethod/ParametersFolder.java
+4 -2
View File
@@ -41,6 +41,7 @@ import java.util.*;
public class ParametersFolder {
private final Map<PsiVariable, PsiExpression> myExpressions = new HashMap<PsiVariable, PsiExpression>();
private final Map<PsiVariable, String> myArgs = new HashMap<>();
private final Map<PsiVariable, List<PsiExpression>> myMentionedInExpressions = new HashMap<PsiVariable, List<PsiExpression>>();
private final Set<String> myUsedNames = new HashSet<String>();
@@ -84,7 +85,7 @@ public class ParametersFolder {
}
public void foldParameterUsagesInBody(@NotNull List<VariableData> datum, PsiElement[] elements, SearchScope scope) {
Map<VariableData, Set<PsiExpression>> equivalentExpressions = new HashMap<>();
Map<VariableData, Set<PsiExpression>> equivalentExpressions = new LinkedHashMap<>();
for (VariableData data : datum) {
if (myDeleted.contains(data.variable)) continue;
final PsiExpression psiExpression = myExpressions.get(data.variable);
@@ -142,6 +143,7 @@ public class ParametersFolder {
if (mostRanked != null) {
myExpressions.put(data.variable, mostRanked);
myArgs.put(data.variable, mostRanked.getText());
data.type = RefactoringChangeUtil.getTypeByExpression(mostRanked);
final JavaCodeStyleManager codeStyleManager = JavaCodeStyleManager.getInstance(mostRanked.getProject());
final SuggestedNameInfo nameInfo = codeStyleManager.suggestVariableName(VariableKind.PARAMETER, null, mostRanked, data.type);
@@ -293,7 +295,7 @@ public class ParametersFolder {
@NotNull
public String getGeneratedCallArgument(@NotNull VariableData data) {
return myExpressions.containsKey(data.variable) ? myExpressions.get(data.variable).getText() : data.variable.getName();
return myArgs.containsKey(data.variable) ? myArgs.get(data.variable) : data.variable.getName();
}
public boolean annotateWithParameter(@NotNull VariableData data, @NotNull PsiElement element) {
java/java-tests/testData/refactoring/extractMethod/FoldedWithNestedExpressions_after.java
+1 -1
View File
@@ -1,6 +1,6 @@
class Test {
void h(int i, String[] s, String[] t) {
final String s1 = newMethod(t[i], s[x.length()]);
final String s1 = newMethod(t[i], s[t[i].length()]);
System.out.println(s1);
}