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 object: no need to change signature when nothing was changed by duplicates processing (IDEA-98288)

Browse Source
This commit is contained in:
anna
2012-12-31 13:30:21 +01:00
parent 42a971fa8d
commit e9070ccbc8
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/util/duplicates/Match.java
+2 -1
View File
@@ -380,8 +380,9 @@ public final class Match {
}
public void changeSignature(final PsiMethod psiMethod) {
final ArrayList<ParameterInfoImpl> newParameters = patchParams(psiMethod);
final PsiType expressionType = getChangedReturnType(psiMethod);
if (expressionType == null && myChangedParams.isEmpty()) return;
final ArrayList<ParameterInfoImpl> newParameters = patchParams(psiMethod);
final ChangeSignatureProcessor csp = new ChangeSignatureProcessor(psiMethod.getProject(), psiMethod, false, null, psiMethod.getName(),
expressionType != null ? expressionType : psiMethod.getReturnType(),
newParameters.toArray(new ParameterInfoImpl[newParameters.size()]));
java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodTest.java
+2
View File
@@ -19,6 +19,7 @@ import com.intellij.JavaTestUtil;
import com.intellij.codeInsight.CodeInsightUtil;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiExpression;
import com.intellij.psi.PsiFile;
@@ -677,6 +678,7 @@ public class ExtractMethodTest extends LightCodeInsightTestCase {
final List<Match> duplicates = processor.getDuplicates();
for (final Match match : duplicates) {
if (!match.getMatchStart().isValid() || !match.getMatchEnd().isValid()) continue;
PsiDocumentManager.getInstance(project).commitAllDocuments();
processor.processMatch(match);
}
}