MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-13 09:19:13 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix exception on unboxing captured wildcard of numeric type

Browse Source 
GitOrigin-RevId: 6fb5c3ed9b1225d4224c8c543221d12412718114
This commit is contained in:
Alexey Kudravtsev
2020-03-10 13:32:01 +00:00
committed by intellij-monorepo-bot
parent 29e3a57092
commit 295a9bc984
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java
+2
View File
@@ -1111,6 +1111,8 @@ public class TypeConversionUtil {
*/
@NotNull
public static PsiType binaryNumericPromotion(PsiType type1, PsiType type2) {
type1 = uncapture(type1);
type2 = uncapture(type2);
if (isDoubleType(type1)) return unbox(type1);
if (isDoubleType(type2)) return unbox(type2);
if (isFloatType(type1)) return unbox(type1);
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/UnboxingWildcards.java
+11
View File
@@ -0,0 +1,11 @@
import java.util.*;
import java.io.*;
class X {
public void save(Collection<? extends Long> value) throws IOException {
assert value.isEmpty() || value.size() == 1;
writeLONG(value.isEmpty() ? 0 : value.iterator().next());
}
public static void writeLONG(long val) throws IOException {
}
}
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/GenericsHighlightingTest.java
+2 -3
View File
@@ -25,9 +25,7 @@ import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.roots.LanguageLevelProjectExtension;
import com.intellij.openapi.util.RecursionManager;
import com.intellij.pom.java.LanguageLevel;
import com.intellij.psi.GenericsUtil;
import com.intellij.psi.PsiManager;
import com.intellij.psi.PsiType;
import com.intellij.psi.*;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.testFramework.IdeaTestUtil;
import org.jetbrains.annotations.NotNull;
@@ -442,4 +440,5 @@ public class GenericsHighlightingTest extends LightDaemonAnalyzerTestCase {
public void testCheckAccessibilityBeforeSuperFieldReferenceInSuperCall() { doTest6(false); }
public void testIDEA128159() { doTest6(false); }
public void testIDEA139214() { doTest(LanguageLevel.JDK_1_6, JavaSdkVersion.JDK_1_8, false); }
public void testUnboxingWildcards() { doTest(LanguageLevel.JDK_1_6, JavaSdkVersion.JDK_1_8, false); }
}