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

IJ-CR-102080 [java-highlighting] IDEA-311833. Support for nested classes

Browse Source 
GitOrigin-RevId: 5b6abb10000191f337228408363abc3bb3f6e64c
This commit is contained in:
Mikhail Pyltsin
2023-02-01 19:49:22 +00:00
committed by intellij-monorepo-bot
parent 78bb5fe457
commit b357f878a5
4 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-api/src/com/intellij/codeInsight/daemon/impl/analysis/JavaGenericsUtil.java
+1 -1
View File
@@ -172,7 +172,7 @@ public final class JavaGenericsUtil {
return true;
}
boolean operandHasWildcard = false;
for (PsiTypeParameter parameter : superClass.getTypeParameters()) {
for (PsiTypeParameter parameter : PsiUtil.typeParametersIterable(operandClass)) {
PsiType operandParameterType = operandSubstitutor.substitute(parameter);
if (operandParameterType instanceof PsiCapturedWildcardType) {
operandHasWildcard = true;
java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java
+13 -25
View File
@@ -17,6 +17,7 @@ import com.intellij.psi.tree.IElementType;
import com.intellij.util.SmartList;
import com.intellij.util.containers.*;
import org.intellij.lang.annotations.MagicConstant;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -25,6 +26,7 @@ import java.util.*;
import java.util.function.BiPredicate;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
import static com.intellij.psi.CommonClassNames.*;
@@ -1261,10 +1263,8 @@ public final class TypeConversionUtil {
* }
* </pre>
*/
@ApiStatus.Experimental
public static boolean existSuperPathWithoutRepetitiveArguments(PsiClass psiClass, PsiClass superClass) {
if (!psiClass.hasTypeParameters() || !superClass.hasTypeParameters()) {
return false;
}
final Map<PsiClass, Object> map = CachedValuesManager.getCachedValue(psiClass, () -> {
HashingStrategy<PsiClass> strategy = new HashingStrategy<PsiClass>() {
@Override
@@ -1280,11 +1280,6 @@ public final class TypeConversionUtil {
if (o1 == null || o2 == null) {
return false;
}
String qname1 = o1.getQualifiedName();
if (qname1 != null) {
return qname1.equals(o2.getQualifiedName());
}
return o1.getManager().areElementsEquivalent(o1, o2);
}
};
@@ -1292,29 +1287,22 @@ public final class TypeConversionUtil {
final Object dummyValue = new Object();
ArrayDeque<PsiClassType> queue = new ArrayDeque<>();
Function<PsiClass, Set<PsiTypeParameter>> collectPsiTypeParameters = aClass -> {
PsiTypeParameter[] typeParameters = aClass.getTypeParameters();
return Arrays.stream(typeParameters)
return StreamSupport.stream(PsiUtil.typeParametersIterable(aClass).spliterator(), false)
.filter(t -> t.getBounds().length == 0)
.collect(Collectors.toSet());
};
BiPredicate<Set<PsiTypeParameter>, PsiClassType> isPossibleWay = (sourceTypeParameters, superType) -> {
Map<PsiTypeParameter, Integer> count = new HashMap<>();
PsiType[] superTypeParameters = superType.getParameters();
if (superTypeParameters.length == 0) {
Map<PsiType, Integer> count = new HashMap<>();
PsiClass resolved = superType.resolve();
if (resolved == null) {
return false;
}
for (PsiType type : superTypeParameters) {
if (!(type instanceof PsiClassType)) {
continue;
}
PsiClassType currentClassType = (PsiClassType)type;
JvmTypeResolveResult resolvedType = currentClassType.resolveType();
if (resolvedType == null) {
continue;
}
JvmTypeDeclaration declaration = resolvedType.getDeclaration();
if (declaration instanceof PsiTypeParameter && sourceTypeParameters.contains(declaration)) {
count.merge((PsiTypeParameter)declaration, 1, (oldValue, newValue) -> oldValue + newValue);
Set<PsiType> sourceTypes = sourceTypeParameters.stream().map(t -> PsiSubstitutor.EMPTY.substitute(t))
.collect(Collectors.toSet());
Map<PsiTypeParameter, PsiType> substitutionMap = superType.resolveGenerics().getSubstitutor().getSubstitutionMap();
for (PsiType type : substitutionMap.values()) {
if (sourceTypes.contains(type)) {
count.merge(type, 1, (oldValue, newValue) -> oldValue + newValue);
}
}
return ContainerUtil.and(count.values(), t -> t <= 1);
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/OnlyUncheckedWarningCastWithInnerClasses.java
+14
View File
@@ -0,0 +1,14 @@
public class OnlyUncheckedWarningCastWithInnerClasses<T> {
public abstract class Mapper extends UnaryOperator {
}
public abstract class UnaryOperator implements Function<T, T> {}
void test(OnlyUncheckedWarningCastWithInnerClasses<? extends CharSequence>.UnaryOperator op) {
OnlyUncheckedWarningCastWithInnerClasses<? extends CharSequence>.Mapper op1 = (OnlyUncheckedWarningCastWithInnerClasses<? extends CharSequence>.Mapper) op;
}
}
interface Function<T, R> {
R apply(T t);
}
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/GenericsHighlightingTest.java
+1
View File
@@ -451,5 +451,6 @@ public class GenericsHighlightingTest extends LightDaemonAnalyzerTestCase {
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); }
public void testOnlyUncheckedWarningWithCast(){doTest(LanguageLevel.JDK_1_7, JavaSdkVersion.JDK_1_7, true);}
public void testOnlyUncheckedWarningCastWithInnerClasses(){doTest(LanguageLevel.JDK_1_7, JavaSdkVersion.JDK_1_7, true);}
public void testOnlyUncheckedWarningCastWithDuplicatedArguments(){doTest(LanguageLevel.JDK_1_7, JavaSdkVersion.JDK_1_7, true);}
}