extract method: duplicates processing fixed (IDEA-105562)

This commit is contained in:
anna
2013-04-17 15:58:52 +02:00
parent 0e18b63ca3
commit ceb9354f15
4 changed files with 29 additions and 1 deletions
@@ -431,7 +431,7 @@ public final class Match {
final PsiElement element = result.getElement();
if (element instanceof PsiMember) {
final PsiClass psiClass = ((PsiMember)element).getContainingClass();
if (psiClass != null) {
if (psiClass != null && psiClass.isPhysical()) {
final JavaPsiFacade facade = JavaPsiFacade.getInstance(parent.getProject());
final PsiClassType expressionType = facade.getElementFactory().createType(psiClass, result.getSubstitutor());
if (weakerType(psiMethod, returnType, expressionType)) {
@@ -0,0 +1,10 @@
class Test {
String[] foos;
void test() {
for (String foo : <selection>foos</selection>) {
}
System.out.println(foos.length);
}
}
@@ -0,0 +1,14 @@
class Test {
String[] foos;
void test() {
for (String foo : newMethod()) {
}
System.out.println(newMethod().length);
}
private String[] newMethod() {
return foos;
}
}
@@ -579,6 +579,10 @@ public class ExtractMethodTest extends LightCodeInsightTestCase {
doDuplicatesTest();
}
public void testArrayReturnType() throws Exception {
doDuplicatesTest();
}
private void doTestDisabledParam() throws PrepareFailedException {
final CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject());
settings.ELSE_ON_NEW_LINE = true;