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

smart completion: detect cases when inference can infer only trivial Object bound (IDEA-153970)

Browse Source
This commit is contained in:
Anna.Kozlova
2016-04-26 15:32:31 +02:00
parent bfb1104420
commit ee6b6e00df
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/CodeInsightUtil.java
+1 -1
View File
@@ -373,7 +373,7 @@ public class CodeInsightUtil {
arg,
true,
PsiUtil.getLanguageLevel(context));
if (PsiType.NULL.equals(substitution) || substitution instanceof PsiWildcardType) continue;
if (PsiType.NULL.equals(substitution) || substitution != null && substitution.equalsToText(CommonClassNames.JAVA_LANG_OBJECT) || substitution instanceof PsiWildcardType) continue;
if (substitution == null) {
result.consume(createType(inheritor, facade.getElementFactory().createRawSubstitutor(inheritor), arrayDim));
return true;
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/PsiGraphInferenceHelper.java
+2 -1
View File
@@ -117,7 +117,8 @@ public class PsiGraphInferenceHelper implements PsiInferenceHelper {
leftTypes = new PsiType[] {arg};
rightTypes = new PsiType[]{param};
}
final PsiTypeParameter[] typeParams = new PsiTypeParameter[] {typeParam};
final PsiTypeParameterListOwner owner = typeParam.getOwner();
final PsiTypeParameter[] typeParams = owner != null ? owner.getTypeParameters() : new PsiTypeParameter[] {typeParam};
final InferenceSession inferenceSession = new InferenceSession(typeParams, leftTypes, rightTypes, PsiSubstitutor.EMPTY, myManager, null);
if (inferenceSession.isProperType(inferenceSession.substituteWithInferenceVariables(param)) &&
inferenceSession.isProperType(inferenceSession.substituteWithInferenceVariables(arg))) {
java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartType18CompletionTest.java
-4
View File
@@ -17,12 +17,9 @@ package com.intellij.codeInsight.completion;
import com.intellij.JavaTestUtil;
import com.intellij.codeInsight.lookup.Lookup;
import com.intellij.idea.Bombed;
import com.intellij.testFramework.LightProjectDescriptor;
import org.jetbrains.annotations.NotNull;
import java.util.Calendar;
public class SmartType18CompletionTest extends LightFixtureCompletionTestCase {
@Override
protected String getBasePath() {
@@ -186,7 +183,6 @@ public void testConvertToObjectStream() {
checkResultByFile("/" + getTestName(false) + "-out.java");
}
@Bombed(user = "anna/peter", month = Calendar.MAY, day = 4)
public void testOnlyCompatibleTypes() {
configureByTestName();
assertOrderedEquals(myFixture.getLookupElementStrings(), "get2");