Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,9 @@ public Tree visitType(TypeElement e, Void p) {
List<Tree> members = new LinkedList<Tree>();

for (Element m : e.getEnclosedElements()) {
if (m.getKind() == ElementKind.RECORD_COMPONENT) {
continue; // TODO update to 'extend AbstractElementVisitor14'; visiting record components causes UnknownElementException
}
Tree member = visit(m);

if (member != null)
Expand All @@ -408,6 +411,10 @@ public Tree visitType(TypeElement e, Void p) {
return addDeprecated(e, make.Interface(mods, e.getSimpleName(), constructTypeParams(e.getTypeParameters()), computeSuper(e.getInterfaces()), members));
case ENUM:
return addDeprecated(e, make.Enum(mods, e.getSimpleName(), computeSuper(e.getInterfaces()), members));
case RECORD:
// TODO generates final class atm
return addDeprecated(e, make.Class(mods, e.getSimpleName(), constructTypeParams(e.getTypeParameters()), null, computeSuper(e.getInterfaces()), members));
// return addDeprecated(e, make.Record(mods, e.getSimpleName(), computeSuper(e.getInterfaces()), members));
case ANNOTATION_TYPE:
return addDeprecated(e, make.AnnotationType(mods, e.getSimpleName(), members));
default:
Expand Down Expand Up @@ -782,6 +789,8 @@ public void writeInstr(Instruction instr) {
IMPLICIT_MODIFIERS = new HashMap<List<ElementKind>, Set<Modifier>>();

IMPLICIT_MODIFIERS.put(Arrays.asList(ElementKind.ENUM), EnumSet.of(Modifier.STATIC, Modifier.ABSTRACT, Modifier.FINAL));
// TODO implement record support
// IMPLICIT_MODIFIERS.put(Arrays.asList(ElementKind.RECORD), EnumSet.of(Modifier.STATIC, Modifier.ABSTRACT, Modifier.FINAL));
IMPLICIT_MODIFIERS.put(Arrays.asList(ElementKind.ANNOTATION_TYPE), EnumSet.of(Modifier.STATIC, Modifier.ABSTRACT));
IMPLICIT_MODIFIERS.put(Arrays.asList(ElementKind.METHOD, ElementKind.ANNOTATION_TYPE), EnumSet.of(Modifier.ABSTRACT));
IMPLICIT_MODIFIERS.put(Arrays.asList(ElementKind.METHOD, ElementKind.INTERFACE), EnumSet.of(Modifier.ABSTRACT));
Expand Down