diff options
| author | Sorin Basca <sorinbasca@google.com> | 2023-04-19 11:36:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-19 11:36:39 +0000 |
| commit | c45dff0efc9a521edb97b5c3c14c104b80437e3a (patch) | |
| tree | 0db6f8d7261fa8ffae9c27c4f0722eeb7dc2b9b9 | |
| parent | 57e70fb82e81559eb5d03c39f6c4ceaaaeb362f3 (diff) | |
| parent | 5d1cb921ec3d3b5d0a094904e66a971bd2ddf5ac (diff) | |
| download | doclava-c45dff0efc9a521edb97b5c3c14c104b80437e3a.tar.gz | |
Merge "Handle ElementKind.RECORD in ProgramElementDocImpl.containingClass" am: 166538e822 am: 809d796a47 am: 5d1cb921ec
Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/2544671
Change-Id: Idc2cfff75b5481da1a04abd13072e0a1ffbdf5ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | doclet_adapter/src/main/java/com/google/doclava/javadoc/ProgramElementDocImpl.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/doclet_adapter/src/main/java/com/google/doclava/javadoc/ProgramElementDocImpl.java b/doclet_adapter/src/main/java/com/google/doclava/javadoc/ProgramElementDocImpl.java index bdf49de..bf9803d 100644 --- a/doclet_adapter/src/main/java/com/google/doclava/javadoc/ProgramElementDocImpl.java +++ b/doclet_adapter/src/main/java/com/google/doclava/javadoc/ProgramElementDocImpl.java @@ -96,14 +96,16 @@ abstract class ProgramElementDocImpl<T extends Element> extends DocImpl<T> imple Element cur = element.getEnclosingElement(); while (cur != null && cur.getKind() != ElementKind.ANNOTATION_TYPE && cur.getKind() != ElementKind.CLASS - && cur.getKind() != ElementKind.ENUM && cur.getKind() != ElementKind.INTERFACE) { + && cur.getKind() != ElementKind.ENUM + && cur.getKind() != ElementKind.INTERFACE + && cur.getKind() != ElementKind.RECORD) { cur = cur.getEnclosingElement(); } if (cur == null) { return null; } return switch (cur.getKind()) { - case CLASS, INTERFACE, ENUM, ANNOTATION_TYPE -> ClassDocImpl.create((TypeElement) cur, + case CLASS, INTERFACE, ENUM, ANNOTATION_TYPE, RECORD -> ClassDocImpl.create((TypeElement) cur, context); default -> null; }; |