MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-04 17:20:55 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java-decompiler] Fix exception when checking for type arguments on classes

Browse Source 
EA-915555 Fixed

GitOrigin-RevId: 9fd579b9bec0ae4aff8a47aeb61cb943033cd787
This commit is contained in:
Bart van Helvert
2023-10-03 14:39:09 +02:00
committed by intellij-monorepo-bot
parent c2f995423a
commit 4a821f078d
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/main/ClassWriter.java
View File

@@ -1,6 +1,7 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.java.decompiler.main;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.java.decompiler.code.CodeConstants;
import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer;
@@ -1188,7 +1189,7 @@ public class ClassWriter {
}
}
private static void appendParameterAnnotations(TextBuffer buffer, StructMethod mt, Type type, int param) {
private static void appendParameterAnnotations(TextBuffer buffer, StructMethod mt, @NotNull Type type, int param) {
for (StructGeneralAttribute.Key<?> key : StructGeneralAttribute.PARAMETER_ANNOTATION_ATTRIBUTES) {
StructAnnotationParameterAttribute attribute = (StructAnnotationParameterAttribute)mt.getAttribute(key);
if (attribute != null) {

2
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/typeann/TypeAnnotation.java
View File

@@ -103,7 +103,7 @@ public class TypeAnnotation {
.collect(Collectors.toList());
}
public boolean isWrittenBeforeType(Type type) {
public boolean isWrittenBeforeType(@NotNull Type type) {
StructTypePathEntry pathEntry = getPaths().stream().findFirst().orElse(null);
if (pathEntry == null && type.getArrayDim() == 0) {
return type.isAnnotatable();

15
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/StructMember.java
View File

@@ -1,6 +1,7 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.java.decompiler.struct;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.java.decompiler.code.CodeConstants;
import org.jetbrains.java.decompiler.modules.decompiler.exps.AnnotationExprent;
import org.jetbrains.java.decompiler.modules.decompiler.typeann.TargetInfo;
@@ -50,15 +51,23 @@ public abstract class StructMember {
protected abstract Type getType();
/**
* Checks whether annotations should go on type instead of member
*/
public boolean memberAnnCollidesWithTypeAnnotation(AnnotationExprent typeAnnotationExpr) {
Set<AnnotationExprent> typeAnnotations = TargetInfo.EmptyTarget.extract(getPossibleTypeAnnotationCollisions(getType()))
Type type = getType();
if (type == null) return false; // when there is no type reference no collision is possible
Set<AnnotationExprent> typeAnnotations = TargetInfo.EmptyTarget.extract(getPossibleTypeAnnotationCollisions(type))
.stream()
.map(typeAnnotation-> typeAnnotation.getAnnotationExpr())
.collect(Collectors.toUnmodifiableSet());
return typeAnnotations.contains(typeAnnotationExpr);
}
public boolean paramAnnCollidesWithTypeAnnotation(AnnotationExprent typeAnnotationExpr, Type type, int param) {
/**
* Checks whether annotations should go on parameter type instead of parameter
*/
public boolean paramAnnCollidesWithTypeAnnotation(AnnotationExprent typeAnnotationExpr, @NotNull Type type, int param) {
Set<AnnotationExprent> typeAnnotations = TargetInfo.FormalParameterTarget
.extract(getPossibleTypeAnnotationCollisions(type), param).stream()
.map(typeAnnotation-> typeAnnotation.getAnnotationExpr())
@@ -66,7 +75,7 @@ public abstract class StructMember {
return typeAnnotations.contains(typeAnnotationExpr);
}
private List<TypeAnnotation> getPossibleTypeAnnotationCollisions(Type type) {
private List<TypeAnnotation> getPossibleTypeAnnotationCollisions(@NotNull Type type) {
return Arrays.stream(StructGeneralAttribute.TYPE_ANNOTATION_ATTRIBUTES)
.flatMap(attrKey -> {
StructTypeAnnotationAttribute attribute = (StructTypeAnnotationAttribute)getAttribute(attrKey);