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

Java: Minor refactoring of parametrized duplicates search (IDEA-179924)

Browse Source
This commit is contained in:
Pavel Dolgov
2017-10-04 16:58:16 +03:00
parent 8fa3f6c822
commit 3bcf150c91
1 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/extractMethod/ParametrizedDuplicates.java
+26 -15
View File
@@ -71,6 +71,9 @@ public class ParametrizedDuplicates {
return null;
}
List<Match> matches = findOriginalDuplicates(originalProcessor);
if (matches.isEmpty()) {
return null;
}
ParametrizedDuplicates duplicates = new ParametrizedDuplicates(pattern);
if (!duplicates.initMatches(matches)) {
@@ -124,23 +127,13 @@ public class ParametrizedDuplicates {
myOccurrencesList = new ArrayList<>();
Map<PsiExpression, Occurrences> occurrencesMap = new THashMap<>();
Set<Match> badMatches = new THashSet<>();
matches:
for (Match match : matches) {
List<Occurrences> matchOccurrences = new ArrayList<>();
List<ExtractedParameter> parameters = match.getExtractedParameters();
for (ExtractedParameter parameter : parameters) {
Occurrences occurrences = occurrencesMap.get(parameter.myPattern.getUsage());
if (occurrences != null && !occurrences.isEquivalent(parameter) ||
occurrences == null && Occurrences.isPresent(occurrencesMap, parameter)) {
badMatches.add(match);
continue matches;
}
if (occurrences == null) {
matchOccurrences.add(occurrences = new Occurrences(parameter));
}
occurrences.add(parameter);
List<Occurrences> occurrencesInMatch = getOccurrencesInMatch(occurrencesMap, match);
if (occurrencesInMatch == null) {
badMatches.add(match);
continue;
}
for (Occurrences occurrences : matchOccurrences) {
for (Occurrences occurrences : occurrencesInMatch) {
myOccurrencesList.add(occurrences);
for (PsiExpression expression : occurrences.myPatterns) {
occurrencesMap.put(expression, occurrences);
@@ -156,6 +149,24 @@ public class ParametrizedDuplicates {
return !myMatches.isEmpty() && !myOccurrencesList.isEmpty();
}
@Nullable
private static List<Occurrences> getOccurrencesInMatch(@NotNull Map<PsiExpression, Occurrences> occurrencesMap, @NotNull Match match) {
List<Occurrences> matchOccurrences = new ArrayList<>();
List<ExtractedParameter> parameters = match.getExtractedParameters();
for (ExtractedParameter parameter : parameters) {
Occurrences occurrences = occurrencesMap.get(parameter.myPattern.getUsage());
if (occurrences != null && !occurrences.isEquivalent(parameter) ||
occurrences == null && Occurrences.isPresent(occurrencesMap, parameter)) {
return null;
}
if (occurrences == null) {
matchOccurrences.add(occurrences = new Occurrences(parameter));
}
occurrences.add(parameter);
}
return matchOccurrences;
}
private boolean extract(@NotNull ExtractMethodProcessor originalProcessor) {
Map<PsiExpression, PsiExpression> expressionsMapping = new THashMap<>();
Map<PsiVariable, PsiVariable> variablesMapping = new THashMap<>();