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

shorten qualified names in change signature return type (IDEA-130277)

Browse Source
This commit is contained in:
Anna Kozlova
2014-09-29 14:08:35 +02:00
parent 7be506a901
commit d34eaa9ad2
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java
+2 -2
View File
@@ -17,7 +17,6 @@ package com.intellij.refactoring.changeSignature;
import com.intellij.codeInsight.AnnotationUtil;
import com.intellij.codeInsight.ExceptionUtil;
import com.intellij.codeInsight.InferredAnnotationsManager;
import com.intellij.codeInsight.daemon.impl.analysis.JavaHighlightUtil;
import com.intellij.codeInspection.dataFlow.ControlFlowAnalyzer;
import com.intellij.lang.StdLanguages;
@@ -694,6 +693,7 @@ public class JavaChangeSignatureUsageProcessor implements ChangeSignatureUsagePr
final PsiSubstitutor substitutor =
baseMethod == null ? PsiSubstitutor.EMPTY : ChangeSignatureProcessor.calculateSubstitutor(method, baseMethod);
final JavaCodeStyleManager javaCodeStyleManager = JavaCodeStyleManager.getInstance(method.getProject());
if (changeInfo.isReturnTypeChanged()) {
PsiType newTypeElement = changeInfo.getNewReturnType().getType(changeInfo.getMethod().getParameterList(), method.getManager());
final PsiType returnType = substitutor.substitute(newTypeElement);
@@ -701,7 +701,7 @@ public class JavaChangeSignatureUsageProcessor implements ChangeSignatureUsagePr
if (method.getName().equals(changeInfo.getNewName())) {
final PsiTypeElement typeElement = method.getReturnTypeElement();
if (typeElement != null) {
typeElement.replace(factory.createTypeElement(returnType));
javaCodeStyleManager.shortenClassReferences(typeElement.replace(factory.createTypeElement(returnType)));
}
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodReturn/afterShortenClassNames.java
+9
View File
@@ -0,0 +1,9 @@
// "Make 'bar' return 'java.util.Iterator'" "true"
import java.util.ArrayList;
import java.util.Iterator;
public class Foo {
Iterator bar() {
return new ArrayList().iterator();
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/methodReturn/beforeShortenClassNames.java
+7
View File
@@ -0,0 +1,7 @@
// "Make 'bar' return 'java.util.Iterator'" "true"
import java.util.ArrayList;
public class Foo {
void bar() {
return new ArrayList().itera<caret>tor();
}
}