From f8db39d7aee8325ccaf94e1d5474edab8c6f6332 Mon Sep 17 00:00:00 2001 From: Noah Santschi-Cooney Date: Thu, 8 Apr 2021 12:04:21 +0100 Subject: [PATCH] add pretty-printing of annotations on symbols --- .gitignore | 2 + .jvmopts | 3 +- build.sbt | 1 + .../lsif_java/SemanticdbPrinters.scala | 2 +- .../commands/SnapshotLsifCommand.scala | 2 +- .../lsif_semanticdb/SignatureFormatter.java | 100 ++++++++++ .../src/main/protobuf/semanticdb.proto | 101 ++++++++++ .../SemanticdbSignatures.java | 160 +--------------- .../SemanticdbTypeVisitor.java | 168 +++++++++++++++++ .../semanticdb_javac/SemanticdbVisitor.java | 175 +++++++++++++++++- .../src/main/java/minimized/Annotations.java | 11 +- .../com/airbnb/epoxy/AfterPropsSet.java | 2 +- .../com/airbnb/epoxy/AsyncEpoxyDiffer.java | 50 ++--- .../generated/com/airbnb/epoxy/AutoModel.java | 2 +- .../com/airbnb/epoxy/BaseEpoxyAdapter.java | 42 ++--- .../com/airbnb/epoxy/BoundViewHolders.java | 14 +- .../com/airbnb/epoxy/CallbackProp.java | 2 +- .../generated/com/airbnb/epoxy/Carousel.java | 100 +++++----- .../airbnb/epoxy/ControllerHelperLookup.java | 2 +- .../com/airbnb/epoxy/ControllerModelList.java | 4 +- .../com/airbnb/epoxy/DebugTimer.java | 4 +- .../com/airbnb/epoxy/DiffHelper.java | 12 +- .../com/airbnb/epoxy/DiffPayload.java | 4 +- .../com/airbnb/epoxy/DiffResult.java | 24 +-- .../com/airbnb/epoxy/EpoxyAdapter.java | 8 +- .../com/airbnb/epoxy/EpoxyAsyncUtil.java | 2 +- .../com/airbnb/epoxy/EpoxyAttribute.java | 6 +- .../com/airbnb/epoxy/EpoxyController.java | 74 ++++---- .../airbnb/epoxy/EpoxyControllerAdapter.java | 80 ++++---- .../airbnb/epoxy/EpoxyDataBindingLayouts.java | 4 +- .../airbnb/epoxy/EpoxyDataBindingPattern.java | 2 +- .../com/airbnb/epoxy/EpoxyDiffLogger.java | 12 +- .../com/airbnb/epoxy/EpoxyHolder.java | 4 +- .../epoxy/EpoxyItemSpacingDecorator.java | 8 +- .../com/airbnb/epoxy/EpoxyModel.java | 92 ++++----- .../com/airbnb/epoxy/EpoxyModelClass.java | 4 +- .../com/airbnb/epoxy/EpoxyModelGroup.java | 64 +++---- .../airbnb/epoxy/EpoxyModelTouchCallback.java | 38 ++-- .../airbnb/epoxy/EpoxyModelWithHolder.java | 46 ++--- .../com/airbnb/epoxy/EpoxyModelWithView.java | 12 +- .../com/airbnb/epoxy/EpoxyTouchHelper.java | 48 ++--- .../epoxy/EpoxyTouchHelperCallback.java | 24 +-- .../com/airbnb/epoxy/EpoxyViewHolder.java | 24 +-- .../com/airbnb/epoxy/HandlerExecutor.java | 4 +- .../com/airbnb/epoxy/HiddenEpoxyModel.java | 4 +- .../generated/com/airbnb/epoxy/IdUtils.java | 2 +- .../airbnb/epoxy/ImmutableModelException.java | 2 +- .../com/airbnb/epoxy/ListenersUtils.java | 6 +- .../generated/com/airbnb/epoxy/ModelList.java | 56 +++--- .../generated/com/airbnb/epoxy/ModelProp.java | 2 +- .../com/airbnb/epoxy/ModelState.java | 2 +- .../generated/com/airbnb/epoxy/ModelView.java | 4 +- .../airbnb/epoxy/NoOpControllerHelper.java | 2 +- .../generated/com/airbnb/epoxy/NoOpTimer.java | 4 +- .../com/airbnb/epoxy/NotifyBlocker.java | 12 +- .../epoxy/OnModelBuildFinishedListener.java | 2 +- .../OnModelVisibilityChangedListener.java | 8 +- ...OnModelVisibilityStateChangedListener.java | 2 +- .../com/airbnb/epoxy/OnViewRecycled.java | 2 +- .../com/airbnb/epoxy/OnVisibilityChanged.java | 2 +- .../epoxy/OnVisibilityStateChanged.java | 2 +- .../com/airbnb/epoxy/PackageEpoxyConfig.java | 2 +- .../airbnb/epoxy/PackageModelViewConfig.java | 2 +- .../epoxy/QuantityStringResAttribute.java | 16 +- .../com/airbnb/epoxy/SimpleEpoxyAdapter.java | 46 ++--- .../airbnb/epoxy/SimpleEpoxyController.java | 4 +- .../com/airbnb/epoxy/SimpleEpoxyModel.java | 20 +- .../com/airbnb/epoxy/StringAttributeData.java | 32 ++-- .../generated/com/airbnb/epoxy/TextProp.java | 4 +- .../airbnb/epoxy/Typed2EpoxyController.java | 8 +- .../airbnb/epoxy/Typed3EpoxyController.java | 8 +- .../airbnb/epoxy/Typed4EpoxyController.java | 8 +- .../airbnb/epoxy/TypedEpoxyController.java | 10 +- .../generated/com/airbnb/epoxy/UpdateOp.java | 12 +- .../com/airbnb/epoxy/UpdateOpHelper.java | 8 +- .../com/airbnb/epoxy/ViewHolderState.java | 16 +- .../com/airbnb/epoxy/ViewTypeManager.java | 4 +- .../com/airbnb/epoxy/VisibilityState.java | 2 +- ...rappedEpoxyModelCheckedChangeListener.java | 6 +- .../main/generated/minimized/Annotations.java | 25 ++- .../generated/minimized/AnonymousClasses.java | 4 +- .../generated/minimized/InnerClasses.java | 4 +- .../minimized/MinimizedJavaMain.java | 2 +- .../main/generated/minimized/RawTypes.java | 2 +- .../main/generated/minimized/SubClasses.java | 4 +- 85 files changed, 1153 insertions(+), 753 deletions(-) create mode 100644 semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbTypeVisitor.java diff --git a/.gitignore b/.gitignore index 0828c091e..a082f970b 100644 --- a/.gitignore +++ b/.gitignore @@ -29,6 +29,8 @@ _site/ metals.sbt metals/project/ +.bsp + .vscode/ local.* diff --git a/.jvmopts b/.jvmopts index 1343b655b..7fb1642e4 100644 --- a/.jvmopts +++ b/.jvmopts @@ -1,5 +1,4 @@ -Xss2m -Xms1G -Xmx4G --Dfile.encoding=UTF-8 --Dsbt.server.autostart=false +-Dfile.encoding=UTF-8 \ No newline at end of file diff --git a/build.sbt b/build.sbt index c1a35a118..8ac86f290 100644 --- a/build.sbt +++ b/build.sbt @@ -248,6 +248,7 @@ lazy val unit = project .in(file("tests/unit")) .settings( testSettings, + //javaOptions ++= Seq( "-Xdebug", "-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"), buildInfoKeys := Seq[BuildInfoKey]( version, diff --git a/lsif-java/src/main/scala/com/sourcegraph/lsif_java/SemanticdbPrinters.scala b/lsif-java/src/main/scala/com/sourcegraph/lsif_java/SemanticdbPrinters.scala index e3f19d142..c3a12efd1 100644 --- a/lsif-java/src/main/scala/com/sourcegraph/lsif_java/SemanticdbPrinters.scala +++ b/lsif-java/src/main/scala/com/sourcegraph/lsif_java/SemanticdbPrinters.scala @@ -88,7 +88,7 @@ object SemanticdbPrinters { if (sig.isEmpty) " " + info.getDisplayName else - " " + sig + " " + sig.replace('\n', ' ') case _ => "" } diff --git a/lsif-java/src/main/scala/com/sourcegraph/lsif_java/commands/SnapshotLsifCommand.scala b/lsif-java/src/main/scala/com/sourcegraph/lsif_java/commands/SnapshotLsifCommand.scala index bf92166e5..0516bafba 100644 --- a/lsif-java/src/main/scala/com/sourcegraph/lsif_java/commands/SnapshotLsifCommand.scala +++ b/lsif-java/src/main/scala/com/sourcegraph/lsif_java/commands/SnapshotLsifCommand.scala @@ -138,7 +138,7 @@ object SnapshotLsifCommand { // we cheese it a bit here, as this is less work than trying to reconstruct // a Signature from the pretty-printed Signature, with accompanying logic // to fallback to display_name in SemanticdbPrinters.scala - .setDisplayName(hover).setSymbol(symbol).build() + .setDisplayName(hover.replace('\n', ' ')).setSymbol(symbol).build() doc.addSymbols(symInfo) } } diff --git a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/SignatureFormatter.java b/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/SignatureFormatter.java index d978462b7..182af2a63 100644 --- a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/SignatureFormatter.java +++ b/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/SignatureFormatter.java @@ -4,6 +4,7 @@ import com.sourcegraph.semanticdb_javac.Semanticdb.*; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Objects; import java.util.concurrent.atomic.AtomicInteger; @@ -51,6 +52,8 @@ private void formatClassSignature(ClassSignature classSignature) { boolean isEnum = has(Property.ENUM); + printKeywordln(formatAnnotations()); + printKeyword(formatAccess()); if (!isEnum && !isAnnotation) printKeyword(formatModifiers()); @@ -143,6 +146,7 @@ private void formatClassSignature(ClassSignature classSignature) { } private void formatMethodSignature(MethodSignature methodSignature) { + printKeywordln(formatAnnotations()); printKeyword(formatAccess()); printKeyword(formatModifiers()); @@ -177,6 +181,7 @@ private void formatMethodSignature(MethodSignature methodSignature) { } private void formatValueSignature(ValueSignature valueSignature) { + printKeywordln(formatAnnotations()); if (isEnumConstant()) { String ownerSym = SymbolDescriptor.parseFromSymbol(symbolInformation.getSymbol()).owner; SymbolInformation ownerInfo = symtab.symbols.get(ownerSym); @@ -234,6 +239,96 @@ private String formatTypeArguments(List typeArguments) { return typeArguments.stream().map(this::formatType).collect(Collectors.joining(", ", "<", ">")); } + private String formatAnnotations() { + return formatAnnotations(symbolInformation); + } + + private String formatAnnotations(SymbolInformation symInfo) { + return symInfo.getAnnotationsList().stream() + .map(this::formatAnnotation) + .collect(Collectors.joining("\n")); + } + + private String formatAnnotation(Annotation annotation) { + StringBuilder b = new StringBuilder(); + b.append('@'); + b.append(formatType(annotation.getTpe())); + if (annotation.getParametersCount() > 0) { + b.append('('); + Annotation.ParameterPair firstParam = annotation.getParameters(0); + if (annotation.getParametersCount() == 1 + && SymbolDescriptor.parseFromSymbol(firstParam.getKey()) + .descriptor + .name + .equals("value")) { + b.append(formatTree(firstParam.getValue())); + } else { + String parameter = + annotation.getParametersList().stream() + .map( + p -> + SymbolDescriptor.parseFromSymbol(p.getKey()).descriptor.name + + " = " + + formatTree(p.getValue())) + .collect(Collectors.joining(", ")); + b.append(parameter); + } + b.append(')'); + } + return b.toString(); + } + + private String formatTree(Tree tree) { + if (tree.hasIdTree()) { + return SymbolDescriptor.parseFromSymbol(tree.getIdTree().getSymbol()).descriptor.name; + } else if (tree.hasLiteralTree()) { + return formatConstant(tree.getLiteralTree().getConstant()); + } else if (tree.hasSelectTree()) { + return formatTree(tree.getSelectTree().getQualifier()) + + "." + + SymbolDescriptor.parseFromSymbol(tree.getSelectTree().getId().getSymbol()) + .descriptor + .name; + } else if (tree.hasAnnotationTree()) { + return formatAnnotation(tree.getAnnotationTree().getAnnotation()); + } else if (tree.hasApplyTree()) { + if (tree.getApplyTree().getFunction().hasIdTree() + && tree.getApplyTree().getFunction().getIdTree().getSymbol().equals(ARRAY_SYMBOL)) { + return tree.getApplyTree().getArgumentsList().stream() + .map(this::formatTree) + .collect(Collectors.joining(", ", "{", "}")); + } else { + throw new IllegalArgumentException( + "unexpected apply tree function " + tree.getApplyTree().getFunction()); + } + } + + throw new IllegalArgumentException("tree was of unexpected type " + tree); + } + + private String formatConstant(Constant constant) { + if (constant.hasBooleanConstant()) { + return Boolean.toString(constant.getBooleanConstant().getValue()); + } else if (constant.hasByteConstant()) { + return Integer.toString(constant.getByteConstant().getValue()); + } else if (constant.hasShortConstant()) { + return Integer.toString(constant.getShortConstant().getValue()); + } else if (constant.hasCharConstant()) { + return String.valueOf((char) constant.getCharConstant().getValue()); + } else if (constant.hasIntConstant()) { + return Integer.toString(constant.getIntConstant().getValue()); + } else if (constant.hasLongConstant()) { + return Long.toString(constant.getLongConstant().getValue()); + } else if (constant.hasFloatConstant()) { + return Float.toString(constant.getFloatConstant().getValue()) + 'f'; + } else if (constant.hasDoubleConstant()) { + return Double.toString(constant.getDoubleConstant().getValue()); + } else if (constant.hasStringConstant()) { + return '"' + constant.getStringConstant().getValue() + '"'; + } + throw new IllegalArgumentException("constant was not of known type " + constant); + } + private String formatType(Type type) { StringBuilder b = new StringBuilder(); if (type.hasTypeRef()) { @@ -307,6 +402,11 @@ private void printKeyword(String keyword) { s.append(keyword).append(' '); } + private void printKeywordln(String keyword) { + if (keyword.isEmpty()) return; + s.append(keyword).append('\n'); + } + private boolean isEnumConstant(SymbolInformation symInfo) { if (!(has(Property.ENUM, symInfo) && has(Property.FINAL, symInfo) diff --git a/semanticdb-java/src/main/protobuf/semanticdb.proto b/semanticdb-java/src/main/protobuf/semanticdb.proto index e3a8e6194..635c3f8ac 100644 --- a/semanticdb-java/src/main/protobuf/semanticdb.proto +++ b/semanticdb-java/src/main/protobuf/semanticdb.proto @@ -103,12 +103,24 @@ message SymbolInformation { Kind kind = 3; int32 properties = 4; string display_name = 5; + repeated Annotation annotations = 13; Signature signature = 17; Access access = 18; repeated string overridden_symbols = 19; Documentation documentation = 20; } +message Annotation { + Type tpe = 1; + // -- OUT OF SPEC -- // + message ParameterPair { + string key = 1; + Tree value = 2; + } + repeated ParameterPair parameters = 2; + // -- OUT OF SPEC -- // +} + message Access { oneof sealed_value { PrivateAccess private_access = 1; @@ -178,4 +190,93 @@ message ExistentialType { reserved 2; Type tpe = 1; Scope declarations = 3; +} + +message Tree { + oneof sealed_value { + ApplyTree apply_tree = 1; + IdTree id_tree = 3; + LiteralTree literal_tree = 4; + OriginalTree original_tree = 6; + SelectTree select_tree = 7; + // -- OUT OF SPEC -- // + AnnotationTree annotation_tree = 8; + // -- OUT OF SPEC -- // + } +} + +message ApplyTree { + Tree function = 1; + repeated Tree arguments = 2; +} + +message IdTree { + string symbol = 1; +} + +message OriginalTree { + Range range = 1; +} + +message LiteralTree { + Constant constant = 1; +} + +message SelectTree { + Tree qualifier = 1; + IdTree id = 2; +} + +message AnnotationTree { + Annotation annotation = 1; +} + +message Constant { + oneof sealed_value { + BooleanConstant boolean_constant = 2; + ByteConstant byte_constant = 3; + ShortConstant short_constant = 4; + CharConstant char_constant = 5; + IntConstant int_constant = 6; + LongConstant long_constant = 7; + FloatConstant float_constant = 8; + DoubleConstant double_constant = 9; + StringConstant string_constant = 10; + } +} + +message BooleanConstant { + bool value = 1; +} + +message ByteConstant { + int32 value = 1; +} + +message ShortConstant { + int32 value = 1; +} + +message CharConstant { + int32 value = 1; +} + +message IntConstant { + int32 value = 1; +} + +message LongConstant { + int64 value = 1; +} + +message FloatConstant { + float value = 1; +} + +message DoubleConstant { + double value = 1; +} + +message StringConstant { + string value = 1; } \ No newline at end of file diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbSignatures.java b/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbSignatures.java index fd0ab1fbf..934c1e4af 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbSignatures.java +++ b/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbSignatures.java @@ -6,20 +6,14 @@ import javax.lang.model.element.Element; import javax.lang.model.type.*; -import javax.lang.model.type.IntersectionType; -import javax.lang.model.util.SimpleTypeVisitor8; -import java.util.ArrayList; import java.util.List; +import static com.sourcegraph.semanticdb_javac.SemanticdbTypeVisitor.UNRESOLVED_TYPE_REF; + public final class SemanticdbSignatures { private final GlobalSymbolsCache cache; private final LocalSymbolsCache locals; - private static final Semanticdb.Type UNRESOLVED_TYPE_REF = - Semanticdb.Type.newBuilder() - .setTypeRef(TypeRef.newBuilder().setSymbol("unresolved_type#")) - .build(); - public SemanticdbSignatures(GlobalSymbolsCache cache, LocalSymbolsCache locals) { this.cache = cache; this.locals = locals; @@ -116,154 +110,4 @@ private Scope generateScope(List elements) { private Semanticdb.Type generateType(TypeMirror mirror) { return mirror.accept(new SemanticdbTypeVisitor(cache, locals), null); } - - /** A TypeMirror tree visitor that constructs a recursive SemanticDB Type structure. */ - private static class SemanticdbTypeVisitor extends SimpleTypeVisitor8 { - private final GlobalSymbolsCache cache; - private final LocalSymbolsCache locals; - - private SemanticdbTypeVisitor(GlobalSymbolsCache cache, LocalSymbolsCache locals) { - this.cache = cache; - this.locals = locals; - } - - @Override - public Semanticdb.Type visitDeclared(DeclaredType t, Void unused) { - boolean isExistential = - t.getTypeArguments().stream().anyMatch((type) -> type instanceof WildcardType); - - ArrayList typeParams = new ArrayList<>(); - Scope.Builder declarations = Scope.newBuilder(); - for (TypeMirror type : t.getTypeArguments()) { - Semanticdb.Type visited = super.visit(type); - if (visited == null) { - visited = UNRESOLVED_TYPE_REF; - } - typeParams.add(visited); - - if (type instanceof WildcardType) { - TypeSignature.Builder typeSig = TypeSignature.newBuilder(); - WildcardType wildcardType = (WildcardType) type; - - // semanticdb spec asks for List() not None for type_parameters field - typeSig.setTypeParameters(Scope.newBuilder()); - - if (wildcardType.getExtendsBound() != null) { - typeSig.setUpperBound(super.visit(wildcardType.getExtendsBound())); - } else if (wildcardType.getSuperBound() != null) { - typeSig.setLowerBound(super.visit(wildcardType.getSuperBound())); - } - - declarations.addHardlinks( - SymbolInformation.newBuilder() - .setSymbol("local_wildcard") - .setSignature(Signature.newBuilder().setTypeSignature(typeSig))); - } else { - declarations.addSymlinks(cache.semanticdbSymbol(((Type) type).asElement(), locals)); - } - } - - if (!isExistential) { - return Semanticdb.Type.newBuilder() - .setTypeRef( - TypeRef.newBuilder() - .setSymbol(cache.semanticdbSymbol(t.asElement(), locals)) - .addAllTypeArguments(typeParams)) - .build(); - } else { - return Semanticdb.Type.newBuilder() - .setExistentialType( - ExistentialType.newBuilder() - .setTpe( - Semanticdb.Type.newBuilder() - .setTypeRef( - TypeRef.newBuilder() - .setSymbol(cache.semanticdbSymbol(t.asElement(), locals)) - .addAllTypeArguments(typeParams))) - .setDeclarations(declarations)) - .build(); - } - } - - @Override - public Semanticdb.Type visitArray(ArrayType t, Void unused) { - Semanticdb.Type arrayComponentType = super.visit(t.getComponentType()); - if (arrayComponentType == null) { - arrayComponentType = UNRESOLVED_TYPE_REF; - } - return Semanticdb.Type.newBuilder() - .setTypeRef( - TypeRef.newBuilder().setSymbol("scala/Array#").addTypeArguments(arrayComponentType)) - .build(); - } - - @Override - public Semanticdb.Type visitPrimitive(PrimitiveType t, Void unused) { - return Semanticdb.Type.newBuilder() - .setTypeRef(TypeRef.newBuilder().setSymbol(primitiveSymbol(t.getKind()))) - .build(); - } - - @Override - public Semanticdb.Type visitTypeVariable(TypeVariable t, Void unused) { - return Semanticdb.Type.newBuilder() - .setTypeRef( - TypeRef.newBuilder().setSymbol(cache.semanticdbSymbol(t.asElement(), locals)).build()) - .build(); - } - - @Override - public Semanticdb.Type visitIntersection(IntersectionType t, Void unused) { - ArrayList types = new ArrayList<>(); - for (TypeMirror type : t.getBounds()) { - types.add(super.visit(type)); - } - - return Semanticdb.Type.newBuilder() - .setIntersectionType(Semanticdb.IntersectionType.newBuilder().addAllTypes(types).build()) - .build(); - } - - @Override - public Semanticdb.Type visitWildcard(WildcardType t, Void unused) { - return Semanticdb.Type.newBuilder() - .setTypeRef( - // https://github.com/scalameta/scalameta/issues/1703 - // https://sourcegraph.com/github.com/scalameta/scalameta/-/blob/semanticdb/metacp/src/main/scala/scala/meta/internal/javacp/Javacp.scala#L452:19 - TypeRef.newBuilder().setSymbol("local_wildcard").build()) - .build(); - } - - @Override - public Semanticdb.Type visitNoType(NoType t, Void unused) { - return Semanticdb.Type.newBuilder() - .setTypeRef(TypeRef.newBuilder().setSymbol(primitiveSymbol(t.getKind()))) - .build(); - } - - public String primitiveSymbol(TypeKind kind) { - switch (kind) { - case BOOLEAN: - return "scala/Boolean#"; - case BYTE: - return "scala/Byte#"; - case SHORT: - return "scala/Short#"; - case INT: - return "scala/Int#"; - case LONG: - return "scala/Long#"; - case CHAR: - return "scala/Char#"; - case FLOAT: - return "scala/Float#"; - case DOUBLE: - return "scala/Double#"; - case VOID: - return "scala/Unit#"; - default: - throw new IllegalArgumentException("got " + kind.name()); - } - } - } } diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbTypeVisitor.java b/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbTypeVisitor.java new file mode 100644 index 000000000..8bf81821c --- /dev/null +++ b/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbTypeVisitor.java @@ -0,0 +1,168 @@ +package com.sourcegraph.semanticdb_javac; + +import com.sun.tools.javac.code.Type; + +import javax.lang.model.type.*; +import javax.lang.model.util.SimpleTypeVisitor8; +import java.util.ArrayList; + +/** A TypeMirror tree visitor that constructs a recursive SemanticDB Type structure. */ +class SemanticdbTypeVisitor extends SimpleTypeVisitor8 { + static final Semanticdb.Type UNRESOLVED_TYPE_REF = + Semanticdb.Type.newBuilder() + .setTypeRef(Semanticdb.TypeRef.newBuilder().setSymbol("unresolved_type#")) + .build(); + + static final String ARRAY_SYMBOL = "scala/Array#"; + + private final GlobalSymbolsCache cache; + private final LocalSymbolsCache locals; + + SemanticdbTypeVisitor(GlobalSymbolsCache cache, LocalSymbolsCache locals) { + this.cache = cache; + this.locals = locals; + } + + @Override + public Semanticdb.Type visitDeclared(DeclaredType t, Void unused) { + boolean isExistential = + t.getTypeArguments().stream().anyMatch((type) -> type instanceof WildcardType); + + ArrayList typeParams = new ArrayList<>(); + Semanticdb.Scope.Builder declarations = Semanticdb.Scope.newBuilder(); + for (TypeMirror type : t.getTypeArguments()) { + Semanticdb.Type visited = super.visit(type); + if (visited == null) { + visited = UNRESOLVED_TYPE_REF; + } + typeParams.add(visited); + + if (type instanceof WildcardType) { + Semanticdb.TypeSignature.Builder typeSig = Semanticdb.TypeSignature.newBuilder(); + WildcardType wildcardType = (WildcardType) type; + + // semanticdb spec asks for List() not None for type_parameters field + typeSig.setTypeParameters(Semanticdb.Scope.newBuilder()); + + if (wildcardType.getExtendsBound() != null) { + typeSig.setUpperBound(super.visit(wildcardType.getExtendsBound())); + } else if (wildcardType.getSuperBound() != null) { + typeSig.setLowerBound(super.visit(wildcardType.getSuperBound())); + } + + declarations.addHardlinks( + Semanticdb.SymbolInformation.newBuilder() + .setSymbol("local_wildcard") + .setSignature(Semanticdb.Signature.newBuilder().setTypeSignature(typeSig))); + } else { + declarations.addSymlinks(cache.semanticdbSymbol(((Type) type).asElement(), locals)); + } + } + + if (!isExistential) { + return Semanticdb.Type.newBuilder() + .setTypeRef( + Semanticdb.TypeRef.newBuilder() + .setSymbol(cache.semanticdbSymbol(t.asElement(), locals)) + .addAllTypeArguments(typeParams)) + .build(); + } else { + return Semanticdb.Type.newBuilder() + .setExistentialType( + Semanticdb.ExistentialType.newBuilder() + .setTpe( + Semanticdb.Type.newBuilder() + .setTypeRef( + Semanticdb.TypeRef.newBuilder() + .setSymbol(cache.semanticdbSymbol(t.asElement(), locals)) + .addAllTypeArguments(typeParams))) + .setDeclarations(declarations)) + .build(); + } + } + + @Override + public Semanticdb.Type visitArray(ArrayType t, Void unused) { + Semanticdb.Type arrayComponentType = super.visit(t.getComponentType()); + if (arrayComponentType == null) { + arrayComponentType = UNRESOLVED_TYPE_REF; + } + return Semanticdb.Type.newBuilder() + .setTypeRef( + Semanticdb.TypeRef.newBuilder() + .setSymbol(ARRAY_SYMBOL) + .addTypeArguments(arrayComponentType)) + .build(); + } + + @Override + public Semanticdb.Type visitPrimitive(PrimitiveType t, Void unused) { + return Semanticdb.Type.newBuilder() + .setTypeRef(Semanticdb.TypeRef.newBuilder().setSymbol(primitiveSymbol(t.getKind()))) + .build(); + } + + @Override + public Semanticdb.Type visitTypeVariable(TypeVariable t, Void unused) { + return Semanticdb.Type.newBuilder() + .setTypeRef( + Semanticdb.TypeRef.newBuilder() + .setSymbol(cache.semanticdbSymbol(t.asElement(), locals)) + .build()) + .build(); + } + + @Override + public Semanticdb.Type visitIntersection(IntersectionType t, Void unused) { + ArrayList types = new ArrayList<>(); + for (TypeMirror type : t.getBounds()) { + types.add(super.visit(type)); + } + + return Semanticdb.Type.newBuilder() + .setIntersectionType(Semanticdb.IntersectionType.newBuilder().addAllTypes(types).build()) + .build(); + } + + @Override + public Semanticdb.Type visitWildcard(WildcardType t, Void unused) { + return Semanticdb.Type.newBuilder() + .setTypeRef( + // https://github.com/scalameta/scalameta/issues/1703 + // https://sourcegraph.com/github.com/scalameta/scalameta/-/blob/semanticdb/metacp/src/main/scala/scala/meta/internal/javacp/Javacp.scala#L452:19 + Semanticdb.TypeRef.newBuilder().setSymbol("local_wildcard").build()) + .build(); + } + + @Override + public Semanticdb.Type visitNoType(NoType t, Void unused) { + return Semanticdb.Type.newBuilder() + .setTypeRef(Semanticdb.TypeRef.newBuilder().setSymbol(primitiveSymbol(t.getKind()))) + .build(); + } + + public String primitiveSymbol(TypeKind kind) { + switch (kind) { + case BOOLEAN: + return "scala/Boolean#"; + case BYTE: + return "scala/Byte#"; + case SHORT: + return "scala/Short#"; + case INT: + return "scala/Int#"; + case LONG: + return "scala/Long#"; + case CHAR: + return "scala/Char#"; + case FLOAT: + return "scala/Float#"; + case DOUBLE: + return "scala/Double#"; + case VOID: + return "scala/Unit#"; + default: + throw new IllegalArgumentException("got " + kind.name()); + } + } +} diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbVisitor.java b/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbVisitor.java index b6999a459..c25889de5 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbVisitor.java +++ b/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbVisitor.java @@ -4,16 +4,17 @@ import com.sun.source.util.*; import com.sun.tools.javac.code.Flags; import com.sun.tools.javac.code.Symbol; +import com.sun.tools.javac.code.Type; import com.sun.tools.javac.tree.EndPosTable; import com.sun.tools.javac.tree.JCTree; import com.sun.tools.javac.util.JCDiagnostic; -import com.sun.tools.javac.util.List; import com.sun.tools.javac.util.Position; import com.sourcegraph.semanticdb_javac.Semanticdb.SymbolInformation.Kind; import com.sourcegraph.semanticdb_javac.Semanticdb.SymbolInformation.Property; import com.sourcegraph.semanticdb_javac.Semanticdb.SymbolOccurrence.Role; -import javax.lang.model.element.ElementKind; +import javax.lang.model.type.PrimitiveType; +import javax.lang.model.type.TypeKind; import javax.lang.model.util.Elements; import java.io.IOException; import java.nio.file.Path; @@ -21,9 +22,12 @@ import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.Iterator; +import java.util.List; import java.util.Optional; import java.util.stream.Collectors; +import static com.sourcegraph.semanticdb_javac.SemanticdbTypeVisitor.ARRAY_SYMBOL; + /** Walks the AST of a typechecked compilation unit and generates a SemanticDB TextDocument. */ public class SemanticdbVisitor extends TreePathScanner { @@ -87,6 +91,8 @@ private void emitSymbolInformation(Symbol sym, JCTree tree) { if (documentation != null) builder.setDocumentation(documentation); Semanticdb.Signature signature = semanticdbSignature(sym); if (signature != null) builder.setSignature(signature); + List annotations = semanticdbAnnotations(tree); + if (annotations != null) builder.addAllAnnotations(annotations); builder .setProperties(semanticdbSymbolInfoProperties(sym)) @@ -305,6 +311,171 @@ private String semanticdbMd5() { } } + private List semanticdbAnnotations(JCTree node) { + if (!(node instanceof JCTree.JCClassDecl) + && !(node instanceof JCTree.JCVariableDecl) + && !(node instanceof JCTree.JCMethodDecl)) return null; + + List annotations = new ArrayList<>(); + + JCTree.JCModifiers mods; + if (node instanceof JCTree.JCClassDecl) { + mods = ((JCTree.JCClassDecl) node).getModifiers(); + } else if (node instanceof JCTree.JCMethodDecl) { + mods = ((JCTree.JCMethodDecl) node).getModifiers(); + } else { + mods = ((JCTree.JCVariableDecl) node).getModifiers(); + } + + for (JCTree.JCAnnotation annotation : mods.getAnnotations()) { + annotations.add(semanticdbAnnotation(annotation).build()); + } + + return annotations; + } + + private Semanticdb.Annotation.Builder semanticdbAnnotation(JCTree.JCAnnotation annotation) { + Semanticdb.Annotation.Builder builder = Semanticdb.Annotation.newBuilder(); + builder.setTpe(new SemanticdbTypeVisitor(globals, locals).visit(annotation.type)); + + for (JCTree.JCExpression param : annotation.args) { + Semanticdb.Annotation.ParameterPair.Builder parameterBuilder = + Semanticdb.Annotation.ParameterPair.newBuilder(); + + // anecdotally always JCAssign + JCTree.JCAssign assign = (JCTree.JCAssign) param; + JCTree.JCExpression assignValue = assign.rhs; + + parameterBuilder.setKey(globals.semanticdbSymbol(((JCTree.JCIdent) assign.lhs).sym, locals)); + + parameterBuilder.setValue(semanticdbAnnotationParameter(assignValue)); + + builder.addParameters(parameterBuilder); + } + + return builder; + } + + private Semanticdb.Tree.Builder semanticdbAnnotationParameter(JCTree.JCExpression expr) { + if (expr instanceof JCTree.JCFieldAccess) { + JCTree.JCFieldAccess rhs = (JCTree.JCFieldAccess) expr; + + Semanticdb.SelectTree.Builder selectBuilder = + Semanticdb.SelectTree.newBuilder() + .setQualifier( + Semanticdb.Tree.newBuilder() + .setIdTree( + Semanticdb.IdTree.newBuilder() + .setSymbol(globals.semanticdbSymbol(rhs.sym.owner, locals)))) + .setId( + Semanticdb.IdTree.newBuilder() + .setSymbol(globals.semanticdbSymbol(rhs.sym, locals))); + return Semanticdb.Tree.newBuilder().setSelectTree(selectBuilder); + } else if (expr instanceof JCTree.JCNewArray) { + JCTree.JCNewArray rhs = (JCTree.JCNewArray) expr; + Semanticdb.ApplyTree.Builder applyTreeBuilder = + Semanticdb.ApplyTree.newBuilder() + .setFunction( + Semanticdb.Tree.newBuilder() + .setIdTree(Semanticdb.IdTree.newBuilder().setSymbol(ARRAY_SYMBOL))); + + for (JCTree.JCExpression element : rhs.elems) { + applyTreeBuilder.addArguments(semanticdbAnnotationParameter(element)); + } + return Semanticdb.Tree.newBuilder().setApplyTree(applyTreeBuilder); + } else if (expr instanceof JCTree.JCLiteral) { + // Literals can either be a primitive or String + JCTree.JCLiteral rhs = (JCTree.JCLiteral) expr; + + Semanticdb.LiteralTree.Builder literalBuilder = Semanticdb.LiteralTree.newBuilder(); + + if (rhs.type instanceof Type.JCPrimitiveType) { + Type.JCPrimitiveType type = (Type.JCPrimitiveType) rhs.type; + Semanticdb.Constant.Builder constantBuilder = Semanticdb.Constant.newBuilder(); + switch (type.getKind()) { + case BOOLEAN: + constantBuilder.setBooleanConstant( + Semanticdb.BooleanConstant.newBuilder() + .setValue(((Integer) rhs.value) == 1) + .build()); + break; + case BYTE: + constantBuilder.setByteConstant( + Semanticdb.ByteConstant.newBuilder().setValue((Byte) rhs.value).build()); + break; + case SHORT: + constantBuilder.setShortConstant( + Semanticdb.ShortConstant.newBuilder().setValue((Short) rhs.value).build()); + break; + case INT: + constantBuilder.setIntConstant( + Semanticdb.IntConstant.newBuilder().setValue((Integer) rhs.value).build()); + break; + case LONG: + constantBuilder.setLongConstant( + Semanticdb.LongConstant.newBuilder().setValue((Long) rhs.value).build()); + break; + case CHAR: + constantBuilder.setCharConstant( + Semanticdb.CharConstant.newBuilder().setValue((Character) rhs.value).build()); + break; + case FLOAT: + constantBuilder.setFloatConstant( + Semanticdb.FloatConstant.newBuilder().setValue((Float) rhs.value).build()); + break; + case DOUBLE: + constantBuilder.setDoubleConstant( + Semanticdb.DoubleConstant.newBuilder().setValue((Double) rhs.value).build()); + break; + } + literalBuilder.setConstant(constantBuilder); + } else if (rhs.type instanceof Type.ClassType) { + Semanticdb.Constant.Builder constantBuilder = Semanticdb.Constant.newBuilder(); + + if (rhs.value instanceof String) { + constantBuilder.setStringConstant( + Semanticdb.StringConstant.newBuilder().setValue((String) rhs.value).build()); + } else { + throw new IllegalStateException( + semanticdbUri() + + ": annotation parameter rhs was of unexpected class type " + + rhs.value.getClass() + + "\n" + + rhs.value); + } + + literalBuilder.setConstant(constantBuilder); + } else { + throw new IllegalStateException( + semanticdbUri() + + ": annotation parameter rhs was of unexpected type " + + rhs.type.getClass() + + "\n" + + rhs.type); + } + + return Semanticdb.Tree.newBuilder().setLiteralTree(literalBuilder); + } else if (expr instanceof JCTree.JCAnnotation) { + return Semanticdb.Tree.newBuilder() + .setAnnotationTree( + Semanticdb.AnnotationTree.newBuilder() + .setAnnotation(semanticdbAnnotation((JCTree.JCAnnotation) expr))); + } else if (expr instanceof JCTree.JCIdent) { + return Semanticdb.Tree.newBuilder() + .setIdTree( + Semanticdb.IdTree.newBuilder() + .setSymbol(globals.semanticdbSymbol(((JCTree.JCIdent) expr).sym, locals)) + .build()); + } + + throw new IllegalArgumentException( + semanticdbUri() + + ": annotation parameter rhs was of unexpected tree node type " + + expr.getClass() + + "\n" + + expr); + } + private int semanticdbSymbolInfoProperties(Symbol sym) { int properties = 0; properties |= sym.isEnum() ? Property.ENUM_VALUE : 0; diff --git a/tests/minimized/src/main/java/minimized/Annotations.java b/tests/minimized/src/main/java/minimized/Annotations.java index 7ba3864f7..30a0fe3a3 100644 --- a/tests/minimized/src/main/java/minimized/Annotations.java +++ b/tests/minimized/src/main/java/minimized/Annotations.java @@ -9,10 +9,17 @@ @Documented @Retention(RetentionPolicy.RUNTIME) -@Target(value = {CONSTRUCTOR, FIELD, LOCAL_VARIABLE, METHOD, PACKAGE, PARAMETER, TYPE}) +@Target(value = {CONSTRUCTOR, + FIELD, + LOCAL_VARIABLE, + METHOD, + PACKAGE, + PARAMETER, + TYPE} +) public @interface Annotations { String value() default ""; String format() default ""; -} +} \ No newline at end of file diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AfterPropsSet.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AfterPropsSet.java index dec953568..b0289b77f 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AfterPropsSet.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AfterPropsSet.java @@ -39,6 +39,6 @@ // ^^^^^^^^^^^^^^^ reference java/lang/annotation/RetentionPolicy# // ^^^^^ reference java/lang/annotation/RetentionPolicy#CLASS. public @interface AfterPropsSet { -// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/AfterPropsSet# public @interface AfterPropsSet +// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/AfterPropsSet# @Target(ElementType.METHOD) @Retention(RetentionPolicy.CLASS) public @interface AfterPropsSet } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyDiffer.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyDiffer.java index 630cd12b3..a6d7789a8 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyDiffer.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyDiffer.java @@ -58,7 +58,7 @@ interface ResultCallback { // ^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#ResultCallback#onResult(). public abstract void onResult(DiffResult result) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^ reference com/airbnb/epoxy/DiffResult# -// ^^^^^^ definition local0 DiffResult result +// ^^^^^^ definition local0 @NonNull DiffResult result } private final Executor executor; @@ -82,16 +82,16 @@ interface ResultCallback { @NonNull Handler handler, // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^ reference _root_/ -// ^^^^^^^ definition local1 unresolved_type handler +// ^^^^^^^ definition local1 @NonNull unresolved_type handler @NonNull ResultCallback resultCallback, // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#ResultCallback# -// ^^^^^^^^^^^^^^ definition local2 ResultCallback resultCallback +// ^^^^^^^^^^^^^^ definition local2 @NonNull ResultCallback resultCallback @NonNull ItemCallback> diffCallback // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^^ reference _root_/ // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^^^^ definition local3 unresolved_type diffCallback +// ^^^^^^^^^^^^ definition local3 @NonNull unresolved_type diffCallback ) { this.executor = new HandlerExecutor(handler); // ^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer# @@ -114,7 +114,7 @@ interface ResultCallback { private volatile List> list; // ^^^^ reference java/util/List# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#list. private List> list +// ^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#list. @Nullable private List> list /** * Non-null, unmodifiable version of list. @@ -126,7 +126,7 @@ interface ResultCallback { private volatile List> readOnlyList = Collections.emptyList(); // ^^^^ reference java/util/List# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#readOnlyList. private List> readOnlyList +// ^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#readOnlyList. @NonNull private List> readOnlyList // ^^^^^^^^^^^ reference java/util/Collections# // ^^^^^^^^^ reference java/util/Collections#emptyList(). @@ -148,7 +148,7 @@ interface ResultCallback { public List> getCurrentList() { // ^^^^ reference java/util/List# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#getCurrentList(). public List> getCurrentList() +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#getCurrentList(). @AnyThread @NonNull public List> getCurrentList() return readOnlyList; // ^^^^^^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#readOnlyList. } @@ -162,7 +162,7 @@ public List> getCurrentList() { @AnyThread // ^^^^^^^^^ reference androidx/annotation/AnyThread# public boolean cancelDiff() { -// ^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#cancelDiff(). public boolean cancelDiff() +// ^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#cancelDiff(). @SuppressWarnings("WeakerAccess") @AnyThread public boolean cancelDiff() return generationTracker.finishMaxGeneration(); // ^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#generationTracker. // ^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#finishMaxGeneration(). @@ -176,7 +176,7 @@ public boolean cancelDiff() { @AnyThread // ^^^^^^^^^ reference androidx/annotation/AnyThread# public boolean isDiffInProgress() { -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#isDiffInProgress(). public boolean isDiffInProgress() +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#isDiffInProgress(). @SuppressWarnings("WeakerAccess") @AnyThread public boolean isDiffInProgress() return generationTracker.hasUnfinishedGeneration(); // ^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#generationTracker. // ^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#hasUnfinishedGeneration(). @@ -191,11 +191,11 @@ public boolean isDiffInProgress() { @AnyThread // ^^^^^^^^^ reference androidx/annotation/AnyThread# public synchronized boolean forceListOverride(@Nullable List> newList) { -// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#forceListOverride(). public boolean forceListOverride(List> newList) +// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#forceListOverride(). @AnyThread public boolean forceListOverride(List> newList) // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^ reference java/util/List# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^ definition local4 List> newList +// ^^^^^^^ definition local4 @Nullable List> newList // We need to make sure that generation changes and list updates are synchronized final boolean interruptedDiff = cancelDiff(); // ^^^^^^^^^^^^^^^ definition local5 final boolean interruptedDiff @@ -227,18 +227,18 @@ public synchronized boolean forceListOverride(@Nullable List> newL @SuppressWarnings("WeakerAccess") // ^^^^^^^^^^^^^^^^ reference java/lang/SuppressWarnings# public void submitList(@Nullable final List> newList) { -// ^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#submitList(). public void submitList(List> newList) +// ^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#submitList(). @AnyThread @SuppressWarnings("WeakerAccess") public void submitList(List> newList) // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^ reference java/util/List# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^ definition local7 final List> newList +// ^^^^^^^ definition local7 @Nullable final List> newList final int runGeneration; // ^^^^^^^^^^^^^ definition local8 final int runGeneration @Nullable final List> previousList; // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^ reference java/util/List# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^^^^ definition local9 final List> previousList +// ^^^^^^^^^^^^ definition local9 @Nullable final List> previousList synchronized (this) { // ^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer# @@ -325,7 +325,7 @@ public void submitList(@Nullable final List> newList) { @Override // ^^^^^^^^ reference java/lang/Override# public void run() { -// ^^^ definition local14 public void run() +// ^^^ definition local14 @Override public void run() DiffUtil.DiffResult result = DiffUtil.calculateDiff(wrappedCallback); // ^^^^^^^^ reference DiffUtil/ // ^^^^^^^^^^ reference DiffUtil/DiffResult# @@ -354,11 +354,11 @@ private void onRunCompleted( // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^ reference java/util/List# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^ definition local17 final List> newList +// ^^^^^^^ definition local17 @Nullable final List> newList @Nullable final DiffResult result // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^^^^^ reference com/airbnb/epoxy/DiffResult# -// ^^^^^^ definition local18 final DiffResult result +// ^^^^^^ definition local18 @Nullable final DiffResult result ) { // We use an asynchronous handler so that the Runnable can be posted directly back to the main @@ -373,7 +373,7 @@ private void onRunCompleted( @Override // ^^^^^^^^ reference java/lang/Override# public void run() { -// ^^^ definition local21 public void run() +// ^^^ definition local21 @Override public void run() final boolean dispatchResult = tryLatchList(newList, runGeneration); // ^^^^^^^^^^^^^^ definition local22 final boolean dispatchResult // ^^^^^^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#tryLatchList(). @@ -400,11 +400,11 @@ public void run() { @AnyThread // ^^^^^^^^^ reference androidx/annotation/AnyThread# private synchronized boolean tryLatchList(@Nullable List> newList, -// ^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#tryLatchList(). private boolean tryLatchList(List> newList, int runGeneration) +// ^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#tryLatchList(). @AnyThread private boolean tryLatchList(List> newList, int runGeneration) // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^ reference java/util/List# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^ definition local23 List> newList +// ^^^^^^^ definition local23 @Nullable List> newList int runGeneration) { // ^^^^^^^^^^^^^ definition local24 int runGeneration if (generationTracker.finishGeneration(runGeneration)) { @@ -551,7 +551,7 @@ private static class DiffCallback extends DiffUtil.Callback { @Override // ^^^^^^^^ reference java/lang/Override# public int getOldListSize() { -// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#getOldListSize(). public int getOldListSize() +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#getOldListSize(). @Override public int getOldListSize() return oldList.size(); // ^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#oldList. // ^^^^ reference java/util/List#size(). @@ -560,7 +560,7 @@ public int getOldListSize() { @Override // ^^^^^^^^ reference java/lang/Override# public int getNewListSize() { -// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#getNewListSize(). public int getNewListSize() +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#getNewListSize(). @Override public int getNewListSize() return newList.size(); // ^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#newList. // ^^^^ reference java/util/List#size(). @@ -569,7 +569,7 @@ public int getNewListSize() { @Override // ^^^^^^^^ reference java/lang/Override# public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) { -// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#areItemsTheSame(). public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) +// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#areItemsTheSame(). @Override public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) // ^^^^^^^^^^^^^^^ definition local31 int oldItemPosition // ^^^^^^^^^^^^^^^ definition local32 int newItemPosition return diffCallback.areItemsTheSame( @@ -589,7 +589,7 @@ public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) { @Override // ^^^^^^^^ reference java/lang/Override# public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) { -// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#areContentsTheSame(). public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) +// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#areContentsTheSame(). @Override public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) // ^^^^^^^^^^^^^^^ definition local33 int oldItemPosition // ^^^^^^^^^^^^^^^ definition local34 int newItemPosition return diffCallback.areContentsTheSame( @@ -612,7 +612,7 @@ public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) { // ^^^^^^^^ reference java/lang/Override# public Object getChangePayload(int oldItemPosition, int newItemPosition) { // ^^^^^^ reference java/lang/Object# -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#getChangePayload(). public Object getChangePayload(int oldItemPosition, int newItemPosition) +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#getChangePayload(). @Nullable @Override public Object getChangePayload(int oldItemPosition, int newItemPosition) // ^^^^^^^^^^^^^^^ definition local35 int oldItemPosition // ^^^^^^^^^^^^^^^ definition local36 int newItemPosition return diffCallback.getChangePayload( diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AutoModel.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AutoModel.java index 2b44d9c2c..66e646d6f 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AutoModel.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AutoModel.java @@ -36,6 +36,6 @@ // ^^^^^^^^^^^^^^^ reference java/lang/annotation/RetentionPolicy# // ^^^^^ reference java/lang/annotation/RetentionPolicy#CLASS. public @interface AutoModel { -// ^^^^^^^^^ definition com/airbnb/epoxy/AutoModel# public @interface AutoModel +// ^^^^^^^^^ definition com/airbnb/epoxy/AutoModel# @Target(ElementType.FIELD) @Retention(RetentionPolicy.CLASS) public @interface AutoModel } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyAdapter.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyAdapter.java index 71538f74f..6e3eeb20d 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyAdapter.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyAdapter.java @@ -105,7 +105,7 @@ public abstract class BaseEpoxyAdapter @Override // ^^^^^^^^ reference java/lang/Override# public int getSpanSize(int position) { -// ^^^^^^^^^^^ definition local1 public int getSpanSize(int position) +// ^^^^^^^^^^^ definition local1 @Override public int getSpanSize(int position) // ^^^^^^^^ definition local2 int position try { return getModelForPosition(position) @@ -159,7 +159,7 @@ protected void onExceptionSwallowed(RuntimeException exception) { @Override // ^^^^^^^^ reference java/lang/Override# public int getItemCount() { -// ^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#getItemCount(). public int getItemCount() +// ^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#getItemCount(). @Override public int getItemCount() return getCurrentModels().size(); // ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BaseEpoxyAdapter#getCurrentModels(). // ^^^^ reference java/util/List#size(). @@ -181,7 +181,7 @@ public boolean isEmpty() { @Override // ^^^^^^^^ reference java/lang/Override# public long getItemId(int position) { -// ^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#getItemId(). public long getItemId(int position) +// ^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#getItemId(). @Override public long getItemId(int position) // ^^^^^^^^ definition local5 int position // This does not call getModelForPosition so that we don't use the id of the empty model when // hidden, @@ -196,7 +196,7 @@ public long getItemId(int position) { @Override // ^^^^^^^^ reference java/lang/Override# public int getItemViewType(int position) { -// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#getItemViewType(). public int getItemViewType(int position) +// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#getItemViewType(). @Override public int getItemViewType(int position) // ^^^^^^^^ definition local6 int position return viewTypeManager.getViewTypeAndRememberModel(getModelForPosition(position)); // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BaseEpoxyAdapter#viewTypeManager. @@ -209,7 +209,7 @@ public int getItemViewType(int position) { // ^^^^^^^^ reference java/lang/Override# public EpoxyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# -// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#onCreateViewHolder(). public EpoxyViewHolder onCreateViewHolder(unresolved_type parent, int viewType) +// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#onCreateViewHolder(). @Override public EpoxyViewHolder onCreateViewHolder(unresolved_type parent, int viewType) // ^^^^^^^^^ reference _root_/ // ^^^^^^ definition local7 unresolved_type parent // ^^^^^^^^ definition local8 int viewType @@ -238,7 +238,7 @@ public EpoxyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { @Override // ^^^^^^^^ reference java/lang/Override# public void onBindViewHolder(EpoxyViewHolder holder, int position) { -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#onBindViewHolder(). public void onBindViewHolder(EpoxyViewHolder holder, int position) +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#onBindViewHolder(). @Override public void onBindViewHolder(EpoxyViewHolder holder, int position) // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# // ^^^^^^ definition local11 EpoxyViewHolder holder // ^^^^^^^^ definition local12 int position @@ -253,7 +253,7 @@ public void onBindViewHolder(EpoxyViewHolder holder, int position) { @Override // ^^^^^^^^ reference java/lang/Override# public void onBindViewHolder(EpoxyViewHolder holder, int position, List payloads) { -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#onBindViewHolder(+1). public void onBindViewHolder(EpoxyViewHolder holder, int position, List payloads) +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#onBindViewHolder(+1). @Override public void onBindViewHolder(EpoxyViewHolder holder, int position, List payloads) // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# // ^^^^^^ definition local13 EpoxyViewHolder holder // ^^^^^^^^ definition local14 int position @@ -343,7 +343,7 @@ protected void onModelBound(EpoxyViewHolder holder, EpoxyModel model, int pos // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^ reference java/util/List# // ^^^^^^ reference java/lang/Object# -// ^^^^^^^^ definition local21 List payloads +// ^^^^^^^^ definition local21 @Nullable List payloads onModelBound(holder, model, position); // ^^^^^^^^^^^^ reference com/airbnb/epoxy/BaseEpoxyAdapter#onModelBound(+2). // ^^^^^^ reference local18 @@ -361,7 +361,7 @@ void onModelBound(EpoxyViewHolder holder, EpoxyModel model, int position, @Nullable EpoxyModel previouslyBoundModel) { // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^^^^^^^^^^^^ definition local25 EpoxyModel previouslyBoundModel +// ^^^^^^^^^^^^^^^^^^^^ definition local25 @Nullable EpoxyModel previouslyBoundModel onModelBound(holder, model, position); // ^^^^^^^^^^^^ reference com/airbnb/epoxy/BaseEpoxyAdapter#onModelBound(+2). // ^^^^^^ reference local22 @@ -408,7 +408,7 @@ EpoxyModel getModelForPosition(int position) { @Override // ^^^^^^^^ reference java/lang/Override# public void onViewRecycled(EpoxyViewHolder holder) { -// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#onViewRecycled(). public void onViewRecycled(EpoxyViewHolder holder) +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#onViewRecycled(). @Override public void onViewRecycled(EpoxyViewHolder holder) // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# // ^^^^^^ definition local30 EpoxyViewHolder holder viewHolderState.save(holder); @@ -439,10 +439,10 @@ public void onViewRecycled(EpoxyViewHolder holder) { @Override // ^^^^^^^^ reference java/lang/Override# public void onDetachedFromRecyclerView(@NonNull RecyclerView recyclerView) { -// ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#onDetachedFromRecyclerView(). public void onDetachedFromRecyclerView(unresolved_type recyclerView) +// ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#onDetachedFromRecyclerView(). @CallSuper @Override public void onDetachedFromRecyclerView(unresolved_type recyclerView) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^^ reference _root_/ -// ^^^^^^^^^^^^ definition local32 unresolved_type recyclerView +// ^^^^^^^^^^^^ definition local32 @NonNull unresolved_type recyclerView // The last model is saved for optimization, but holding onto it can leak anything saved inside // the model (like a click listener that references a Fragment). This is only needed during // the viewholder creation phase, so it is safe to clear now. @@ -469,7 +469,7 @@ protected void onModelUnbound(EpoxyViewHolder holder, EpoxyModel model) { @Override // ^^^^^^^^ reference java/lang/Override# public boolean onFailedToRecycleView(EpoxyViewHolder holder) { -// ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#onFailedToRecycleView(). public boolean onFailedToRecycleView(EpoxyViewHolder holder) +// ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#onFailedToRecycleView(). @CallSuper @Override public boolean onFailedToRecycleView(EpoxyViewHolder holder) // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# // ^^^^^^ definition local35 EpoxyViewHolder holder //noinspection unchecked,rawtypes @@ -487,7 +487,7 @@ public boolean onFailedToRecycleView(EpoxyViewHolder holder) { @Override // ^^^^^^^^ reference java/lang/Override# public void onViewAttachedToWindow(EpoxyViewHolder holder) { -// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#onViewAttachedToWindow(). public void onViewAttachedToWindow(EpoxyViewHolder holder) +// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#onViewAttachedToWindow(). @CallSuper @Override public void onViewAttachedToWindow(EpoxyViewHolder holder) // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# // ^^^^^^ definition local36 EpoxyViewHolder holder //noinspection unchecked,rawtypes @@ -505,7 +505,7 @@ public void onViewAttachedToWindow(EpoxyViewHolder holder) { @Override // ^^^^^^^^ reference java/lang/Override# public void onViewDetachedFromWindow(EpoxyViewHolder holder) { -// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#onViewDetachedFromWindow(). public void onViewDetachedFromWindow(EpoxyViewHolder holder) +// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#onViewDetachedFromWindow(). @CallSuper @Override public void onViewDetachedFromWindow(EpoxyViewHolder holder) // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# // ^^^^^^ definition local37 EpoxyViewHolder holder //noinspection unchecked,rawtypes @@ -555,7 +555,7 @@ public void onRestoreInstanceState(@Nullable Bundle inState) { // ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#onRestoreInstanceState(). public void onRestoreInstanceState(unresolved_type inState) // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^ reference _root_/ -// ^^^^^^^ definition local40 unresolved_type inState +// ^^^^^^^ definition local40 @Nullable unresolved_type inState // To simplify things we enforce that state is restored before views are bound, otherwise it // is more difficult to update view state once they are bound if (boundViewHolders.size() > 0) { @@ -671,10 +671,10 @@ public boolean isMultiSpan() { @Override // ^^^^^^^^ reference java/lang/Override# public void setupStickyHeaderView(@NotNull View stickyHeader) { -// ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#setupStickyHeaderView(). public void setupStickyHeaderView(unresolved_type stickyHeader) +// ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#setupStickyHeaderView(). @Override public void setupStickyHeaderView(unresolved_type stickyHeader) // ^^^^^^^ reference org/jetbrains/annotations/NotNull# // ^^^^ reference _root_/ -// ^^^^^^^^^^^^ definition local45 unresolved_type stickyHeader +// ^^^^^^^^^^^^ definition local45 @NotNull unresolved_type stickyHeader // no-op } @@ -688,10 +688,10 @@ public void setupStickyHeaderView(@NotNull View stickyHeader) { @Override // ^^^^^^^^ reference java/lang/Override# public void teardownStickyHeaderView(@NotNull View stickyHeader) { -// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#teardownStickyHeaderView(). public void teardownStickyHeaderView(unresolved_type stickyHeader) +// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#teardownStickyHeaderView(). @Override public void teardownStickyHeaderView(unresolved_type stickyHeader) // ^^^^^^^ reference org/jetbrains/annotations/NotNull# // ^^^^ reference _root_/ -// ^^^^^^^^^^^^ definition local46 unresolved_type stickyHeader +// ^^^^^^^^^^^^ definition local46 @NotNull unresolved_type stickyHeader // no-op } @@ -705,7 +705,7 @@ public void teardownStickyHeaderView(@NotNull View stickyHeader) { @Override // ^^^^^^^^ reference java/lang/Override# public boolean isStickyHeader(int position) { -// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#isStickyHeader(). public boolean isStickyHeader(int position) +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#isStickyHeader(). @Override public boolean isStickyHeader(int position) // ^^^^^^^^ definition local47 int position return false; } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BoundViewHolders.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BoundViewHolders.java index 2c1a1527b..322acef7b 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BoundViewHolders.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BoundViewHolders.java @@ -23,7 +23,7 @@ @SuppressWarnings("WeakerAccess") //^^^^^^^^^^^^^^^ reference java/lang/SuppressWarnings# public class BoundViewHolders implements Iterable { -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BoundViewHolders# public class BoundViewHolders implements Iterable +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BoundViewHolders# @SuppressWarnings("WeakerAccess") public class BoundViewHolders implements Iterable // ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BoundViewHolders#``(). public BoundViewHolders() // ^^^^^^^^ reference java/lang/Iterable# // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# @@ -38,7 +38,7 @@ public class BoundViewHolders implements Iterable { // ^^^^^^^^ reference androidx/annotation/Nullable# public EpoxyViewHolder get(EpoxyViewHolder holder) { // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# -// ^^^ definition com/airbnb/epoxy/BoundViewHolders#get(). public EpoxyViewHolder get(EpoxyViewHolder holder) +// ^^^ definition com/airbnb/epoxy/BoundViewHolders#get(). @Nullable public EpoxyViewHolder get(EpoxyViewHolder holder) // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# // ^^^^^^ definition local0 EpoxyViewHolder holder return holders.get(holder.getItemId()); @@ -83,7 +83,7 @@ public int size() { public Iterator iterator() { // ^^^^^^^^ reference java/util/Iterator# // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# -// ^^^^^^^^ definition com/airbnb/epoxy/BoundViewHolders#iterator(). public Iterator iterator() +// ^^^^^^^^ definition com/airbnb/epoxy/BoundViewHolders#iterator(). @Override public Iterator iterator() return new HolderIterator(); // ^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BoundViewHolders#HolderIterator#``(). // ^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BoundViewHolders#HolderIterator# @@ -93,7 +93,7 @@ public Iterator iterator() { // ^^^^^^^^ reference androidx/annotation/Nullable# public EpoxyViewHolder getHolderForModel(EpoxyModel model) { // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# -// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BoundViewHolders#getHolderForModel(). public EpoxyViewHolder getHolderForModel(EpoxyModel model) +// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BoundViewHolders#getHolderForModel(). @Nullable public EpoxyViewHolder getHolderForModel(EpoxyModel model) // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^ definition local3 EpoxyModel model return holders.get(model.id()); @@ -114,7 +114,7 @@ private class HolderIterator implements Iterator { @Override // ^^^^^^^^ reference java/lang/Override# public boolean hasNext() { -// ^^^^^^^ definition com/airbnb/epoxy/BoundViewHolders#HolderIterator#hasNext(). public boolean hasNext() +// ^^^^^^^ definition com/airbnb/epoxy/BoundViewHolders#HolderIterator#hasNext(). @Override public boolean hasNext() return position < holders.size(); // ^^^^^^^^ reference com/airbnb/epoxy/BoundViewHolders#HolderIterator#position. // ^^^^^^^ reference com/airbnb/epoxy/BoundViewHolders#holders. @@ -125,7 +125,7 @@ public boolean hasNext() { // ^^^^^^^^ reference java/lang/Override# public EpoxyViewHolder next() { // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# -// ^^^^ definition com/airbnb/epoxy/BoundViewHolders#HolderIterator#next(). public EpoxyViewHolder next() +// ^^^^ definition com/airbnb/epoxy/BoundViewHolders#HolderIterator#next(). @Override public EpoxyViewHolder next() if (!hasNext()) { // ^^^^^^^ reference com/airbnb/epoxy/BoundViewHolders#HolderIterator#hasNext(). throw new NoSuchElementException(); @@ -141,7 +141,7 @@ public EpoxyViewHolder next() { @Override // ^^^^^^^^ reference java/lang/Override# public void remove() { -// ^^^^^^ definition com/airbnb/epoxy/BoundViewHolders#HolderIterator#remove(). public void remove() +// ^^^^^^ definition com/airbnb/epoxy/BoundViewHolders#HolderIterator#remove(). @Override public void remove() throw new UnsupportedOperationException(); // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference java/lang/UnsupportedOperationException#``(). // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference java/lang/UnsupportedOperationException# diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/CallbackProp.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/CallbackProp.java index f0c65cfba..897bf9acb 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/CallbackProp.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/CallbackProp.java @@ -45,5 +45,5 @@ // ^^^^^^^^^^^^^^^ reference java/lang/annotation/RetentionPolicy# // ^^^^^ reference java/lang/annotation/RetentionPolicy#CLASS. public @interface CallbackProp { -// ^^^^^^^^^^^^ definition com/airbnb/epoxy/CallbackProp# public @interface CallbackProp +// ^^^^^^^^^^^^ definition com/airbnb/epoxy/CallbackProp# @Target({ElementType.METHOD, ElementType.FIELD}) @Retention(RetentionPolicy.CLASS) public @interface CallbackProp } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java index b663ff611..fdc4c4f39 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java @@ -110,7 +110,7 @@ // ^^^^ reference com/airbnb/epoxy/ModelView#Size# // ^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ModelView#Size#MATCH_WIDTH_WRAP_HEIGHT. public class Carousel extends EpoxyRecyclerView { -// ^^^^^^^^ definition com/airbnb/epoxy/Carousel# public class Carousel extends unresolved_type +// ^^^^^^^^ definition com/airbnb/epoxy/Carousel# @ModelView(saveViewState = true, autoLayout = Size.MATCH_WIDTH_WRAP_HEIGHT) public class Carousel extends unresolved_type // ^^^^^^^^^^^^^^^^^ reference _root_/ public static final int NO_VALUE_SET = -1; // ^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#NO_VALUE_SET. public static final int NO_VALUE_SET @@ -129,7 +129,7 @@ public class Carousel extends EpoxyRecyclerView { // ^^^^^^^ reference androidx/annotation/NonNull# public SnapHelper buildSnapHelper(Context context) { // ^^^^^^^^^^ reference _root_/ -// ^^^^^^^^^^^^^^^ definition local2 public buildSnapHelper(unresolved_type context) +// ^^^^^^^^^^^^^^^ definition local2 @Override @NonNull public buildSnapHelper(unresolved_type context) // ^^^^^^^ reference _root_/ // ^^^^^^^ definition local3 unresolved_type context return new LinearSnapHelper(); @@ -144,7 +144,7 @@ public SnapHelper buildSnapHelper(Context context) { // ^^^^^^^^^ reference androidx/annotation/Dimension# // ^^ reference androidx/annotation/Dimension#DP. private static int defaultSpacingBetweenItemsDp = 8; -// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#defaultSpacingBetweenItemsDp. private static int defaultSpacingBetweenItemsDp +// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#defaultSpacingBetweenItemsDp. @Dimension(unit = Dimension.DP) private static int defaultSpacingBetweenItemsDp private float numViewsToShowOnScreen; // ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#numViewsToShowOnScreen. private float numViewsToShowOnScreen @@ -163,7 +163,7 @@ public Carousel(Context context, @Nullable AttributeSet attrs) { // ^^^^^^^ definition local5 unresolved_type context // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^^^^^^^ reference _root_/ -// ^^^^^ definition local6 unresolved_type attrs +// ^^^^^ definition local6 @Nullable unresolved_type attrs super(context, attrs); // ^^^^^^^ reference local5 // ^^^^^ reference local6 @@ -175,7 +175,7 @@ public Carousel(Context context, @Nullable AttributeSet attrs, int defStyle) { // ^^^^^^^ definition local7 unresolved_type context // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^^^^^^^ reference _root_/ -// ^^^^^ definition local8 unresolved_type attrs +// ^^^^^ definition local8 @Nullable unresolved_type attrs // ^^^^^^^^ definition local9 int defStyle super(context, attrs, defStyle); // ^^^^^^^ reference local7 @@ -186,7 +186,7 @@ public Carousel(Context context, @Nullable AttributeSet attrs, int defStyle) { @Override // ^^^^^^^^ reference java/lang/Override# protected void init() { -// ^^^^ definition com/airbnb/epoxy/Carousel#init(). protected void init() +// ^^^^ definition com/airbnb/epoxy/Carousel#init(). @Override protected void init() super.init(); // ^^^^^ reference _root_/ // ^^^^ reference init# @@ -244,7 +244,7 @@ && getPaddingBottom() == 0) { // ^^^^^^^^ reference androidx/annotation/Nullable# protected SnapHelperFactory getSnapHelperFactory() { // ^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#SnapHelperFactory# -// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#getSnapHelperFactory(). protected SnapHelperFactory getSnapHelperFactory() +// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#getSnapHelperFactory(). @Nullable protected SnapHelperFactory getSnapHelperFactory() return defaultGlobalSnapHelperFactory; // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#defaultGlobalSnapHelperFactory. } @@ -261,7 +261,7 @@ public static void setDefaultGlobalSnapHelperFactory(@Nullable SnapHelperFactory // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#setDefaultGlobalSnapHelperFactory(). public static void setDefaultGlobalSnapHelperFactory(SnapHelperFactory factory) // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#SnapHelperFactory# -// ^^^^^^^ definition local12 SnapHelperFactory factory +// ^^^^^^^ definition local12 @Nullable SnapHelperFactory factory defaultGlobalSnapHelperFactory = factory; // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#defaultGlobalSnapHelperFactory. // ^^^^^^^ reference local12 @@ -272,7 +272,7 @@ public static void setDefaultGlobalSnapHelperFactory(@Nullable SnapHelperFactory @Override // ^^^^^^^^ reference java/lang/Override# public void setHasFixedSize(boolean hasFixedSize) { -// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#setHasFixedSize(). public void setHasFixedSize(boolean hasFixedSize) +// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#setHasFixedSize(). @ModelProp @Override public void setHasFixedSize(boolean hasFixedSize) // ^^^^^^^^^^^^ definition local13 boolean hasFixedSize super.setHasFixedSize(hasFixedSize); // ^^^^^ reference _root_/ @@ -302,7 +302,7 @@ public void setHasFixedSize(boolean hasFixedSize) { // ^^^^^^^^^ reference com/airbnb/epoxy/ModelProp# // ^^^^^ reference com/airbnb/epoxy/ModelProp#group(). public void setNumViewsToShowOnScreen(float viewCount) { -// ^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#setNumViewsToShowOnScreen(). public void setNumViewsToShowOnScreen(float viewCount) +// ^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#setNumViewsToShowOnScreen(). @ModelProp(group = "prefetch") public void setNumViewsToShowOnScreen(float viewCount) // ^^^^^^^^^ definition local14 float viewCount numViewsToShowOnScreen = viewCount; // ^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#numViewsToShowOnScreen. @@ -334,7 +334,7 @@ public float getNumViewsToShowOnScreen() { // ^^^^^^^^^ reference com/airbnb/epoxy/ModelProp# // ^^^^^ reference com/airbnb/epoxy/ModelProp#group(). public void setInitialPrefetchItemCount(int numItemsToPrefetch) { -// ^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#setInitialPrefetchItemCount(). public void setInitialPrefetchItemCount(int numItemsToPrefetch) +// ^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#setInitialPrefetchItemCount(). @ModelProp(group = "prefetch") public void setInitialPrefetchItemCount(int numItemsToPrefetch) // ^^^^^^^^^^^^^^^^^^ definition local15 int numItemsToPrefetch if (numItemsToPrefetch < 0) { // ^^^^^^^^^^^^^^^^^^ reference local15 @@ -367,7 +367,7 @@ public void setInitialPrefetchItemCount(int numItemsToPrefetch) { @Override // ^^^^^^^^ reference java/lang/Override# public void onChildAttachedToWindow(View child) { -// ^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#onChildAttachedToWindow(). public void onChildAttachedToWindow(unresolved_type child) +// ^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#onChildAttachedToWindow(). @Override public void onChildAttachedToWindow(unresolved_type child) // ^^^^ reference _root_/ // ^^^^^ definition local18 unresolved_type child if (numViewsToShowOnScreen > 0) { @@ -464,7 +464,7 @@ private int getSpaceForChildren(boolean horizontal) { @Px // ^^ reference androidx/annotation/Px# private static int getTotalWidthPx(View view) { -// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#getTotalWidthPx(). private static int getTotalWidthPx(unresolved_type view) +// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#getTotalWidthPx(). @Px private static int getTotalWidthPx(unresolved_type view) // ^^^^ reference _root_/ // ^^^^ definition local25 unresolved_type view if (view.getWidth() > 0) { @@ -500,7 +500,7 @@ private static int getTotalWidthPx(View view) { @Px // ^^ reference androidx/annotation/Px# private static int getTotalHeightPx(View view) { -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#getTotalHeightPx(). private static int getTotalHeightPx(unresolved_type view) +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#getTotalHeightPx(). @Px private static int getTotalHeightPx(unresolved_type view) // ^^^^ reference _root_/ // ^^^^ definition local27 unresolved_type view if (view.getHeight() > 0) { @@ -535,7 +535,7 @@ private static int getTotalHeightPx(View view) { @Override // ^^^^^^^^ reference java/lang/Override# public void onChildDetachedFromWindow(View child) { -// ^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#onChildDetachedFromWindow(). public void onChildDetachedFromWindow(unresolved_type child) +// ^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#onChildDetachedFromWindow(). @Override public void onChildDetachedFromWindow(unresolved_type child) // ^^^^ reference _root_/ // ^^^^^ definition local29 unresolved_type child // Restore the view width that existed before we modified it @@ -581,7 +581,7 @@ public static void setDefaultItemSpacingDp(@Dimension(unit = Dimension.DP) int d // ^^^^ reference androidx/annotation/Dimension#unit(). // ^^^^^^^^^ reference androidx/annotation/Dimension# // ^^ reference androidx/annotation/Dimension#DP. -// ^^ definition local32 int dp +// ^^ definition local32 @Dimension(unit = Dimension.DP) int dp defaultSpacingBetweenItemsDp = dp; // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#defaultSpacingBetweenItemsDp. // ^^ reference local32 @@ -599,7 +599,7 @@ public static void setDefaultItemSpacingDp(@Dimension(unit = Dimension.DP) int d // ^^^^^^^^^ reference androidx/annotation/Dimension# // ^^ reference androidx/annotation/Dimension#DP. protected int getDefaultSpacingBetweenItemsDp() { -// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#getDefaultSpacingBetweenItemsDp(). protected int getDefaultSpacingBetweenItemsDp() +// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#getDefaultSpacingBetweenItemsDp(). @Dimension(unit = Dimension.DP) protected int getDefaultSpacingBetweenItemsDp() return defaultSpacingBetweenItemsDp; // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#defaultSpacingBetweenItemsDp. } @@ -612,9 +612,9 @@ protected int getDefaultSpacingBetweenItemsDp() { // ^^^^^^^^^ reference com/airbnb/epoxy/ModelProp# // ^^^^^ reference com/airbnb/epoxy/ModelProp#group(). public void setPaddingRes(@DimenRes int paddingRes) { -// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#setPaddingRes(). public void setPaddingRes(int paddingRes) +// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#setPaddingRes(). @ModelProp(group = "padding") public void setPaddingRes(int paddingRes) // ^^^^^^^^ reference androidx/annotation/DimenRes# -// ^^^^^^^^^^ definition local33 int paddingRes +// ^^^^^^^^^^ definition local33 @DimenRes int paddingRes int px = resToPx(paddingRes); // ^^ definition local34 int px // ^^^^^^^ reference com/airbnb/epoxy/Carousel#resToPx# @@ -641,12 +641,12 @@ public void setPaddingRes(@DimenRes int paddingRes) { // ^^^^^^^^^^^^ reference com/airbnb/epoxy/ModelProp#defaultValue(). // ^^^^^ reference com/airbnb/epoxy/ModelProp#group(). public void setPaddingDp(@Dimension(unit = Dimension.DP) int paddingDp) { -// ^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#setPaddingDp(). public void setPaddingDp(int paddingDp) +// ^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#setPaddingDp(). @ModelProp(defaultValue = "NO_VALUE_SET", group = "padding") public void setPaddingDp(int paddingDp) // ^^^^^^^^^ reference androidx/annotation/Dimension# // ^^^^ reference androidx/annotation/Dimension#unit(). // ^^^^^^^^^ reference androidx/annotation/Dimension# // ^^ reference androidx/annotation/Dimension#DP. -// ^^^^^^^^^ definition local35 int paddingDp +// ^^^^^^^^^ definition local35 @Dimension(unit = Dimension.DP) int paddingDp int px = dpToPx(paddingDp != NO_VALUE_SET ? paddingDp : getDefaultSpacingBetweenItemsDp()); // ^^ definition local36 int px // ^^^^^^ reference com/airbnb/epoxy/Carousel#dpToPx# @@ -675,10 +675,10 @@ public void setPaddingDp(@Dimension(unit = Dimension.DP) int paddingDp) { // ^^^^^^^^^ reference com/airbnb/epoxy/ModelProp# // ^^^^^ reference com/airbnb/epoxy/ModelProp#group(). public void setPadding(@Nullable Padding padding) { -// ^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#setPadding(). public void setPadding(Padding padding) +// ^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#setPadding(). @ModelProp(group = "padding") public void setPadding(Padding padding) // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^^ reference com/airbnb/epoxy/Carousel#Padding# -// ^^^^^^^ definition local37 Padding padding +// ^^^^^^^ definition local37 @Nullable Padding padding if (padding == null) { // ^^^^^^^ reference local37 setPaddingDp(0); @@ -802,9 +802,9 @@ public static Padding resource(@DimenRes int paddingRes, @DimenRes int itemSpaci // ^^^^^^^ reference com/airbnb/epoxy/Carousel#Padding# // ^^^^^^^^ definition com/airbnb/epoxy/Carousel#Padding#resource(). public static Padding resource(int paddingRes, int itemSpacingRes) // ^^^^^^^^ reference androidx/annotation/DimenRes# -// ^^^^^^^^^^ definition local38 int paddingRes +// ^^^^^^^^^^ definition local38 @DimenRes int paddingRes // ^^^^^^^^ reference androidx/annotation/DimenRes# -// ^^^^^^^^^^^^^^ definition local39 int itemSpacingRes +// ^^^^^^^^^^^^^^ definition local39 @DimenRes int itemSpacingRes return new Padding( // ^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#Padding#``(+2). 1:95 // ^^^^^^^ reference com/airbnb/epoxy/Carousel#Padding# @@ -831,19 +831,19 @@ public static Padding resource( // ^^^^^^^^ definition com/airbnb/epoxy/Carousel#Padding#resource(+1). public static Padding resource(int leftRes, int topRes, int rightRes, int bottomRes, int itemSpacingRes) @DimenRes int leftRes, // ^^^^^^^^ reference androidx/annotation/DimenRes# -// ^^^^^^^ definition local40 int leftRes +// ^^^^^^^ definition local40 @DimenRes int leftRes @DimenRes int topRes, // ^^^^^^^^ reference androidx/annotation/DimenRes# -// ^^^^^^ definition local41 int topRes +// ^^^^^^ definition local41 @DimenRes int topRes @DimenRes int rightRes, // ^^^^^^^^ reference androidx/annotation/DimenRes# -// ^^^^^^^^ definition local42 int rightRes +// ^^^^^^^^ definition local42 @DimenRes int rightRes @DimenRes int bottomRes, // ^^^^^^^^ reference androidx/annotation/DimenRes# -// ^^^^^^^^^ definition local43 int bottomRes +// ^^^^^^^^^ definition local43 @DimenRes int bottomRes @DimenRes int itemSpacingRes) { // ^^^^^^^^ reference androidx/annotation/DimenRes# -// ^^^^^^^^^^^^^^ definition local44 int itemSpacingRes +// ^^^^^^^^^^^^^^ definition local44 @DimenRes int itemSpacingRes return new Padding( // ^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#Padding#``(+2). 1:85 // ^^^^^^^ reference com/airbnb/epoxy/Carousel#Padding# @@ -870,13 +870,13 @@ public static Padding dp( // ^^^^ reference androidx/annotation/Dimension#unit(). // ^^^^^^^^^ reference androidx/annotation/Dimension# // ^^ reference androidx/annotation/Dimension#DP. -// ^^^^^^^^^ definition local45 int paddingDp +// ^^^^^^^^^ definition local45 @Dimension(unit = Dimension.DP) int paddingDp @Dimension(unit = Dimension.DP) int itemSpacingDp) { // ^^^^^^^^^ reference androidx/annotation/Dimension# // ^^^^ reference androidx/annotation/Dimension#unit(). // ^^^^^^^^^ reference androidx/annotation/Dimension# // ^^ reference androidx/annotation/Dimension#DP. -// ^^^^^^^^^^^^^ definition local46 int itemSpacingDp +// ^^^^^^^^^^^^^ definition local46 @Dimension(unit = Dimension.DP) int itemSpacingDp return new Padding(paddingDp, paddingDp, paddingDp, paddingDp, itemSpacingDp, PaddingType.DP); // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#Padding#``(+2). // ^^^^^^^ reference com/airbnb/epoxy/Carousel#Padding# @@ -905,31 +905,31 @@ public static Padding dp( // ^^^^ reference androidx/annotation/Dimension#unit(). // ^^^^^^^^^ reference androidx/annotation/Dimension# // ^^ reference androidx/annotation/Dimension#DP. -// ^^^^^^ definition local47 int leftDp +// ^^^^^^ definition local47 @Dimension(unit = Dimension.DP) int leftDp @Dimension(unit = Dimension.DP) int topDp, // ^^^^^^^^^ reference androidx/annotation/Dimension# // ^^^^ reference androidx/annotation/Dimension#unit(). // ^^^^^^^^^ reference androidx/annotation/Dimension# // ^^ reference androidx/annotation/Dimension#DP. -// ^^^^^ definition local48 int topDp +// ^^^^^ definition local48 @Dimension(unit = Dimension.DP) int topDp @Dimension(unit = Dimension.DP) int rightDp, // ^^^^^^^^^ reference androidx/annotation/Dimension# // ^^^^ reference androidx/annotation/Dimension#unit(). // ^^^^^^^^^ reference androidx/annotation/Dimension# // ^^ reference androidx/annotation/Dimension#DP. -// ^^^^^^^ definition local49 int rightDp +// ^^^^^^^ definition local49 @Dimension(unit = Dimension.DP) int rightDp @Dimension(unit = Dimension.DP) int bottomDp, // ^^^^^^^^^ reference androidx/annotation/Dimension# // ^^^^ reference androidx/annotation/Dimension#unit(). // ^^^^^^^^^ reference androidx/annotation/Dimension# // ^^ reference androidx/annotation/Dimension#DP. -// ^^^^^^^^ definition local50 int bottomDp +// ^^^^^^^^ definition local50 @Dimension(unit = Dimension.DP) int bottomDp @Dimension(unit = Dimension.DP) int itemSpacingDp) { // ^^^^^^^^^ reference androidx/annotation/Dimension# // ^^^^ reference androidx/annotation/Dimension#unit(). // ^^^^^^^^^ reference androidx/annotation/Dimension# // ^^ reference androidx/annotation/Dimension#DP. -// ^^^^^^^^^^^^^ definition local51 int itemSpacingDp +// ^^^^^^^^^^^^^ definition local51 @Dimension(unit = Dimension.DP) int itemSpacingDp return new Padding(leftDp, topDp, rightDp, bottomDp, itemSpacingDp, PaddingType.DP); // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#Padding#``(+2). // ^^^^^^^ reference com/airbnb/epoxy/Carousel#Padding# @@ -950,9 +950,9 @@ public static Padding dp( public Padding(@Px int paddingPx, @Px int itemSpacingPx) { // ^^^^^^ definition com/airbnb/epoxy/Carousel#Padding#``(). public Padding(int paddingPx, int itemSpacingPx) // ^^ reference androidx/annotation/Px# -// ^^^^^^^^^ definition local52 int paddingPx +// ^^^^^^^^^ definition local52 @Px int paddingPx // ^^ reference androidx/annotation/Px# -// ^^^^^^^^^^^^^ definition local53 int itemSpacingPx +// ^^^^^^^^^^^^^ definition local53 @Px int itemSpacingPx this(paddingPx, paddingPx, paddingPx, paddingPx, itemSpacingPx, PaddingType.PX); // ^^^^ reference com/airbnb/epoxy/Carousel#Padding#``(+2). // ^^^^^^^^^ reference local52 @@ -976,15 +976,15 @@ public Padding( // ^^^^^^ definition com/airbnb/epoxy/Carousel#Padding#``(+1). public Padding(int leftPx, int topPx, int rightPx, int bottomPx, int itemSpacingPx) @Px int leftPx, @Px int topPx, @Px int rightPx, @Px int bottomPx, @Px int itemSpacingPx) { // ^^ reference androidx/annotation/Px# -// ^^^^^^ definition local54 int leftPx +// ^^^^^^ definition local54 @Px int leftPx // ^^ reference androidx/annotation/Px# -// ^^^^^ definition local55 int topPx +// ^^^^^ definition local55 @Px int topPx // ^^ reference androidx/annotation/Px# -// ^^^^^^^ definition local56 int rightPx +// ^^^^^^^ definition local56 @Px int rightPx // ^^ reference androidx/annotation/Px# -// ^^^^^^^^ definition local57 int bottomPx +// ^^^^^^^^ definition local57 @Px int bottomPx // ^^ reference androidx/annotation/Px# -// ^^^^^^^^^^^^^ definition local58 int itemSpacingPx +// ^^^^^^^^^^^^^ definition local58 @Px int itemSpacingPx this(leftPx, topPx, rightPx, bottomPx, itemSpacingPx, PaddingType.PX); // ^^^^ reference com/airbnb/epoxy/Carousel#Padding#``(+2). // ^^^^^^ reference local54 @@ -1045,7 +1045,7 @@ private Padding( @Override // ^^^^^^^^ reference java/lang/Override# public boolean equals(Object o) { -// ^^^^^^ definition com/airbnb/epoxy/Carousel#Padding#equals(). public boolean equals(Object o) +// ^^^^^^ definition com/airbnb/epoxy/Carousel#Padding#equals(). @Override public boolean equals(Object o) // ^^^^^^ reference java/lang/Object# // ^ definition local65 Object o if (this == o) { @@ -1100,7 +1100,7 @@ public boolean equals(Object o) { @Override // ^^^^^^^^ reference java/lang/Override# public int hashCode() { -// ^^^^^^^^ definition com/airbnb/epoxy/Carousel#Padding#hashCode(). public int hashCode() +// ^^^^^^^^ definition com/airbnb/epoxy/Carousel#Padding#hashCode(). @Override public int hashCode() int result = left; // ^^^^^^ definition local67 int result // ^^^^ reference com/airbnb/epoxy/Carousel#Padding#left. @@ -1128,11 +1128,11 @@ public int hashCode() { @ModelProp // ^^^^^^^^^ reference com/airbnb/epoxy/ModelProp# public void setModels(@NonNull List> models) { -// ^^^^^^^^^ definition com/airbnb/epoxy/Carousel#setModels(). public void setModels(List> models) +// ^^^^^^^^^ definition com/airbnb/epoxy/Carousel#setModels(). @ModelProp public void setModels(List> models) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^ reference java/util/List# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^ definition local68 List> models +// ^^^^^^ definition local68 @NonNull List> models super.setModels(models); // ^^^^^ reference _root_/ // ^^^^^^^^^ reference setModels# @@ -1142,7 +1142,7 @@ public void setModels(@NonNull List> models) { @OnViewRecycled // ^^^^^^^^^^^^^^ reference com/airbnb/epoxy/OnViewRecycled# public void clear() { -// ^^^^^ definition com/airbnb/epoxy/Carousel#clear(). public void clear() +// ^^^^^ definition com/airbnb/epoxy/Carousel#clear(). @OnViewRecycled public void clear() super.clear(); // ^^^^^ reference _root_/ // ^^^^^ reference clear# @@ -1160,7 +1160,7 @@ public abstract static class SnapHelperFactory { // ^^^^^^^ reference androidx/annotation/NonNull# public abstract SnapHelper buildSnapHelper(Context context); // ^^^^^^^^^^ reference _root_/ -// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#SnapHelperFactory#buildSnapHelper(). public abstract buildSnapHelper(unresolved_type context) +// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#SnapHelperFactory#buildSnapHelper(). @NonNull public abstract buildSnapHelper(unresolved_type context) // ^^^^^^^ reference _root_/ // ^^^^^^^ definition local69 unresolved_type context } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelperLookup.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelperLookup.java index 9543dab5d..8f59d38f8 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelperLookup.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelperLookup.java @@ -120,7 +120,7 @@ static ControllerHelper getHelperForController(EpoxyController controller) { // ^^^^^^^^ reference androidx/annotation/Nullable# private static Constructor findConstructorForClass(Class controllerClass) { // ^^^^^^^^^^^ reference java/lang/reflect/Constructor# -// ^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ControllerHelperLookup#findConstructorForClass(). private static Constructor findConstructorForClass(Class controllerClass) +// ^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ControllerHelperLookup#findConstructorForClass(). @Nullable private static Constructor findConstructorForClass(Class controllerClass) // ^^^^^ reference java/lang/Class# // ^^^^^^^^^^^^^^^ definition local6 Class controllerClass Constructor helperCtor = BINDINGS.get(controllerClass); diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerModelList.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerModelList.java index f741ccaec..4e0c6964a 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerModelList.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerModelList.java @@ -20,7 +20,7 @@ class ControllerModelList extends ModelList { @Override // ^^^^^^^^ reference java/lang/Override# public void onItemRangeInserted(int positionStart, int itemCount) { -// ^^^^^^^^^^^^^^^^^^^ definition local2 public void onItemRangeInserted(int positionStart, int itemCount) +// ^^^^^^^^^^^^^^^^^^^ definition local2 @Override public void onItemRangeInserted(int positionStart, int itemCount) // ^^^^^^^^^^^^^ definition local4 int positionStart // ^^^^^^^^^ definition local5 int itemCount throw new IllegalStateException( @@ -32,7 +32,7 @@ public void onItemRangeInserted(int positionStart, int itemCount) { @Override // ^^^^^^^^ reference java/lang/Override# public void onItemRangeRemoved(int positionStart, int itemCount) { -// ^^^^^^^^^^^^^^^^^^ definition local3 public void onItemRangeRemoved(int positionStart, int itemCount) +// ^^^^^^^^^^^^^^^^^^ definition local3 @Override public void onItemRangeRemoved(int positionStart, int itemCount) // ^^^^^^^^^^^^^ definition local6 int positionStart // ^^^^^^^^^ definition local7 int itemCount throw new IllegalStateException( diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DebugTimer.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DebugTimer.java index be0feb37a..2fa62c92a 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DebugTimer.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DebugTimer.java @@ -41,7 +41,7 @@ private void reset() { @Override // ^^^^^^^^ reference java/lang/Override# public void start(String sectionName) { -// ^^^^^ definition com/airbnb/epoxy/DebugTimer#start(). public void start(String sectionName) +// ^^^^^ definition com/airbnb/epoxy/DebugTimer#start(). @Override public void start(String sectionName) // ^^^^^^ reference java/lang/String# // ^^^^^^^^^^^ definition local1 String sectionName if (startTime != -1) { @@ -64,7 +64,7 @@ public void start(String sectionName) { @Override // ^^^^^^^^ reference java/lang/Override# public void stop() { -// ^^^^ definition com/airbnb/epoxy/DebugTimer#stop(). public void stop() +// ^^^^ definition com/airbnb/epoxy/DebugTimer#stop(). @Override public void stop() if (startTime == -1) { // ^^^^^^^^^ reference com/airbnb/epoxy/DebugTimer#startTime. throw new IllegalStateException("Timer was not started"); diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffHelper.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffHelper.java index 96d834892..56e1c58f2 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffHelper.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffHelper.java @@ -103,7 +103,7 @@ class DiffHelper { @Override // ^^^^^^^^ reference java/lang/Override# public void onChanged() { -// ^^^^^^^^^ definition local3 public void onChanged() +// ^^^^^^^^^ definition local3 @Override public void onChanged() throw new UnsupportedOperationException( // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference java/lang/UnsupportedOperationException#``(+1). 1:99 // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference java/lang/UnsupportedOperationException# @@ -113,7 +113,7 @@ public void onChanged() { @Override // ^^^^^^^^ reference java/lang/Override# public void onItemRangeChanged(int positionStart, int itemCount) { -// ^^^^^^^^^^^^^^^^^^ definition local4 public void onItemRangeChanged(int positionStart, int itemCount) +// ^^^^^^^^^^^^^^^^^^ definition local4 @Override public void onItemRangeChanged(int positionStart, int itemCount) // ^^^^^^^^^^^^^ definition local8 int positionStart // ^^^^^^^^^ definition local9 int itemCount for (int i = positionStart; i < positionStart + itemCount; i++) { @@ -139,7 +139,7 @@ public void onItemRangeChanged(int positionStart, int itemCount) { @Override // ^^^^^^^^ reference java/lang/Override# public void onItemRangeInserted(int positionStart, int itemCount) { -// ^^^^^^^^^^^^^^^^^^^ definition local5 public void onItemRangeInserted(int positionStart, int itemCount) +// ^^^^^^^^^^^^^^^^^^^ definition local5 @Override public void onItemRangeInserted(int positionStart, int itemCount) // ^^^^^^^^^^^^^ definition local11 int positionStart // ^^^^^^^^^ definition local12 int itemCount if (itemCount == 0) { @@ -221,7 +221,7 @@ public void onItemRangeInserted(int positionStart, int itemCount) { @Override // ^^^^^^^^ reference java/lang/Override# public void onItemRangeRemoved(int positionStart, int itemCount) { -// ^^^^^^^^^^^^^^^^^^ definition local6 public void onItemRangeRemoved(int positionStart, int itemCount) +// ^^^^^^^^^^^^^^^^^^ definition local6 @Override public void onItemRangeRemoved(int positionStart, int itemCount) // ^^^^^^^^^^^^^ definition local18 int positionStart // ^^^^^^^^^ definition local19 int itemCount if (itemCount == 0) { @@ -277,7 +277,7 @@ public void onItemRangeRemoved(int positionStart, int itemCount) { @Override // ^^^^^^^^ reference java/lang/Override# public void onItemRangeMoved(int fromPosition, int toPosition, int itemCount) { -// ^^^^^^^^^^^^^^^^ definition local7 public void onItemRangeMoved(int fromPosition, int toPosition, int itemCount) +// ^^^^^^^^^^^^^^^^ definition local7 @Override public void onItemRangeMoved(int fromPosition, int toPosition, int itemCount) // ^^^^^^^^^^^^ definition local24 int fromPosition // ^^^^^^^^^^ definition local25 int toPosition // ^^^^^^^^^ definition local26 int itemCount @@ -1087,7 +1087,7 @@ private void updateItemPosition(ModelState item, List moveOps) { // ^^^^^^^^ reference androidx/annotation/Nullable# private ModelState getNextItemWithPair(Iterator iterator) { // ^^^^^^^^^^ reference com/airbnb/epoxy/ModelState# -// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/DiffHelper#getNextItemWithPair(). private ModelState getNextItemWithPair(Iterator iterator) +// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/DiffHelper#getNextItemWithPair(). @Nullable private ModelState getNextItemWithPair(Iterator iterator) // ^^^^^^^^ reference java/util/Iterator# // ^^^^^^^^^^ reference com/airbnb/epoxy/ModelState# // ^^^^^^^^ definition local69 Iterator iterator diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffPayload.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffPayload.java index d864dc2b5..c5b8b3128 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffPayload.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffPayload.java @@ -107,7 +107,7 @@ public DiffPayload(EpoxyModel changedItem) { // ^^^^^^^^ reference androidx/annotation/Nullable# public static EpoxyModel getModelFromPayload(List payloads, long modelId) { // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/DiffPayload#getModelFromPayload(). public static EpoxyModel getModelFromPayload(List payloads, long modelId) +// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/DiffPayload#getModelFromPayload(). @Nullable public static EpoxyModel getModelFromPayload(List payloads, long modelId) // ^^^^ reference java/util/List# // ^^^^^^ reference java/lang/Object# // ^^^^^^^^ definition local4 List payloads @@ -162,7 +162,7 @@ public static EpoxyModel getModelFromPayload(List payloads, long mode @VisibleForTesting // ^^^^^^^^^^^^^^^^^ reference androidx/annotation/VisibleForTesting# boolean equalsForTesting(DiffPayload that) { -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/DiffPayload#equalsForTesting(). boolean equalsForTesting(DiffPayload that) +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/DiffPayload#equalsForTesting(). @VisibleForTesting boolean equalsForTesting(DiffPayload that) // ^^^^^^^^^^^ reference com/airbnb/epoxy/DiffPayload# // ^^^^ definition local9 DiffPayload that if (singleModel != null) { diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffResult.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffResult.java index 336f64550..c676a7211 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffResult.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffResult.java @@ -48,12 +48,12 @@ public class DiffResult { // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^ reference java/util/List# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/DiffResult#previousModels. final List> previousModels +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/DiffResult#previousModels. @NonNull final List> previousModels @NonNull final List> newModels; // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^ reference java/util/List# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^ definition com/airbnb/epoxy/DiffResult#newModels. final List> newModels +// ^^^^^^^^^ definition com/airbnb/epoxy/DiffResult#newModels. @NonNull final List> newModels /** * If this is non null it means the full differ ran and the result is contained @@ -64,7 +64,7 @@ public class DiffResult { // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^^^ reference DiffUtil/ // ^^^^^^^^^^ reference DiffUtil/DiffResult# -// ^^^^^^^^^^^^ definition com/airbnb/epoxy/DiffResult#differResult. final unresolved_type differResult +// ^^^^^^^^^^^^ definition com/airbnb/epoxy/DiffResult#differResult. @Nullable final unresolved_type differResult /** No changes were made to the models. */ static DiffResult noOp(@Nullable List> models) { @@ -73,7 +73,7 @@ static DiffResult noOp(@Nullable List> models) { // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^ reference java/util/List# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^ definition local0 List> models +// ^^^^^^ definition local0 @Nullable List> models if (models == null) { // ^^^^^^ reference local0 models = Collections.emptyList(); @@ -95,7 +95,7 @@ static DiffResult inserted(@NonNull List> newModels) { // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^ reference java/util/List# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^ definition local1 List> newModels +// ^^^^^^^^^ definition local1 @NonNull List> newModels //noinspection unchecked return new DiffResult(Collections.EMPTY_LIST, newModels, null); // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/DiffResult#``(). @@ -112,7 +112,7 @@ static DiffResult clear(@NonNull List> previousModels) { // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^ reference java/util/List# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^^^^^^ definition local2 List> previousModels +// ^^^^^^^^^^^^^^ definition local2 @NonNull List> previousModels //noinspection unchecked return new DiffResult(previousModels, Collections.EMPTY_LIST, null); // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/DiffResult#``(). @@ -133,17 +133,17 @@ static DiffResult diff( // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^ reference java/util/List# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^^^^^^ definition local3 List> previousModels +// ^^^^^^^^^^^^^^ definition local3 @NonNull List> previousModels @NonNull List> newModels, // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^ reference java/util/List# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^ definition local4 List> newModels +// ^^^^^^^^^ definition local4 @NonNull List> newModels @NonNull DiffUtil.DiffResult differResult // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^ reference DiffUtil/ // ^^^^^^^^^^ reference DiffUtil/DiffResult# -// ^^^^^^^^^^^^ definition local5 unresolved_type differResult +// ^^^^^^^^^^^^ definition local5 @NonNull unresolved_type differResult ) { return new DiffResult(previousModels, newModels, differResult); // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/DiffResult#``(). @@ -159,17 +159,17 @@ private DiffResult( // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^ reference java/util/List# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^^^^^^ definition local6 List> previousModels +// ^^^^^^^^^^^^^^ definition local6 @NonNull List> previousModels @NonNull List> newModels, // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^ reference java/util/List# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^ definition local7 List> newModels +// ^^^^^^^^^ definition local7 @NonNull List> newModels @Nullable DiffUtil.DiffResult differResult // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^^^ reference DiffUtil/ // ^^^^^^^^^^ reference DiffUtil/DiffResult# -// ^^^^^^^^^^^^ definition local8 unresolved_type differResult +// ^^^^^^^^^^^^ definition local8 @Nullable unresolved_type differResult ) { this.previousModels = previousModels; // ^^^^ reference com/airbnb/epoxy/DiffResult# diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAdapter.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAdapter.java index 87654ecd0..e559770d2 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAdapter.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAdapter.java @@ -35,7 +35,7 @@ @SuppressWarnings("WeakerAccess") //^^^^^^^^^^^^^^^ reference java/lang/SuppressWarnings# public abstract class EpoxyAdapter extends BaseEpoxyAdapter { -// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyAdapter# public abstract class EpoxyAdapter extends BaseEpoxyAdapter +// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyAdapter# @SuppressWarnings("WeakerAccess") public abstract class EpoxyAdapter extends BaseEpoxyAdapter // ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyAdapter#``(). public EpoxyAdapter() // ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BaseEpoxyAdapter# private final HiddenEpoxyModel hiddenModel = new HiddenEpoxyModel(); @@ -63,7 +63,7 @@ public abstract class EpoxyAdapter extends BaseEpoxyAdapter { List> getCurrentModels() { //^^^^ reference java/util/List# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyAdapter#getCurrentModels(). List> getCurrentModels() +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyAdapter#getCurrentModels(). @Override List> getCurrentModels() return models; // ^^^^^^ reference com/airbnb/epoxy/EpoxyAdapter#models. } @@ -109,7 +109,7 @@ protected void enableDiffing() { // ^^^^^^^^ reference java/lang/Override# EpoxyModel getModelForPosition(int position) { //^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyAdapter#getModelForPosition(). EpoxyModel getModelForPosition(int position) +// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyAdapter#getModelForPosition(). @Override EpoxyModel getModelForPosition(int position) // ^^^^^^^^ definition local0 int position EpoxyModel model = models.get(position); // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# @@ -174,7 +174,7 @@ protected void notifyModelChanged(EpoxyModel model, @Nullable Object payload) // ^^^^^ definition local3 EpoxyModel model // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^ reference java/lang/Object# -// ^^^^^^^ definition local4 Object payload +// ^^^^^^^ definition local4 @Nullable Object payload int index = getModelPosition(model); // ^^^^^ definition local5 int index // ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BaseEpoxyAdapter#getModelPosition(). diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAsyncUtil.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAsyncUtil.java index 185151639..4ec53f7ed 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAsyncUtil.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAsyncUtil.java @@ -77,7 +77,7 @@ private EpoxyAsyncUtil() { // ^^^^^^^^^^ reference androidx/annotation/MainThread# public static Handler getAsyncBackgroundHandler() { // ^^^^^^^ reference _root_/ -// ^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyAsyncUtil#getAsyncBackgroundHandler(). public static getAsyncBackgroundHandler() +// ^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyAsyncUtil#getAsyncBackgroundHandler(). @MainThread public static getAsyncBackgroundHandler() // This is initialized lazily so we don't create the thread unless it will be used. // It isn't synchronized so it should only be accessed on the main thread. if (asyncBackgroundHandler == null) { diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAttribute.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAttribute.java index 14127dfc6..fe74d1963 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAttribute.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAttribute.java @@ -35,7 +35,7 @@ // ^^^^^^^^^^^^^^^ reference java/lang/annotation/RetentionPolicy# // ^^^^^ reference java/lang/annotation/RetentionPolicy#CLASS. public @interface EpoxyAttribute { -// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyAttribute# public @interface EpoxyAttribute +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyAttribute# @Target(ElementType.FIELD) @Retention(RetentionPolicy.CLASS) public @interface EpoxyAttribute /** * Options that can be included on the attribute to affect how the model's generated class is * created. @@ -112,7 +112,7 @@ enum Option { @Deprecated // ^^^^^^^^^^ reference java/lang/Deprecated# boolean hash() default true; -// ^^^^ definition com/airbnb/epoxy/EpoxyAttribute#hash(). public abstract boolean hash() +// ^^^^ definition com/airbnb/epoxy/EpoxyAttribute#hash(). @Deprecated public abstract boolean hash() /** * Whether or not to generate setter for this attribute. @@ -125,5 +125,5 @@ enum Option { @Deprecated // ^^^^^^^^^^ reference java/lang/Deprecated# boolean setter() default true; -// ^^^^^^ definition com/airbnb/epoxy/EpoxyAttribute#setter(). public abstract boolean setter() +// ^^^^^^ definition com/airbnb/epoxy/EpoxyAttribute#setter(). @Deprecated public abstract boolean setter() } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java index 55a719e79..fdd6357f9 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java @@ -260,7 +260,7 @@ public EpoxyController(Handler modelBuildingHandler, Handler diffingHandler) { */ @RequestedModelBuildType private volatile int requestedModelBuildType = // ^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#RequestedModelBuildType# -// ^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#requestedModelBuildType. private int requestedModelBuildType +// ^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#requestedModelBuildType. @RequestedModelBuildType private int requestedModelBuildType RequestedModelBuildType.NONE; // ^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#RequestedModelBuildType# // ^^^^ reference com/airbnb/epoxy/EpoxyController#RequestedModelBuildType#NONE. @@ -280,7 +280,7 @@ public EpoxyController(Handler modelBuildingHandler, Handler diffingHandler) { // ^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#RequestedModelBuildType# // ^^^^^^^ reference com/airbnb/epoxy/EpoxyController#RequestedModelBuildType#DELAYED. private @interface RequestedModelBuildType { -// ^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#RequestedModelBuildType# private @interface RequestedModelBuildType +// ^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#RequestedModelBuildType# @Retention(RetentionPolicy.SOURCE) @IntDef({RequestedModelBuildType.NONE, RequestedModelBuildType.NEXT_FRAME, RequestedModelBuildType.DELAYED}) private @interface RequestedModelBuildType int NONE = 0; // ^^^^ definition com/airbnb/epoxy/EpoxyController#RequestedModelBuildType#NONE. public static final int NONE /** A request has been made to build models immediately. It is posted. */ @@ -477,7 +477,7 @@ public synchronized void cancelPendingModelBuild() { @Override // ^^^^^^^^ reference java/lang/Override# public void run() { -// ^^^ definition local7 public void run() +// ^^^ definition local7 @Override public void run() // Do this first to mark the controller as being in the model building process. threadBuildingModels = Thread.currentThread(); // ^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#threadBuildingModels. @@ -767,7 +767,7 @@ public interface Interceptor { // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^ reference java/util/List# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^ definition local23 List> models +// ^^^^^^ definition local23 @NonNull List> models } /** @@ -782,7 +782,7 @@ public void addInterceptor(@NonNull Interceptor interceptor) { // ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#addInterceptor(). public void addInterceptor(Interceptor interceptor) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#Interceptor# -// ^^^^^^^^^^^ definition local24 Interceptor interceptor +// ^^^^^^^^^^^ definition local24 @NonNull Interceptor interceptor interceptors.add(interceptor); // ^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#interceptors. // ^^^ reference java/util/List#add(). @@ -794,7 +794,7 @@ public void removeInterceptor(@NonNull Interceptor interceptor) { // ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#removeInterceptor(). public void removeInterceptor(Interceptor interceptor) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#Interceptor# -// ^^^^^^^^^^^ definition local25 Interceptor interceptor +// ^^^^^^^^^^^ definition local25 @NonNull Interceptor interceptor interceptors.remove(interceptor); // ^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#interceptors. // ^^^^^^ reference java/util/List#remove(). @@ -846,7 +846,7 @@ public void add(@NonNull EpoxyModel model) { // ^^^ definition com/airbnb/epoxy/EpoxyController#add(). public void add(EpoxyModel model) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^ definition local26 EpoxyModel model +// ^^^^^ definition local26 @NonNull EpoxyModel model model.addTo(this); // ^^^^^ reference local26 // ^^^^^ reference com/airbnb/epoxy/EpoxyModel#addTo(). @@ -861,7 +861,7 @@ protected void add(@NonNull EpoxyModel... modelsToAdd) { // ^^^ definition com/airbnb/epoxy/EpoxyController#add(+1). protected void add(EpoxyModel[] modelsToAdd) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^^^ definition local27 EpoxyModel[] modelsToAdd +// ^^^^^^^^^^^ definition local27 @NonNull EpoxyModel[] modelsToAdd modelsBeingBuilt.ensureCapacity(modelsBeingBuilt.size() + modelsToAdd.length); // ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#modelsBeingBuilt. // ^^^^^^^^^^^^^^ reference java/util/ArrayList#ensureCapacity(). @@ -889,7 +889,7 @@ protected void add(@NonNull List> modelsToAdd) { // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^ reference java/util/List# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^^^ definition local29 List> modelsToAdd +// ^^^^^^^^^^^ definition local29 @NonNull List> modelsToAdd modelsBeingBuilt.ensureCapacity(modelsBeingBuilt.size() + modelsToAdd.size()); // ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#modelsBeingBuilt. // ^^^^^^^^^^^^^^ reference java/util/ArrayList#ensureCapacity(). @@ -1314,7 +1314,7 @@ public void notifyModelChanged(int position) { // ^^^^^^^ reference androidx/annotation/NonNull# public EpoxyControllerAdapter getAdapter() { // ^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyControllerAdapter# -// ^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#getAdapter(). public EpoxyControllerAdapter getAdapter() +// ^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#getAdapter(). @NonNull public EpoxyControllerAdapter getAdapter() return adapter; // ^^^^^^^ reference com/airbnb/epoxy/EpoxyController#adapter. } @@ -1323,7 +1323,7 @@ public void onSaveInstanceState(@NonNull Bundle outState) { // ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#onSaveInstanceState(). public void onSaveInstanceState(unresolved_type outState) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^ reference _root_/ -// ^^^^^^^^ definition local53 unresolved_type outState +// ^^^^^^^^ definition local53 @NonNull unresolved_type outState adapter.onSaveInstanceState(outState); // ^^^^^^^ reference com/airbnb/epoxy/EpoxyController#adapter. // ^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BaseEpoxyAdapter#onSaveInstanceState(). @@ -1334,7 +1334,7 @@ public void onRestoreInstanceState(@Nullable Bundle inState) { // ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#onRestoreInstanceState(). public void onRestoreInstanceState(unresolved_type inState) // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^ reference _root_/ -// ^^^^^^^ definition local54 unresolved_type inState +// ^^^^^^^ definition local54 @Nullable unresolved_type inState adapter.onRestoreInstanceState(inState); // ^^^^^^^ reference com/airbnb/epoxy/EpoxyController#adapter. // ^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BaseEpoxyAdapter#onRestoreInstanceState(). @@ -1351,7 +1351,7 @@ public void onRestoreInstanceState(@Nullable Bundle inState) { // ^^^^^^^ reference androidx/annotation/NonNull# public SpanSizeLookup getSpanSizeLookup() { // ^^^^^^^^^^^^^^ reference _root_/ -// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#getSpanSizeLookup(). public getSpanSizeLookup() +// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#getSpanSizeLookup(). @NonNull public getSpanSizeLookup() return adapter.getSpanSizeLookup(); // ^^^^^^^ reference com/airbnb/epoxy/EpoxyController#adapter. // ^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BaseEpoxyAdapter#getSpanSizeLookup(). @@ -1403,7 +1403,7 @@ protected void onExceptionSwallowed(@NonNull RuntimeException exception) { // ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#onExceptionSwallowed(). protected void onExceptionSwallowed(RuntimeException exception) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^^^^^^ reference java/lang/RuntimeException# -// ^^^^^^^^^ definition local56 RuntimeException exception +// ^^^^^^^^^ definition local56 @NonNull RuntimeException exception globalExceptionHandler.onException(this, exception); // ^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#globalExceptionHandler. // ^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#ExceptionHandler#onException(). @@ -1426,14 +1426,14 @@ protected void onExceptionSwallowed(@NonNull RuntimeException exception) { @Override // ^^^^^^^^ reference java/lang/Override# public void onException(@NonNull EpoxyController controller, -// ^^^^^^^^^^^ definition local59 public void onException(EpoxyController controller, RuntimeException exception) +// ^^^^^^^^^^^ definition local59 @Override public void onException(EpoxyController controller, RuntimeException exception) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController# -// ^^^^^^^^^^ definition local60 EpoxyController controller +// ^^^^^^^^^^ definition local60 @NonNull EpoxyController controller @NonNull RuntimeException exception) { // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^^^^^^ reference java/lang/RuntimeException# -// ^^^^^^^^^ definition local61 RuntimeException exception +// ^^^^^^^^^ definition local61 @NonNull RuntimeException exception // Ignore exceptions as the default } }; @@ -1457,7 +1457,7 @@ public static void setGlobalExceptionHandler( @NonNull ExceptionHandler globalExceptionHandler) { // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#ExceptionHandler# -// ^^^^^^^^^^^^^^^^^^^^^^ definition local62 ExceptionHandler globalExceptionHandler +// ^^^^^^^^^^^^^^^^^^^^^^ definition local62 @NonNull ExceptionHandler globalExceptionHandler EpoxyController.globalExceptionHandler = globalExceptionHandler; // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController# // ^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#globalExceptionHandler. @@ -1479,10 +1479,10 @@ public interface ExceptionHandler { // ^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#ExceptionHandler#onException(). public abstract void onException(EpoxyController controller, RuntimeException exception) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController# -// ^^^^^^^^^^ definition local63 EpoxyController controller +// ^^^^^^^^^^ definition local63 @NonNull EpoxyController controller // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^^^^^^ reference java/lang/RuntimeException# -// ^^^^^^^^^ definition local64 RuntimeException exception +// ^^^^^^^^^ definition local64 @NonNull RuntimeException exception } void onAttachedToRecyclerViewInternal(RecyclerView recyclerView) { @@ -1505,7 +1505,7 @@ void onAttachedToRecyclerViewInternal(RecyclerView recyclerView) { @Override // ^^^^^^^^ reference java/lang/Override# public void run() { -// ^^^ definition local68 public void run() +// ^^^ definition local68 @Override public void run() // Only warn if there are still multiple adapters attached after a delay, to allow for // a grace period if (recyclerViewAttachCount > 1) { @@ -1551,7 +1551,7 @@ protected void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) { // ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#onAttachedToRecyclerView(). protected void onAttachedToRecyclerView(unresolved_type recyclerView) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^^ reference _root_/ -// ^^^^^^^^^^^^ definition local70 unresolved_type recyclerView +// ^^^^^^^^^^^^ definition local70 @NonNull unresolved_type recyclerView } @@ -1560,7 +1560,7 @@ protected void onDetachedFromRecyclerView(@NonNull RecyclerView recyclerView) { // ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#onDetachedFromRecyclerView(). protected void onDetachedFromRecyclerView(unresolved_type recyclerView) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^^ reference _root_/ -// ^^^^^^^^^^^^ definition local71 unresolved_type recyclerView +// ^^^^^^^^^^^^ definition local71 @NonNull unresolved_type recyclerView } @@ -1601,16 +1601,16 @@ protected void onModelBound(@NonNull EpoxyViewHolder holder, @NonNull EpoxyModel // ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#onModelBound(). protected void onModelBound(EpoxyViewHolder holder, EpoxyModel boundModel, int position, EpoxyModel previouslyBoundModel) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# -// ^^^^^^ definition local72 EpoxyViewHolder holder +// ^^^^^^ definition local72 @NonNull EpoxyViewHolder holder // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^^ definition local73 EpoxyModel boundModel +// ^^^^^^^^^^ definition local73 @NonNull EpoxyModel boundModel int position, // ^^^^^^^^ definition local74 int position @Nullable EpoxyModel previouslyBoundModel) { // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^^^^^^^^^^^^ definition local75 EpoxyModel previouslyBoundModel +// ^^^^^^^^^^^^^^^^^^^^ definition local75 @Nullable EpoxyModel previouslyBoundModel } /** @@ -1622,10 +1622,10 @@ protected void onModelUnbound(@NonNull EpoxyViewHolder holder, @NonNull EpoxyMod // ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#onModelUnbound(). protected void onModelUnbound(EpoxyViewHolder holder, EpoxyModel model) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# -// ^^^^^^ definition local76 EpoxyViewHolder holder +// ^^^^^^ definition local76 @NonNull EpoxyViewHolder holder // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^ definition local77 EpoxyModel model +// ^^^^^ definition local77 @NonNull EpoxyModel model } @@ -1639,11 +1639,11 @@ protected void onViewAttachedToWindow(@NonNull EpoxyViewHolder holder, // ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#onViewAttachedToWindow(). protected void onViewAttachedToWindow(EpoxyViewHolder holder, EpoxyModel model) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# -// ^^^^^^ definition local78 EpoxyViewHolder holder +// ^^^^^^ definition local78 @NonNull EpoxyViewHolder holder @NonNull EpoxyModel model) { // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^ definition local79 EpoxyModel model +// ^^^^^ definition local79 @NonNull EpoxyModel model } @@ -1657,11 +1657,11 @@ protected void onViewDetachedFromWindow(@NonNull EpoxyViewHolder holder, // ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#onViewDetachedFromWindow(). protected void onViewDetachedFromWindow(EpoxyViewHolder holder, EpoxyModel model) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# -// ^^^^^^ definition local80 EpoxyViewHolder holder +// ^^^^^^ definition local80 @NonNull EpoxyViewHolder holder @NonNull EpoxyModel model) { // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^ definition local81 EpoxyModel model +// ^^^^^ definition local81 @NonNull EpoxyModel model } @@ -1677,10 +1677,10 @@ protected void onViewDetachedFromWindow(@NonNull EpoxyViewHolder holder, @Override // ^^^^^^^^ reference java/lang/Override# public void setupStickyHeaderView(@NotNull View stickyHeader) { -// ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#setupStickyHeaderView(). public void setupStickyHeaderView(unresolved_type stickyHeader) +// ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#setupStickyHeaderView(). @Override public void setupStickyHeaderView(unresolved_type stickyHeader) // ^^^^^^^ reference org/jetbrains/annotations/NotNull# // ^^^^ reference _root_/ -// ^^^^^^^^^^^^ definition local82 unresolved_type stickyHeader +// ^^^^^^^^^^^^ definition local82 @NotNull unresolved_type stickyHeader // no-op } @@ -1694,10 +1694,10 @@ public void setupStickyHeaderView(@NotNull View stickyHeader) { @Override // ^^^^^^^^ reference java/lang/Override# public void teardownStickyHeaderView(@NotNull View stickyHeader) { -// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#teardownStickyHeaderView(). public void teardownStickyHeaderView(unresolved_type stickyHeader) +// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#teardownStickyHeaderView(). @Override public void teardownStickyHeaderView(unresolved_type stickyHeader) // ^^^^^^^ reference org/jetbrains/annotations/NotNull# // ^^^^ reference _root_/ -// ^^^^^^^^^^^^ definition local83 unresolved_type stickyHeader +// ^^^^^^^^^^^^ definition local83 @NotNull unresolved_type stickyHeader // no-op } @@ -1711,7 +1711,7 @@ public void teardownStickyHeaderView(@NotNull View stickyHeader) { @Override // ^^^^^^^^ reference java/lang/Override# public boolean isStickyHeader(int position) { -// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#isStickyHeader(). public boolean isStickyHeader(int position) +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#isStickyHeader(). @Override public boolean isStickyHeader(int position) // ^^^^^^^^ definition local84 int position return false; } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyControllerAdapter.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyControllerAdapter.java index b94d46d1b..c82ec0944 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyControllerAdapter.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyControllerAdapter.java @@ -83,7 +83,7 @@ public final class EpoxyControllerAdapter extends BaseEpoxyAdapter implements Re //^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#``(). EpoxyControllerAdapter(EpoxyController epoxyController, unresolved_type diffingHandler) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController# -// ^^^^^^^^^^^^^^^ definition local0 EpoxyController epoxyController +// ^^^^^^^^^^^^^^^ definition local0 @NonNull EpoxyController epoxyController // ^^^^^^^ reference _root_/ // ^^^^^^^^^^^^^^ definition local1 unresolved_type diffingHandler this.epoxyController = epoxyController; @@ -109,10 +109,10 @@ public final class EpoxyControllerAdapter extends BaseEpoxyAdapter implements Re @Override // ^^^^^^^^ reference java/lang/Override# protected void onExceptionSwallowed(@NonNull RuntimeException exception) { -// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#onExceptionSwallowed(). protected void onExceptionSwallowed(RuntimeException exception) +// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#onExceptionSwallowed(). @Override protected void onExceptionSwallowed(RuntimeException exception) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^^^^^^ reference java/lang/RuntimeException# -// ^^^^^^^^^ definition local2 RuntimeException exception +// ^^^^^^^^^ definition local2 @NonNull RuntimeException exception epoxyController.onExceptionSwallowed(exception); // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyControllerAdapter#epoxyController. // ^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#onExceptionSwallowed(). @@ -126,7 +126,7 @@ protected void onExceptionSwallowed(@NonNull RuntimeException exception) { List> getCurrentModels() { //^^^^ reference java/util/List# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#getCurrentModels(). List> getCurrentModels() +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#getCurrentModels(). @NonNull @Override List> getCurrentModels() return differ.getCurrentList(); // ^^^^^^ reference com/airbnb/epoxy/EpoxyControllerAdapter#differ. // ^^^^^^^^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#getCurrentList(). @@ -135,7 +135,7 @@ List> getCurrentModels() { @Override // ^^^^^^^^ reference java/lang/Override# public int getItemCount() { -// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#getItemCount(). public int getItemCount() +// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#getItemCount(). @Override public int getItemCount() // RecyclerView calls this A LOT. The base class implementation does // getCurrentModels().size() which adds some overhead because of the method calls. // We can easily memoize this, which seems to help when there are lots of models. @@ -148,7 +148,7 @@ void setModels(@NonNull ControllerModelList models) { // ^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#setModels(). void setModels(ControllerModelList models) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ControllerModelList# -// ^^^^^^ definition local3 ControllerModelList models +// ^^^^^^ definition local3 @NonNull ControllerModelList models // If debug model validations are on then we should help detect the error case where models // were incorrectly mutated once they were added. That check is also done before and after // bind, but there is no other check after that to see if a model is incorrectly @@ -211,10 +211,10 @@ public boolean isDiffInProgress() { @Override // ^^^^^^^^ reference java/lang/Override# public void onResult(@NonNull DiffResult result) { -// ^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#onResult(). public void onResult(DiffResult result) +// ^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#onResult(). @Override public void onResult(DiffResult result) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^ reference com/airbnb/epoxy/DiffResult# -// ^^^^^^ definition local7 DiffResult result +// ^^^^^^ definition local7 @NonNull DiffResult result itemCount = result.newModels.size(); // ^^^^^^^^^ reference com/airbnb/epoxy/EpoxyControllerAdapter#itemCount. // ^^^^^^ reference local7 @@ -269,17 +269,17 @@ public void removeModelBuildListener(OnModelBuildFinishedListener listener) { @Override // ^^^^^^^^ reference java/lang/Override# boolean diffPayloadsEnabled() { -// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#diffPayloadsEnabled(). boolean diffPayloadsEnabled() +// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#diffPayloadsEnabled(). @Override boolean diffPayloadsEnabled() return true; } @Override // ^^^^^^^^ reference java/lang/Override# public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) { -// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#onAttachedToRecyclerView(). public void onAttachedToRecyclerView(unresolved_type recyclerView) +// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#onAttachedToRecyclerView(). @Override public void onAttachedToRecyclerView(unresolved_type recyclerView) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^^ reference _root_/ -// ^^^^^^^^^^^^ definition local11 unresolved_type recyclerView +// ^^^^^^^^^^^^ definition local11 @NonNull unresolved_type recyclerView super.onAttachedToRecyclerView(recyclerView); // ^^^^^ reference com/airbnb/epoxy/EpoxyControllerAdapter#super. // ^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BaseEpoxyAdapter#onAttachedToRecyclerView# @@ -293,10 +293,10 @@ public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) { @Override // ^^^^^^^^ reference java/lang/Override# public void onDetachedFromRecyclerView(@NonNull RecyclerView recyclerView) { -// ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#onDetachedFromRecyclerView(). public void onDetachedFromRecyclerView(unresolved_type recyclerView) +// ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#onDetachedFromRecyclerView(). @Override public void onDetachedFromRecyclerView(unresolved_type recyclerView) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^^ reference _root_/ -// ^^^^^^^^^^^^ definition local12 unresolved_type recyclerView +// ^^^^^^^^^^^^ definition local12 @NonNull unresolved_type recyclerView super.onDetachedFromRecyclerView(recyclerView); // ^^^^^ reference com/airbnb/epoxy/EpoxyControllerAdapter#super. // ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BaseEpoxyAdapter#onDetachedFromRecyclerView(). @@ -310,10 +310,10 @@ public void onDetachedFromRecyclerView(@NonNull RecyclerView recyclerView) { @Override // ^^^^^^^^ reference java/lang/Override# public void onViewAttachedToWindow(@NonNull EpoxyViewHolder holder) { -// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#onViewAttachedToWindow(). public void onViewAttachedToWindow(EpoxyViewHolder holder) +// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#onViewAttachedToWindow(). @Override public void onViewAttachedToWindow(EpoxyViewHolder holder) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# -// ^^^^^^ definition local13 EpoxyViewHolder holder +// ^^^^^^ definition local13 @NonNull EpoxyViewHolder holder super.onViewAttachedToWindow(holder); // ^^^^^ reference com/airbnb/epoxy/EpoxyControllerAdapter#super. // ^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BaseEpoxyAdapter#onViewAttachedToWindow(). @@ -329,10 +329,10 @@ public void onViewAttachedToWindow(@NonNull EpoxyViewHolder holder) { @Override // ^^^^^^^^ reference java/lang/Override# public void onViewDetachedFromWindow(@NonNull EpoxyViewHolder holder) { -// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#onViewDetachedFromWindow(). public void onViewDetachedFromWindow(EpoxyViewHolder holder) +// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#onViewDetachedFromWindow(). @Override public void onViewDetachedFromWindow(EpoxyViewHolder holder) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# -// ^^^^^^ definition local14 EpoxyViewHolder holder +// ^^^^^^ definition local14 @NonNull EpoxyViewHolder holder super.onViewDetachedFromWindow(holder); // ^^^^^ reference com/airbnb/epoxy/EpoxyControllerAdapter#super. // ^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BaseEpoxyAdapter#onViewDetachedFromWindow(). @@ -348,18 +348,18 @@ public void onViewDetachedFromWindow(@NonNull EpoxyViewHolder holder) { @Override // ^^^^^^^^ reference java/lang/Override# protected void onModelBound(@NonNull EpoxyViewHolder holder, @NonNull EpoxyModel model, -// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#onModelBound(). protected void onModelBound(EpoxyViewHolder holder, EpoxyModel model, int position, EpoxyModel previouslyBoundModel) +// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#onModelBound(). @Override protected void onModelBound(EpoxyViewHolder holder, EpoxyModel model, int position, EpoxyModel previouslyBoundModel) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# -// ^^^^^^ definition local15 EpoxyViewHolder holder +// ^^^^^^ definition local15 @NonNull EpoxyViewHolder holder // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^ definition local16 EpoxyModel model +// ^^^^^ definition local16 @NonNull EpoxyModel model int position, @Nullable EpoxyModel previouslyBoundModel) { // ^^^^^^^^ definition local17 int position // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^^^^^^^^^^^^ definition local18 EpoxyModel previouslyBoundModel +// ^^^^^^^^^^^^^^^^^^^^ definition local18 @Nullable EpoxyModel previouslyBoundModel epoxyController.onModelBound(holder, model, position, previouslyBoundModel); // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyControllerAdapter#epoxyController. // ^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#onModelBound(). @@ -372,13 +372,13 @@ protected void onModelBound(@NonNull EpoxyViewHolder holder, @NonNull EpoxyModel @Override // ^^^^^^^^ reference java/lang/Override# protected void onModelUnbound(@NonNull EpoxyViewHolder holder, @NonNull EpoxyModel model) { -// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#onModelUnbound(). protected void onModelUnbound(EpoxyViewHolder holder, EpoxyModel model) +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#onModelUnbound(). @Override protected void onModelUnbound(EpoxyViewHolder holder, EpoxyModel model) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# -// ^^^^^^ definition local19 EpoxyViewHolder holder +// ^^^^^^ definition local19 @NonNull EpoxyViewHolder holder // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^ definition local20 EpoxyModel model +// ^^^^^ definition local20 @NonNull EpoxyModel model epoxyController.onModelUnbound(holder, model); // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyControllerAdapter#epoxyController. // ^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#onModelUnbound(). @@ -392,7 +392,7 @@ protected void onModelUnbound(@NonNull EpoxyViewHolder holder, @NonNull EpoxyMod public List> getCopyOfModels() { // ^^^^ reference java/util/List# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#getCopyOfModels(). public List> getCopyOfModels() +// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#getCopyOfModels(). @NonNull public List> getCopyOfModels() //noinspection unchecked return (List>) getCurrentModels(); // ^^^^ reference java/util/List# @@ -408,7 +408,7 @@ public List> getCopyOfModels() { // ^^^^^^^ reference androidx/annotation/NonNull# public EpoxyModel getModelAtPosition(int position) { // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#getModelAtPosition(). public EpoxyModel getModelAtPosition(int position) +// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#getModelAtPosition(). @NonNull public EpoxyModel getModelAtPosition(int position) // ^^^^^^^^ definition local21 int position return getCurrentModels().get(position); // ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyControllerAdapter#getCurrentModels(). @@ -424,7 +424,7 @@ public EpoxyModel getModelAtPosition(int position) { // ^^^^^^^^ reference androidx/annotation/Nullable# public EpoxyModel getModelById(long id) { // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#getModelById(). public EpoxyModel getModelById(long id) +// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#getModelById(). @Nullable public EpoxyModel getModelById(long id) // ^^ definition local22 long id for (EpoxyModel model : getCurrentModels()) { // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# @@ -445,10 +445,10 @@ public EpoxyModel getModelById(long id) { @Override // ^^^^^^^^ reference java/lang/Override# public int getModelPosition(@NonNull EpoxyModel targetModel) { -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#getModelPosition(). public int getModelPosition(EpoxyModel targetModel) +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#getModelPosition(). @Override public int getModelPosition(EpoxyModel targetModel) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^^^ definition local24 EpoxyModel targetModel +// ^^^^^^^^^^^ definition local24 @NonNull EpoxyModel targetModel int size = getCurrentModels().size(); // ^^^^ definition local25 int size // ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyControllerAdapter#getCurrentModels(). @@ -483,7 +483,7 @@ public int getModelPosition(@NonNull EpoxyModel targetModel) { // ^^^^^^^^ reference java/lang/Override# public BoundViewHolders getBoundViewHolders() { // ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BoundViewHolders# -// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#getBoundViewHolders(). public BoundViewHolders getBoundViewHolders() +// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#getBoundViewHolders(). @NonNull @Override public BoundViewHolders getBoundViewHolders() return super.getBoundViewHolders(); // ^^^^^ reference com/airbnb/epoxy/EpoxyControllerAdapter#super. // ^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BaseEpoxyAdapter#getBoundViewHolders(). @@ -492,7 +492,7 @@ public BoundViewHolders getBoundViewHolders() { @UiThread // ^^^^^^^^ reference androidx/annotation/UiThread# void moveModel(int fromPosition, int toPosition) { -// ^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#moveModel(). void moveModel(int fromPosition, int toPosition) +// ^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#moveModel(). @UiThread void moveModel(int fromPosition, int toPosition) // ^^^^^^^^^^^^ definition local28 int fromPosition // ^^^^^^^^^^ definition local29 int toPosition ArrayList> updatedList = new ArrayList<>(getCurrentModels()); @@ -540,7 +540,7 @@ void moveModel(int fromPosition, int toPosition) { @UiThread // ^^^^^^^^ reference androidx/annotation/UiThread# void notifyModelChanged(int position) { -// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#notifyModelChanged(). void notifyModelChanged(int position) +// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#notifyModelChanged(). @UiThread void notifyModelChanged(int position) // ^^^^^^^^ definition local32 int position ArrayList> updatedList = new ArrayList<>(getCurrentModels()); // ^^^^^^^^^ reference java/util/ArrayList# @@ -589,7 +589,7 @@ void notifyModelChanged(int position) { @Override // ^^^^^^^^ reference java/lang/Override# public boolean areItemsTheSame(EpoxyModel oldItem, EpoxyModel newItem) { -// ^^^^^^^^^^^^^^^ definition local36 public boolean areItemsTheSame(EpoxyModel oldItem, EpoxyModel newItem) +// ^^^^^^^^^^^^^^^ definition local36 @Override public boolean areItemsTheSame(EpoxyModel oldItem, EpoxyModel newItem) // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^^^ definition local39 EpoxyModel oldItem // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# @@ -604,7 +604,7 @@ public boolean areItemsTheSame(EpoxyModel oldItem, EpoxyModel newItem) { @Override // ^^^^^^^^ reference java/lang/Override# public boolean areContentsTheSame(EpoxyModel oldItem, EpoxyModel newItem) { -// ^^^^^^^^^^^^^^^^^^ definition local37 public boolean areContentsTheSame(EpoxyModel oldItem, EpoxyModel newItem) +// ^^^^^^^^^^^^^^^^^^ definition local37 @Override public boolean areContentsTheSame(EpoxyModel oldItem, EpoxyModel newItem) // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^^^ definition local41 EpoxyModel oldItem // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# @@ -619,7 +619,7 @@ public boolean areContentsTheSame(EpoxyModel oldItem, EpoxyModel newItem) // ^^^^^^^^ reference java/lang/Override# public Object getChangePayload(EpoxyModel oldItem, EpoxyModel newItem) { // ^^^^^^ reference java/lang/Object# -// ^^^^^^^^^^^^^^^^ definition local38 public Object getChangePayload(EpoxyModel oldItem, EpoxyModel newItem) +// ^^^^^^^^^^^^^^^^ definition local38 @Override public Object getChangePayload(EpoxyModel oldItem, EpoxyModel newItem) // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^^^ definition local43 EpoxyModel oldItem // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# @@ -638,7 +638,7 @@ public Object getChangePayload(EpoxyModel oldItem, EpoxyModel newItem) { @Override // ^^^^^^^^ reference java/lang/Override# public boolean isStickyHeader(int position) { -// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#isStickyHeader(). public boolean isStickyHeader(int position) +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#isStickyHeader(). @Override public boolean isStickyHeader(int position) // ^^^^^^^^ definition local45 int position return epoxyController.isStickyHeader(position); // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyControllerAdapter#epoxyController. @@ -653,10 +653,10 @@ public boolean isStickyHeader(int position) { @Override // ^^^^^^^^ reference java/lang/Override# public void setupStickyHeaderView(@NotNull View stickyHeader) { -// ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#setupStickyHeaderView(). public void setupStickyHeaderView(unresolved_type stickyHeader) +// ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#setupStickyHeaderView(). @Override public void setupStickyHeaderView(unresolved_type stickyHeader) // ^^^^^^^ reference org/jetbrains/annotations/NotNull# // ^^^^ reference _root_/ -// ^^^^^^^^^^^^ definition local46 unresolved_type stickyHeader +// ^^^^^^^^^^^^ definition local46 @NotNull unresolved_type stickyHeader epoxyController.setupStickyHeaderView(stickyHeader); // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyControllerAdapter#epoxyController. // ^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#setupStickyHeaderView(). @@ -670,10 +670,10 @@ public void setupStickyHeaderView(@NotNull View stickyHeader) { @Override // ^^^^^^^^ reference java/lang/Override# public void teardownStickyHeaderView(@NotNull View stickyHeader) { -// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#teardownStickyHeaderView(). public void teardownStickyHeaderView(unresolved_type stickyHeader) +// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter#teardownStickyHeaderView(). @Override public void teardownStickyHeaderView(unresolved_type stickyHeader) // ^^^^^^^ reference org/jetbrains/annotations/NotNull# // ^^^^ reference _root_/ -// ^^^^^^^^^^^^ definition local47 unresolved_type stickyHeader +// ^^^^^^^^^^^^ definition local47 @NotNull unresolved_type stickyHeader epoxyController.teardownStickyHeaderView(stickyHeader); // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyControllerAdapter#epoxyController. // ^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#teardownStickyHeaderView(). diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDataBindingLayouts.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDataBindingLayouts.java index 6813e8c3f..e02e4b260 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDataBindingLayouts.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDataBindingLayouts.java @@ -46,11 +46,11 @@ // ^^^^^^^^^^^^^^^ reference java/lang/annotation/RetentionPolicy# // ^^^^^ reference java/lang/annotation/RetentionPolicy#CLASS. public @interface EpoxyDataBindingLayouts { -// ^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDataBindingLayouts# public @interface EpoxyDataBindingLayouts +// ^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDataBindingLayouts# @Target(ElementType.TYPE) @Retention(RetentionPolicy.CLASS) public @interface EpoxyDataBindingLayouts /** A list of databinding layout resources that should have EpoxyModel's generated for them. */ @LayoutRes int[] value(); // ^^^^^^^^^ reference androidx/annotation/LayoutRes# -// ^^^^^ definition com/airbnb/epoxy/EpoxyDataBindingLayouts#value(). public abstract int[] value() +// ^^^^^ definition com/airbnb/epoxy/EpoxyDataBindingLayouts#value(). @LayoutRes public abstract int[] value() /** * If true, any variable whose type does not implement equals and hashcode will have the diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDataBindingPattern.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDataBindingPattern.java index ad7f7cda5..52a62d544 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDataBindingPattern.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDataBindingPattern.java @@ -38,7 +38,7 @@ // ^^^^^^^^^^^^^^^ reference java/lang/annotation/RetentionPolicy# // ^^^^^ reference java/lang/annotation/RetentionPolicy#CLASS. public @interface EpoxyDataBindingPattern { -// ^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDataBindingPattern# public @interface EpoxyDataBindingPattern +// ^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDataBindingPattern# @Target(ElementType.TYPE) @Retention(RetentionPolicy.CLASS) public @interface EpoxyDataBindingPattern /** * The R class used in this module (eg "com.example.app.R.class"). This is needed so Epoxy can * look up layout files. diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDiffLogger.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDiffLogger.java index 5421a3aab..0203169c9 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDiffLogger.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDiffLogger.java @@ -47,7 +47,7 @@ public EpoxyDiffLogger(String tag) { @Override // ^^^^^^^^ reference java/lang/Override# public void onItemRangeChanged(int positionStart, int itemCount) { -// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeChanged(). public void onItemRangeChanged(int positionStart, int itemCount) +// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeChanged(). @Override public void onItemRangeChanged(int positionStart, int itemCount) // ^^^^^^^^^^^^^ definition local1 int positionStart // ^^^^^^^^^ definition local2 int itemCount Log.d(tag, "Item range changed. Start: " + positionStart + " Count: " + itemCount); @@ -61,12 +61,12 @@ public void onItemRangeChanged(int positionStart, int itemCount) { @Override // ^^^^^^^^ reference java/lang/Override# public void onItemRangeChanged(int positionStart, int itemCount, @Nullable Object payload) { -// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeChanged(+1). public void onItemRangeChanged(int positionStart, int itemCount, Object payload) +// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeChanged(+1). @Override public void onItemRangeChanged(int positionStart, int itemCount, Object payload) // ^^^^^^^^^^^^^ definition local3 int positionStart // ^^^^^^^^^ definition local4 int itemCount // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^ reference java/lang/Object# -// ^^^^^^^ definition local5 Object payload +// ^^^^^^^ definition local5 @Nullable Object payload if (payload == null) { // ^^^^^^^ reference local5 onItemRangeChanged(positionStart, itemCount); @@ -87,7 +87,7 @@ public void onItemRangeChanged(int positionStart, int itemCount, @Nullable Objec @Override // ^^^^^^^^ reference java/lang/Override# public void onItemRangeInserted(int positionStart, int itemCount) { -// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeInserted(). public void onItemRangeInserted(int positionStart, int itemCount) +// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeInserted(). @Override public void onItemRangeInserted(int positionStart, int itemCount) // ^^^^^^^^^^^^^ definition local6 int positionStart // ^^^^^^^^^ definition local7 int itemCount Log.d(tag, "Item range inserted. Start: " + positionStart + " Count: " + itemCount); @@ -101,7 +101,7 @@ public void onItemRangeInserted(int positionStart, int itemCount) { @Override // ^^^^^^^^ reference java/lang/Override# public void onItemRangeRemoved(int positionStart, int itemCount) { -// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeRemoved(). public void onItemRangeRemoved(int positionStart, int itemCount) +// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeRemoved(). @Override public void onItemRangeRemoved(int positionStart, int itemCount) // ^^^^^^^^^^^^^ definition local8 int positionStart // ^^^^^^^^^ definition local9 int itemCount Log.d(tag, "Item range removed. Start: " + positionStart + " Count: " + itemCount); @@ -115,7 +115,7 @@ public void onItemRangeRemoved(int positionStart, int itemCount) { @Override // ^^^^^^^^ reference java/lang/Override# public void onItemRangeMoved(int fromPosition, int toPosition, int itemCount) { -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeMoved(). public void onItemRangeMoved(int fromPosition, int toPosition, int itemCount) +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDiffLogger#onItemRangeMoved(). @Override public void onItemRangeMoved(int fromPosition, int toPosition, int itemCount) // ^^^^^^^^^^^^ definition local10 int fromPosition // ^^^^^^^^^^ definition local11 int toPosition // ^^^^^^^^^ definition local12 int itemCount diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyHolder.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyHolder.java index f482636c2..03cdfe3bf 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyHolder.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyHolder.java @@ -25,7 +25,7 @@ public EpoxyHolder(@NonNull ViewParent parent) { // ^^^^^^ definition com/airbnb/epoxy/EpoxyHolder#``(). public EpoxyHolder(unresolved_type parent) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^ reference _root_/ -// ^^^^^^ definition local0 unresolved_type parent +// ^^^^^^ definition local0 @NonNull unresolved_type parent this(); // ^^^^ reference com/airbnb/epoxy/EpoxyHolder#``(+1). } @@ -46,5 +46,5 @@ public EpoxyHolder() { // ^^^^^^^^ definition com/airbnb/epoxy/EpoxyHolder#bindView(). protected abstract void bindView(unresolved_type itemView) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^ reference _root_/ -// ^^^^^^^^ definition local1 unresolved_type itemView +// ^^^^^^^^ definition local1 @NonNull unresolved_type itemView } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyItemSpacingDecorator.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyItemSpacingDecorator.java index 32d4e088b..33089e623 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyItemSpacingDecorator.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyItemSpacingDecorator.java @@ -91,7 +91,7 @@ public EpoxyItemSpacingDecorator() { public EpoxyItemSpacingDecorator(@Px int pxBetweenItems) { // ^^^^^^ definition com/airbnb/epoxy/EpoxyItemSpacingDecorator#``(+1). public EpoxyItemSpacingDecorator(int pxBetweenItems) // ^^ reference androidx/annotation/Px# -// ^^^^^^^^^^^^^^ definition local0 int pxBetweenItems +// ^^^^^^^^^^^^^^ definition local0 @Px int pxBetweenItems setPxBetweenItems(pxBetweenItems); // ^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyItemSpacingDecorator#setPxBetweenItems(). // ^^^^^^^^^^^^^^ reference local0 @@ -100,7 +100,7 @@ public EpoxyItemSpacingDecorator(@Px int pxBetweenItems) { public void setPxBetweenItems(@Px int pxBetweenItems) { // ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyItemSpacingDecorator#setPxBetweenItems(). public void setPxBetweenItems(int pxBetweenItems) // ^^ reference androidx/annotation/Px# -// ^^^^^^^^^^^^^^ definition local1 int pxBetweenItems +// ^^^^^^^^^^^^^^ definition local1 @Px int pxBetweenItems this.pxBetweenItems = pxBetweenItems; // ^^^^ reference com/airbnb/epoxy/EpoxyItemSpacingDecorator# // ^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyItemSpacingDecorator#pxBetweenItems. @@ -110,7 +110,7 @@ public void setPxBetweenItems(@Px int pxBetweenItems) { @Px // ^^ reference androidx/annotation/Px# public int getPxBetweenItems() { -// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyItemSpacingDecorator#getPxBetweenItems(). public int getPxBetweenItems() +// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyItemSpacingDecorator#getPxBetweenItems(). @Px public int getPxBetweenItems() return pxBetweenItems; // ^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyItemSpacingDecorator#pxBetweenItems. } @@ -118,7 +118,7 @@ public int getPxBetweenItems() { @Override // ^^^^^^^^ reference java/lang/Override# public void getItemOffsets(Rect outRect, View view, RecyclerView parent, State state) { -// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyItemSpacingDecorator#getItemOffsets(). public void getItemOffsets(unresolved_type outRect, unresolved_type view, unresolved_type parent, unresolved_type state) +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyItemSpacingDecorator#getItemOffsets(). @Override public void getItemOffsets(unresolved_type outRect, unresolved_type view, unresolved_type parent, unresolved_type state) // ^^^^ reference _root_/ // ^^^^^^^ definition local2 unresolved_type outRect // ^^^^ reference _root_/ diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java index 216c9f622..46591bbcc 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java @@ -91,7 +91,7 @@ public abstract class EpoxyModel { // ^^ definition com/airbnb/epoxy/EpoxyModel#id. private long id @LayoutRes private int layout; // ^^^^^^^^^ reference androidx/annotation/LayoutRes# -// ^^^^^^ definition com/airbnb/epoxy/EpoxyModel#layout. private int layout +// ^^^^^^ definition com/airbnb/epoxy/EpoxyModel#layout. @LayoutRes private int layout private boolean shown = true; // ^^^^^ definition com/airbnb/epoxy/EpoxyModel#shown. private boolean shown /** @@ -125,7 +125,7 @@ public abstract class EpoxyModel { @Nullable private SpanSizeOverrideCallback spanSizeOverride; // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#SpanSizeOverrideCallback# -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel#spanSizeOverride. private SpanSizeOverrideCallback spanSizeOverride +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel#spanSizeOverride. @Nullable private SpanSizeOverrideCallback spanSizeOverride protected EpoxyModel(long id) { // ^^^^^^ definition com/airbnb/epoxy/EpoxyModel#``(). protected EpoxyModel(long id) @@ -173,7 +173,7 @@ protected View buildView(@NonNull ViewGroup parent) { // ^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel#buildView(). protected buildView(unresolved_type parent) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^ reference _root_/ -// ^^^^^^ definition local1 unresolved_type parent +// ^^^^^^ definition local1 @NonNull unresolved_type parent return LayoutInflater.from(parent.getContext()).inflate(getLayout(), parent, false); // ^^^^^^^^^^^^^^ reference _root_/ // ^^^^ reference from# @@ -192,7 +192,7 @@ public void bind(@NonNull T view) { // ^^^^ definition com/airbnb/epoxy/EpoxyModel#bind(). public void bind(T view) // ^^^^^^^ reference androidx/annotation/NonNull# // ^ reference com/airbnb/epoxy/EpoxyModel#[T] -// ^^^^ definition local2 T view +// ^^^^ definition local2 @NonNull T view } @@ -208,11 +208,11 @@ public void bind(@NonNull T view, @NonNull List payloads) { // ^^^^ definition com/airbnb/epoxy/EpoxyModel#bind(+1). public void bind(T view, List payloads) // ^^^^^^^ reference androidx/annotation/NonNull# // ^ reference com/airbnb/epoxy/EpoxyModel#[T] -// ^^^^ definition local3 T view +// ^^^^ definition local3 @NonNull T view // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^ reference java/util/List# // ^^^^^^ reference java/lang/Object# -// ^^^^^^^^ definition local4 List payloads +// ^^^^^^^^ definition local4 @NonNull List payloads bind(view); // ^^^^ reference com/airbnb/epoxy/EpoxyModel#bind(). // ^^^^ reference local3 @@ -253,10 +253,10 @@ public void bind(@NonNull T view, @NonNull EpoxyModel previouslyBoundModel) { // ^^^^ definition com/airbnb/epoxy/EpoxyModel#bind(+2). public void bind(T view, EpoxyModel previouslyBoundModel) // ^^^^^^^ reference androidx/annotation/NonNull# // ^ reference com/airbnb/epoxy/EpoxyModel#[T] -// ^^^^ definition local5 T view +// ^^^^ definition local5 @NonNull T view // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^^^^^^^^^^^^ definition local6 EpoxyModel previouslyBoundModel +// ^^^^^^^^^^^^^^^^^^^^ definition local6 @NonNull EpoxyModel previouslyBoundModel bind(view); // ^^^^ reference com/airbnb/epoxy/EpoxyModel#bind(). // ^^^^ reference local5 @@ -276,7 +276,7 @@ public void unbind(@NonNull T view) { // ^^^^^^ definition com/airbnb/epoxy/EpoxyModel#unbind(). public void unbind(T view) // ^^^^^^^ reference androidx/annotation/NonNull# // ^ reference com/airbnb/epoxy/EpoxyModel#[T] -// ^^^^ definition local7 T view +// ^^^^ definition local7 @NonNull T view } /** @@ -287,10 +287,10 @@ public void unbind(@NonNull T view) { public void onVisibilityStateChanged(@Visibility int visibilityState, @NonNull T view) { // ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel#onVisibilityStateChanged(). public void onVisibilityStateChanged(int visibilityState, T view) // ^^^^^^^^^^ reference com/airbnb/epoxy/VisibilityState#Visibility# -// ^^^^^^^^^^^^^^^ definition local8 int visibilityState +// ^^^^^^^^^^^^^^^ definition local8 @Visibility int visibilityState // ^^^^^^^ reference androidx/annotation/NonNull# // ^ reference com/airbnb/epoxy/EpoxyModel#[T] -// ^^^^ definition local9 T view +// ^^^^ definition local9 @NonNull T view } /** @@ -304,22 +304,22 @@ public void onVisibilityChanged( // ^^^^^^^^^^ reference androidx/annotation/FloatRange# // ^^^^ reference androidx/annotation/FloatRange#from(). // ^^ reference androidx/annotation/FloatRange#to(). -// ^^^^^^^^^^^^^^^^^^^^ definition local10 float percentVisibleHeight +// ^^^^^^^^^^^^^^^^^^^^ definition local10 @FloatRange(from = 0.0, to = 100.0) float percentVisibleHeight @FloatRange(from = 0.0f, to = 100.0f) float percentVisibleWidth, // ^^^^^^^^^^ reference androidx/annotation/FloatRange# // ^^^^ reference androidx/annotation/FloatRange#from(). // ^^ reference androidx/annotation/FloatRange#to(). -// ^^^^^^^^^^^^^^^^^^^ definition local11 float percentVisibleWidth +// ^^^^^^^^^^^^^^^^^^^ definition local11 @FloatRange(from = 0.0, to = 100.0) float percentVisibleWidth @Px int visibleHeight, // ^^ reference androidx/annotation/Px# -// ^^^^^^^^^^^^^ definition local12 int visibleHeight +// ^^^^^^^^^^^^^ definition local12 @Px int visibleHeight @Px int visibleWidth, // ^^ reference androidx/annotation/Px# -// ^^^^^^^^^^^^ definition local13 int visibleWidth +// ^^^^^^^^^^^^ definition local13 @Px int visibleWidth @NonNull T view // ^^^^^^^ reference androidx/annotation/NonNull# // ^ reference com/airbnb/epoxy/EpoxyModel#[T] -// ^^^^ definition local14 T view +// ^^^^ definition local14 @NonNull T view ) { } @@ -373,7 +373,7 @@ public EpoxyModel id(@Nullable Number... ids) { // ^^ definition com/airbnb/epoxy/EpoxyModel#id(+2). public EpoxyModel id(Number[] ids) // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^ reference java/lang/Number# -// ^^^ definition local16 Number[] ids +// ^^^ definition local16 @Nullable Number[] ids long result = 0; // ^^^^^^ definition local17 long result if (ids != null) { @@ -381,7 +381,7 @@ public EpoxyModel id(@Nullable Number... ids) { for (@Nullable Number id : ids) { // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^ reference java/lang/Number# -// ^^ definition local18 Number id +// ^^ definition local18 @Nullable Number id // ^^^ reference local16 result = 31 * result + hashLong64Bit(id == null ? 0 : id.hashCode()); // ^^^^^^ reference local17 @@ -441,7 +441,7 @@ public EpoxyModel id(@Nullable CharSequence key) { // ^^ definition com/airbnb/epoxy/EpoxyModel#id(+4). public EpoxyModel id(CharSequence key) // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^^^^^^^ reference java/lang/CharSequence# -// ^^^ definition local22 CharSequence key +// ^^^ definition local22 @Nullable CharSequence key id(hashString64Bit(key)); // ^^ reference com/airbnb/epoxy/EpoxyModel#id(+1). // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/IdUtils#hashString64Bit(). @@ -461,10 +461,10 @@ public EpoxyModel id(@Nullable CharSequence key, @Nullable CharSequence... ot // ^^ definition com/airbnb/epoxy/EpoxyModel#id(+5). public EpoxyModel id(CharSequence key, CharSequence[] otherKeys) // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^^^^^^^ reference java/lang/CharSequence# -// ^^^ definition local23 CharSequence key +// ^^^ definition local23 @Nullable CharSequence key // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^^^^^^^ reference java/lang/CharSequence# -// ^^^^^^^^^ definition local24 CharSequence[] otherKeys +// ^^^^^^^^^ definition local24 @Nullable CharSequence[] otherKeys long result = hashString64Bit(key); // ^^^^^^ definition local25 long result // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/IdUtils#hashString64Bit(). @@ -505,7 +505,7 @@ public EpoxyModel id(@Nullable CharSequence key, long id) { // ^^ definition com/airbnb/epoxy/EpoxyModel#id(+6). public EpoxyModel id(CharSequence key, long id) // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^^^^^^^ reference java/lang/CharSequence# -// ^^^ definition local27 CharSequence key +// ^^^ definition local27 @Nullable CharSequence key // ^^ definition local28 long id long result = hashString64Bit(key); // ^^^^^^ definition local29 long result @@ -537,16 +537,16 @@ public EpoxyModel id(@Nullable CharSequence key, long id) { @LayoutRes // ^^^^^^^^^ reference androidx/annotation/LayoutRes# protected abstract int getDefaultLayout(); -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel#getDefaultLayout(). protected abstract int getDefaultLayout() +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel#getDefaultLayout(). @LayoutRes protected abstract int getDefaultLayout() @NonNull // ^^^^^^^ reference androidx/annotation/NonNull# public EpoxyModel layout(@LayoutRes int layoutRes) { // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^ reference com/airbnb/epoxy/EpoxyModel#[T] -// ^^^^^^ definition com/airbnb/epoxy/EpoxyModel#layout(). public EpoxyModel layout(int layoutRes) +// ^^^^^^ definition com/airbnb/epoxy/EpoxyModel#layout(). @NonNull public EpoxyModel layout(int layoutRes) // ^^^^^^^^^ reference androidx/annotation/LayoutRes# -// ^^^^^^^^^ definition local30 int layoutRes +// ^^^^^^^^^ definition local30 @LayoutRes int layoutRes onMutation(); // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#onMutation(). layout = layoutRes; @@ -559,7 +559,7 @@ public EpoxyModel layout(@LayoutRes int layoutRes) { @LayoutRes // ^^^^^^^^^ reference androidx/annotation/LayoutRes# public final int getLayout() { -// ^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel#getLayout(). public final int getLayout() +// ^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel#getLayout(). @LayoutRes public final int getLayout() if (layout == 0) { // ^^^^^^ reference com/airbnb/epoxy/EpoxyModel#layout. return getDefaultLayout(); @@ -578,7 +578,7 @@ public final int getLayout() { public EpoxyModel reset() { // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^ reference com/airbnb/epoxy/EpoxyModel#[T] -// ^^^^^ definition com/airbnb/epoxy/EpoxyModel#reset(). public EpoxyModel reset() +// ^^^^^ definition com/airbnb/epoxy/EpoxyModel#reset(). @NonNull public EpoxyModel reset() onMutation(); // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#onMutation(). @@ -599,7 +599,7 @@ public void addTo(@NonNull EpoxyController controller) { // ^^^^^ definition com/airbnb/epoxy/EpoxyModel#addTo(). public void addTo(EpoxyController controller) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController# -// ^^^^^^^^^^ definition local31 EpoxyController controller +// ^^^^^^^^^^ definition local31 @NonNull EpoxyController controller controller.addInternal(this); // ^^^^^^^^^^ reference local31 // ^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#addInternal(). @@ -615,7 +615,7 @@ public void addIf(boolean condition, @NonNull EpoxyController controller) { // ^^^^^^^^^ definition local32 boolean condition // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController# -// ^^^^^^^^^^ definition local33 EpoxyController controller +// ^^^^^^^^^^ definition local33 @NonNull EpoxyController controller if (condition) { // ^^^^^^^^^ reference local32 addTo(controller); @@ -643,10 +643,10 @@ public void addIf(@NonNull AddPredicate predicate, @NonNull EpoxyController cont // ^^^^^ definition com/airbnb/epoxy/EpoxyModel#addIf(+1). public void addIf(AddPredicate predicate, EpoxyController controller) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#AddPredicate# -// ^^^^^^^^^ definition local34 AddPredicate predicate +// ^^^^^^^^^ definition local34 @NonNull AddPredicate predicate // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController# -// ^^^^^^^^^^ definition local35 EpoxyController controller +// ^^^^^^^^^^ definition local35 @NonNull EpoxyController controller addIf(predicate.addIf(), controller); // ^^^^^ reference com/airbnb/epoxy/EpoxyModel#addIf(). // ^^^^^^^^^ reference local34 @@ -671,7 +671,7 @@ protected final void addWithDebugValidation(@NonNull EpoxyController controller) // ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel#addWithDebugValidation(). protected final void addWithDebugValidation(EpoxyController controller) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController# -// ^^^^^^^^^^ definition local36 EpoxyController controller +// ^^^^^^^^^^ definition local36 @NonNull EpoxyController controller if (controller == null) { // ^^^^^^^^^^ reference local36 throw new IllegalArgumentException("Controller cannot be null"); @@ -718,7 +718,7 @@ protected final void addWithDebugValidation(@NonNull EpoxyController controller) @Override // ^^^^^^^^ reference java/lang/Override# public void onInterceptorsStarted(EpoxyController controller) { -// ^^^^^^^^^^^^^^^^^^^^^ definition local39 public void onInterceptorsStarted(EpoxyController controller) +// ^^^^^^^^^^^^^^^^^^^^^ definition local39 @Override public void onInterceptorsStarted(EpoxyController controller) // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController# // ^^^^^^^^^^ definition local41 EpoxyController controller currentlyInInterceptors = true; @@ -728,7 +728,7 @@ public void onInterceptorsStarted(EpoxyController controller) { @Override // ^^^^^^^^ reference java/lang/Override# public void onInterceptorsFinished(EpoxyController controller) { -// ^^^^^^^^^^^^^^^^^^^^^^ definition local40 public void onInterceptorsFinished(EpoxyController controller) +// ^^^^^^^^^^^^^^^^^^^^^^ definition local40 @Override public void onInterceptorsFinished(EpoxyController controller) // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController# // ^^^^^^^^^^ definition local42 EpoxyController controller hashCodeWhenAdded = EpoxyModel.this.hashCode(); @@ -790,11 +790,11 @@ private static int getPosition(@NonNull EpoxyController controller, // ^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel#getPosition(). private static int getPosition(EpoxyController controller, EpoxyModel model) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController# -// ^^^^^^^^^^ definition local43 EpoxyController controller +// ^^^^^^^^^^ definition local43 @NonNull EpoxyController controller @NonNull EpoxyModel model) { // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^ definition local44 EpoxyModel model +// ^^^^^ definition local44 @NonNull EpoxyModel model // If the model was added to multiple controllers, or was removed from the controller and then // modified, this won't be correct. But those should be very rare cases that we don't need to // worry about @@ -848,7 +848,7 @@ protected final void validateStateHasNotChangedSinceAdded(String descriptionOfCh @Override // ^^^^^^^^ reference java/lang/Override# public boolean equals(Object o) { -// ^^^^^^ definition com/airbnb/epoxy/EpoxyModel#equals(). public boolean equals(Object o) +// ^^^^^^ definition com/airbnb/epoxy/EpoxyModel#equals(). @Override public boolean equals(Object o) // ^^^^^^ reference java/lang/Object# // ^ definition local47 Object o if (this == o) { @@ -889,7 +889,7 @@ public boolean equals(Object o) { @Override // ^^^^^^^^ reference java/lang/Override# public int hashCode() { -// ^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel#hashCode(). public int hashCode() +// ^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel#hashCode(). @Override public int hashCode() int result = (int) (id ^ (id >>> 32)); // ^^^^^^ definition local49 int result // ^^ reference com/airbnb/epoxy/EpoxyModel#id. @@ -928,7 +928,7 @@ public EpoxyModel spanSizeOverride(@Nullable SpanSizeOverrideCallback spanSiz // ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel#spanSizeOverride(). public EpoxyModel spanSizeOverride(SpanSizeOverrideCallback spanSizeCallback) // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#SpanSizeOverrideCallback# -// ^^^^^^^^^^^^^^^^ definition local53 SpanSizeOverrideCallback spanSizeCallback +// ^^^^^^^^^^^^^^^^ definition local53 @Nullable SpanSizeOverrideCallback spanSizeCallback this.spanSizeOverride = spanSizeCallback; // ^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#spanSizeOverride. @@ -982,7 +982,7 @@ public final int spanSize(int totalSpanCount, int position, int itemCount) { public EpoxyModel show() { // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^ reference com/airbnb/epoxy/EpoxyModel#[T] -// ^^^^ definition com/airbnb/epoxy/EpoxyModel#show(). public EpoxyModel show() +// ^^^^ definition com/airbnb/epoxy/EpoxyModel#show(). @NonNull public EpoxyModel show() return show(true); // ^^^^ reference com/airbnb/epoxy/EpoxyModel#show(+1). } @@ -997,7 +997,7 @@ public EpoxyModel show() { public EpoxyModel show(boolean show) { // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^ reference com/airbnb/epoxy/EpoxyModel#[T] -// ^^^^ definition com/airbnb/epoxy/EpoxyModel#show(+1). public EpoxyModel show(boolean show) +// ^^^^ definition com/airbnb/epoxy/EpoxyModel#show(+1). @NonNull public EpoxyModel show(boolean show) // ^^^^ definition local60 boolean show onMutation(); // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#onMutation(). @@ -1018,7 +1018,7 @@ public EpoxyModel show(boolean show) { public EpoxyModel hide() { // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^ reference com/airbnb/epoxy/EpoxyModel#[T] -// ^^^^ definition com/airbnb/epoxy/EpoxyModel#hide(). public EpoxyModel hide() +// ^^^^ definition com/airbnb/epoxy/EpoxyModel#hide(). @NonNull public EpoxyModel hide() return show(false); // ^^^^ reference com/airbnb/epoxy/EpoxyModel#show(+1). } @@ -1054,7 +1054,7 @@ public boolean onFailedToRecycleView(@NonNull T view) { // ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel#onFailedToRecycleView(). public boolean onFailedToRecycleView(T view) // ^^^^^^^ reference androidx/annotation/NonNull# // ^ reference com/airbnb/epoxy/EpoxyModel#[T] -// ^^^^ definition local61 T view +// ^^^^ definition local61 @NonNull T view return false; } @@ -1067,7 +1067,7 @@ public void onViewAttachedToWindow(@NonNull T view) { // ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel#onViewAttachedToWindow(). public void onViewAttachedToWindow(T view) // ^^^^^^^ reference androidx/annotation/NonNull# // ^ reference com/airbnb/epoxy/EpoxyModel#[T] -// ^^^^ definition local62 T view +// ^^^^ definition local62 @NonNull T view } @@ -1081,7 +1081,7 @@ public void onViewDetachedFromWindow(@NonNull T view) { // ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel#onViewDetachedFromWindow(). public void onViewDetachedFromWindow(T view) // ^^^^^^^ reference androidx/annotation/NonNull# // ^ reference com/airbnb/epoxy/EpoxyModel#[T] -// ^^^^ definition local63 T view +// ^^^^ definition local63 @NonNull T view } @@ -1089,7 +1089,7 @@ public void onViewDetachedFromWindow(@NonNull T view) { // ^^^^^^^^ reference java/lang/Override# public String toString() { // ^^^^^^ reference java/lang/String# -// ^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel#toString(). public String toString() +// ^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel#toString(). @Override public String toString() return getClass().getSimpleName() + "{" // ^^^^^^^^ reference java/lang/Object#getClass(). // ^^^^^^^^^^^^^ reference java/lang/Class#getSimpleName(). diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelClass.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelClass.java index ca18b7b21..3adc40331 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelClass.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelClass.java @@ -41,14 +41,14 @@ // ^^^^^^^^^^^^^^^ reference java/lang/annotation/RetentionPolicy# // ^^^^^ reference java/lang/annotation/RetentionPolicy#CLASS. public @interface EpoxyModelClass { -// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelClass# public @interface EpoxyModelClass +// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelClass# @Target(ElementType.TYPE) @Retention(RetentionPolicy.CLASS) public @interface EpoxyModelClass /** * A layout resource that should be used as the default layout for the model. If you set this you * don't have to implement `getDefaultLayout`; it will be generated for you. */ @LayoutRes int layout() default 0; // ^^^^^^^^^ reference androidx/annotation/LayoutRes# -// ^^^^^^ definition com/airbnb/epoxy/EpoxyModelClass#layout(). public abstract int layout() +// ^^^^^^ definition com/airbnb/epoxy/EpoxyModelClass#layout(). @LayoutRes public abstract int layout() /** * If true, any layout file name that has {@link #layout()} as a prefix will be included as a diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java index 0117a72cb..e542e464f 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java @@ -97,7 +97,7 @@ @SuppressWarnings("rawtypes") //^^^^^^^^^^^^^^^ reference java/lang/SuppressWarnings# public class EpoxyModelGroup extends EpoxyModelWithHolder { -// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup# public class EpoxyModelGroup extends EpoxyModelWithHolder +// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup# @SuppressWarnings("rawtypes") public class EpoxyModelGroup extends EpoxyModelWithHolder // ^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelWithHolder# // ^^^^^^^^^^^^^^^^ reference _root_/ @@ -113,7 +113,7 @@ public class EpoxyModelGroup extends EpoxyModelWithHolder { // ^^^^^^^^ reference androidx/annotation/Nullable# private Boolean shouldSaveViewState = null; // ^^^^^^^ reference java/lang/Boolean# -// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#shouldSaveViewState. private Boolean shouldSaveViewState +// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#shouldSaveViewState. @Nullable private Boolean shouldSaveViewState /** * @param layoutRes The layout to use with these models. @@ -122,7 +122,7 @@ public class EpoxyModelGroup extends EpoxyModelWithHolder { public EpoxyModelGroup(@LayoutRes int layoutRes, Collection> models) { // ^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#``(). public EpoxyModelGroup(int layoutRes, Collection> models) // ^^^^^^^^^ reference androidx/annotation/LayoutRes# -// ^^^^^^^^^ definition local0 int layoutRes +// ^^^^^^^^^ definition local0 @LayoutRes int layoutRes // ^^^^^^^^^^ reference java/util/Collection# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^^ definition local1 Collection> models @@ -141,7 +141,7 @@ public EpoxyModelGroup(@LayoutRes int layoutRes, Collection... models) { // ^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#``(+1). public EpoxyModelGroup(int layoutRes, EpoxyModel[] models) // ^^^^^^^^^ reference androidx/annotation/LayoutRes# -// ^^^^^^^^^ definition local2 int layoutRes +// ^^^^^^^^^ definition local2 @LayoutRes int layoutRes // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^^ definition local3 EpoxyModel[] models this(layoutRes, new ArrayList<>(Arrays.asList(models))); @@ -161,7 +161,7 @@ public EpoxyModelGroup(@LayoutRes int layoutRes, EpoxyModel... models) { private EpoxyModelGroup(@LayoutRes int layoutRes, List> models) { // ^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#``(+2). private EpoxyModelGroup(int layoutRes, List> models) // ^^^^^^^^^ reference androidx/annotation/LayoutRes# -// ^^^^^^^^^ definition local4 int layoutRes +// ^^^^^^^^^ definition local4 @LayoutRes int layoutRes // ^^^^ reference java/util/List# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^^ definition local5 List> models @@ -225,7 +225,7 @@ protected EpoxyModelGroup() { protected EpoxyModelGroup(@LayoutRes int layoutRes) { // ^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#``(+4). protected EpoxyModelGroup(int layoutRes) // ^^^^^^^^^ reference androidx/annotation/LayoutRes# -// ^^^^^^^^^ definition local8 int layoutRes +// ^^^^^^^^^ definition local8 @LayoutRes int layoutRes this(); // ^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#``(+3). layout(layoutRes); @@ -237,7 +237,7 @@ protected void addModel(@NonNull EpoxyModel model) { // ^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#addModel(). protected void addModel(EpoxyModel model) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^ definition local9 EpoxyModel model +// ^^^^^ definition local9 @NonNull EpoxyModel model // By default we save view state if any of the models need to save state. shouldSaveViewStateDefault |= model.shouldSaveViewState(); // ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#shouldSaveViewStateDefault. @@ -254,10 +254,10 @@ protected void addModel(@NonNull EpoxyModel model) { @Override // ^^^^^^^^ reference java/lang/Override# public void bind(@NonNull ModelGroupHolder holder) { -// ^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#bind(). public void bind(unresolved_type holder) +// ^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#bind(). @CallSuper @Override public void bind(unresolved_type holder) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^^^^^^ reference _root_/ -// ^^^^^^ definition local10 unresolved_type holder +// ^^^^^^ definition local10 @NonNull unresolved_type holder iterateModels(holder, new IterateModelsCallback() { // ^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#iterateModels(). // ^^^^^^ reference local10 @@ -267,7 +267,7 @@ public void bind(@NonNull ModelGroupHolder holder) { @Override // ^^^^^^^^ reference java/lang/Override# public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex) { -// ^^^^^^^ definition local13 public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex) +// ^^^^^^^ definition local13 @Override public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex) // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^ definition local14 EpoxyModel model // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# @@ -293,14 +293,14 @@ public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex @Override // ^^^^^^^^ reference java/lang/Override# public void bind(@NonNull ModelGroupHolder holder, @NonNull final List payloads) { -// ^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#bind(+1). public void bind(unresolved_type holder, List payloads) +// ^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#bind(+1). @CallSuper @Override public void bind(unresolved_type holder, List payloads) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^^^^^^ reference _root_/ -// ^^^^^^ definition local17 unresolved_type holder +// ^^^^^^ definition local17 @NonNull unresolved_type holder // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^ reference java/util/List# // ^^^^^^ reference java/lang/Object# -// ^^^^^^^^ definition local18 final List payloads +// ^^^^^^^^ definition local18 @NonNull final List payloads iterateModels(holder, new IterateModelsCallback() { // ^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#iterateModels(). // ^^^^^^ reference local17 @@ -310,7 +310,7 @@ public void bind(@NonNull ModelGroupHolder holder, @NonNull final List p @Override // ^^^^^^^^ reference java/lang/Override# public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex) { -// ^^^^^^^ definition local21 public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex) +// ^^^^^^^ definition local21 @Override public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex) // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^ definition local22 EpoxyModel model // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# @@ -334,13 +334,13 @@ public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex @Override // ^^^^^^^^ reference java/lang/Override# public void bind(@NonNull ModelGroupHolder holder, @NonNull EpoxyModel previouslyBoundModel) { -// ^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#bind(+2). public void bind(unresolved_type holder, EpoxyModel previouslyBoundModel) +// ^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#bind(+2). @Override public void bind(unresolved_type holder, EpoxyModel previouslyBoundModel) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^^^^^^ reference _root_/ -// ^^^^^^ definition local25 unresolved_type holder +// ^^^^^^ definition local25 @NonNull unresolved_type holder // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^^^^^^^^^^^^ definition local26 EpoxyModel previouslyBoundModel +// ^^^^^^^^^^^^^^^^^^^^ definition local26 @NonNull EpoxyModel previouslyBoundModel if (!(previouslyBoundModel instanceof EpoxyModelGroup)) { // ^^^^^^^^^^^^^^^^^^^^ reference local26 // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup# @@ -365,7 +365,7 @@ public void bind(@NonNull ModelGroupHolder holder, @NonNull EpoxyModel previo @Override // ^^^^^^^^ reference java/lang/Override# public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex) { -// ^^^^^^^ definition local30 public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex) +// ^^^^^^^ definition local30 @Override public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex) // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^ definition local31 EpoxyModel model // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# @@ -446,10 +446,10 @@ private static void setViewVisibility(EpoxyModel model, EpoxyViewHolder viewHold @Override // ^^^^^^^^ reference java/lang/Override# public void unbind(@NonNull ModelGroupHolder holder) { -// ^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#unbind(). public void unbind(unresolved_type holder) +// ^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#unbind(). @CallSuper @Override public void unbind(unresolved_type holder) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^^^^^^ reference _root_/ -// ^^^^^^ definition local37 unresolved_type holder +// ^^^^^^ definition local37 @NonNull unresolved_type holder holder.unbindGroup(); // ^^^^^^ reference local37 // ^^^^^^^^^^^ reference unbindGroup# @@ -460,7 +460,7 @@ public void unbind(@NonNull ModelGroupHolder holder) { @Override // ^^^^^^^^ reference java/lang/Override# public void onViewAttachedToWindow(ModelGroupHolder holder) { -// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#onViewAttachedToWindow(). public void onViewAttachedToWindow(unresolved_type holder) +// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#onViewAttachedToWindow(). @CallSuper @Override public void onViewAttachedToWindow(unresolved_type holder) // ^^^^^^^^^^^^^^^^ reference _root_/ // ^^^^^^ definition local38 unresolved_type holder iterateModels(holder, new IterateModelsCallback() { @@ -472,7 +472,7 @@ public void onViewAttachedToWindow(ModelGroupHolder holder) { @Override // ^^^^^^^^ reference java/lang/Override# public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex) { -// ^^^^^^^ definition local41 public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex) +// ^^^^^^^ definition local41 @Override public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex) // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^ definition local42 EpoxyModel model // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# @@ -493,7 +493,7 @@ public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex @Override // ^^^^^^^^ reference java/lang/Override# public void onViewDetachedFromWindow(ModelGroupHolder holder) { -// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#onViewDetachedFromWindow(). public void onViewDetachedFromWindow(unresolved_type holder) +// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#onViewDetachedFromWindow(). @CallSuper @Override public void onViewDetachedFromWindow(unresolved_type holder) // ^^^^^^^^^^^^^^^^ reference _root_/ // ^^^^^^ definition local45 unresolved_type holder iterateModels(holder, new IterateModelsCallback() { @@ -505,7 +505,7 @@ public void onViewDetachedFromWindow(ModelGroupHolder holder) { @Override // ^^^^^^^^ reference java/lang/Override# public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex) { -// ^^^^^^^ definition local48 public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex) +// ^^^^^^^ definition local48 @Override public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex) // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^ definition local49 EpoxyModel model // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# @@ -569,7 +569,7 @@ private interface IterateModelsCallback { @Override // ^^^^^^^^ reference java/lang/Override# public int getSpanSize(int totalSpanCount, int position, int itemCount) { -// ^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#getSpanSize(). public int getSpanSize(int totalSpanCount, int position, int itemCount) +// ^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#getSpanSize(). @Override public int getSpanSize(int totalSpanCount, int position, int itemCount) // ^^^^^^^^^^^^^^ definition local59 int totalSpanCount // ^^^^^^^^ definition local60 int position // ^^^^^^^^^ definition local61 int itemCount @@ -586,7 +586,7 @@ public int getSpanSize(int totalSpanCount, int position, int itemCount) { @Override // ^^^^^^^^ reference java/lang/Override# protected final int getDefaultLayout() { -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#getDefaultLayout(). protected final int getDefaultLayout() +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#getDefaultLayout(). @Override protected final int getDefaultLayout() throw new UnsupportedOperationException( // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference java/lang/UnsupportedOperationException#``(+1). 1:74 // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference java/lang/UnsupportedOperationException# @@ -597,7 +597,7 @@ protected final int getDefaultLayout() { // ^^^^^^^ reference androidx/annotation/NonNull# public EpoxyModelGroup shouldSaveViewState(boolean shouldSaveViewState) { // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup# -// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#shouldSaveViewState(). public EpoxyModelGroup shouldSaveViewState(boolean shouldSaveViewState) +// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#shouldSaveViewState(). @NonNull public EpoxyModelGroup shouldSaveViewState(boolean shouldSaveViewState) // ^^^^^^^^^^^^^^^^^^^ definition local62 boolean shouldSaveViewState onMutation(); // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#onMutation(). @@ -612,7 +612,7 @@ public EpoxyModelGroup shouldSaveViewState(boolean shouldSaveViewState) { @Override // ^^^^^^^^ reference java/lang/Override# public boolean shouldSaveViewState() { -// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#shouldSaveViewState(+1). public boolean shouldSaveViewState() +// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#shouldSaveViewState(+1). @Override public boolean shouldSaveViewState() // By default state is saved if any of the models have saved state enabled. // Override this if you need custom behavior. if (shouldSaveViewState != null) { @@ -646,10 +646,10 @@ protected boolean useViewStubLayoutParams(EpoxyModel model, int modelPosition // ^^^^^^^^ reference java/lang/Override# protected final ModelGroupHolder createNewHolder(@NonNull ViewParent parent) { // ^^^^^^^^^^^^^^^^ reference _root_/ -// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#createNewHolder(). protected final createNewHolder(unresolved_type parent) +// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#createNewHolder(). @Override protected final createNewHolder(unresolved_type parent) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^ reference _root_/ -// ^^^^^^ definition local65 unresolved_type parent +// ^^^^^^ definition local65 @NonNull unresolved_type parent return new ModelGroupHolder(parent); // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference ``# // ^^^^^^^^^^^^^^^^ reference _root_/ @@ -659,7 +659,7 @@ protected final ModelGroupHolder createNewHolder(@NonNull ViewParent parent) { @Override // ^^^^^^^^ reference java/lang/Override# public boolean equals(Object o) { -// ^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#equals(). public boolean equals(Object o) +// ^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#equals(). @Override public boolean equals(Object o) // ^^^^^^ reference java/lang/Object# // ^ definition local66 Object o if (this == o) { @@ -695,7 +695,7 @@ public boolean equals(Object o) { @Override // ^^^^^^^^ reference java/lang/Override# public int hashCode() { -// ^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#hashCode(). public int hashCode() +// ^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#hashCode(). @Override public int hashCode() int result = super.hashCode(); // ^^^^^^ definition local68 int result // ^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#super. diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelTouchCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelTouchCallback.java index d20910a04..d1234b487 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelTouchCallback.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelTouchCallback.java @@ -55,7 +55,7 @@ public abstract class EpoxyModelTouchCallback @Nullable private final EpoxyController controller; // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController# -// ^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback#controller. private final EpoxyController controller +// ^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback#controller. @Nullable private final EpoxyController controller private final Class targetModelClass; // ^^^^^ reference java/lang/Class# // ^ reference com/airbnb/epoxy/EpoxyModelTouchCallback#[T] @@ -71,7 +71,7 @@ public EpoxyModelTouchCallback(@Nullable EpoxyController controller, Class ta // ^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback#``(). public EpoxyModelTouchCallback(EpoxyController controller, Class targetModelClass) // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController# -// ^^^^^^^^^^ definition local0 EpoxyController controller +// ^^^^^^^^^^ definition local0 @Nullable EpoxyController controller // ^^^^^ reference java/lang/Class# // ^ reference com/airbnb/epoxy/EpoxyModelTouchCallback#[T] // ^^^^^^^^^^^^^^^^ definition local1 Class targetModelClass @@ -88,7 +88,7 @@ public EpoxyModelTouchCallback(@Nullable EpoxyController controller, Class ta @Override // ^^^^^^^^ reference java/lang/Override# protected int getMovementFlags(RecyclerView recyclerView, EpoxyViewHolder viewHolder) { -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback#getMovementFlags(). protected int getMovementFlags(unresolved_type recyclerView, EpoxyViewHolder viewHolder) +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback#getMovementFlags(). @Override protected int getMovementFlags(unresolved_type recyclerView, EpoxyViewHolder viewHolder) // ^^^^^^^^^^^^ reference _root_/ // ^^^^^^^^^^^^ definition local2 unresolved_type recyclerView // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# @@ -131,7 +131,7 @@ protected int getMovementFlags(RecyclerView recyclerView, EpoxyViewHolder viewHo @Override // ^^^^^^^^ reference java/lang/Override# protected boolean canDropOver(RecyclerView recyclerView, EpoxyViewHolder current, -// ^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback#canDropOver(). protected boolean canDropOver(unresolved_type recyclerView, EpoxyViewHolder current, EpoxyViewHolder target) +// ^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback#canDropOver(). @Override protected boolean canDropOver(unresolved_type recyclerView, EpoxyViewHolder current, EpoxyViewHolder target) // ^^^^^^^^^^^^ reference _root_/ // ^^^^^^^^^^^^ definition local6 unresolved_type recyclerView // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# @@ -159,7 +159,7 @@ protected boolean isTouchableModel(EpoxyModel model) { @Override // ^^^^^^^^ reference java/lang/Override# protected boolean onMove(RecyclerView recyclerView, EpoxyViewHolder viewHolder, -// ^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback#onMove(). protected boolean onMove(unresolved_type recyclerView, EpoxyViewHolder viewHolder, EpoxyViewHolder target) +// ^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback#onMove(). @Override protected boolean onMove(unresolved_type recyclerView, EpoxyViewHolder viewHolder, EpoxyViewHolder target) // ^^^^^^^^^^^^ reference _root_/ // ^^^^^^^^^^^^ definition local10 unresolved_type recyclerView // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# @@ -221,7 +221,7 @@ protected boolean onMove(RecyclerView recyclerView, EpoxyViewHolder viewHolder, @Override // ^^^^^^^^ reference java/lang/Override# public void onModelMoved(int fromPosition, int toPosition, T modelBeingMoved, View itemView) { -// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback#onModelMoved(). public void onModelMoved(int fromPosition, int toPosition, T modelBeingMoved, unresolved_type itemView) +// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback#onModelMoved(). @Override public void onModelMoved(int fromPosition, int toPosition, T modelBeingMoved, unresolved_type itemView) // ^^^^^^^^^^^^ definition local16 int fromPosition // ^^^^^^^^^^ definition local17 int toPosition // ^ reference com/airbnb/epoxy/EpoxyModelTouchCallback#[T] @@ -234,7 +234,7 @@ public void onModelMoved(int fromPosition, int toPosition, T modelBeingMoved, Vi @Override // ^^^^^^^^ reference java/lang/Override# protected void onSwiped(EpoxyViewHolder viewHolder, int direction) { -// ^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback#onSwiped(). protected void onSwiped(EpoxyViewHolder viewHolder, int direction) +// ^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback#onSwiped(). @Override protected void onSwiped(EpoxyViewHolder viewHolder, int direction) // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# // ^^^^^^^^^^ definition local20 EpoxyViewHolder viewHolder // ^^^^^^^^^ definition local21 int direction @@ -277,7 +277,7 @@ protected void onSwiped(EpoxyViewHolder viewHolder, int direction) { @Override // ^^^^^^^^ reference java/lang/Override# public void onSwipeCompleted(T model, View itemView, int position, int direction) { -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeCompleted(). public void onSwipeCompleted(T model, unresolved_type itemView, int position, int direction) +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeCompleted(). @Override public void onSwipeCompleted(T model, unresolved_type itemView, int position, int direction) // ^ reference com/airbnb/epoxy/EpoxyModelTouchCallback#[T] // ^^^^^ definition local25 T model // ^^^^ reference _root_/ @@ -290,10 +290,10 @@ public void onSwipeCompleted(T model, View itemView, int position, int direction @Override // ^^^^^^^^ reference java/lang/Override# protected void onSelectedChanged(@Nullable EpoxyViewHolder viewHolder, int actionState) { -// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback#onSelectedChanged(). protected void onSelectedChanged(EpoxyViewHolder viewHolder, int actionState) +// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback#onSelectedChanged(). @Override protected void onSelectedChanged(EpoxyViewHolder viewHolder, int actionState) // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# -// ^^^^^^^^^^ definition local29 EpoxyViewHolder viewHolder +// ^^^^^^^^^^ definition local29 @Nullable EpoxyViewHolder viewHolder // ^^^^^^^^^^^ definition local30 int actionState super.onSelectedChanged(viewHolder, actionState); // ^^^^^ reference com/airbnb/epoxy/EpoxyModelTouchCallback#super. @@ -427,7 +427,7 @@ private void clearRecyclerViewSelectionMarker(RecyclerView recyclerView) { @Override // ^^^^^^^^ reference java/lang/Override# public void onSwipeStarted(T model, View itemView, int adapterPosition) { -// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeStarted(). public void onSwipeStarted(T model, unresolved_type itemView, int adapterPosition) +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeStarted(). @Override public void onSwipeStarted(T model, unresolved_type itemView, int adapterPosition) // ^ reference com/airbnb/epoxy/EpoxyModelTouchCallback#[T] // ^^^^^ definition local35 T model // ^^^^ reference _root_/ @@ -439,7 +439,7 @@ public void onSwipeStarted(T model, View itemView, int adapterPosition) { @Override // ^^^^^^^^ reference java/lang/Override# public void onSwipeReleased(T model, View itemView) { -// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeReleased(). public void onSwipeReleased(T model, unresolved_type itemView) +// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeReleased(). @Override public void onSwipeReleased(T model, unresolved_type itemView) // ^ reference com/airbnb/epoxy/EpoxyModelTouchCallback#[T] // ^^^^^ definition local38 T model // ^^^^ reference _root_/ @@ -450,7 +450,7 @@ public void onSwipeReleased(T model, View itemView) { @Override // ^^^^^^^^ reference java/lang/Override# public void onDragStarted(T model, View itemView, int adapterPosition) { -// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback#onDragStarted(). public void onDragStarted(T model, unresolved_type itemView, int adapterPosition) +// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback#onDragStarted(). @Override public void onDragStarted(T model, unresolved_type itemView, int adapterPosition) // ^ reference com/airbnb/epoxy/EpoxyModelTouchCallback#[T] // ^^^^^ definition local40 T model // ^^^^ reference _root_/ @@ -462,7 +462,7 @@ public void onDragStarted(T model, View itemView, int adapterPosition) { @Override // ^^^^^^^^ reference java/lang/Override# public void onDragReleased(T model, View itemView) { -// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback#onDragReleased(). public void onDragReleased(T model, unresolved_type itemView) +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback#onDragReleased(). @Override public void onDragReleased(T model, unresolved_type itemView) // ^ reference com/airbnb/epoxy/EpoxyModelTouchCallback#[T] // ^^^^^ definition local43 T model // ^^^^ reference _root_/ @@ -473,7 +473,7 @@ public void onDragReleased(T model, View itemView) { @Override // ^^^^^^^^ reference java/lang/Override# protected void clearView(final RecyclerView recyclerView, EpoxyViewHolder viewHolder) { -// ^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback#clearView(). protected void clearView(unresolved_type recyclerView, EpoxyViewHolder viewHolder) +// ^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback#clearView(). @Override protected void clearView(unresolved_type recyclerView, EpoxyViewHolder viewHolder) // ^^^^^^^^^^^^ reference _root_/ // ^^^^^^^^^^^^ definition local45 final unresolved_type recyclerView // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# @@ -506,7 +506,7 @@ protected void clearView(final RecyclerView recyclerView, EpoxyViewHolder viewHo @Override // ^^^^^^^^ reference java/lang/Override# public void run() { -// ^^^ definition local49 public void run() +// ^^^ definition local49 @Override public void run() clearRecyclerViewSelectionMarker(recyclerView); // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelTouchCallback#clearRecyclerViewSelectionMarker(). // ^^^^^^^^^^^^ reference local45 @@ -518,7 +518,7 @@ public void run() { @Override // ^^^^^^^^ reference java/lang/Override# public void clearView(T model, View itemView) { -// ^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback#clearView(+1). public void clearView(T model, unresolved_type itemView) +// ^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback#clearView(+1). @Override public void clearView(T model, unresolved_type itemView) // ^ reference com/airbnb/epoxy/EpoxyModelTouchCallback#[T] // ^^^^^ definition local50 T model // ^^^^ reference _root_/ @@ -529,7 +529,7 @@ public void clearView(T model, View itemView) { @Override // ^^^^^^^^ reference java/lang/Override# protected void onChildDraw(Canvas c, RecyclerView recyclerView, EpoxyViewHolder viewHolder, -// ^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback#onChildDraw(). protected void onChildDraw(unresolved_type c, unresolved_type recyclerView, EpoxyViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive) +// ^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback#onChildDraw(). @Override protected void onChildDraw(unresolved_type c, unresolved_type recyclerView, EpoxyViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive) // ^^^^^^ reference _root_/ // ^ definition local52 unresolved_type c // ^^^^^^^^^^^^ reference _root_/ @@ -618,7 +618,7 @@ protected void onChildDraw(Canvas c, RecyclerView recyclerView, EpoxyViewHolder @Override // ^^^^^^^^ reference java/lang/Override# public void onSwipeProgressChanged(T model, View itemView, float swipeProgress, -// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeProgressChanged(). public void onSwipeProgressChanged(T model, unresolved_type itemView, float swipeProgress, unresolved_type canvas) +// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback#onSwipeProgressChanged(). @Override public void onSwipeProgressChanged(T model, unresolved_type itemView, float swipeProgress, unresolved_type canvas) // ^ reference com/airbnb/epoxy/EpoxyModelTouchCallback#[T] // ^^^^^ definition local63 T model // ^^^^ reference _root_/ diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithHolder.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithHolder.java index df8da1539..f3eca5ec7 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithHolder.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithHolder.java @@ -59,15 +59,15 @@ public EpoxyModelWithHolder(long id) { // ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelWithHolder#createNewHolder(). protected abstract T createNewHolder(unresolved_type parent) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^ reference _root_/ -// ^^^^^^ definition local1 unresolved_type parent +// ^^^^^^ definition local1 @NonNull unresolved_type parent @Override // ^^^^^^^^ reference java/lang/Override# public void bind(@NonNull T holder) { -// ^^^^ definition com/airbnb/epoxy/EpoxyModelWithHolder#bind(). public void bind(T holder) +// ^^^^ definition com/airbnb/epoxy/EpoxyModelWithHolder#bind(). @Override public void bind(T holder) // ^^^^^^^ reference androidx/annotation/NonNull# // ^ reference com/airbnb/epoxy/EpoxyModelWithHolder#[T] -// ^^^^^^ definition local2 T holder +// ^^^^^^ definition local2 @NonNull T holder super.bind(holder); // ^^^^^ reference com/airbnb/epoxy/EpoxyModelWithHolder#super. // ^^^^ reference com/airbnb/epoxy/EpoxyModel#bind(). @@ -77,14 +77,14 @@ public void bind(@NonNull T holder) { @Override // ^^^^^^^^ reference java/lang/Override# public void bind(@NonNull T holder, @NonNull List payloads) { -// ^^^^ definition com/airbnb/epoxy/EpoxyModelWithHolder#bind(+1). public void bind(T holder, List payloads) +// ^^^^ definition com/airbnb/epoxy/EpoxyModelWithHolder#bind(+1). @Override public void bind(T holder, List payloads) // ^^^^^^^ reference androidx/annotation/NonNull# // ^ reference com/airbnb/epoxy/EpoxyModelWithHolder#[T] -// ^^^^^^ definition local3 T holder +// ^^^^^^ definition local3 @NonNull T holder // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^ reference java/util/List# // ^^^^^^ reference java/lang/Object# -// ^^^^^^^^ definition local4 List payloads +// ^^^^^^^^ definition local4 @NonNull List payloads super.bind(holder, payloads); // ^^^^^ reference com/airbnb/epoxy/EpoxyModelWithHolder#super. // ^^^^ reference com/airbnb/epoxy/EpoxyModel#bind(+1). @@ -95,13 +95,13 @@ public void bind(@NonNull T holder, @NonNull List payloads) { @Override // ^^^^^^^^ reference java/lang/Override# public void bind(@NonNull T holder, @NonNull EpoxyModel previouslyBoundModel) { -// ^^^^ definition com/airbnb/epoxy/EpoxyModelWithHolder#bind(+2). public void bind(T holder, EpoxyModel previouslyBoundModel) +// ^^^^ definition com/airbnb/epoxy/EpoxyModelWithHolder#bind(+2). @Override public void bind(T holder, EpoxyModel previouslyBoundModel) // ^^^^^^^ reference androidx/annotation/NonNull# // ^ reference com/airbnb/epoxy/EpoxyModelWithHolder#[T] -// ^^^^^^ definition local5 T holder +// ^^^^^^ definition local5 @NonNull T holder // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^^^^^^^^^^^^ definition local6 EpoxyModel previouslyBoundModel +// ^^^^^^^^^^^^^^^^^^^^ definition local6 @NonNull EpoxyModel previouslyBoundModel super.bind(holder, previouslyBoundModel); // ^^^^^ reference com/airbnb/epoxy/EpoxyModelWithHolder#super. // ^^^^ reference com/airbnb/epoxy/EpoxyModel#bind(+2). @@ -112,10 +112,10 @@ public void bind(@NonNull T holder, @NonNull EpoxyModel previouslyBoundModel) @Override // ^^^^^^^^ reference java/lang/Override# public void unbind(@NonNull T holder) { -// ^^^^^^ definition com/airbnb/epoxy/EpoxyModelWithHolder#unbind(). public void unbind(T holder) +// ^^^^^^ definition com/airbnb/epoxy/EpoxyModelWithHolder#unbind(). @Override public void unbind(T holder) // ^^^^^^^ reference androidx/annotation/NonNull# // ^ reference com/airbnb/epoxy/EpoxyModelWithHolder#[T] -// ^^^^^^ definition local7 T holder +// ^^^^^^ definition local7 @NonNull T holder super.unbind(holder); // ^^^^^ reference com/airbnb/epoxy/EpoxyModelWithHolder#super. // ^^^^^^ reference com/airbnb/epoxy/EpoxyModel#unbind(). @@ -126,12 +126,12 @@ public void unbind(@NonNull T holder) { @Override // ^^^^^^^^ reference java/lang/Override# public void onVisibilityStateChanged(@Visibility int visibilityState, @NonNull T holder) { -// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelWithHolder#onVisibilityStateChanged(). public void onVisibilityStateChanged(int visibilityState, T holder) +// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelWithHolder#onVisibilityStateChanged(). @Override public void onVisibilityStateChanged(int visibilityState, T holder) // ^^^^^^^^^^ reference com/airbnb/epoxy/VisibilityState#Visibility# -// ^^^^^^^^^^^^^^^ definition local8 int visibilityState +// ^^^^^^^^^^^^^^^ definition local8 @Visibility int visibilityState // ^^^^^^^ reference androidx/annotation/NonNull# // ^ reference com/airbnb/epoxy/EpoxyModelWithHolder#[T] -// ^^^^^^ definition local9 T holder +// ^^^^^^ definition local9 @NonNull T holder super.onVisibilityStateChanged(visibilityState, holder); // ^^^^^ reference com/airbnb/epoxy/EpoxyModelWithHolder#super. // ^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#onVisibilityStateChanged(). @@ -142,26 +142,26 @@ public void onVisibilityStateChanged(@Visibility int visibilityState, @NonNull T @Override // ^^^^^^^^ reference java/lang/Override# public void onVisibilityChanged( -// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelWithHolder#onVisibilityChanged(). public void onVisibilityChanged(float percentVisibleHeight, float percentVisibleWidth, int visibleHeight, int visibleWidth, T holder) +// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelWithHolder#onVisibilityChanged(). @Override public void onVisibilityChanged(float percentVisibleHeight, float percentVisibleWidth, int visibleHeight, int visibleWidth, T holder) @FloatRange(from = 0, to = 100) float percentVisibleHeight, // ^^^^^^^^^^ reference androidx/annotation/FloatRange# // ^^^^ reference androidx/annotation/FloatRange#from(). // ^^ reference androidx/annotation/FloatRange#to(). -// ^^^^^^^^^^^^^^^^^^^^ definition local10 float percentVisibleHeight +// ^^^^^^^^^^^^^^^^^^^^ definition local10 @FloatRange(from = 0, to = 100) float percentVisibleHeight @FloatRange(from = 0, to = 100) float percentVisibleWidth, // ^^^^^^^^^^ reference androidx/annotation/FloatRange# // ^^^^ reference androidx/annotation/FloatRange#from(). // ^^ reference androidx/annotation/FloatRange#to(). -// ^^^^^^^^^^^^^^^^^^^ definition local11 float percentVisibleWidth +// ^^^^^^^^^^^^^^^^^^^ definition local11 @FloatRange(from = 0, to = 100) float percentVisibleWidth @Px int visibleHeight, @Px int visibleWidth, // ^^ reference androidx/annotation/Px# -// ^^^^^^^^^^^^^ definition local12 int visibleHeight +// ^^^^^^^^^^^^^ definition local12 @Px int visibleHeight // ^^ reference androidx/annotation/Px# -// ^^^^^^^^^^^^ definition local13 int visibleWidth +// ^^^^^^^^^^^^ definition local13 @Px int visibleWidth @NonNull T holder) { // ^^^^^^^ reference androidx/annotation/NonNull# // ^ reference com/airbnb/epoxy/EpoxyModelWithHolder#[T] -// ^^^^^^ definition local14 T holder +// ^^^^^^ definition local14 @NonNull T holder super.onVisibilityChanged( // ^^^^^ reference com/airbnb/epoxy/EpoxyModelWithHolder#super. // ^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#onVisibilityChanged(). @@ -178,7 +178,7 @@ public void onVisibilityChanged( @Override // ^^^^^^^^ reference java/lang/Override# public boolean onFailedToRecycleView(T holder) { -// ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelWithHolder#onFailedToRecycleView(). public boolean onFailedToRecycleView(T holder) +// ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelWithHolder#onFailedToRecycleView(). @Override public boolean onFailedToRecycleView(T holder) // ^ reference com/airbnb/epoxy/EpoxyModelWithHolder#[T] // ^^^^^^ definition local15 T holder return super.onFailedToRecycleView(holder); @@ -190,7 +190,7 @@ public boolean onFailedToRecycleView(T holder) { @Override // ^^^^^^^^ reference java/lang/Override# public void onViewAttachedToWindow(T holder) { -// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelWithHolder#onViewAttachedToWindow(). public void onViewAttachedToWindow(T holder) +// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelWithHolder#onViewAttachedToWindow(). @Override public void onViewAttachedToWindow(T holder) // ^ reference com/airbnb/epoxy/EpoxyModelWithHolder#[T] // ^^^^^^ definition local16 T holder super.onViewAttachedToWindow(holder); @@ -202,7 +202,7 @@ public void onViewAttachedToWindow(T holder) { @Override // ^^^^^^^^ reference java/lang/Override# public void onViewDetachedFromWindow(T holder) { -// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelWithHolder#onViewDetachedFromWindow(). public void onViewDetachedFromWindow(T holder) +// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelWithHolder#onViewDetachedFromWindow(). @Override public void onViewDetachedFromWindow(T holder) // ^ reference com/airbnb/epoxy/EpoxyModelWithHolder#[T] // ^^^^^^ definition local17 T holder super.onViewDetachedFromWindow(holder); diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithView.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithView.java index 3e5015d02..4f54bf9c7 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithView.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithView.java @@ -51,7 +51,7 @@ public abstract class EpoxyModelWithView extends EpoxyModel { @Override // ^^^^^^^^ reference java/lang/Override# protected int getViewType() { -// ^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelWithView#getViewType(). protected int getViewType() +// ^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelWithView#getViewType(). @Override protected int getViewType() return 0; } @@ -65,15 +65,15 @@ protected int getViewType() { // ^^^^^^^^ reference java/lang/Override# protected abstract T buildView(@NonNull ViewGroup parent); // ^ reference com/airbnb/epoxy/EpoxyModelWithView#[T] -// ^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelWithView#buildView(). protected abstract T buildView(unresolved_type parent) +// ^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelWithView#buildView(). @Override protected abstract T buildView(unresolved_type parent) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^ reference _root_/ -// ^^^^^^ definition local0 unresolved_type parent +// ^^^^^^ definition local0 @NonNull unresolved_type parent @Override // ^^^^^^^^ reference java/lang/Override# protected final int getDefaultLayout() { -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelWithView#getDefaultLayout(). protected final int getDefaultLayout() +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelWithView#getDefaultLayout(). @Override protected final int getDefaultLayout() throw new UnsupportedOperationException( // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference java/lang/UnsupportedOperationException#``(+1). 1:83 // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference java/lang/UnsupportedOperationException# @@ -85,9 +85,9 @@ protected final int getDefaultLayout() { public EpoxyModel layout(@LayoutRes int layoutRes) { // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^ reference com/airbnb/epoxy/EpoxyModelWithView#[T] -// ^^^^^^ definition com/airbnb/epoxy/EpoxyModelWithView#layout(). public EpoxyModel layout(int layoutRes) +// ^^^^^^ definition com/airbnb/epoxy/EpoxyModelWithView#layout(). @Override public EpoxyModel layout(int layoutRes) // ^^^^^^^^^ reference androidx/annotation/LayoutRes# -// ^^^^^^^^^ definition local1 int layoutRes +// ^^^^^^^^^ definition local1 @LayoutRes int layoutRes throw new UnsupportedOperationException( // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference java/lang/UnsupportedOperationException#``(+1). 1:83 // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference java/lang/UnsupportedOperationException# diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelper.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelper.java index cca604256..97dd7b5cb 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelper.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelper.java @@ -428,7 +428,7 @@ public ItemTouchHelper andCallbacks(final DragCallbacks callbacks) { @Override // ^^^^^^^^ reference java/lang/Override# public int getMovementFlagsForModel(U model, int adapterPosition) { -// ^^^^^^^^^^^^^^^^^^^^^^^^ definition local21 public int getMovementFlagsForModel(U model, int adapterPosition) +// ^^^^^^^^^^^^^^^^^^^^^^^^ definition local21 @Override public int getMovementFlagsForModel(U model, int adapterPosition) // ^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U] // ^^^^^ definition local29 U model // ^^^^^^^^^^^^^^^ definition local30 int adapterPosition @@ -439,7 +439,7 @@ public int getMovementFlagsForModel(U model, int adapterPosition) { @Override // ^^^^^^^^ reference java/lang/Override# protected boolean isTouchableModel(EpoxyModel model) { -// ^^^^^^^^^^^^^^^^ definition local22 protected boolean isTouchableModel(EpoxyModel model) +// ^^^^^^^^^^^^^^^^ definition local22 @Override protected boolean isTouchableModel(EpoxyModel model) // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^ definition local31 EpoxyModel model boolean isTargetType = targetModelClasses.size() == 1 @@ -468,7 +468,7 @@ protected boolean isTouchableModel(EpoxyModel model) { @Override // ^^^^^^^^ reference java/lang/Override# public void onDragStarted(U model, View itemView, int adapterPosition) { -// ^^^^^^^^^^^^^ definition local23 public void onDragStarted(U model, unresolved_type itemView, int adapterPosition) +// ^^^^^^^^^^^^^ definition local23 @Override public void onDragStarted(U model, unresolved_type itemView, int adapterPosition) // ^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U] // ^^^^^ definition local34 U model // ^^^^ reference _root_/ @@ -485,7 +485,7 @@ public void onDragStarted(U model, View itemView, int adapterPosition) { @Override // ^^^^^^^^ reference java/lang/Override# public void onDragReleased(U model, View itemView) { -// ^^^^^^^^^^^^^^ definition local24 public void onDragReleased(U model, unresolved_type itemView) +// ^^^^^^^^^^^^^^ definition local24 @Override public void onDragReleased(U model, unresolved_type itemView) // ^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U] // ^^^^^ definition local37 U model // ^^^^ reference _root_/ @@ -500,7 +500,7 @@ public void onDragReleased(U model, View itemView) { @Override // ^^^^^^^^ reference java/lang/Override# public void onModelMoved(int fromPosition, int toPosition, U modelBeingMoved, -// ^^^^^^^^^^^^ definition local25 public void onModelMoved(int fromPosition, int toPosition, U modelBeingMoved, unresolved_type itemView) +// ^^^^^^^^^^^^ definition local25 @Override public void onModelMoved(int fromPosition, int toPosition, U modelBeingMoved, unresolved_type itemView) // ^^^^^^^^^^^^ definition local39 int fromPosition // ^^^^^^^^^^ definition local40 int toPosition // ^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U] @@ -520,7 +520,7 @@ public void onModelMoved(int fromPosition, int toPosition, U modelBeingMoved, @Override // ^^^^^^^^ reference java/lang/Override# public void clearView(U model, View itemView) { -// ^^^^^^^^^ definition local26 public void clearView(U model, unresolved_type itemView) +// ^^^^^^^^^ definition local26 @Override public void clearView(U model, unresolved_type itemView) // ^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U] // ^^^^^ definition local43 U model // ^^^^ reference _root_/ @@ -555,7 +555,7 @@ public abstract static class DragCallbacks @Override // ^^^^^^^^ reference java/lang/Override# public void onDragStarted(T model, View itemView, int adapterPosition) { -// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onDragStarted(). public void onDragStarted(T model, unresolved_type itemView, int adapterPosition) +// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onDragStarted(). @Override public void onDragStarted(T model, unresolved_type itemView, int adapterPosition) // ^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#[T] // ^^^^^ definition local45 T model // ^^^^ reference _root_/ @@ -567,7 +567,7 @@ public void onDragStarted(T model, View itemView, int adapterPosition) { @Override // ^^^^^^^^ reference java/lang/Override# public void onDragReleased(T model, View itemView) { -// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onDragReleased(). public void onDragReleased(T model, unresolved_type itemView) +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onDragReleased(). @Override public void onDragReleased(T model, unresolved_type itemView) // ^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#[T] // ^^^^^ definition local48 T model // ^^^^ reference _root_/ @@ -578,7 +578,7 @@ public void onDragReleased(T model, View itemView) { @Override // ^^^^^^^^ reference java/lang/Override# public abstract void onModelMoved(int fromPosition, int toPosition, T modelBeingMoved, -// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onModelMoved(). public abstract void onModelMoved(int fromPosition, int toPosition, T modelBeingMoved, unresolved_type itemView) +// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#onModelMoved(). @Override public abstract void onModelMoved(int fromPosition, int toPosition, T modelBeingMoved, unresolved_type itemView) // ^^^^^^^^^^^^ definition local50 int fromPosition // ^^^^^^^^^^ definition local51 int toPosition // ^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#[T] @@ -590,7 +590,7 @@ public abstract void onModelMoved(int fromPosition, int toPosition, T modelBeing @Override // ^^^^^^^^ reference java/lang/Override# public void clearView(T model, View itemView) { -// ^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#clearView(). public void clearView(T model, unresolved_type itemView) +// ^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#clearView(). @Override public void clearView(T model, unresolved_type itemView) // ^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#[T] // ^^^^^ definition local54 T model // ^^^^ reference _root_/ @@ -613,7 +613,7 @@ public boolean isDragEnabledForModel(T model) { @Override // ^^^^^^^^ reference java/lang/Override# public final int getMovementFlagsForModel(T model, int adapterPosition) { -// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#getMovementFlagsForModel(). public final int getMovementFlagsForModel(T model, int adapterPosition) +// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#getMovementFlagsForModel(). @Override public final int getMovementFlagsForModel(T model, int adapterPosition) // ^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#[T] // ^^^^^ definition local57 T model // ^^^^^^^^^^^^^^^ definition local58 int adapterPosition @@ -907,7 +907,7 @@ public ItemTouchHelper andCallbacks(final SwipeCallbacks callbacks) { @Override // ^^^^^^^^ reference java/lang/Override# public int getMovementFlagsForModel(U model, int adapterPosition) { -// ^^^^^^^^^^^^^^^^^^^^^^^^ definition local75 public int getMovementFlagsForModel(U model, int adapterPosition) +// ^^^^^^^^^^^^^^^^^^^^^^^^ definition local75 @Override public int getMovementFlagsForModel(U model, int adapterPosition) // ^ reference com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U] // ^^^^^ definition local84 U model // ^^^^^^^^^^^^^^^ definition local85 int adapterPosition @@ -918,7 +918,7 @@ public int getMovementFlagsForModel(U model, int adapterPosition) { @Override // ^^^^^^^^ reference java/lang/Override# protected boolean isTouchableModel(EpoxyModel model) { -// ^^^^^^^^^^^^^^^^ definition local76 protected boolean isTouchableModel(EpoxyModel model) +// ^^^^^^^^^^^^^^^^ definition local76 @Override protected boolean isTouchableModel(EpoxyModel model) // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^ definition local86 EpoxyModel model boolean isTargetType = targetModelClasses.size() == 1 @@ -947,7 +947,7 @@ protected boolean isTouchableModel(EpoxyModel model) { @Override // ^^^^^^^^ reference java/lang/Override# public void onSwipeStarted(U model, View itemView, int adapterPosition) { -// ^^^^^^^^^^^^^^ definition local77 public void onSwipeStarted(U model, unresolved_type itemView, int adapterPosition) +// ^^^^^^^^^^^^^^ definition local77 @Override public void onSwipeStarted(U model, unresolved_type itemView, int adapterPosition) // ^ reference com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U] // ^^^^^ definition local89 U model // ^^^^ reference _root_/ @@ -964,7 +964,7 @@ public void onSwipeStarted(U model, View itemView, int adapterPosition) { @Override // ^^^^^^^^ reference java/lang/Override# public void onSwipeProgressChanged(U model, View itemView, float swipeProgress, -// ^^^^^^^^^^^^^^^^^^^^^^ definition local78 public void onSwipeProgressChanged(U model, unresolved_type itemView, float swipeProgress, unresolved_type canvas) +// ^^^^^^^^^^^^^^^^^^^^^^ definition local78 @Override public void onSwipeProgressChanged(U model, unresolved_type itemView, float swipeProgress, unresolved_type canvas) // ^ reference com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U] // ^^^^^ definition local92 U model // ^^^^ reference _root_/ @@ -985,7 +985,7 @@ public void onSwipeProgressChanged(U model, View itemView, float swipeProgress, @Override // ^^^^^^^^ reference java/lang/Override# public void onSwipeCompleted(U model, View itemView, int position, int direction) { -// ^^^^^^^^^^^^^^^^ definition local79 public void onSwipeCompleted(U model, unresolved_type itemView, int position, int direction) +// ^^^^^^^^^^^^^^^^ definition local79 @Override public void onSwipeCompleted(U model, unresolved_type itemView, int position, int direction) // ^ reference com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U] // ^^^^^ definition local96 U model // ^^^^ reference _root_/ @@ -1004,7 +1004,7 @@ public void onSwipeCompleted(U model, View itemView, int position, int direction @Override // ^^^^^^^^ reference java/lang/Override# public void onSwipeReleased(U model, View itemView) { -// ^^^^^^^^^^^^^^^ definition local80 public void onSwipeReleased(U model, unresolved_type itemView) +// ^^^^^^^^^^^^^^^ definition local80 @Override public void onSwipeReleased(U model, unresolved_type itemView) // ^ reference com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U] // ^^^^^ definition local100 U model // ^^^^ reference _root_/ @@ -1019,7 +1019,7 @@ public void onSwipeReleased(U model, View itemView) { @Override // ^^^^^^^^ reference java/lang/Override# public void clearView(U model, View itemView) { -// ^^^^^^^^^ definition local81 public void clearView(U model, unresolved_type itemView) +// ^^^^^^^^^ definition local81 @Override public void clearView(U model, unresolved_type itemView) // ^ reference com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U] // ^^^^^ definition local102 U model // ^^^^ reference _root_/ @@ -1054,7 +1054,7 @@ public abstract static class SwipeCallbacks @Override // ^^^^^^^^ reference java/lang/Override# public void onSwipeStarted(T model, View itemView, int adapterPosition) { -// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeStarted(). public void onSwipeStarted(T model, unresolved_type itemView, int adapterPosition) +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeStarted(). @Override public void onSwipeStarted(T model, unresolved_type itemView, int adapterPosition) // ^ reference com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#[T] // ^^^^^ definition local104 T model // ^^^^ reference _root_/ @@ -1066,7 +1066,7 @@ public void onSwipeStarted(T model, View itemView, int adapterPosition) { @Override // ^^^^^^^^ reference java/lang/Override# public void onSwipeProgressChanged(T model, View itemView, float swipeProgress, -// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeProgressChanged(). public void onSwipeProgressChanged(T model, unresolved_type itemView, float swipeProgress, unresolved_type canvas) +// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeProgressChanged(). @Override public void onSwipeProgressChanged(T model, unresolved_type itemView, float swipeProgress, unresolved_type canvas) // ^ reference com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#[T] // ^^^^^ definition local107 T model // ^^^^ reference _root_/ @@ -1081,7 +1081,7 @@ public void onSwipeProgressChanged(T model, View itemView, float swipeProgress, @Override // ^^^^^^^^ reference java/lang/Override# public abstract void onSwipeCompleted(T model, View itemView, int position, int direction); -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeCompleted(). public abstract void onSwipeCompleted(T model, unresolved_type itemView, int position, int direction) +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeCompleted(). @Override public abstract void onSwipeCompleted(T model, unresolved_type itemView, int position, int direction) // ^ reference com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#[T] // ^^^^^ definition local111 T model // ^^^^ reference _root_/ @@ -1092,7 +1092,7 @@ public void onSwipeProgressChanged(T model, View itemView, float swipeProgress, @Override // ^^^^^^^^ reference java/lang/Override# public void onSwipeReleased(T model, View itemView) { -// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeReleased(). public void onSwipeReleased(T model, unresolved_type itemView) +// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#onSwipeReleased(). @Override public void onSwipeReleased(T model, unresolved_type itemView) // ^ reference com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#[T] // ^^^^^ definition local115 T model // ^^^^ reference _root_/ @@ -1103,7 +1103,7 @@ public void onSwipeReleased(T model, View itemView) { @Override // ^^^^^^^^ reference java/lang/Override# public void clearView(T model, View itemView) { -// ^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#clearView(). public void clearView(T model, unresolved_type itemView) +// ^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#clearView(). @Override public void clearView(T model, unresolved_type itemView) // ^ reference com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#[T] // ^^^^^ definition local117 T model // ^^^^ reference _root_/ @@ -1126,7 +1126,7 @@ public boolean isSwipeEnabledForModel(T model) { @Override // ^^^^^^^^ reference java/lang/Override# public final int getMovementFlagsForModel(T model, int adapterPosition) { -// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#getMovementFlagsForModel(). public final int getMovementFlagsForModel(T model, int adapterPosition) +// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#getMovementFlagsForModel(). @Override public final int getMovementFlagsForModel(T model, int adapterPosition) // ^ reference com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#[T] // ^^^^^ definition local120 T model // ^^^^^^^^^^^^^^^ definition local121 int adapterPosition diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelperCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelperCallback.java index cc4d60c77..3370a8826 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelperCallback.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelperCallback.java @@ -40,7 +40,7 @@ public abstract class EpoxyTouchHelperCallback extends ItemTouchHelper.Callback @Override // ^^^^^^^^ reference java/lang/Override# public final int getMovementFlags(RecyclerView recyclerView, ViewHolder viewHolder) { -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelperCallback#getMovementFlags(). public final int getMovementFlags(unresolved_type recyclerView, unresolved_type viewHolder) +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelperCallback#getMovementFlags(). @Override public final int getMovementFlags(unresolved_type recyclerView, unresolved_type viewHolder) // ^^^^^^^^^^^^ reference _root_/ // ^^^^^^^^^^^^ definition local0 unresolved_type recyclerView // ^^^^^^^^^^ reference _root_/ @@ -65,7 +65,7 @@ public final int getMovementFlags(RecyclerView recyclerView, ViewHolder viewHold @Override // ^^^^^^^^ reference java/lang/Override# public final boolean onMove(RecyclerView recyclerView, ViewHolder viewHolder, ViewHolder target) { -// ^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelperCallback#onMove(). public final boolean onMove(unresolved_type recyclerView, unresolved_type viewHolder, unresolved_type target) +// ^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelperCallback#onMove(). @Override public final boolean onMove(unresolved_type recyclerView, unresolved_type viewHolder, unresolved_type target) // ^^^^^^^^^^^^ reference _root_/ // ^^^^^^^^^^^^ definition local4 unresolved_type recyclerView // ^^^^^^^^^^ reference _root_/ @@ -97,7 +97,7 @@ protected abstract boolean onMove(RecyclerView recyclerView, EpoxyViewHolder vie @Override // ^^^^^^^^ reference java/lang/Override# public final void onSwiped(ViewHolder viewHolder, int direction) { -// ^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelperCallback#onSwiped(). public final void onSwiped(unresolved_type viewHolder, int direction) +// ^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelperCallback#onSwiped(). @Override public final void onSwiped(unresolved_type viewHolder, int direction) // ^^^^^^^^^^ reference _root_/ // ^^^^^^^^^^ definition local10 unresolved_type viewHolder // ^^^^^^^^^ definition local11 int direction @@ -120,7 +120,7 @@ public final void onSwiped(ViewHolder viewHolder, int direction) { @Override // ^^^^^^^^ reference java/lang/Override# public final boolean canDropOver(RecyclerView recyclerView, ViewHolder current, -// ^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelperCallback#canDropOver(). public final boolean canDropOver(unresolved_type recyclerView, unresolved_type current, unresolved_type target) +// ^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelperCallback#canDropOver(). @Override public final boolean canDropOver(unresolved_type recyclerView, unresolved_type current, unresolved_type target) // ^^^^^^^^^^^^ reference _root_/ // ^^^^^^^^^^^^ definition local14 unresolved_type recyclerView // ^^^^^^^^^^ reference _root_/ @@ -160,7 +160,7 @@ protected boolean canDropOver(RecyclerView recyclerView, EpoxyViewHolder current @Override // ^^^^^^^^ reference java/lang/Override# public final float getSwipeThreshold(ViewHolder viewHolder) { -// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelperCallback#getSwipeThreshold(). public final float getSwipeThreshold(unresolved_type viewHolder) +// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelperCallback#getSwipeThreshold(). @Override public final float getSwipeThreshold(unresolved_type viewHolder) // ^^^^^^^^^^ reference _root_/ // ^^^^^^^^^^ definition local20 unresolved_type viewHolder return getSwipeThreshold((EpoxyViewHolder) viewHolder); @@ -185,7 +185,7 @@ protected float getSwipeThreshold(EpoxyViewHolder viewHolder) { @Override // ^^^^^^^^ reference java/lang/Override# public final float getMoveThreshold(ViewHolder viewHolder) { -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelperCallback#getMoveThreshold(). public final float getMoveThreshold(unresolved_type viewHolder) +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelperCallback#getMoveThreshold(). @Override public final float getMoveThreshold(unresolved_type viewHolder) // ^^^^^^^^^^ reference _root_/ // ^^^^^^^^^^ definition local22 unresolved_type viewHolder return getMoveThreshold((EpoxyViewHolder) viewHolder); @@ -211,7 +211,7 @@ protected float getMoveThreshold(EpoxyViewHolder viewHolder) { // ^^^^^^^^ reference java/lang/Override# public final ViewHolder chooseDropTarget(ViewHolder selected, List dropTargets, int curX, // ^^^^^^^^^^ reference _root_/ -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelperCallback#chooseDropTarget(). public final chooseDropTarget(unresolved_type selected, List dropTargets, int curX, int curY) +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelperCallback#chooseDropTarget(). @Override public final chooseDropTarget(unresolved_type selected, List dropTargets, int curX, int curY) // ^^^^^^^^^^ reference _root_/ // ^^^^^^^^ definition local24 unresolved_type selected // ^^^^ reference java/util/List# @@ -262,7 +262,7 @@ protected EpoxyViewHolder chooseDropTarget(EpoxyViewHolder selected, @Override // ^^^^^^^^ reference java/lang/Override# public final void onSelectedChanged(ViewHolder viewHolder, int actionState) { -// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelperCallback#onSelectedChanged(). public final void onSelectedChanged(unresolved_type viewHolder, int actionState) +// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelperCallback#onSelectedChanged(). @Override public final void onSelectedChanged(unresolved_type viewHolder, int actionState) // ^^^^^^^^^^ reference _root_/ // ^^^^^^^^^^ definition local32 unresolved_type viewHolder // ^^^^^^^^^^^ definition local33 int actionState @@ -291,7 +291,7 @@ protected void onSelectedChanged(EpoxyViewHolder viewHolder, int actionState) { @Override // ^^^^^^^^ reference java/lang/Override# public final void onMoved(RecyclerView recyclerView, ViewHolder viewHolder, int fromPos, -// ^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelperCallback#onMoved(). public final void onMoved(unresolved_type recyclerView, unresolved_type viewHolder, int fromPos, unresolved_type target, int toPos, int x, int y) +// ^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelperCallback#onMoved(). @Override public final void onMoved(unresolved_type recyclerView, unresolved_type viewHolder, int fromPos, unresolved_type target, int toPos, int x, int y) // ^^^^^^^^^^^^ reference _root_/ // ^^^^^^^^^^^^ definition local36 unresolved_type recyclerView // ^^^^^^^^^^ reference _root_/ @@ -349,7 +349,7 @@ protected void onMoved(RecyclerView recyclerView, EpoxyViewHolder viewHolder, in @Override // ^^^^^^^^ reference java/lang/Override# public final void clearView(RecyclerView recyclerView, ViewHolder viewHolder) { -// ^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelperCallback#clearView(). public final void clearView(unresolved_type recyclerView, unresolved_type viewHolder) +// ^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelperCallback#clearView(). @Override public final void clearView(unresolved_type recyclerView, unresolved_type viewHolder) // ^^^^^^^^^^^^ reference _root_/ // ^^^^^^^^^^^^ definition local50 unresolved_type recyclerView // ^^^^^^^^^^ reference _root_/ @@ -380,7 +380,7 @@ protected void clearView(RecyclerView recyclerView, EpoxyViewHolder viewHolder) @Override // ^^^^^^^^ reference java/lang/Override# public final void onChildDraw(Canvas c, RecyclerView recyclerView, ViewHolder viewHolder, -// ^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDraw(). public final void onChildDraw(unresolved_type c, unresolved_type recyclerView, unresolved_type viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive) +// ^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDraw(). @Override public final void onChildDraw(unresolved_type c, unresolved_type recyclerView, unresolved_type viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive) // ^^^^^^ reference _root_/ // ^ definition local54 unresolved_type c // ^^^^^^^^^^^^ reference _root_/ @@ -438,7 +438,7 @@ protected void onChildDraw(Canvas c, RecyclerView recyclerView, EpoxyViewHolder @Override // ^^^^^^^^ reference java/lang/Override# public final void onChildDrawOver(Canvas c, RecyclerView recyclerView, ViewHolder viewHolder, -// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDrawOver(). public final void onChildDrawOver(unresolved_type c, unresolved_type recyclerView, unresolved_type viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive) +// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelperCallback#onChildDrawOver(). @Override public final void onChildDrawOver(unresolved_type c, unresolved_type recyclerView, unresolved_type viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive) // ^^^^^^ reference _root_/ // ^ definition local68 unresolved_type c // ^^^^^^^^^^^^ reference _root_/ diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyViewHolder.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyViewHolder.java index a97545d97..88a6c066c 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyViewHolder.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyViewHolder.java @@ -52,13 +52,13 @@ @SuppressWarnings("WeakerAccess") //^^^^^^^^^^^^^^^ reference java/lang/SuppressWarnings# public class EpoxyViewHolder extends RecyclerView.ViewHolder { -// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyViewHolder# public class EpoxyViewHolder extends unresolved_type +// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyViewHolder# @SuppressWarnings("WeakerAccess") public class EpoxyViewHolder extends unresolved_type // ^^^^^^^^^^^^ reference RecyclerView/ // ^^^^^^^^^^ reference RecyclerView/ViewHolder# @SuppressWarnings("rawtypes") private EpoxyModel epoxyModel; // ^^^^^^^^^^^^^^^^ reference java/lang/SuppressWarnings# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyViewHolder#epoxyModel. private EpoxyModel epoxyModel +// ^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyViewHolder#epoxyModel. @SuppressWarnings("rawtypes") private EpoxyModel epoxyModel private List payloads; // ^^^^ reference java/util/List# // ^^^^^^ reference java/lang/Object# @@ -70,7 +70,7 @@ public class EpoxyViewHolder extends RecyclerView.ViewHolder { // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ViewHolderState# // ^^^^^^^^^ reference com/airbnb/epoxy/ViewHolderState#ViewState# -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyViewHolder#initialViewState. ViewState initialViewState +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyViewHolder#initialViewState. @Nullable ViewState initialViewState // Once the EpoxyHolder is created parent will be set to null. private ViewParent parent; @@ -122,11 +122,11 @@ public void bind(@SuppressWarnings("rawtypes") EpoxyModel model, // ^^^^ definition com/airbnb/epoxy/EpoxyViewHolder#bind(). public void bind(EpoxyModel model, EpoxyModel previouslyBoundModel, List payloads, int position) // ^^^^^^^^^^^^^^^^ reference java/lang/SuppressWarnings# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^ definition local3 EpoxyModel model +// ^^^^^ definition local3 @SuppressWarnings("rawtypes") EpoxyModel model @Nullable EpoxyModel previouslyBoundModel, List payloads, int position) { // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^^^^^^^^^^^^ definition local4 EpoxyModel previouslyBoundModel +// ^^^^^^^^^^^^^^^^^^^^ definition local4 @Nullable EpoxyModel previouslyBoundModel // ^^^^ reference java/util/List# // ^^^^^^ reference java/lang/Object# // ^^^^^^^^ definition local5 List payloads @@ -216,7 +216,7 @@ public void bind(@SuppressWarnings("rawtypes") EpoxyModel model, // ^^^^^^^ reference androidx/annotation/NonNull# Object objectToBind() { //^^^^^^ reference java/lang/Object# -// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyViewHolder#objectToBind(). Object objectToBind() +// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyViewHolder#objectToBind(). @NonNull Object objectToBind() return epoxyHolder != null ? epoxyHolder : itemView; // ^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder#epoxyHolder. // ^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder#epoxyHolder. @@ -242,7 +242,7 @@ public void unbind() { public void visibilityStateChanged(@Visibility int visibilityState) { // ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyViewHolder#visibilityStateChanged(). public void visibilityStateChanged(int visibilityState) // ^^^^^^^^^^ reference com/airbnb/epoxy/VisibilityState#Visibility# -// ^^^^^^^^^^^^^^^ definition local7 int visibilityState +// ^^^^^^^^^^^^^^^ definition local7 @Visibility int visibilityState assertBound(); // ^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder#assertBound(). // noinspection unchecked @@ -259,18 +259,18 @@ public void visibilityChanged( // ^^^^^^^^^^ reference androidx/annotation/FloatRange# // ^^^^ reference androidx/annotation/FloatRange#from(). // ^^ reference androidx/annotation/FloatRange#to(). -// ^^^^^^^^^^^^^^^^^^^^ definition local8 float percentVisibleHeight +// ^^^^^^^^^^^^^^^^^^^^ definition local8 @FloatRange(from = 0.0, to = 100.0) float percentVisibleHeight @FloatRange(from = 0.0f, to = 100.0f) float percentVisibleWidth, // ^^^^^^^^^^ reference androidx/annotation/FloatRange# // ^^^^ reference androidx/annotation/FloatRange#from(). // ^^ reference androidx/annotation/FloatRange#to(). -// ^^^^^^^^^^^^^^^^^^^ definition local9 float percentVisibleWidth +// ^^^^^^^^^^^^^^^^^^^ definition local9 @FloatRange(from = 0.0, to = 100.0) float percentVisibleWidth @Px int visibleHeight, // ^^ reference androidx/annotation/Px# -// ^^^^^^^^^^^^^ definition local10 int visibleHeight +// ^^^^^^^^^^^^^ definition local10 @Px int visibleHeight @Px int visibleWidth // ^^ reference androidx/annotation/Px# -// ^^^^^^^^^^^^ definition local11 int visibleWidth +// ^^^^^^^^^^^^ definition local11 @Px int visibleWidth ) { assertBound(); // ^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder#assertBound(). @@ -328,7 +328,7 @@ private void assertBound() { // ^^^^^^^^ reference java/lang/Override# public String toString() { // ^^^^^^ reference java/lang/String# -// ^^^^^^^^ definition com/airbnb/epoxy/EpoxyViewHolder#toString(). public String toString() +// ^^^^^^^^ definition com/airbnb/epoxy/EpoxyViewHolder#toString(). @Override public String toString() return "EpoxyViewHolder{" + "epoxyModel=" + epoxyModel // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder#epoxyModel. diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/HandlerExecutor.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/HandlerExecutor.java index e0d3e53f2..9d5c3d1ad 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/HandlerExecutor.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/HandlerExecutor.java @@ -46,10 +46,10 @@ class HandlerExecutor implements Executor { @Override // ^^^^^^^^ reference java/lang/Override# public void execute(@NonNull Runnable command) { -// ^^^^^^^ definition com/airbnb/epoxy/HandlerExecutor#execute(). public void execute(Runnable command) +// ^^^^^^^ definition com/airbnb/epoxy/HandlerExecutor#execute(). @Override public void execute(Runnable command) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^ reference java/lang/Runnable# -// ^^^^^^^ definition local1 Runnable command +// ^^^^^^^ definition local1 @NonNull Runnable command // If we're already on the same thread then we can execute this synchronously if (Looper.myLooper() == handler.getLooper()) { // ^^^^^^ reference _root_/ diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/HiddenEpoxyModel.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/HiddenEpoxyModel.java index d20b4c681..8fc473144 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/HiddenEpoxyModel.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/HiddenEpoxyModel.java @@ -25,7 +25,7 @@ class HiddenEpoxyModel extends EpoxyModel { @Override // ^^^^^^^^ reference java/lang/Override# public int getDefaultLayout() { -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/HiddenEpoxyModel#getDefaultLayout(). public int getDefaultLayout() +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/HiddenEpoxyModel#getDefaultLayout(). @Override public int getDefaultLayout() return R.layout.view_holder_empty_view; // ^ reference R/ // ^^^^^^ reference R/layout# @@ -35,7 +35,7 @@ public int getDefaultLayout() { @Override // ^^^^^^^^ reference java/lang/Override# public int getSpanSize(int spanCount, int position, int itemCount) { -// ^^^^^^^^^^^ definition com/airbnb/epoxy/HiddenEpoxyModel#getSpanSize(). public int getSpanSize(int spanCount, int position, int itemCount) +// ^^^^^^^^^^^ definition com/airbnb/epoxy/HiddenEpoxyModel#getSpanSize(). @Override public int getSpanSize(int spanCount, int position, int itemCount) // ^^^^^^^^^ definition local0 int spanCount // ^^^^^^^^ definition local1 int position // ^^^^^^^^^ definition local2 int itemCount diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/IdUtils.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/IdUtils.java index 95591751f..e61bffde3 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/IdUtils.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/IdUtils.java @@ -51,7 +51,7 @@ public static long hashString64Bit(@Nullable CharSequence str) { // ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/IdUtils#hashString64Bit(). public static long hashString64Bit(CharSequence str) // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^^^^^^^ reference java/lang/CharSequence# -// ^^^ definition local1 CharSequence str +// ^^^ definition local1 @Nullable CharSequence str if (str == null) { // ^^^ reference local1 return 0; diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ImmutableModelException.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ImmutableModelException.java index f9c8a64e8..9bc152b2c 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ImmutableModelException.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ImmutableModelException.java @@ -53,7 +53,7 @@ class ImmutableModelException extends RuntimeException { // ^^^^^^^ reference androidx/annotation/NonNull# private static String buildMessage(EpoxyModel model, // ^^^^^^ reference java/lang/String# -// ^^^^^^^^^^^^ definition com/airbnb/epoxy/ImmutableModelException#buildMessage(). private static String buildMessage(EpoxyModel model, String descriptionOfWhenChangeHappened, int modelPosition) +// ^^^^^^^^^^^^ definition com/airbnb/epoxy/ImmutableModelException#buildMessage(). @NonNull private static String buildMessage(EpoxyModel model, String descriptionOfWhenChangeHappened, int modelPosition) // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^ definition local5 EpoxyModel model String descriptionOfWhenChangeHappened, int modelPosition) { diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ListenersUtils.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ListenersUtils.java index 370f5c6ef..36ac04b7a 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ListenersUtils.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ListenersUtils.java @@ -33,7 +33,7 @@ public class ListenersUtils { // ^^^^^^^^ reference androidx/annotation/Nullable# static EpoxyViewHolder getEpoxyHolderForChildView(View v) { // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# -// ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ListenersUtils#getEpoxyHolderForChildView(). static EpoxyViewHolder getEpoxyHolderForChildView(unresolved_type v) +// ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ListenersUtils#getEpoxyHolderForChildView(). @Nullable static EpoxyViewHolder getEpoxyHolderForChildView(unresolved_type v) // ^^^^ reference _root_/ // ^ definition local0 unresolved_type v RecyclerView recyclerView = findParentRecyclerView(v); @@ -72,10 +72,10 @@ static EpoxyViewHolder getEpoxyHolderForChildView(View v) { // ^^^^^^^^ reference androidx/annotation/Nullable# private static RecyclerView findParentRecyclerView(@Nullable View v) { // ^^^^^^^^^^^^ reference _root_/ -// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ListenersUtils#findParentRecyclerView(). private static findParentRecyclerView(unresolved_type v) +// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ListenersUtils#findParentRecyclerView(). @Nullable private static findParentRecyclerView(unresolved_type v) // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^ reference _root_/ -// ^ definition local3 unresolved_type v +// ^ definition local3 @Nullable unresolved_type v if (v == null) { // ^ reference local3 return null; diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelList.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelList.java index 3dcc90e67..505c26ab3 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelList.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelList.java @@ -147,7 +147,7 @@ private void notifyRemoval(int positionStart, int itemCount) { // ^^^^^^^^ reference java/lang/Override# public EpoxyModel set(int index, EpoxyModel element) { // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^ definition com/airbnb/epoxy/ModelList#set(). public EpoxyModel set(int index, EpoxyModel element) +// ^^^ definition com/airbnb/epoxy/ModelList#set(). @Override public EpoxyModel set(int index, EpoxyModel element) // ^^^^^ definition local10 int index // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^^^ definition local11 EpoxyModel element @@ -179,7 +179,7 @@ public EpoxyModel set(int index, EpoxyModel element) { @Override // ^^^^^^^^ reference java/lang/Override# public boolean add(EpoxyModel epoxyModel) { -// ^^^ definition com/airbnb/epoxy/ModelList#add(). public boolean add(EpoxyModel epoxyModel) +// ^^^ definition com/airbnb/epoxy/ModelList#add(). @Override public boolean add(EpoxyModel epoxyModel) // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^^^^^^ definition local13 EpoxyModel epoxyModel notifyInsertion(size(), 1); @@ -194,7 +194,7 @@ public boolean add(EpoxyModel epoxyModel) { @Override // ^^^^^^^^ reference java/lang/Override# public void add(int index, EpoxyModel element) { -// ^^^ definition com/airbnb/epoxy/ModelList#add(+1). public void add(int index, EpoxyModel element) +// ^^^ definition com/airbnb/epoxy/ModelList#add(+1). @Override public void add(int index, EpoxyModel element) // ^^^^^ definition local14 int index // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^^^ definition local15 EpoxyModel element @@ -211,7 +211,7 @@ public void add(int index, EpoxyModel element) { @Override // ^^^^^^^^ reference java/lang/Override# public boolean addAll(Collection> c) { -// ^^^^^^ definition com/airbnb/epoxy/ModelList#addAll(). public boolean addAll(Collection> c) +// ^^^^^^ definition com/airbnb/epoxy/ModelList#addAll(). @Override public boolean addAll(Collection> c) // ^^^^^^^^^^ reference java/util/Collection# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^ definition local16 Collection> c @@ -229,7 +229,7 @@ public boolean addAll(Collection> c) { @Override // ^^^^^^^^ reference java/lang/Override# public boolean addAll(int index, Collection> c) { -// ^^^^^^ definition com/airbnb/epoxy/ModelList#addAll(+1). public boolean addAll(int index, Collection> c) +// ^^^^^^ definition com/airbnb/epoxy/ModelList#addAll(+1). @Override public boolean addAll(int index, Collection> c) // ^^^^^ definition local17 int index // ^^^^^^^^^^ reference java/util/Collection# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# @@ -250,7 +250,7 @@ public boolean addAll(int index, Collection> c) { // ^^^^^^^^ reference java/lang/Override# public EpoxyModel remove(int index) { // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^ definition com/airbnb/epoxy/ModelList#remove(). public EpoxyModel remove(int index) +// ^^^^^^ definition com/airbnb/epoxy/ModelList#remove(). @Override public EpoxyModel remove(int index) // ^^^^^ definition local19 int index notifyRemoval(index, 1); // ^^^^^^^^^^^^^ reference com/airbnb/epoxy/ModelList#notifyRemoval(). @@ -264,7 +264,7 @@ public EpoxyModel remove(int index) { @Override // ^^^^^^^^ reference java/lang/Override# public boolean remove(Object o) { -// ^^^^^^ definition com/airbnb/epoxy/ModelList#remove(+1). public boolean remove(Object o) +// ^^^^^^ definition com/airbnb/epoxy/ModelList#remove(+1). @Override public boolean remove(Object o) // ^^^^^^ reference java/lang/Object# // ^ definition local20 Object o int index = indexOf(o); @@ -290,7 +290,7 @@ public boolean remove(Object o) { @Override // ^^^^^^^^ reference java/lang/Override# public void clear() { -// ^^^^^ definition com/airbnb/epoxy/ModelList#clear(). public void clear() +// ^^^^^ definition com/airbnb/epoxy/ModelList#clear(). @Override public void clear() if (!isEmpty()) { // ^^^^^^^ reference java/util/ArrayList#isEmpty(). notifyRemoval(0, size()); @@ -305,7 +305,7 @@ public void clear() { @Override // ^^^^^^^^ reference java/lang/Override# protected void removeRange(int fromIndex, int toIndex) { -// ^^^^^^^^^^^ definition com/airbnb/epoxy/ModelList#removeRange(). protected void removeRange(int fromIndex, int toIndex) +// ^^^^^^^^^^^ definition com/airbnb/epoxy/ModelList#removeRange(). @Override protected void removeRange(int fromIndex, int toIndex) // ^^^^^^^^^ definition local22 int fromIndex // ^^^^^^^ definition local23 int toIndex if (fromIndex == toIndex) { @@ -329,7 +329,7 @@ protected void removeRange(int fromIndex, int toIndex) { @Override // ^^^^^^^^ reference java/lang/Override# public boolean removeAll(Collection collection) { -// ^^^^^^^^^ definition com/airbnb/epoxy/ModelList#removeAll(). public boolean removeAll(Collection collection) +// ^^^^^^^^^ definition com/airbnb/epoxy/ModelList#removeAll(). @Override public boolean removeAll(Collection collection) // ^^^^^^^^^^ reference java/util/Collection# // ^^^^^^^^^^ definition local24 Collection collection // Using this implementation from the Android ArrayList since the Java 1.8 ArrayList @@ -363,7 +363,7 @@ public boolean removeAll(Collection collection) { @Override // ^^^^^^^^ reference java/lang/Override# public boolean retainAll(Collection collection) { -// ^^^^^^^^^ definition com/airbnb/epoxy/ModelList#retainAll(). public boolean retainAll(Collection collection) +// ^^^^^^^^^ definition com/airbnb/epoxy/ModelList#retainAll(). @Override public boolean retainAll(Collection collection) // ^^^^^^^^^^ reference java/util/Collection# // ^^^^^^^^^^ definition local27 Collection collection // Using this implementation from the Android ArrayList since the Java 1.8 ArrayList @@ -401,7 +401,7 @@ public boolean retainAll(Collection collection) { public Iterator> iterator() { // ^^^^^^^^ reference java/util/Iterator# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^ definition com/airbnb/epoxy/ModelList#iterator(). public Iterator> iterator() +// ^^^^^^^^ definition com/airbnb/epoxy/ModelList#iterator(). @NonNull @Override public Iterator> iterator() return new Itr(); // ^^^^^^^^^ reference com/airbnb/epoxy/ModelList#Itr#``(). // ^^^ reference com/airbnb/epoxy/ModelList#Itr# @@ -437,7 +437,7 @@ public boolean hasNext() { // ^^^^^^^^^^^^^^^^ reference java/lang/SuppressWarnings# public EpoxyModel next() { // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^ definition com/airbnb/epoxy/ModelList#Itr#next(). public EpoxyModel next() +// ^^^^ definition com/airbnb/epoxy/ModelList#Itr#next(). @SuppressWarnings("unchecked") public EpoxyModel next() checkForComodification(); // ^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ModelList#Itr#checkForComodification(). int i = cursor; @@ -509,7 +509,7 @@ final void checkForComodification() { public ListIterator> listIterator() { // ^^^^^^^^^^^^ reference java/util/ListIterator# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelList#listIterator(). public ListIterator> listIterator() +// ^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelList#listIterator(). @NonNull @Override public ListIterator> listIterator() return new ListItr(0); // ^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ModelList#ListItr#``(). // ^^^^^^^ reference com/airbnb/epoxy/ModelList#ListItr# @@ -522,7 +522,7 @@ public ListIterator> listIterator() { public ListIterator> listIterator(int index) { // ^^^^^^^^^^^^ reference java/util/ListIterator# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelList#listIterator(+1). public ListIterator> listIterator(int index) +// ^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelList#listIterator(+1). @NonNull @Override public ListIterator> listIterator(int index) // ^^^^^ definition local32 int index return new ListItr(index); // ^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ModelList#ListItr#``(). @@ -571,7 +571,7 @@ public int previousIndex() { // ^^^^^^^^^^^^^^^^ reference java/lang/SuppressWarnings# public EpoxyModel previous() { // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^ definition com/airbnb/epoxy/ModelList#ListItr#previous(). public EpoxyModel previous() +// ^^^^^^^^ definition com/airbnb/epoxy/ModelList#ListItr#previous(). @SuppressWarnings("unchecked") public EpoxyModel previous() checkForComodification(); // ^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ModelList#Itr#checkForComodification(). int i = cursor - 1; @@ -668,7 +668,7 @@ public void add(EpoxyModel e) { public List> subList(int start, int end) { // ^^^^ reference java/util/List# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^ definition com/airbnb/epoxy/ModelList#subList(). public List> subList(int start, int end) +// ^^^^^^^ definition com/airbnb/epoxy/ModelList#subList(). @NonNull @Override public List> subList(int start, int end) // ^^^^^ definition local40 int start // ^^^ definition local41 int end if (start >= 0 && end <= size()) { @@ -887,7 +887,7 @@ public void set(EpoxyModel object) { @Override // ^^^^^^^^ reference java/lang/Override# public void add(int location, EpoxyModel object) { -// ^^^ definition com/airbnb/epoxy/ModelList#SubList#add(). public void add(int location, EpoxyModel object) +// ^^^ definition com/airbnb/epoxy/ModelList#SubList#add(). @Override public void add(int location, EpoxyModel object) // ^^^^^^^^ definition local52 int location // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^^ definition local53 EpoxyModel object @@ -926,7 +926,7 @@ public void add(int location, EpoxyModel object) { @Override // ^^^^^^^^ reference java/lang/Override# public boolean addAll(int location, Collection> collection) { -// ^^^^^^ definition com/airbnb/epoxy/ModelList#SubList#addAll(). public boolean addAll(int location, Collection> collection) +// ^^^^^^ definition com/airbnb/epoxy/ModelList#SubList#addAll(). @Override public boolean addAll(int location, Collection> collection) // ^^^^^^^^ definition local54 int location // ^^^^^^^^^^ reference java/util/Collection# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# @@ -972,11 +972,11 @@ public boolean addAll(int location, Collection> collecti @Override // ^^^^^^^^ reference java/lang/Override# public boolean addAll(@NonNull Collection> collection) { -// ^^^^^^ definition com/airbnb/epoxy/ModelList#SubList#addAll(+1). public boolean addAll(Collection> collection) +// ^^^^^^ definition com/airbnb/epoxy/ModelList#SubList#addAll(+1). @Override public boolean addAll(Collection> collection) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^ reference java/util/Collection# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^^ definition local57 Collection> collection +// ^^^^^^^^^^ definition local57 @NonNull Collection> collection if (modCount == fullList.modCount) { // ^^^^^^^^ reference java/util/AbstractList#modCount. // ^^^^^^^^ reference com/airbnb/epoxy/ModelList#SubList#fullList. @@ -1011,7 +1011,7 @@ public boolean addAll(@NonNull Collection> collection) { // ^^^^^^^^ reference java/lang/Override# public EpoxyModel get(int location) { // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^ definition com/airbnb/epoxy/ModelList#SubList#get(). public EpoxyModel get(int location) +// ^^^ definition com/airbnb/epoxy/ModelList#SubList#get(). @Override public EpoxyModel get(int location) // ^^^^^^^^ definition local59 int location if (modCount == fullList.modCount) { // ^^^^^^^^ reference java/util/AbstractList#modCount. @@ -1043,7 +1043,7 @@ public EpoxyModel get(int location) { public Iterator> iterator() { // ^^^^^^^^ reference java/util/Iterator# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^ definition com/airbnb/epoxy/ModelList#SubList#iterator(). public Iterator> iterator() +// ^^^^^^^^ definition com/airbnb/epoxy/ModelList#SubList#iterator(). @NonNull @Override public Iterator> iterator() return listIterator(0); // ^^^^^^^^^^^^ reference com/airbnb/epoxy/ModelList#SubList#listIterator(). } @@ -1055,7 +1055,7 @@ public Iterator> iterator() { public ListIterator> listIterator(int location) { // ^^^^^^^^^^^^ reference java/util/ListIterator# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelList#SubList#listIterator(). public ListIterator> listIterator(int location) +// ^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelList#SubList#listIterator(). @NonNull @Override public ListIterator> listIterator(int location) // ^^^^^^^^ definition local60 int location if (modCount == fullList.modCount) { // ^^^^^^^^ reference java/util/AbstractList#modCount. @@ -1089,7 +1089,7 @@ public ListIterator> listIterator(int location) { // ^^^^^^^^ reference java/lang/Override# public EpoxyModel remove(int location) { // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^ definition com/airbnb/epoxy/ModelList#SubList#remove(). public EpoxyModel remove(int location) +// ^^^^^^ definition com/airbnb/epoxy/ModelList#SubList#remove(). @Override public EpoxyModel remove(int location) // ^^^^^^^^ definition local61 int location if (modCount == fullList.modCount) { // ^^^^^^^^ reference java/util/AbstractList#modCount. @@ -1127,7 +1127,7 @@ public EpoxyModel remove(int location) { @Override // ^^^^^^^^ reference java/lang/Override# protected void removeRange(int start, int end) { -// ^^^^^^^^^^^ definition com/airbnb/epoxy/ModelList#SubList#removeRange(). protected void removeRange(int start, int end) +// ^^^^^^^^^^^ definition com/airbnb/epoxy/ModelList#SubList#removeRange(). @Override protected void removeRange(int start, int end) // ^^^^^ definition local63 int start // ^^^ definition local64 int end if (start != end) { @@ -1164,7 +1164,7 @@ protected void removeRange(int start, int end) { // ^^^^^^^^ reference java/lang/Override# public EpoxyModel set(int location, EpoxyModel object) { // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^ definition com/airbnb/epoxy/ModelList#SubList#set(). public EpoxyModel set(int location, EpoxyModel object) +// ^^^ definition com/airbnb/epoxy/ModelList#SubList#set(). @Override public EpoxyModel set(int location, EpoxyModel object) // ^^^^^^^^ definition local65 int location // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^^ definition local66 EpoxyModel object @@ -1195,7 +1195,7 @@ public EpoxyModel set(int location, EpoxyModel object) { @Override // ^^^^^^^^ reference java/lang/Override# public int size() { -// ^^^^ definition com/airbnb/epoxy/ModelList#SubList#size(). public int size() +// ^^^^ definition com/airbnb/epoxy/ModelList#SubList#size(). @Override public int size() if (modCount == fullList.modCount) { // ^^^^^^^^ reference java/util/AbstractList#modCount. // ^^^^^^^^ reference com/airbnb/epoxy/ModelList#SubList#fullList. diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelProp.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelProp.java index 9f52351d2..e0f2f7106 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelProp.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelProp.java @@ -48,7 +48,7 @@ // ^^^^^^^^^^^^^^^ reference java/lang/annotation/RetentionPolicy# // ^^^^^ reference java/lang/annotation/RetentionPolicy#CLASS. public @interface ModelProp { -// ^^^^^^^^^ definition com/airbnb/epoxy/ModelProp# public @interface ModelProp +// ^^^^^^^^^ definition com/airbnb/epoxy/ModelProp# @Target({ElementType.METHOD, ElementType.FIELD}) @Retention(RetentionPolicy.CLASS) public @interface ModelProp enum Option { // ^^^^^^ definition com/airbnb/epoxy/ModelProp#Option# public enum Option diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelState.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelState.java index 25ca586d7..ef6cb2af3 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelState.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelState.java @@ -127,7 +127,7 @@ void pairWithSelf() { // ^^^^^^^^ reference java/lang/Override# public String toString() { // ^^^^^^ reference java/lang/String# -// ^^^^^^^^ definition com/airbnb/epoxy/ModelState#toString(). public String toString() +// ^^^^^^^^ definition com/airbnb/epoxy/ModelState#toString(). @Override public String toString() return "ModelState{" + "id=" + id // ^^ reference com/airbnb/epoxy/ModelState#id. diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelView.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelView.java index 055ded9f7..2b9608140 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelView.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelView.java @@ -41,7 +41,7 @@ // ^^^^^^^^^^^^^^^ reference java/lang/annotation/RetentionPolicy# // ^^^^^ reference java/lang/annotation/RetentionPolicy#CLASS. public @interface ModelView { -// ^^^^^^^^^ definition com/airbnb/epoxy/ModelView# public @interface ModelView +// ^^^^^^^^^ definition com/airbnb/epoxy/ModelView# @Target(ElementType.TYPE) @Retention(RetentionPolicy.CLASS) public @interface ModelView /** * Use with {@link #autoLayout()} to declare what layout parameters should be used to size your @@ -86,7 +86,7 @@ enum Size { */ @LayoutRes int defaultLayout() default 0; // ^^^^^^^^^ reference androidx/annotation/LayoutRes# -// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelView#defaultLayout(). public abstract int defaultLayout() +// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelView#defaultLayout(). @LayoutRes public abstract int defaultLayout() /** * An optional EpoxyModel subclass to use as the base class of the generated view. A default can * also be set with {@link PackageModelViewConfig} diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpControllerHelper.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpControllerHelper.java index 30a388b6c..1f55ed97e 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpControllerHelper.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpControllerHelper.java @@ -13,7 +13,7 @@ class NoOpControllerHelper extends ControllerHelper { @Override // ^^^^^^^^ reference java/lang/Override# public void resetAutoModels() { -// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/NoOpControllerHelper#resetAutoModels(). public void resetAutoModels() +// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/NoOpControllerHelper#resetAutoModels(). @Override public void resetAutoModels() // No - Op } } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpTimer.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpTimer.java index 4dbe40801..ea5eaf506 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpTimer.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpTimer.java @@ -7,7 +7,7 @@ class NoOpTimer implements Timer { @Override // ^^^^^^^^ reference java/lang/Override# public void start(String sectionName) { -// ^^^^^ definition com/airbnb/epoxy/NoOpTimer#start(). public void start(String sectionName) +// ^^^^^ definition com/airbnb/epoxy/NoOpTimer#start(). @Override public void start(String sectionName) // ^^^^^^ reference java/lang/String# // ^^^^^^^^^^^ definition local0 String sectionName @@ -16,7 +16,7 @@ public void start(String sectionName) { @Override // ^^^^^^^^ reference java/lang/Override# public void stop() { -// ^^^^ definition com/airbnb/epoxy/NoOpTimer#stop(). public void stop() +// ^^^^ definition com/airbnb/epoxy/NoOpTimer#stop(). @Override public void stop() } } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/NotifyBlocker.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/NotifyBlocker.java index fff966013..34d9f3662 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/NotifyBlocker.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/NotifyBlocker.java @@ -37,7 +37,7 @@ void blockChanges() { @Override // ^^^^^^^^ reference java/lang/Override# public void onChanged() { -// ^^^^^^^^^ definition com/airbnb/epoxy/NotifyBlocker#onChanged(). public void onChanged() +// ^^^^^^^^^ definition com/airbnb/epoxy/NotifyBlocker#onChanged(). @Override public void onChanged() if (!changesAllowed) { // ^^^^^^^^^^^^^^ reference com/airbnb/epoxy/NotifyBlocker#changesAllowed. throw new IllegalStateException( @@ -50,7 +50,7 @@ public void onChanged() { @Override // ^^^^^^^^ reference java/lang/Override# public void onItemRangeChanged(int positionStart, int itemCount) { -// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/NotifyBlocker#onItemRangeChanged(). public void onItemRangeChanged(int positionStart, int itemCount) +// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/NotifyBlocker#onItemRangeChanged(). @Override public void onItemRangeChanged(int positionStart, int itemCount) // ^^^^^^^^^^^^^ definition local0 int positionStart // ^^^^^^^^^ definition local1 int itemCount onChanged(); @@ -60,7 +60,7 @@ public void onItemRangeChanged(int positionStart, int itemCount) { @Override // ^^^^^^^^ reference java/lang/Override# public void onItemRangeChanged(int positionStart, int itemCount, Object payload) { -// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/NotifyBlocker#onItemRangeChanged(+1). public void onItemRangeChanged(int positionStart, int itemCount, Object payload) +// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/NotifyBlocker#onItemRangeChanged(+1). @Override public void onItemRangeChanged(int positionStart, int itemCount, Object payload) // ^^^^^^^^^^^^^ definition local2 int positionStart // ^^^^^^^^^ definition local3 int itemCount // ^^^^^^ reference java/lang/Object# @@ -72,7 +72,7 @@ public void onItemRangeChanged(int positionStart, int itemCount, Object payload) @Override // ^^^^^^^^ reference java/lang/Override# public void onItemRangeInserted(int positionStart, int itemCount) { -// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/NotifyBlocker#onItemRangeInserted(). public void onItemRangeInserted(int positionStart, int itemCount) +// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/NotifyBlocker#onItemRangeInserted(). @Override public void onItemRangeInserted(int positionStart, int itemCount) // ^^^^^^^^^^^^^ definition local5 int positionStart // ^^^^^^^^^ definition local6 int itemCount onChanged(); @@ -82,7 +82,7 @@ public void onItemRangeInserted(int positionStart, int itemCount) { @Override // ^^^^^^^^ reference java/lang/Override# public void onItemRangeRemoved(int positionStart, int itemCount) { -// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/NotifyBlocker#onItemRangeRemoved(). public void onItemRangeRemoved(int positionStart, int itemCount) +// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/NotifyBlocker#onItemRangeRemoved(). @Override public void onItemRangeRemoved(int positionStart, int itemCount) // ^^^^^^^^^^^^^ definition local7 int positionStart // ^^^^^^^^^ definition local8 int itemCount onChanged(); @@ -92,7 +92,7 @@ public void onItemRangeRemoved(int positionStart, int itemCount) { @Override // ^^^^^^^^ reference java/lang/Override# public void onItemRangeMoved(int fromPosition, int toPosition, int itemCount) { -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/NotifyBlocker#onItemRangeMoved(). public void onItemRangeMoved(int fromPosition, int toPosition, int itemCount) +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/NotifyBlocker#onItemRangeMoved(). @Override public void onItemRangeMoved(int fromPosition, int toPosition, int itemCount) // ^^^^^^^^^^^^ definition local9 int fromPosition // ^^^^^^^^^^ definition local10 int toPosition // ^^^^^^^^^ definition local11 int itemCount diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBuildFinishedListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBuildFinishedListener.java index 63baf28c1..0a63c0453 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBuildFinishedListener.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBuildFinishedListener.java @@ -19,5 +19,5 @@ public interface OnModelBuildFinishedListener { // ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelBuildFinishedListener#onModelBuildFinished(). public abstract void onModelBuildFinished(DiffResult result) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^ reference com/airbnb/epoxy/DiffResult# -// ^^^^^^ definition local0 DiffResult result +// ^^^^^^ definition local0 @NonNull DiffResult result } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityChangedListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityChangedListener.java index affb623d1..200f50e65 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityChangedListener.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityChangedListener.java @@ -42,15 +42,15 @@ void onVisibilityChanged(T model, V view, // ^^^^^^^^^^ reference androidx/annotation/FloatRange# // ^^^^ reference androidx/annotation/FloatRange#from(). // ^^ reference androidx/annotation/FloatRange#to(). -// ^^^^^^^^^^^^^^^^^^^^ definition local2 float percentVisibleHeight +// ^^^^^^^^^^^^^^^^^^^^ definition local2 @FloatRange(from = 0, to = 100) float percentVisibleHeight @FloatRange(from = 0, to = 100) float percentVisibleWidth, // ^^^^^^^^^^ reference androidx/annotation/FloatRange# // ^^^^ reference androidx/annotation/FloatRange#from(). // ^^ reference androidx/annotation/FloatRange#to(). -// ^^^^^^^^^^^^^^^^^^^ definition local3 float percentVisibleWidth +// ^^^^^^^^^^^^^^^^^^^ definition local3 @FloatRange(from = 0, to = 100) float percentVisibleWidth @Px int heightVisible, @Px int widthVisible); // ^^ reference androidx/annotation/Px# -// ^^^^^^^^^^^^^ definition local4 int heightVisible +// ^^^^^^^^^^^^^ definition local4 @Px int heightVisible // ^^ reference androidx/annotation/Px# -// ^^^^^^^^^^^^ definition local5 int widthVisible +// ^^^^^^^^^^^^ definition local5 @Px int widthVisible } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityStateChangedListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityStateChangedListener.java index 443602b99..110e1de61 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityStateChangedListener.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityStateChangedListener.java @@ -31,5 +31,5 @@ public interface OnModelVisibilityStateChangedListener, // ^ reference com/airbnb/epoxy/OnModelVisibilityStateChangedListener#[V] // ^^^^ definition local1 V view // ^^^^^^^^^^ reference com/airbnb/epoxy/VisibilityState#Visibility# -// ^^^^^^^^^^^^^^^ definition local2 int visibilityState +// ^^^^^^^^^^^^^^^ definition local2 @Visibility int visibilityState } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnViewRecycled.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnViewRecycled.java index c6330d5cf..ae1d19806 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnViewRecycled.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnViewRecycled.java @@ -35,5 +35,5 @@ // ^^^^^^^^^^^^^^^ reference java/lang/annotation/RetentionPolicy# // ^^^^^ reference java/lang/annotation/RetentionPolicy#CLASS. public @interface OnViewRecycled { -// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnViewRecycled# public @interface OnViewRecycled +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnViewRecycled# @Target(ElementType.METHOD) @Retention(RetentionPolicy.CLASS) public @interface OnViewRecycled } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnVisibilityChanged.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnVisibilityChanged.java index 1179af7ce..cfc6b9de3 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnVisibilityChanged.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnVisibilityChanged.java @@ -45,5 +45,5 @@ // ^^^^^^^^^^^^^^^ reference java/lang/annotation/RetentionPolicy# // ^^^^^ reference java/lang/annotation/RetentionPolicy#CLASS. public @interface OnVisibilityChanged { -// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnVisibilityChanged# public @interface OnVisibilityChanged +// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnVisibilityChanged# @Target(ElementType.METHOD) @Retention(RetentionPolicy.CLASS) public @interface OnVisibilityChanged } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnVisibilityStateChanged.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnVisibilityStateChanged.java index 1a81e06e1..cb23eac4a 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnVisibilityStateChanged.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnVisibilityStateChanged.java @@ -47,5 +47,5 @@ // ^^^^^^^^^^^^^^^ reference java/lang/annotation/RetentionPolicy# // ^^^^^ reference java/lang/annotation/RetentionPolicy#CLASS. public @interface OnVisibilityStateChanged { -// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnVisibilityStateChanged# public @interface OnVisibilityStateChanged +// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnVisibilityStateChanged# @SuppressWarnings("JavadocReference") @Target(ElementType.METHOD) @Retention(RetentionPolicy.CLASS) public @interface OnVisibilityStateChanged } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/PackageEpoxyConfig.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/PackageEpoxyConfig.java index 52dc732d4..7b9a769d7 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/PackageEpoxyConfig.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/PackageEpoxyConfig.java @@ -39,7 +39,7 @@ // ^^^^^^^^^^^^^^^ reference java/lang/annotation/RetentionPolicy# // ^^^^^ reference java/lang/annotation/RetentionPolicy#CLASS. public @interface PackageEpoxyConfig { -// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageEpoxyConfig# public @interface PackageEpoxyConfig +// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageEpoxyConfig# @Target(ElementType.TYPE) @Retention(RetentionPolicy.CLASS) public @interface PackageEpoxyConfig boolean REQUIRE_HASHCODE_DEFAULT = false; // ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageEpoxyConfig#REQUIRE_HASHCODE_DEFAULT. public static final boolean REQUIRE_HASHCODE_DEFAULT boolean REQUIRE_ABSTRACT_MODELS_DEFAULT = false; diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/PackageModelViewConfig.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/PackageModelViewConfig.java index d651a5fad..dafa67744 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/PackageModelViewConfig.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/PackageModelViewConfig.java @@ -35,7 +35,7 @@ // ^^^^^^^^^^^^^^^ reference java/lang/annotation/RetentionPolicy# // ^^^^^ reference java/lang/annotation/RetentionPolicy#CLASS. public @interface PackageModelViewConfig { -// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig# public @interface PackageModelViewConfig +// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig# @Target(ElementType.TYPE) @Retention(RetentionPolicy.CLASS) public @interface PackageModelViewConfig /** * The R class used in this module (eg "com.example.app.R.class"). This is needed so Epoxy can * look up layout files. diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/QuantityStringResAttribute.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/QuantityStringResAttribute.java index d5ea220e0..e555d5386 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/QuantityStringResAttribute.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/QuantityStringResAttribute.java @@ -23,23 +23,23 @@ public class QuantityStringResAttribute { // ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/QuantityStringResAttribute# public class QuantityStringResAttribute @PluralsRes private final int id; // ^^^^^^^^^^ reference androidx/annotation/PluralsRes# -// ^^ definition com/airbnb/epoxy/QuantityStringResAttribute#id. private final int id +// ^^ definition com/airbnb/epoxy/QuantityStringResAttribute#id. @PluralsRes private final int id private final int quantity; // ^^^^^^^^ definition com/airbnb/epoxy/QuantityStringResAttribute#quantity. private final int quantity @Nullable private final Object[] formatArgs; // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^ reference java/lang/Object# -// ^^^^^^^^^^ definition com/airbnb/epoxy/QuantityStringResAttribute#formatArgs. private final Object[] formatArgs +// ^^^^^^^^^^ definition com/airbnb/epoxy/QuantityStringResAttribute#formatArgs. @Nullable private final Object[] formatArgs public QuantityStringResAttribute(@PluralsRes int id, int quantity, // ^^^^^^ definition com/airbnb/epoxy/QuantityStringResAttribute#``(). public QuantityStringResAttribute(int id, int quantity, Object[] formatArgs) // ^^^^^^^^^^ reference androidx/annotation/PluralsRes# -// ^^ definition local0 int id +// ^^ definition local0 @PluralsRes int id // ^^^^^^^^ definition local1 int quantity @Nullable Object[] formatArgs) { // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^ reference java/lang/Object# -// ^^^^^^^^^^ definition local2 Object[] formatArgs +// ^^^^^^^^^^ definition local2 @Nullable Object[] formatArgs this.quantity = quantity; // ^^^^ reference com/airbnb/epoxy/QuantityStringResAttribute# // ^^^^^^^^ reference com/airbnb/epoxy/QuantityStringResAttribute#quantity. @@ -67,7 +67,7 @@ public QuantityStringResAttribute(int id, int quantity) { @PluralsRes // ^^^^^^^^^^ reference androidx/annotation/PluralsRes# public int getId() { -// ^^^^^ definition com/airbnb/epoxy/QuantityStringResAttribute#getId(). public int getId() +// ^^^^^ definition com/airbnb/epoxy/QuantityStringResAttribute#getId(). @PluralsRes public int getId() return id; // ^^ reference com/airbnb/epoxy/QuantityStringResAttribute#id. } @@ -82,7 +82,7 @@ public int getQuantity() { // ^^^^^^^^ reference androidx/annotation/Nullable# public Object[] getFormatArgs() { // ^^^^^^ reference java/lang/Object# -// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/QuantityStringResAttribute#getFormatArgs(). public Object[] getFormatArgs() +// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/QuantityStringResAttribute#getFormatArgs(). @Nullable public Object[] getFormatArgs() return formatArgs; // ^^^^^^^^^^ reference com/airbnb/epoxy/QuantityStringResAttribute#formatArgs. } @@ -116,7 +116,7 @@ public CharSequence toString(Context context) { @Override // ^^^^^^^^ reference java/lang/Override# public boolean equals(Object o) { -// ^^^^^^ definition com/airbnb/epoxy/QuantityStringResAttribute#equals(). public boolean equals(Object o) +// ^^^^^^ definition com/airbnb/epoxy/QuantityStringResAttribute#equals(). @Override public boolean equals(Object o) // ^^^^^^ reference java/lang/Object# // ^ definition local6 Object o if (this == o) { @@ -160,7 +160,7 @@ public boolean equals(Object o) { @Override // ^^^^^^^^ reference java/lang/Override# public int hashCode() { -// ^^^^^^^^ definition com/airbnb/epoxy/QuantityStringResAttribute#hashCode(). public int hashCode() +// ^^^^^^^^ definition com/airbnb/epoxy/QuantityStringResAttribute#hashCode(). @Override public int hashCode() int result = id; // ^^^^^^ definition local8 int result // ^^ reference com/airbnb/epoxy/QuantityStringResAttribute#id. diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyAdapter.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyAdapter.java index e296b7ffc..eb34cdb9e 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyAdapter.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyAdapter.java @@ -30,7 +30,7 @@ public List> getModels() { @Override // ^^^^^^^^ reference java/lang/Override# public void enableDiffing() { -// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#enableDiffing(). public void enableDiffing() +// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#enableDiffing(). @Override public void enableDiffing() super.enableDiffing(); // ^^^^^ reference com/airbnb/epoxy/SimpleEpoxyAdapter#super. // ^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyAdapter#enableDiffing(). @@ -39,7 +39,7 @@ public void enableDiffing() { @Override // ^^^^^^^^ reference java/lang/Override# public void notifyModelsChanged() { -// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#notifyModelsChanged(). public void notifyModelsChanged() +// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#notifyModelsChanged(). @Override public void notifyModelsChanged() super.notifyModelsChanged(); // ^^^^^ reference com/airbnb/epoxy/SimpleEpoxyAdapter#super. // ^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyAdapter#notifyModelsChanged(). @@ -49,7 +49,7 @@ public void notifyModelsChanged() { // ^^^^^^^^ reference java/lang/Override# public BoundViewHolders getBoundViewHolders() { // ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BoundViewHolders# -// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#getBoundViewHolders(). public BoundViewHolders getBoundViewHolders() +// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#getBoundViewHolders(). @Override public BoundViewHolders getBoundViewHolders() return super.getBoundViewHolders(); // ^^^^^ reference com/airbnb/epoxy/SimpleEpoxyAdapter#super. // ^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BaseEpoxyAdapter#getBoundViewHolders(). @@ -58,7 +58,7 @@ public BoundViewHolders getBoundViewHolders() { @Override // ^^^^^^^^ reference java/lang/Override# public void notifyModelChanged(EpoxyModel model) { -// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#notifyModelChanged(). public void notifyModelChanged(EpoxyModel model) +// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#notifyModelChanged(). @Override public void notifyModelChanged(EpoxyModel model) // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^ definition local0 EpoxyModel model super.notifyModelChanged(model); @@ -70,7 +70,7 @@ public void notifyModelChanged(EpoxyModel model) { @Override // ^^^^^^^^ reference java/lang/Override# public void addModels(EpoxyModel... modelsToAdd) { -// ^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#addModels(). public void addModels(EpoxyModel[] modelsToAdd) +// ^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#addModels(). @Override public void addModels(EpoxyModel[] modelsToAdd) // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^^^^^^^ definition local1 EpoxyModel[] modelsToAdd super.addModels(modelsToAdd); @@ -82,7 +82,7 @@ public void addModels(EpoxyModel... modelsToAdd) { @Override // ^^^^^^^^ reference java/lang/Override# public void addModels(Collection> modelsToAdd) { -// ^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#addModels(+1). public void addModels(Collection> modelsToAdd) +// ^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#addModels(+1). @Override public void addModels(Collection> modelsToAdd) // ^^^^^^^^^^ reference java/util/Collection# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^^^^^^^ definition local2 Collection> modelsToAdd @@ -95,7 +95,7 @@ public void addModels(Collection> modelsToAdd) { @Override // ^^^^^^^^ reference java/lang/Override# public void insertModelBefore(EpoxyModel modelToInsert, EpoxyModel modelToInsertBefore) { -// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#insertModelBefore(). public void insertModelBefore(EpoxyModel modelToInsert, EpoxyModel modelToInsertBefore) +// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#insertModelBefore(). @Override public void insertModelBefore(EpoxyModel modelToInsert, EpoxyModel modelToInsertBefore) // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^^^^^^^^^ definition local3 EpoxyModel modelToInsert // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# @@ -110,7 +110,7 @@ public void insertModelBefore(EpoxyModel modelToInsert, EpoxyModel modelTo @Override // ^^^^^^^^ reference java/lang/Override# public void insertModelAfter(EpoxyModel modelToInsert, EpoxyModel modelToInsertAfter) { -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#insertModelAfter(). public void insertModelAfter(EpoxyModel modelToInsert, EpoxyModel modelToInsertAfter) +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#insertModelAfter(). @Override public void insertModelAfter(EpoxyModel modelToInsert, EpoxyModel modelToInsertAfter) // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^^^^^^^^^ definition local5 EpoxyModel modelToInsert // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# @@ -125,7 +125,7 @@ public void insertModelAfter(EpoxyModel modelToInsert, EpoxyModel modelToI @Override // ^^^^^^^^ reference java/lang/Override# public void removeModel(EpoxyModel model) { -// ^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#removeModel(). public void removeModel(EpoxyModel model) +// ^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#removeModel(). @Override public void removeModel(EpoxyModel model) // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^ definition local7 EpoxyModel model super.removeModel(model); @@ -137,7 +137,7 @@ public void removeModel(EpoxyModel model) { @Override // ^^^^^^^^ reference java/lang/Override# public void removeAllModels() { -// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#removeAllModels(). public void removeAllModels() +// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#removeAllModels(). @Override public void removeAllModels() super.removeAllModels(); // ^^^^^ reference com/airbnb/epoxy/SimpleEpoxyAdapter#super. // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyAdapter#removeAllModels(). @@ -146,7 +146,7 @@ public void removeAllModels() { @Override // ^^^^^^^^ reference java/lang/Override# public void removeAllAfterModel(EpoxyModel model) { -// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#removeAllAfterModel(). public void removeAllAfterModel(EpoxyModel model) +// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#removeAllAfterModel(). @Override public void removeAllAfterModel(EpoxyModel model) // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^ definition local8 EpoxyModel model super.removeAllAfterModel(model); @@ -158,7 +158,7 @@ public void removeAllAfterModel(EpoxyModel model) { @Override // ^^^^^^^^ reference java/lang/Override# public void showModel(EpoxyModel model, boolean show) { -// ^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#showModel(). public void showModel(EpoxyModel model, boolean show) +// ^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#showModel(). @Override public void showModel(EpoxyModel model, boolean show) // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^ definition local9 EpoxyModel model // ^^^^ definition local10 boolean show @@ -172,7 +172,7 @@ public void showModel(EpoxyModel model, boolean show) { @Override // ^^^^^^^^ reference java/lang/Override# public void showModel(EpoxyModel model) { -// ^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#showModel(+1). public void showModel(EpoxyModel model) +// ^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#showModel(+1). @Override public void showModel(EpoxyModel model) // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^ definition local11 EpoxyModel model super.showModel(model); @@ -184,7 +184,7 @@ public void showModel(EpoxyModel model) { @Override // ^^^^^^^^ reference java/lang/Override# public void showModels(EpoxyModel... models) { -// ^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#showModels(). public void showModels(EpoxyModel[] models) +// ^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#showModels(). @Override public void showModels(EpoxyModel[] models) // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^^ definition local12 EpoxyModel[] models super.showModels(models); @@ -196,7 +196,7 @@ public void showModels(EpoxyModel... models) { @Override // ^^^^^^^^ reference java/lang/Override# public void showModels(boolean show, EpoxyModel... models) { -// ^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#showModels(+1). public void showModels(boolean show, EpoxyModel[] models) +// ^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#showModels(+1). @Override public void showModels(boolean show, EpoxyModel[] models) // ^^^^ definition local13 boolean show // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^^ definition local14 EpoxyModel[] models @@ -210,7 +210,7 @@ public void showModels(boolean show, EpoxyModel... models) { @Override // ^^^^^^^^ reference java/lang/Override# public void showModels(Iterable> epoxyModels) { -// ^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#showModels(+2). public void showModels(Iterable> epoxyModels) +// ^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#showModels(+2). @Override public void showModels(Iterable> epoxyModels) // ^^^^^^^^ reference java/lang/Iterable# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^^^^^^^ definition local15 Iterable> epoxyModels @@ -223,7 +223,7 @@ public void showModels(Iterable> epoxyModels) { @Override // ^^^^^^^^ reference java/lang/Override# public void showModels(Iterable> epoxyModels, boolean show) { -// ^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#showModels(+3). public void showModels(Iterable> epoxyModels, boolean show) +// ^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#showModels(+3). @Override public void showModels(Iterable> epoxyModels, boolean show) // ^^^^^^^^ reference java/lang/Iterable# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^^^^^^^ definition local16 Iterable> epoxyModels @@ -238,7 +238,7 @@ public void showModels(Iterable> epoxyModels, boolean show) { @Override // ^^^^^^^^ reference java/lang/Override# public void hideModel(EpoxyModel model) { -// ^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#hideModel(). public void hideModel(EpoxyModel model) +// ^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#hideModel(). @Override public void hideModel(EpoxyModel model) // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^ definition local18 EpoxyModel model super.hideModel(model); @@ -250,7 +250,7 @@ public void hideModel(EpoxyModel model) { @Override // ^^^^^^^^ reference java/lang/Override# public void hideModels(Iterable> epoxyModels) { -// ^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#hideModels(). public void hideModels(Iterable> epoxyModels) +// ^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#hideModels(). @Override public void hideModels(Iterable> epoxyModels) // ^^^^^^^^ reference java/lang/Iterable# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^^^^^^^ definition local19 Iterable> epoxyModels @@ -263,7 +263,7 @@ public void hideModels(Iterable> epoxyModels) { @Override // ^^^^^^^^ reference java/lang/Override# public void hideModels(EpoxyModel... models) { -// ^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#hideModels(+1). public void hideModels(EpoxyModel[] models) +// ^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#hideModels(+1). @Override public void hideModels(EpoxyModel[] models) // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^^ definition local20 EpoxyModel[] models super.hideModels(models); @@ -275,7 +275,7 @@ public void hideModels(EpoxyModel... models) { @Override // ^^^^^^^^ reference java/lang/Override# public void hideAllAfterModel(EpoxyModel model) { -// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#hideAllAfterModel(). public void hideAllAfterModel(EpoxyModel model) +// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#hideAllAfterModel(). @Override public void hideAllAfterModel(EpoxyModel model) // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^ definition local21 EpoxyModel model super.hideAllAfterModel(model); @@ -289,7 +289,7 @@ public void hideAllAfterModel(EpoxyModel model) { public List> getAllModelsAfter(EpoxyModel model) { // ^^^^ reference java/util/List# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#getAllModelsAfter(). public List> getAllModelsAfter(EpoxyModel model) +// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#getAllModelsAfter(). @Override public List> getAllModelsAfter(EpoxyModel model) // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^ definition local22 EpoxyModel model return super.getAllModelsAfter(model); @@ -301,7 +301,7 @@ public List> getAllModelsAfter(EpoxyModel model) { @Override // ^^^^^^^^ reference java/lang/Override# public int getModelPosition(EpoxyModel model) { -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#getModelPosition(). public int getModelPosition(EpoxyModel model) +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#getModelPosition(). @Override public int getModelPosition(EpoxyModel model) // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^ definition local23 EpoxyModel model return super.getModelPosition(model); diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyController.java index 83972b02a..dfa1a89cf 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyController.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyController.java @@ -43,7 +43,7 @@ public void setModels(List> models) { @Override // ^^^^^^^^ reference java/lang/Override# public final void requestModelBuild() { -// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyController#requestModelBuild(). public final void requestModelBuild() +// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyController#requestModelBuild(). @Override public final void requestModelBuild() if (!insideSetModels) { // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/SimpleEpoxyController#insideSetModels. throw new IllegalEpoxyUsage( @@ -59,7 +59,7 @@ public final void requestModelBuild() { @Override // ^^^^^^^^ reference java/lang/Override# protected final void buildModels() { -// ^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyController#buildModels(). protected final void buildModels() +// ^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyController#buildModels(). @Override protected final void buildModels() if (!isBuildingModels()) { // ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#isBuildingModels(). throw new IllegalEpoxyUsage( diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyModel.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyModel.java index b4b18ccc4..020725244 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyModel.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyModel.java @@ -30,7 +30,7 @@ public class SimpleEpoxyModel extends EpoxyModel { // ^^^^ reference _root_/ @LayoutRes private final int layoutRes; // ^^^^^^^^^ reference androidx/annotation/LayoutRes# -// ^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyModel#layoutRes. private final int layoutRes +// ^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyModel#layoutRes. @LayoutRes private final int layoutRes private View.OnClickListener onClickListener; // ^^^^ reference View/ // ^^^^^^^^^^^^^^^ reference View/OnClickListener# @@ -41,7 +41,7 @@ public class SimpleEpoxyModel extends EpoxyModel { public SimpleEpoxyModel(@LayoutRes int layoutRes) { // ^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyModel#``(). public SimpleEpoxyModel(int layoutRes) // ^^^^^^^^^ reference androidx/annotation/LayoutRes# -// ^^^^^^^^^ definition local0 int layoutRes +// ^^^^^^^^^ definition local0 @LayoutRes int layoutRes this.layoutRes = layoutRes; // ^^^^ reference com/airbnb/epoxy/SimpleEpoxyModel# // ^^^^^^^^^ reference com/airbnb/epoxy/SimpleEpoxyModel#layoutRes. @@ -78,10 +78,10 @@ public SimpleEpoxyModel span(int span) { @Override // ^^^^^^^^ reference java/lang/Override# public void bind(@NonNull View view) { -// ^^^^ definition com/airbnb/epoxy/SimpleEpoxyModel#bind(). public void bind(unresolved_type view) +// ^^^^ definition com/airbnb/epoxy/SimpleEpoxyModel#bind(). @CallSuper @Override public void bind(unresolved_type view) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^ reference _root_/ -// ^^^^ definition local3 unresolved_type view +// ^^^^ definition local3 @NonNull unresolved_type view super.bind(view); // ^^^^^ reference com/airbnb/epoxy/SimpleEpoxyModel#super. // ^^^^ reference com/airbnb/epoxy/EpoxyModel#bind(). @@ -101,10 +101,10 @@ public void bind(@NonNull View view) { @Override // ^^^^^^^^ reference java/lang/Override# public void unbind(@NonNull View view) { -// ^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyModel#unbind(). public void unbind(unresolved_type view) +// ^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyModel#unbind(). @CallSuper @Override public void unbind(unresolved_type view) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^ reference _root_/ -// ^^^^ definition local4 unresolved_type view +// ^^^^ definition local4 @NonNull unresolved_type view super.unbind(view); // ^^^^^ reference com/airbnb/epoxy/SimpleEpoxyModel#super. // ^^^^^^ reference com/airbnb/epoxy/EpoxyModel#unbind(). @@ -117,7 +117,7 @@ public void unbind(@NonNull View view) { @Override // ^^^^^^^^ reference java/lang/Override# protected int getDefaultLayout() { -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyModel#getDefaultLayout(). protected int getDefaultLayout() +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyModel#getDefaultLayout(). @Override protected int getDefaultLayout() return layoutRes; // ^^^^^^^^^ reference com/airbnb/epoxy/SimpleEpoxyModel#layoutRes. } @@ -125,7 +125,7 @@ protected int getDefaultLayout() { @Override // ^^^^^^^^ reference java/lang/Override# public int getSpanSize(int totalSpanCount, int position, int itemCount) { -// ^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyModel#getSpanSize(). public int getSpanSize(int totalSpanCount, int position, int itemCount) +// ^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyModel#getSpanSize(). @Override public int getSpanSize(int totalSpanCount, int position, int itemCount) // ^^^^^^^^^^^^^^ definition local5 int totalSpanCount // ^^^^^^^^ definition local6 int position // ^^^^^^^^^ definition local7 int itemCount @@ -136,7 +136,7 @@ public int getSpanSize(int totalSpanCount, int position, int itemCount) { @Override // ^^^^^^^^ reference java/lang/Override# public boolean equals(Object o) { -// ^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyModel#equals(). public boolean equals(Object o) +// ^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyModel#equals(). @Override public boolean equals(Object o) // ^^^^^^ reference java/lang/Object# // ^ definition local8 Object o if (this == o) { @@ -188,7 +188,7 @@ public boolean equals(Object o) { @Override // ^^^^^^^^ reference java/lang/Override# public int hashCode() { -// ^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyModel#hashCode(). public int hashCode() +// ^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyModel#hashCode(). @Override public int hashCode() int result = super.hashCode(); // ^^^^^^ definition local10 int result // ^^^^^ reference com/airbnb/epoxy/SimpleEpoxyModel#super. diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/StringAttributeData.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/StringAttributeData.java index 71e194b2b..ce28a3f51 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/StringAttributeData.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/StringAttributeData.java @@ -30,27 +30,27 @@ public class StringAttributeData { @Nullable private final CharSequence defaultString; // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^^^^^^^ reference java/lang/CharSequence# -// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/StringAttributeData#defaultString. private final CharSequence defaultString +// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/StringAttributeData#defaultString. @Nullable private final CharSequence defaultString @StringRes private final int defaultStringRes; // ^^^^^^^^^ reference androidx/annotation/StringRes# -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/StringAttributeData#defaultStringRes. private final int defaultStringRes +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/StringAttributeData#defaultStringRes. @StringRes private final int defaultStringRes @Nullable private CharSequence string; // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^^^^^^^ reference java/lang/CharSequence# -// ^^^^^^ definition com/airbnb/epoxy/StringAttributeData#string. private CharSequence string +// ^^^^^^ definition com/airbnb/epoxy/StringAttributeData#string. @Nullable private CharSequence string @StringRes private int stringRes; // ^^^^^^^^^ reference androidx/annotation/StringRes# -// ^^^^^^^^^ definition com/airbnb/epoxy/StringAttributeData#stringRes. private int stringRes +// ^^^^^^^^^ definition com/airbnb/epoxy/StringAttributeData#stringRes. @StringRes private int stringRes @PluralsRes private int pluralRes; // ^^^^^^^^^^ reference androidx/annotation/PluralsRes# -// ^^^^^^^^^ definition com/airbnb/epoxy/StringAttributeData#pluralRes. private int pluralRes +// ^^^^^^^^^ definition com/airbnb/epoxy/StringAttributeData#pluralRes. @PluralsRes private int pluralRes private int quantity; // ^^^^^^^^ definition com/airbnb/epoxy/StringAttributeData#quantity. private int quantity @Nullable private Object[] formatArgs; // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^ reference java/lang/Object# -// ^^^^^^^^^^ definition com/airbnb/epoxy/StringAttributeData#formatArgs. private Object[] formatArgs +// ^^^^^^^^^^ definition com/airbnb/epoxy/StringAttributeData#formatArgs. @Nullable private Object[] formatArgs public StringAttributeData() { // ^^^^^^ definition com/airbnb/epoxy/StringAttributeData#``(). public StringAttributeData() @@ -66,7 +66,7 @@ public StringAttributeData(@Nullable CharSequence defaultString) { // ^^^^^^ definition com/airbnb/epoxy/StringAttributeData#``(+1). public StringAttributeData(CharSequence defaultString) // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^^^^^^^ reference java/lang/CharSequence# -// ^^^^^^^^^^^^^ definition local0 CharSequence defaultString +// ^^^^^^^^^^^^^ definition local0 @Nullable CharSequence defaultString hasDefault = true; // ^^^^^^^^^^ reference com/airbnb/epoxy/StringAttributeData#hasDefault. this.defaultString = defaultString; @@ -83,7 +83,7 @@ public StringAttributeData(@Nullable CharSequence defaultString) { public StringAttributeData(@StringRes int defaultStringRes) { // ^^^^^^ definition com/airbnb/epoxy/StringAttributeData#``(+2). public StringAttributeData(int defaultStringRes) // ^^^^^^^^^ reference androidx/annotation/StringRes# -// ^^^^^^^^^^^^^^^^ definition local1 int defaultStringRes +// ^^^^^^^^^^^^^^^^ definition local1 @StringRes int defaultStringRes hasDefault = true; // ^^^^^^^^^^ reference com/airbnb/epoxy/StringAttributeData#hasDefault. this.defaultStringRes = defaultStringRes; @@ -101,7 +101,7 @@ public void setValue(@Nullable CharSequence string) { // ^^^^^^^^ definition com/airbnb/epoxy/StringAttributeData#setValue(). public void setValue(CharSequence string) // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^^^^^^^ reference java/lang/CharSequence# -// ^^^^^^ definition local2 CharSequence string +// ^^^^^^ definition local2 @Nullable CharSequence string this.string = string; // ^^^^ reference com/airbnb/epoxy/StringAttributeData# // ^^^^^^ reference com/airbnb/epoxy/StringAttributeData#string. @@ -115,7 +115,7 @@ public void setValue(@Nullable CharSequence string) { public void setValue(@StringRes int stringRes) { // ^^^^^^^^ definition com/airbnb/epoxy/StringAttributeData#setValue(+1). public void setValue(int stringRes) // ^^^^^^^^^ reference androidx/annotation/StringRes# -// ^^^^^^^^^ definition local3 int stringRes +// ^^^^^^^^^ definition local3 @StringRes int stringRes setValue(stringRes, null); // ^^^^^^^^ reference com/airbnb/epoxy/StringAttributeData#setValue(+2). // ^^^^^^^^^ reference local3 @@ -124,10 +124,10 @@ public void setValue(@StringRes int stringRes) { public void setValue(@StringRes int stringRes, @Nullable Object[] formatArgs) { // ^^^^^^^^ definition com/airbnb/epoxy/StringAttributeData#setValue(+2). public void setValue(int stringRes, Object[] formatArgs) // ^^^^^^^^^ reference androidx/annotation/StringRes# -// ^^^^^^^^^ definition local4 int stringRes +// ^^^^^^^^^ definition local4 @StringRes int stringRes // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^ reference java/lang/Object# -// ^^^^^^^^^^ definition local5 Object[] formatArgs +// ^^^^^^^^^^ definition local5 @Nullable Object[] formatArgs if (stringRes != 0) { // ^^^^^^^^^ reference local4 this.stringRes = stringRes; @@ -172,11 +172,11 @@ private void handleInvalidStringRes() { public void setValue(@PluralsRes int pluralRes, int quantity, @Nullable Object[] formatArgs) { // ^^^^^^^^ definition com/airbnb/epoxy/StringAttributeData#setValue(+3). public void setValue(int pluralRes, int quantity, Object[] formatArgs) // ^^^^^^^^^^ reference androidx/annotation/PluralsRes# -// ^^^^^^^^^ definition local6 int pluralRes +// ^^^^^^^^^ definition local6 @PluralsRes int pluralRes // ^^^^^^^^ definition local7 int quantity // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^ reference java/lang/Object# -// ^^^^^^^^^^ definition local8 Object[] formatArgs +// ^^^^^^^^^^ definition local8 @Nullable Object[] formatArgs if (pluralRes != 0) { // ^^^^^^^^^ reference local6 this.pluralRes = pluralRes; @@ -251,7 +251,7 @@ public CharSequence toString(Context context) { @Override // ^^^^^^^^ reference java/lang/Override# public boolean equals(Object o) { -// ^^^^^^ definition com/airbnb/epoxy/StringAttributeData#equals(). public boolean equals(Object o) +// ^^^^^^ definition com/airbnb/epoxy/StringAttributeData#equals(). @Override public boolean equals(Object o) // ^^^^^^ reference java/lang/Object# // ^ definition local10 Object o if (this == o) { @@ -311,7 +311,7 @@ public boolean equals(Object o) { @Override // ^^^^^^^^ reference java/lang/Override# public int hashCode() { -// ^^^^^^^^ definition com/airbnb/epoxy/StringAttributeData#hashCode(). public int hashCode() +// ^^^^^^^^ definition com/airbnb/epoxy/StringAttributeData#hashCode(). @Override public int hashCode() int result = string != null ? string.hashCode() : 0; // ^^^^^^ definition local12 int result // ^^^^^^ reference com/airbnb/epoxy/StringAttributeData#string. diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/TextProp.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/TextProp.java index b9ce4983e..e554c2fc4 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/TextProp.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/TextProp.java @@ -45,9 +45,9 @@ // ^^^^^^^^^^^^^^^ reference java/lang/annotation/RetentionPolicy# // ^^^^^ reference java/lang/annotation/RetentionPolicy#CLASS. public @interface TextProp { -// ^^^^^^^^ definition com/airbnb/epoxy/TextProp# public @interface TextProp +// ^^^^^^^^ definition com/airbnb/epoxy/TextProp# @Target({ElementType.METHOD, ElementType.FIELD}) @Retention(RetentionPolicy.CLASS) public @interface TextProp @StringRes int defaultRes() default 0; // ^^^^^^^^^ reference androidx/annotation/StringRes# -// ^^^^^^^^^^ definition com/airbnb/epoxy/TextProp#defaultRes(). public abstract int defaultRes() +// ^^^^^^^^^^ definition com/airbnb/epoxy/TextProp#defaultRes(). @StringRes public abstract int defaultRes() } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed2EpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed2EpoxyController.java index f02fdc47d..7743e7341 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed2EpoxyController.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed2EpoxyController.java @@ -79,7 +79,7 @@ public void setData(T data1, U data2) { @Override // ^^^^^^^^ reference java/lang/Override# public final void requestModelBuild() { -// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Typed2EpoxyController#requestModelBuild(). public final void requestModelBuild() +// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Typed2EpoxyController#requestModelBuild(). @Override public final void requestModelBuild() if (!allowModelBuildRequests) { // ^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Typed2EpoxyController#allowModelBuildRequests. throw new IllegalStateException( @@ -96,7 +96,7 @@ public final void requestModelBuild() { @Override // ^^^^^^^^ reference java/lang/Override# public void moveModel(int fromPosition, int toPosition) { -// ^^^^^^^^^ definition com/airbnb/epoxy/Typed2EpoxyController#moveModel(). public void moveModel(int fromPosition, int toPosition) +// ^^^^^^^^^ definition com/airbnb/epoxy/Typed2EpoxyController#moveModel(). @Override public void moveModel(int fromPosition, int toPosition) // ^^^^^^^^^^^^ definition local4 int fromPosition // ^^^^^^^^^^ definition local5 int toPosition allowModelBuildRequests = true; @@ -113,7 +113,7 @@ public void moveModel(int fromPosition, int toPosition) { @Override // ^^^^^^^^ reference java/lang/Override# public void requestDelayedModelBuild(int delayMs) { -// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Typed2EpoxyController#requestDelayedModelBuild(). public void requestDelayedModelBuild(int delayMs) +// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Typed2EpoxyController#requestDelayedModelBuild(). @Override public void requestDelayedModelBuild(int delayMs) // ^^^^^^^ definition local6 int delayMs if (!allowModelBuildRequests) { // ^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Typed2EpoxyController#allowModelBuildRequests. @@ -132,7 +132,7 @@ public void requestDelayedModelBuild(int delayMs) { @Override // ^^^^^^^^ reference java/lang/Override# protected final void buildModels() { -// ^^^^^^^^^^^ definition com/airbnb/epoxy/Typed2EpoxyController#buildModels(). protected final void buildModels() +// ^^^^^^^^^^^ definition com/airbnb/epoxy/Typed2EpoxyController#buildModels(). @Override protected final void buildModels() if (!isBuildingModels()) { // ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#isBuildingModels(). throw new IllegalStateException( diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed3EpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed3EpoxyController.java index f9e005035..36a5906cd 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed3EpoxyController.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed3EpoxyController.java @@ -89,7 +89,7 @@ public void setData(T data1, U data2, V data3) { @Override // ^^^^^^^^ reference java/lang/Override# public final void requestModelBuild() { -// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Typed3EpoxyController#requestModelBuild(). public final void requestModelBuild() +// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Typed3EpoxyController#requestModelBuild(). @Override public final void requestModelBuild() if (!allowModelBuildRequests) { // ^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Typed3EpoxyController#allowModelBuildRequests. throw new IllegalStateException( @@ -106,7 +106,7 @@ public final void requestModelBuild() { @Override // ^^^^^^^^ reference java/lang/Override# public void moveModel(int fromPosition, int toPosition) { -// ^^^^^^^^^ definition com/airbnb/epoxy/Typed3EpoxyController#moveModel(). public void moveModel(int fromPosition, int toPosition) +// ^^^^^^^^^ definition com/airbnb/epoxy/Typed3EpoxyController#moveModel(). @Override public void moveModel(int fromPosition, int toPosition) // ^^^^^^^^^^^^ definition local5 int fromPosition // ^^^^^^^^^^ definition local6 int toPosition allowModelBuildRequests = true; @@ -123,7 +123,7 @@ public void moveModel(int fromPosition, int toPosition) { @Override // ^^^^^^^^ reference java/lang/Override# public void requestDelayedModelBuild(int delayMs) { -// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Typed3EpoxyController#requestDelayedModelBuild(). public void requestDelayedModelBuild(int delayMs) +// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Typed3EpoxyController#requestDelayedModelBuild(). @Override public void requestDelayedModelBuild(int delayMs) // ^^^^^^^ definition local7 int delayMs if (!allowModelBuildRequests) { // ^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Typed3EpoxyController#allowModelBuildRequests. @@ -142,7 +142,7 @@ public void requestDelayedModelBuild(int delayMs) { @Override // ^^^^^^^^ reference java/lang/Override# protected final void buildModels() { -// ^^^^^^^^^^^ definition com/airbnb/epoxy/Typed3EpoxyController#buildModels(). protected final void buildModels() +// ^^^^^^^^^^^ definition com/airbnb/epoxy/Typed3EpoxyController#buildModels(). @Override protected final void buildModels() if (!isBuildingModels()) { // ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#isBuildingModels(). throw new IllegalStateException( diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed4EpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed4EpoxyController.java index 03b95df5f..cad770edd 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed4EpoxyController.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed4EpoxyController.java @@ -99,7 +99,7 @@ public void setData(T data1, U data2, V data3, W data4) { @Override // ^^^^^^^^ reference java/lang/Override# public final void requestModelBuild() { -// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Typed4EpoxyController#requestModelBuild(). public final void requestModelBuild() +// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Typed4EpoxyController#requestModelBuild(). @Override public final void requestModelBuild() if (!allowModelBuildRequests) { // ^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Typed4EpoxyController#allowModelBuildRequests. throw new IllegalStateException( @@ -116,7 +116,7 @@ public final void requestModelBuild() { @Override // ^^^^^^^^ reference java/lang/Override# public void moveModel(int fromPosition, int toPosition) { -// ^^^^^^^^^ definition com/airbnb/epoxy/Typed4EpoxyController#moveModel(). public void moveModel(int fromPosition, int toPosition) +// ^^^^^^^^^ definition com/airbnb/epoxy/Typed4EpoxyController#moveModel(). @Override public void moveModel(int fromPosition, int toPosition) // ^^^^^^^^^^^^ definition local6 int fromPosition // ^^^^^^^^^^ definition local7 int toPosition allowModelBuildRequests = true; @@ -133,7 +133,7 @@ public void moveModel(int fromPosition, int toPosition) { @Override // ^^^^^^^^ reference java/lang/Override# public void requestDelayedModelBuild(int delayMs) { -// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Typed4EpoxyController#requestDelayedModelBuild(). public void requestDelayedModelBuild(int delayMs) +// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Typed4EpoxyController#requestDelayedModelBuild(). @Override public void requestDelayedModelBuild(int delayMs) // ^^^^^^^ definition local8 int delayMs if (!allowModelBuildRequests) { // ^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Typed4EpoxyController#allowModelBuildRequests. @@ -152,7 +152,7 @@ public void requestDelayedModelBuild(int delayMs) { @Override // ^^^^^^^^ reference java/lang/Override# protected final void buildModels() { -// ^^^^^^^^^^^ definition com/airbnb/epoxy/Typed4EpoxyController#buildModels(). protected final void buildModels() +// ^^^^^^^^^^^ definition com/airbnb/epoxy/Typed4EpoxyController#buildModels(). @Override protected final void buildModels() if (!isBuildingModels()) { // ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#isBuildingModels(). throw new IllegalStateException( diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/TypedEpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/TypedEpoxyController.java index e478c647a..e16baf2a8 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/TypedEpoxyController.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/TypedEpoxyController.java @@ -67,7 +67,7 @@ public final void setData(T data) { @Override // ^^^^^^^^ reference java/lang/Override# public final void requestModelBuild() { -// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/TypedEpoxyController#requestModelBuild(). public final void requestModelBuild() +// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/TypedEpoxyController#requestModelBuild(). @Override public final void requestModelBuild() if (!allowModelBuildRequests) { // ^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/TypedEpoxyController#allowModelBuildRequests. throw new IllegalStateException( @@ -84,7 +84,7 @@ public final void requestModelBuild() { @Override // ^^^^^^^^ reference java/lang/Override# public void moveModel(int fromPosition, int toPosition) { -// ^^^^^^^^^ definition com/airbnb/epoxy/TypedEpoxyController#moveModel(). public void moveModel(int fromPosition, int toPosition) +// ^^^^^^^^^ definition com/airbnb/epoxy/TypedEpoxyController#moveModel(). @Override public void moveModel(int fromPosition, int toPosition) // ^^^^^^^^^^^^ definition local3 int fromPosition // ^^^^^^^^^^ definition local4 int toPosition allowModelBuildRequests = true; @@ -101,7 +101,7 @@ public void moveModel(int fromPosition, int toPosition) { @Override // ^^^^^^^^ reference java/lang/Override# public void requestDelayedModelBuild(int delayMs) { -// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/TypedEpoxyController#requestDelayedModelBuild(). public void requestDelayedModelBuild(int delayMs) +// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/TypedEpoxyController#requestDelayedModelBuild(). @Override public void requestDelayedModelBuild(int delayMs) // ^^^^^^^ definition local5 int delayMs if (!allowModelBuildRequests) { // ^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/TypedEpoxyController#allowModelBuildRequests. @@ -121,7 +121,7 @@ public void requestDelayedModelBuild(int delayMs) { // ^^^^^^^^ reference androidx/annotation/Nullable# public final T getCurrentData() { // ^ reference com/airbnb/epoxy/TypedEpoxyController#[T] -// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/TypedEpoxyController#getCurrentData(). public final T getCurrentData() +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/TypedEpoxyController#getCurrentData(). @Nullable public final T getCurrentData() return currentData; // ^^^^^^^^^^^ reference com/airbnb/epoxy/TypedEpoxyController#currentData. } @@ -129,7 +129,7 @@ public final T getCurrentData() { @Override // ^^^^^^^^ reference java/lang/Override# protected final void buildModels() { -// ^^^^^^^^^^^ definition com/airbnb/epoxy/TypedEpoxyController#buildModels(). protected final void buildModels() +// ^^^^^^^^^^^ definition com/airbnb/epoxy/TypedEpoxyController#buildModels(). @Override protected final void buildModels() if (!isBuildingModels()) { // ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#isBuildingModels(). throw new IllegalStateException( diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOp.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOp.java index e4c37416b..d7e45091e 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOp.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOp.java @@ -40,7 +40,7 @@ class UpdateOp { // ^^^^^^^^^^^^^^^ reference java/lang/annotation/RetentionPolicy# // ^^^^^^ reference java/lang/annotation/RetentionPolicy#SOURCE. @interface Type { -// ^^^^ definition com/airbnb/epoxy/UpdateOp#Type# @interface Type +// ^^^^ definition com/airbnb/epoxy/UpdateOp#Type# @IntDef({ADD, REMOVE, UPDATE, MOVE}) @Retention(RetentionPolicy.SOURCE) @interface Type } static final int ADD = 0; @@ -54,7 +54,7 @@ class UpdateOp { @Type int type; // ^^^^ reference com/airbnb/epoxy/UpdateOp#Type# -// ^^^^ definition com/airbnb/epoxy/UpdateOp#type. int type +// ^^^^ definition com/airbnb/epoxy/UpdateOp#type. @Type int type int positionStart; // ^^^^^^^^^^^^^ definition com/airbnb/epoxy/UpdateOp#positionStart. int positionStart /** Holds the target position if this is a MOVE */ @@ -73,13 +73,13 @@ static UpdateOp instance(@Type int type, int positionStart, int itemCount, // ^^^^^^^^ reference com/airbnb/epoxy/UpdateOp# // ^^^^^^^^ definition com/airbnb/epoxy/UpdateOp#instance(). static UpdateOp instance(int type, int positionStart, int itemCount, EpoxyModel payload) // ^^^^ reference com/airbnb/epoxy/UpdateOp#Type# -// ^^^^ definition local0 int type +// ^^^^ definition local0 @Type int type // ^^^^^^^^^^^^^ definition local1 int positionStart // ^^^^^^^^^ definition local2 int itemCount @Nullable EpoxyModel payload) { // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^ definition local3 EpoxyModel payload +// ^^^^^^^ definition local3 @Nullable EpoxyModel payload UpdateOp op = new UpdateOp(); // ^^^^^^^^ reference com/airbnb/epoxy/UpdateOp# // ^^ definition local4 UpdateOp op @@ -146,7 +146,7 @@ void addPayload(@Nullable EpoxyModel payload) { // ^^^^^^^^^^ definition com/airbnb/epoxy/UpdateOp#addPayload(). void addPayload(EpoxyModel payload) // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^ definition local8 EpoxyModel payload +// ^^^^^^^ definition local8 @Nullable EpoxyModel payload if (payload == null) { // ^^^^^^^ reference local8 return; @@ -179,7 +179,7 @@ void addPayload(@Nullable EpoxyModel payload) { // ^^^^^^^^ reference java/lang/Override# public String toString() { // ^^^^^^ reference java/lang/String# -// ^^^^^^^^ definition com/airbnb/epoxy/UpdateOp#toString(). public String toString() +// ^^^^^^^^ definition com/airbnb/epoxy/UpdateOp#toString(). @Override public String toString() return "UpdateOp{" + "type=" + type // ^^^^ reference com/airbnb/epoxy/UpdateOp#type. diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOpHelper.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOpHelper.java index af4d7b003..0fa829341 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOpHelper.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOpHelper.java @@ -269,7 +269,7 @@ private boolean isLastOp(@UpdateOp.Type int updateType) { // ^^^^^^^^ definition com/airbnb/epoxy/UpdateOpHelper#isLastOp(). private boolean isLastOp(int updateType) // ^^^^^^^^ reference com/airbnb/epoxy/UpdateOp# // ^^^^ reference com/airbnb/epoxy/UpdateOp#Type# -// ^^^^^^^^^^ definition local11 int updateType +// ^^^^^^^^^^ definition local11 @Type int updateType return lastOp != null && lastOp.type == updateType; // ^^^^^^ reference com/airbnb/epoxy/UpdateOpHelper#lastOp. // ^^^^^^ reference com/airbnb/epoxy/UpdateOpHelper#lastOp. @@ -280,7 +280,7 @@ private boolean isLastOp(@UpdateOp.Type int updateType) { private void addNewOperation(@Type int type, int position, int itemCount) { // ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/UpdateOpHelper#addNewOperation(). private void addNewOperation(int type, int position, int itemCount) // ^^^^ reference com/airbnb/epoxy/UpdateOp#Type# -// ^^^^ definition local12 int type +// ^^^^ definition local12 @Type int type // ^^^^^^^^ definition local13 int position // ^^^^^^^^^ definition local14 int itemCount addNewOperation(type, position, itemCount, null); @@ -293,13 +293,13 @@ private void addNewOperation(@Type int type, int position, int itemCount) { private void addNewOperation(@Type int type, int position, int itemCount, // ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/UpdateOpHelper#addNewOperation(+1). private void addNewOperation(int type, int position, int itemCount, EpoxyModel payload) // ^^^^ reference com/airbnb/epoxy/UpdateOp#Type# -// ^^^^ definition local15 int type +// ^^^^ definition local15 @Type int type // ^^^^^^^^ definition local16 int position // ^^^^^^^^^ definition local17 int itemCount @Nullable EpoxyModel payload) { // ^^^^^^^^ reference androidx/annotation/Nullable# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^ definition local18 EpoxyModel payload +// ^^^^^^^ definition local18 @Nullable EpoxyModel payload lastOp = UpdateOp.instance(type, position, itemCount, payload); // ^^^^^^ reference com/airbnb/epoxy/UpdateOpHelper#lastOp. // ^^^^^^^^ reference com/airbnb/epoxy/UpdateOp# diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewHolderState.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewHolderState.java index 8a387d931..dc1444a62 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewHolderState.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewHolderState.java @@ -59,7 +59,7 @@ @SuppressWarnings("WeakerAccess") //^^^^^^^^^^^^^^^ reference java/lang/SuppressWarnings# class ViewHolderState extends LongSparseArray implements Parcelable { -// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ViewHolderState# class ViewHolderState extends LongSparseArray implements unresolved_type +// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ViewHolderState# @SuppressWarnings("WeakerAccess") class ViewHolderState extends LongSparseArray implements unresolved_type // ^^^^^^^^^^^^^^^ reference androidx/collection/LongSparseArray# // ^^^^^^^^^ reference com/airbnb/epoxy/ViewHolderState#ViewState# // ^^^^^^^^^^ reference _root_/ @@ -78,14 +78,14 @@ private ViewHolderState(int size) { @Override // ^^^^^^^^ reference java/lang/Override# public int describeContents() { -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ViewHolderState#describeContents(). public int describeContents() +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ViewHolderState#describeContents(). @Override public int describeContents() return 0; } @Override // ^^^^^^^^ reference java/lang/Override# public void writeToParcel(Parcel dest, int flags) { -// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/ViewHolderState#writeToParcel(). public void writeToParcel(unresolved_type dest, int flags) +// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/ViewHolderState#writeToParcel(). @Override public void writeToParcel(unresolved_type dest, int flags) // ^^^^^^ reference _root_/ // ^^^^ definition local1 unresolved_type dest // ^^^^^ definition local2 int flags @@ -388,14 +388,14 @@ private void setIdIfNoneExists(View view) { @Override // ^^^^^^^^ reference java/lang/Override# public int describeContents() { -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ViewHolderState#ViewState#describeContents(). public int describeContents() +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ViewHolderState#ViewState#describeContents(). @Override public int describeContents() return 0; } @Override // ^^^^^^^^ reference java/lang/Override# public void writeToParcel(Parcel parcel, int flags) { -// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/ViewHolderState#ViewState#writeToParcel(). public void writeToParcel(unresolved_type parcel, int flags) +// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/ViewHolderState#ViewState#writeToParcel(). @Override public void writeToParcel(unresolved_type parcel, int flags) // ^^^^^^ reference _root_/ // ^^^^^^ definition local31 unresolved_type parcel // ^^^^^ definition local32 int flags @@ -457,7 +457,7 @@ public void writeToParcel(Parcel parcel, int flags) { // ^^^^^^^^ reference java/lang/Override# public ViewState createFromParcel(Parcel source, ClassLoader loader) { // ^^^^^^^^^ reference com/airbnb/epoxy/ViewHolderState#ViewState# -// ^^^^^^^^^^^^^^^^ definition local38 public ViewState createFromParcel(unresolved_type source, ClassLoader loader) +// ^^^^^^^^^^^^^^^^ definition local38 @Override public ViewState createFromParcel(unresolved_type source, ClassLoader loader) // ^^^^^^ reference _root_/ // ^^^^^^ definition local41 unresolved_type source // ^^^^^^^^^^^ reference java/lang/ClassLoader# @@ -491,7 +491,7 @@ public ViewState createFromParcel(Parcel source, ClassLoader loader) { // ^^^^^^^^ reference java/lang/Override# public ViewState createFromParcel(Parcel source) { // ^^^^^^^^^ reference com/airbnb/epoxy/ViewHolderState#ViewState# -// ^^^^^^^^^^^^^^^^ definition local39 public ViewState createFromParcel(unresolved_type source) +// ^^^^^^^^^^^^^^^^ definition local39 @Override public ViewState createFromParcel(unresolved_type source) // ^^^^^^ reference _root_/ // ^^^^^^ definition local46 unresolved_type source return createFromParcel(source, null); @@ -503,7 +503,7 @@ public ViewState createFromParcel(Parcel source) { // ^^^^^^^^ reference java/lang/Override# public ViewState[] newArray(int size) { // ^^^^^^^^^ reference com/airbnb/epoxy/ViewHolderState#ViewState# -// ^^^^^^^^ definition local40 public ViewState[] newArray(int size) +// ^^^^^^^^ definition local40 @Override public ViewState[] newArray(int size) // ^^^^ definition local47 int size return new ViewState[size]; // ^^^^^^^^^ reference com/airbnb/epoxy/ViewHolderState#ViewState# diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewTypeManager.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewTypeManager.java index 87eb1c9a1..7c2788d5d 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewTypeManager.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewTypeManager.java @@ -36,7 +36,7 @@ class ViewTypeManager { // ^^^^^^^^ reference androidx/annotation/Nullable# EpoxyModel lastModelForViewTypeLookup; //^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ViewTypeManager#lastModelForViewTypeLookup. EpoxyModel lastModelForViewTypeLookup +// ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ViewTypeManager#lastModelForViewTypeLookup. @Nullable EpoxyModel lastModelForViewTypeLookup /** * The type map is static so that models of the same class share the same views across different @@ -47,7 +47,7 @@ class ViewTypeManager { @VisibleForTesting // ^^^^^^^^^^^^^^^^^ reference androidx/annotation/VisibleForTesting# void resetMapForTesting() { -// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ViewTypeManager#resetMapForTesting(). void resetMapForTesting() +// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ViewTypeManager#resetMapForTesting(). @VisibleForTesting void resetMapForTesting() VIEW_TYPE_MAP.clear(); // ^^^^^^^^^^^^^ reference com/airbnb/epoxy/ViewTypeManager#VIEW_TYPE_MAP. // ^^^^^ reference java/util/Map#clear(). diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/VisibilityState.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/VisibilityState.java index caa445d79..5557f5241 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/VisibilityState.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/VisibilityState.java @@ -40,7 +40,7 @@ public final class VisibilityState { PARTIAL_IMPRESSION_INVISIBLE}) // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/VisibilityState#PARTIAL_IMPRESSION_INVISIBLE. public @interface Visibility { -// ^^^^^^^^^^ definition com/airbnb/epoxy/VisibilityState#Visibility# public @interface Visibility +// ^^^^^^^^^^ definition com/airbnb/epoxy/VisibilityState#Visibility# @Retention(RetentionPolicy.SOURCE) @IntDef({VISIBLE, INVISIBLE, FOCUSED_VISIBLE, UNFOCUSED_VISIBLE, FULL_IMPRESSION_VISIBLE, PARTIAL_IMPRESSION_VISIBLE, PARTIAL_IMPRESSION_INVISIBLE}) public @interface Visibility } /** diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener.java index 7203ce19d..e9fcf888d 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener.java @@ -58,7 +58,7 @@ public WrappedEpoxyModelCheckedChangeListener( @Override // ^^^^^^^^ reference java/lang/Override# public void onCheckedChanged(CompoundButton button, boolean isChecked) { -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#onCheckedChanged(). public void onCheckedChanged(unresolved_type button, boolean isChecked) +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#onCheckedChanged(). @Override public void onCheckedChanged(unresolved_type button, boolean isChecked) // ^^^^^^^^^^^^^^ reference _root_/ // ^^^^^^ definition local1 unresolved_type button // ^^^^^^^^^ definition local2 boolean isChecked @@ -107,7 +107,7 @@ public void onCheckedChanged(CompoundButton button, boolean isChecked) { @Override // ^^^^^^^^ reference java/lang/Override# public boolean equals(Object o) { -// ^^^^^^ definition com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#equals(). public boolean equals(Object o) +// ^^^^^^ definition com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#equals(). @Override public boolean equals(Object o) // ^^^^^^ reference java/lang/Object# // ^ definition local5 Object o if (this == o) { @@ -138,7 +138,7 @@ public boolean equals(Object o) { @Override // ^^^^^^^^ reference java/lang/Override# public int hashCode() { -// ^^^^^^^^ definition com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#hashCode(). public int hashCode() +// ^^^^^^^^ definition com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#hashCode(). @Override public int hashCode() return originalCheckedChangeListener.hashCode(); // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#originalCheckedChangeListener. // ^^^^^^^^ reference java/lang/Object#hashCode(). diff --git a/tests/snapshots/src/main/generated/minimized/Annotations.java b/tests/snapshots/src/main/generated/minimized/Annotations.java index 248cc51be..5d6fb8e14 100644 --- a/tests/snapshots/src/main/generated/minimized/Annotations.java +++ b/tests/snapshots/src/main/generated/minimized/Annotations.java @@ -33,18 +33,25 @@ //^^^^^^^^ reference java/lang/annotation/Retention# // ^^^^^^^^^^^^^^^ reference java/lang/annotation/RetentionPolicy# // ^^^^^^^ reference java/lang/annotation/RetentionPolicy#RUNTIME. -@Target(value = {CONSTRUCTOR, FIELD, LOCAL_VARIABLE, METHOD, PACKAGE, PARAMETER, TYPE}) +@Target(value = {CONSTRUCTOR, //^^^^^ reference java/lang/annotation/Target# // ^^^^^ reference java/lang/annotation/Target#value(). // ^^^^^^^^^^^ reference java/lang/annotation/ElementType#CONSTRUCTOR. -// ^^^^^ reference java/lang/annotation/ElementType#FIELD. -// ^^^^^^^^^^^^^^ reference java/lang/annotation/ElementType#LOCAL_VARIABLE. -// ^^^^^^ reference java/lang/annotation/ElementType#METHOD. -// ^^^^^^^ reference java/lang/annotation/ElementType#PACKAGE. -// ^^^^^^^^^ reference java/lang/annotation/ElementType#PARAMETER. -// ^^^^ reference java/lang/annotation/ElementType#TYPE. + FIELD, +// ^^^^^ reference java/lang/annotation/ElementType#FIELD. + LOCAL_VARIABLE, +// ^^^^^^^^^^^^^^ reference java/lang/annotation/ElementType#LOCAL_VARIABLE. + METHOD, +// ^^^^^^ reference java/lang/annotation/ElementType#METHOD. + PACKAGE, +// ^^^^^^^ reference java/lang/annotation/ElementType#PACKAGE. + PARAMETER, +// ^^^^^^^^^ reference java/lang/annotation/ElementType#PARAMETER. + TYPE} +// ^^^^ reference java/lang/annotation/ElementType#TYPE. +) public @interface Annotations { -// ^^^^^^^^^^^ definition minimized/Annotations# public @interface Annotations +// ^^^^^^^^^^^ definition minimized/Annotations# @Documented @Retention(RetentionPolicy.RUNTIME) @Target({CONSTRUCTOR, FIELD, LOCAL_VARIABLE, METHOD, PACKAGE, PARAMETER, TYPE}) public @interface Annotations String value() default ""; //^^^^^^ reference java/lang/String# @@ -53,4 +60,4 @@ String format() default ""; //^^^^^^ reference java/lang/String# // ^^^^^^ definition minimized/Annotations#format(). public abstract String format() -} +} \ No newline at end of file diff --git a/tests/snapshots/src/main/generated/minimized/AnonymousClasses.java b/tests/snapshots/src/main/generated/minimized/AnonymousClasses.java index 53ad97171..a70796ced 100644 --- a/tests/snapshots/src/main/generated/minimized/AnonymousClasses.java +++ b/tests/snapshots/src/main/generated/minimized/AnonymousClasses.java @@ -9,7 +9,7 @@ @SuppressWarnings("ALL") //^^^^^^^^^^^^^^^ reference java/lang/SuppressWarnings# public class AnonymousClasses { -// ^^^^^^^^^^^^^^^^ definition minimized/AnonymousClasses# public class AnonymousClasses +// ^^^^^^^^^^^^^^^^ definition minimized/AnonymousClasses# @SuppressWarnings("ALL") public class AnonymousClasses // ^^^^^^^^^^^^^^^^ definition minimized/AnonymousClasses#``(). public AnonymousClasses() public static int app(int n) { // ^^^ definition minimized/AnonymousClasses#app(). public static int app(int n) @@ -31,7 +31,7 @@ public static int app(int n) { // ^^^^^^^^ reference java/lang/Override# public Integer apply(Integer integer) { // ^^^^^^^ reference java/lang/Integer# -// ^^^^^ definition local4 public Integer apply(Integer integer) +// ^^^^^ definition local4 @Override public Integer apply(Integer integer) // ^^^^^^^ reference java/lang/Integer# // ^^^^^^^ definition local5 Integer integer return integer + n; diff --git a/tests/snapshots/src/main/generated/minimized/InnerClasses.java b/tests/snapshots/src/main/generated/minimized/InnerClasses.java index 32fb9cdc6..75f6bb741 100644 --- a/tests/snapshots/src/main/generated/minimized/InnerClasses.java +++ b/tests/snapshots/src/main/generated/minimized/InnerClasses.java @@ -75,7 +75,7 @@ public void innerMethod() { // ^^^^^^^^ reference java/lang/Override# public Integer apply(Integer integer) { // ^^^^^^^ reference java/lang/Integer# -// ^^^^^ definition minimized/InnerClasses#InnerClass#apply(). public Integer apply(Integer integer) +// ^^^^^ definition minimized/InnerClasses#InnerClass#apply(). @Override public Integer apply(Integer integer) // ^^^^^^^ reference java/lang/Integer# // ^^^^^^^ definition local3 Integer integer return field * integer; @@ -173,7 +173,7 @@ public static void testAnon() { // ^^^^^^^^ reference java/lang/Override# public String apply(String s) { // ^^^^^^ reference java/lang/String# -// ^^^^^ definition local10 public String apply(String s) +// ^^^^^ definition local10 @Override public String apply(String s) // ^^^^^^ reference java/lang/String# // ^ definition local11 String s return s + "b"; diff --git a/tests/snapshots/src/main/generated/minimized/MinimizedJavaMain.java b/tests/snapshots/src/main/generated/minimized/MinimizedJavaMain.java index 5bcfefb16..d97c96ab4 100644 --- a/tests/snapshots/src/main/generated/minimized/MinimizedJavaMain.java +++ b/tests/snapshots/src/main/generated/minimized/MinimizedJavaMain.java @@ -5,7 +5,7 @@ // ^^^^^ reference minimized/Annotations#value(). // ^^^^^^ reference minimized/Annotations#format(). public class MinimizedJavaMain { -// ^^^^^^^^^^^^^^^^^ definition minimized/MinimizedJavaMain# public class MinimizedJavaMain +// ^^^^^^^^^^^^^^^^^ definition minimized/MinimizedJavaMain# @Annotations(value = "value", format = "format") public class MinimizedJavaMain // ^^^^^^^^^^^^^^^^^ definition minimized/MinimizedJavaMain#``(). public MinimizedJavaMain() public static void main(String[] args) { // ^^^^ definition minimized/MinimizedJavaMain#main(). public static void main(String[] args) diff --git a/tests/snapshots/src/main/generated/minimized/RawTypes.java b/tests/snapshots/src/main/generated/minimized/RawTypes.java index 124e80a60..949b8db52 100644 --- a/tests/snapshots/src/main/generated/minimized/RawTypes.java +++ b/tests/snapshots/src/main/generated/minimized/RawTypes.java @@ -12,7 +12,7 @@ @SuppressWarnings("ALL") //^^^^^^^^^^^^^^^ reference java/lang/SuppressWarnings# public class RawTypes { -// ^^^^^^^^ definition minimized/RawTypes# public class RawTypes +// ^^^^^^^^ definition minimized/RawTypes# @SuppressWarnings("ALL") public class RawTypes // ^^^^^^^^ definition minimized/RawTypes#``(). public RawTypes() public static final List x = Collections.singletonList(42); // ^^^^ reference java/util/List# diff --git a/tests/snapshots/src/main/generated/minimized/SubClasses.java b/tests/snapshots/src/main/generated/minimized/SubClasses.java index 5eee21343..4b985a44e 100644 --- a/tests/snapshots/src/main/generated/minimized/SubClasses.java +++ b/tests/snapshots/src/main/generated/minimized/SubClasses.java @@ -10,7 +10,7 @@ public class SubClasses extends AbstractClasses implements Interfaces { // ^^^^^^^^ reference java/lang/Override# public String abstractImplementation() { // ^^^^^^ reference java/lang/String# -// ^^^^^^^^^^^^^^^^^^^^^^ definition minimized/SubClasses#abstractImplementation(). public String abstractImplementation() +// ^^^^^^^^^^^^^^^^^^^^^^ definition minimized/SubClasses#abstractImplementation(). @Override public String abstractImplementation() return "abstract"; } @@ -18,7 +18,7 @@ public String abstractImplementation() { // ^^^^^^^^ reference java/lang/Override# public String abstractInterfaceMethod() { // ^^^^^^ reference java/lang/String# -// ^^^^^^^^^^^^^^^^^^^^^^^ definition minimized/SubClasses#abstractInterfaceMethod(). public String abstractInterfaceMethod() +// ^^^^^^^^^^^^^^^^^^^^^^^ definition minimized/SubClasses#abstractInterfaceMethod(). @Override public String abstractInterfaceMethod() return "abstractInterface"; }