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

javac 6 workaround (from IDEA-16723)

Browse Source
This commit is contained in:
Anna Kozlova
2014-06-03 12:50:34 +04:00
parent 19af1ec220
commit fd72f3e8fa
2 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiOldInferenceHelper.java
+8
View File
@@ -249,6 +249,14 @@ public class PsiOldInferenceHelper implements PsiInferenceHelper {
}
break OtherParameters;
}
else if (currentConstraintType == ConstraintType.SUPERTYPE && !JavaVersionService.getInstance().isAtLeast(parent, JavaSdkVersion.JDK_1_7)) {
if (PsiType.NULL.equals(substitutionFromBounds)) {
substitutionFromBounds = currentSubstitution;
}
else {
substitutionFromBounds = GenericsUtil.getLeastUpperBound(substitutionFromBounds, currentSubstitution, myManager);
}
}
}
}
}
java/java-tests/testSrc/com/intellij/codeInspection/RedundantTypeArgsInspectionTest.java
+19 -7
View File
@@ -5,25 +5,37 @@
package com.intellij.codeInspection;
import com.intellij.JavaTestUtil;
import com.intellij.codeInsight.daemon.LightDaemonAnalyzerTestCase;
import com.intellij.codeInspection.miscGenerics.RedundantTypeArgsInspection;
import com.intellij.openapi.projectRoots.JavaSdkVersion;
import com.intellij.pom.java.LanguageLevel;
import com.intellij.testFramework.IdeaTestUtil;
import com.intellij.testFramework.builders.JavaModuleFixtureBuilder;
import com.intellij.testFramework.fixtures.JavaCodeInsightFixtureTestCase;
import org.jetbrains.annotations.NotNull;
public class RedundantTypeArgsInspectionTest extends JavaCodeInsightFixtureTestCase {
public class RedundantTypeArgsInspectionTest extends LightDaemonAnalyzerTestCase {
@NotNull
@Override
protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) {
moduleBuilder.setMockJdkLevel(JavaModuleFixtureBuilder.MockJdkLevel.jdk15);
protected LocalInspectionTool[] configureLocalInspectionTools() {
return new LocalInspectionTool[] { new RedundantTypeArgsInspection()};
}
@Override
protected LanguageLevel getLanguageLevel() {
return LanguageLevel.JDK_1_6;
}
@NotNull
@Override
protected String getTestDataPath() {
return JavaTestUtil.getJavaTestDataPath() + "/inspection/redundantTypeArgs/";
return JavaTestUtil.getJavaTestDataPath();
}
private void doTest() throws Throwable {
final RedundantTypeArgsInspection inspection = new RedundantTypeArgsInspection();
myFixture.enableInspections(inspection);
myFixture.testHighlighting(true, false, false, getTestName(false) + ".java");
IdeaTestUtil.setTestVersion(JavaSdkVersion.JDK_1_6, getModule(), myTestRootDisposable);
doTest("/inspection/redundantTypeArgs/" + getTestName(false) + ".java", true, false);
}
public void testReturnPrimitiveTypes() throws Throwable { // javac non-boxing: IDEA-53984