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

WI-59905 Support extracting duplicates when changed param is also output variable

Browse Source 
GitOrigin-RevId: 2292b61d367a5f040e415547ff45a38cb10aec64
This commit is contained in:
Artemy Pestretsov
2021-04-15 00:29:15 +03:00
committed by intellij-monorepo-bot
parent 3929f8daa8
commit 01be87cc6b
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/refactoring/extractMethod/SimpleDuplicatesFinder.java
+6
View File
@@ -146,6 +146,9 @@ public class SimpleDuplicatesFinder {
final PsiElement candidateParent = candidate.getParent();
if (patternParent == null || candidateParent == null) return false;
if (pattern.getUserData(PARAMETER) != null && patternParent.getClass() == candidateParent.getClass()) {
if (myOutputVariables.contains(pattern.getText())) {
match.changeOutput(candidate.getText());
}
return changeParameter(pattern.getText(), candidate.getText(), match);
}
if (children1.length != children2.length) return false;
@@ -158,6 +161,9 @@ public class SimpleDuplicatesFinder {
if (children1.length == 0) {
if (pattern.getUserData(PARAMETER) != null && patternParent.getClass() == candidateParent.getClass()) {
if (myOutputVariables.contains(pattern.getText())) {
match.changeOutput(candidate.getText());
}
return changeParameter(pattern.getText(), candidate.getText(), match);
}
if (myOutputVariables.contains(pattern.getText())) {