MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 14:23:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

do not create raw outer types during diamond inference

Browse Source 
(cherry picked from commit c812622e14b3cb86ec18cedd406118789abb2e83)
This commit is contained in:
anna
2013-11-27 13:34:17 +01:00
parent 834793e8f3
commit ad9486dbf7
3 changed files with 63 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
java/java-psi-impl/src/com/intellij/psi/PsiDiamondTypeImpl.java
View File

@@ -28,6 +28,7 @@ import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.util.Function;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -136,7 +137,7 @@ public class PsiDiamondTypeImpl extends PsiDiamondType {
final PsiMethod constructor = findConstructor(psiClass, newExpression);
PsiTypeParameter[] params = getAllTypeParams(constructor, psiClass);
final PsiMethod staticFactory = generateStaticFactory(constructor, psiClass, params);
final PsiMethod staticFactory = generateStaticFactory(constructor, psiClass, params, newExpression.getClassReference());
if (staticFactory == null) {
return null;
}
@@ -210,7 +211,10 @@ public class PsiDiamondTypeImpl extends PsiDiamondType {
}
@Nullable
private static PsiMethod generateStaticFactory(@Nullable PsiMethod constructor, PsiClass containingClass, PsiTypeParameter[] params) {
private static PsiMethod generateStaticFactory(@Nullable PsiMethod constructor,
PsiClass containingClass,
PsiTypeParameter[] params,
PsiJavaCodeReferenceElement reference) {
final StringBuilder buf = new StringBuilder();
buf.append("public static ");
buf.append("<");
@@ -223,7 +227,23 @@ public class PsiDiamondTypeImpl extends PsiDiamondType {
}, ", "));
buf.append(">");
final String qualifiedName = containingClass.getQualifiedName();
final PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(containingClass.getProject());
String qualifiedName = containingClass.getQualifiedName();
PsiElement qualifier = reference != null ? reference.getQualifier() : null;
if (qualifier instanceof PsiJavaCodeReferenceElement) {
final JavaResolveResult resolveResult = ((PsiJavaCodeReferenceElement)qualifier).advancedResolve(false);
final PsiElement element = resolveResult.getElement();
if (element instanceof PsiClass) {
final String outerClassSubstitutedQName =
elementFactory.createType((PsiClass)element, resolveResult.getSubstitutor()).getInternalCanonicalText();
qualifiedName = outerClassSubstitutedQName + "." + containingClass.getName();
}
} else if (reference != null && qualifier == null && containingClass.getContainingClass() != null) {
qualifiedName = null;
}
buf.append(qualifiedName != null ? qualifiedName : containingClass.getName());
final PsiTypeParameter[] parameters = containingClass.getTypeParameters();
buf.append("<");
@@ -253,7 +273,12 @@ public class PsiDiamondTypeImpl extends PsiDiamondType {
}
buf.append("{}");
return JavaPsiFacade.getElementFactory(containingClass.getProject()).createMethodFromText(buf.toString(), constructor != null ? constructor : containingClass);
try {
return elementFactory.createMethodFromText(buf.toString(), constructor != null ? constructor : containingClass);
}
catch (IncorrectOperationException e) {
return null;
}
}
private static PsiTypeParameter[] getAllTypeParams(PsiTypeParameterListOwner listOwner, PsiClass containingClass) {

23
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/diamond/OuterClass.java Normal file
View File

@@ -0,0 +1,23 @@
import java.util.*;
class HT<O> {
private Iterator<O> getIterator(int type, int count) {
return new Enumerator<>(type, true);
}
private class Enumerator<T> implements Iterator<T> {
public Enumerator(int type, boolean b) {
}
@Override
public boolean hasNext() {
return false;
}
@Override
public T next() {
return null;
}
}
}

11
java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/Diamond8HighlightingTest.java
View File

@@ -16,6 +16,8 @@
package com.intellij.codeInsight.daemon.lambda;
import com.intellij.codeInsight.daemon.LightDaemonAnalyzerTestCase;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.testFramework.IdeaTestUtil;
import org.jetbrains.annotations.NonNls;
public class Diamond8HighlightingTest extends LightDaemonAnalyzerTestCase {
@@ -25,7 +27,16 @@ public class Diamond8HighlightingTest extends LightDaemonAnalyzerTestCase {
doTest();
}
public void testOuterClass() throws Exception {
doTest();
}
private void doTest() throws Exception {
doTestNewInference(BASE_PATH + "/" + getTestName(false) + ".java", false, false);
}
@Override
protected Sdk getProjectJDK() {
return IdeaTestUtil.getMockJdk18();
}
}