From 0287ac0eaadbd36e4cdc568a7ef1e7fceefc2ec0 Mon Sep 17 00:00:00 2001 From: Noah Santschi-Cooney Date: Wed, 21 Apr 2021 15:40:42 +0100 Subject: [PATCH 1/2] minor fix to interface and interface method signatures --- .../lsif_semanticdb/SignatureFormatter.java | 11 ++++++++--- .../com/airbnb/epoxy/AsyncEpoxyDiffer.java | 4 ++-- .../com/airbnb/epoxy/BaseEpoxyTouchCallback.java | 6 +++--- .../com/airbnb/epoxy/EpoxyAttribute.java | 6 +++--- .../com/airbnb/epoxy/EpoxyController.java | 14 +++++++------- .../airbnb/epoxy/EpoxyDataBindingLayouts.java | 4 ++-- .../airbnb/epoxy/EpoxyDataBindingPattern.java | 6 +++--- .../com/airbnb/epoxy/EpoxyDragCallback.java | 8 ++++---- .../generated/com/airbnb/epoxy/EpoxyModel.java | 8 ++++---- .../com/airbnb/epoxy/EpoxyModelClass.java | 4 ++-- .../com/airbnb/epoxy/EpoxyModelGroup.java | 4 ++-- .../com/airbnb/epoxy/EpoxySwipeCallback.java | 10 +++++----- .../com/airbnb/epoxy/GeneratedModel.java | 6 +++--- .../generated/com/airbnb/epoxy/ModelList.java | 6 +++--- .../generated/com/airbnb/epoxy/ModelProp.java | 8 ++++---- .../generated/com/airbnb/epoxy/ModelView.java | 10 +++++----- .../com/airbnb/epoxy/OnModelBoundListener.java | 4 ++-- .../epoxy/OnModelBuildFinishedListener.java | 4 ++-- .../epoxy/OnModelCheckedChangeListener.java | 4 ++-- .../com/airbnb/epoxy/OnModelClickListener.java | 4 ++-- .../airbnb/epoxy/OnModelLongClickListener.java | 4 ++-- .../com/airbnb/epoxy/OnModelUnboundListener.java | 4 ++-- .../epoxy/OnModelVisibilityChangedListener.java | 4 ++-- .../OnModelVisibilityStateChangedListener.java | 4 ++-- .../com/airbnb/epoxy/PackageEpoxyConfig.java | 6 +++--- .../com/airbnb/epoxy/PackageModelViewConfig.java | 16 ++++++++-------- .../com/airbnb/epoxy/StyleBuilderCallback.java | 4 ++-- .../generated/com/airbnb/epoxy/TextProp.java | 2 +- .../main/generated/com/airbnb/epoxy/Timer.java | 6 +++--- .../main/generated/minimized/Annotations.java | 4 ++-- .../main/generated/minimized/InnerClasses.java | 4 ++-- .../src/main/generated/minimized/Interfaces.java | 6 +++--- .../main/generated/minimized/TypeVariables.java | 4 ++-- 33 files changed, 102 insertions(+), 97 deletions(-) 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 f0e1d0f4..b838f98f 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 @@ -52,11 +52,12 @@ private void formatClassSignature(ClassSignature classSignature) { .anyMatch(t -> t.getTypeRef().getSymbol().equals(ANNOTATION_SYMBOL)); boolean isEnum = has(Property.ENUM); + boolean isInterface = symbolInformation.getKind() == SymbolInformation.Kind.INTERFACE; printKeywordln(formatAnnotations()); printKeyword(formatAccess()); - if (!isEnum && !isAnnotation) printKeyword(formatModifiers()); + if (!isEnum && !isAnnotation && !isInterface) printKeyword(formatModifiers()); switch (symbolInformation.getKind()) { case CLASS: @@ -149,7 +150,12 @@ private void formatClassSignature(ClassSignature classSignature) { private void formatMethodSignature(MethodSignature methodSignature) { printKeywordln(formatAnnotations()); printKeyword(formatAccess()); - printKeyword(formatModifiers()); + + String owner = SymbolDescriptor.parseFromSymbol(symbolInformation.getSymbol()).owner; + SymbolInformation ownerSymbol = + symtab.symbols.get(SymbolDescriptor.parseFromSymbol(symbolInformation.getSymbol()).owner); + if (ownerSymbol != null && ownerSymbol.getKind() != SymbolInformation.Kind.INTERFACE) + printKeyword(formatModifiers()); List typeParameters = getSymlinks(methodSignature.getTypeParameters()); if (!typeParameters.isEmpty()) { @@ -163,7 +169,6 @@ private void formatMethodSignature(MethodSignature methodSignature) { printKeyword(formatType(methodSignature.getReturnType())); s.append(symbolInformation.getDisplayName()); } else { - String owner = SymbolDescriptor.parseFromSymbol(symbolInformation.getSymbol()).owner; // Fix for https://github.com/sourcegraph/lsif-java/issues/150 if (!owner.equals(SemanticdbSymbols.NONE)) { s.append(SymbolDescriptor.parseFromSymbol(owner).descriptor.name); 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 4e7c9e6c..442f576d 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyDiffer.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyDiffer.java @@ -53,9 +53,9 @@ class AsyncEpoxyDiffer { // ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer# class AsyncEpoxyDiffer interface ResultCallback { -// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#ResultCallback# abstract static interface ResultCallback +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#ResultCallback# interface ResultCallback void onResult(@NonNull DiffResult result); -// ^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#ResultCallback#onResult(). public abstract void onResult(DiffResult result) +// ^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#ResultCallback#onResult(). public void onResult(DiffResult result) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^ reference com/airbnb/epoxy/DiffResult# // ^^^^^^ definition local0 @NonNull DiffResult result diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyTouchCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyTouchCallback.java index d6f98c39..02fd3b05 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyTouchCallback.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyTouchCallback.java @@ -6,7 +6,7 @@ // ^^^^ reference android/view/View# interface BaseEpoxyTouchCallback { -// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyTouchCallback# abstract interface BaseEpoxyTouchCallback +// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyTouchCallback# interface BaseEpoxyTouchCallback // ^ definition com/airbnb/epoxy/BaseEpoxyTouchCallback#[T] T extends EpoxyModel // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# @@ -21,7 +21,7 @@ interface BaseEpoxyTouchCallback { * @see androidx.recyclerview.widget.ItemTouchHelper.Callback#getMovementFlags */ int getMovementFlagsForModel(T model, int adapterPosition); -// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyTouchCallback#getMovementFlagsForModel(). public abstract int getMovementFlagsForModel(T model, int adapterPosition) +// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyTouchCallback#getMovementFlagsForModel(). public int getMovementFlagsForModel(T model, int adapterPosition) // ^ reference com/airbnb/epoxy/BaseEpoxyTouchCallback#[T] // ^^^^^ definition local0 T model // ^^^^^^^^^^^^^^^ definition local1 int adapterPosition @@ -37,7 +37,7 @@ interface BaseEpoxyTouchCallback { * @param itemView The view being cleared. */ void clearView(T model, View itemView); -// ^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyTouchCallback#clearView(). public abstract void clearView(T model, unresolved_type itemView) +// ^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyTouchCallback#clearView(). public void clearView(T model, unresolved_type itemView) // ^ reference com/airbnb/epoxy/BaseEpoxyTouchCallback#[T] // ^^^^^ definition local2 T model // ^^^^ reference _root_/ 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 c10a0b6b..4eb5fe78 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAttribute.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAttribute.java @@ -104,7 +104,7 @@ enum Option { // ^^^^^^ reference com/airbnb/epoxy/EpoxyAttribute#Option#``(). Option[] value() default {}; //^^^^^^ reference com/airbnb/epoxy/EpoxyAttribute#Option# -// ^^^^^ definition com/airbnb/epoxy/EpoxyAttribute#value(). public abstract Option[] value() +// ^^^^^ definition com/airbnb/epoxy/EpoxyAttribute#value(). public Option[] value() /** * Whether or not to include this attribute in equals and hashCode calculations. @@ -117,7 +117,7 @@ enum Option { @Deprecated // ^^^^^^^^^^ reference java/lang/Deprecated# boolean hash() default true; -// ^^^^ definition com/airbnb/epoxy/EpoxyAttribute#hash(). @Deprecated public abstract boolean hash() +// ^^^^ definition com/airbnb/epoxy/EpoxyAttribute#hash(). @Deprecated public boolean hash() /** * Whether or not to generate setter for this attribute. @@ -130,5 +130,5 @@ enum Option { @Deprecated // ^^^^^^^^^^ reference java/lang/Deprecated# boolean setter() default true; -// ^^^^^^ definition com/airbnb/epoxy/EpoxyAttribute#setter(). @Deprecated public abstract boolean setter() +// ^^^^^^ definition com/airbnb/epoxy/EpoxyAttribute#setter(). @Deprecated public 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 f805f617..e57a3133 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java @@ -670,13 +670,13 @@ void addAfterInterceptorCallback(ModelInterceptorCallback callback) { * to allow changes. */ interface ModelInterceptorCallback { -// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback# abstract static interface ModelInterceptorCallback +// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback# interface ModelInterceptorCallback void onInterceptorsStarted(EpoxyController controller); -// ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#onInterceptorsStarted(). public abstract void onInterceptorsStarted(EpoxyController controller) +// ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#onInterceptorsStarted(). public void onInterceptorsStarted(EpoxyController controller) // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController# // ^^^^^^^^^^ definition local18 EpoxyController controller void onInterceptorsFinished(EpoxyController controller); -// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#onInterceptorsFinished(). public abstract void onInterceptorsFinished(EpoxyController controller) +// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#onInterceptorsFinished(). public void onInterceptorsFinished(EpoxyController controller) // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController# // ^^^^^^^^^^ definition local19 EpoxyController controller } @@ -738,7 +738,7 @@ private void runInterceptors() { /** A callback that is run after {@link #buildModels()} completes and before diffing is run. */ public interface Interceptor { -// ^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#Interceptor# public abstract static interface Interceptor +// ^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#Interceptor# public interface Interceptor /** * This is called immediately after {@link #buildModels()} and before diffing is run and the * models are set on the adapter. This is a final chance to make any changes to the the models @@ -750,7 +750,7 @@ public interface Interceptor { * exception. */ void intercept(@NonNull List> models); -// ^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#Interceptor#intercept(). public abstract void intercept(List> models) +// ^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#Interceptor#intercept(). public void intercept(List> models) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^ reference java/util/List# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# @@ -1437,7 +1437,7 @@ public static void setGlobalExceptionHandler( } public interface ExceptionHandler { -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#ExceptionHandler# public abstract static interface ExceptionHandler +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#ExceptionHandler# public interface ExceptionHandler /** * This is called when recoverable exceptions happen at runtime. They can be ignored and Epoxy * will recover, but you can override this to be aware of when they happen. @@ -1448,7 +1448,7 @@ public interface ExceptionHandler { * @param controller The EpoxyController that the error occurred in. */ void onException(@NonNull EpoxyController controller, @NonNull RuntimeException exception); -// ^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#ExceptionHandler#onException(). public abstract void onException(EpoxyController controller, RuntimeException exception) +// ^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#ExceptionHandler#onException(). public void onException(EpoxyController controller, RuntimeException exception) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController# // ^^^^^^^^^^ definition local63 @NonNull EpoxyController controller 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 e02e4b26..f2b2965d 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDataBindingLayouts.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDataBindingLayouts.java @@ -50,7 +50,7 @@ /** 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(). @LayoutRes public abstract int[] value() +// ^^^^^ definition com/airbnb/epoxy/EpoxyDataBindingLayouts#value(). @LayoutRes public int[] value() /** * If true, any variable whose type does not implement equals and hashcode will have the @@ -62,5 +62,5 @@ * For details on the nuances of this, see https://github.com/airbnb/epoxy/wiki/DoNotHash */ boolean enableDoNotHash() default true; -// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDataBindingLayouts#enableDoNotHash(). public abstract boolean enableDoNotHash() +// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDataBindingLayouts#enableDoNotHash(). public boolean enableDoNotHash() } 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 52a62d54..290bd1f3 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDataBindingPattern.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDataBindingPattern.java @@ -45,7 +45,7 @@ */ Class rClass(); //^^^^^ reference java/lang/Class# -// ^^^^^^ definition com/airbnb/epoxy/EpoxyDataBindingPattern#rClass(). public abstract Class rClass() +// ^^^^^^ definition com/airbnb/epoxy/EpoxyDataBindingPattern#rClass(). public Class rClass() /** * A string prefix that your databinding layouts start with. Epoxy will generate a model for each * databinding layout whose name starts with this. @@ -55,7 +55,7 @@ */ String layoutPrefix(); //^^^^^^ reference java/lang/String# -// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDataBindingPattern#layoutPrefix(). public abstract String layoutPrefix() +// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDataBindingPattern#layoutPrefix(). public String layoutPrefix() /** * If true, any variable whose type does not implement equals and hashcode will have the @@ -67,5 +67,5 @@ * For details on the nuances of this, see https://github.com/airbnb/epoxy/wiki/DoNotHash */ boolean enableDoNotHash() default true; -// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDataBindingPattern#enableDoNotHash(). public abstract boolean enableDoNotHash() +// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDataBindingPattern#enableDoNotHash(). public boolean enableDoNotHash() } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDragCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDragCallback.java index 3461a798..8977277c 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDragCallback.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDragCallback.java @@ -9,7 +9,7 @@ * For use with {@link EpoxyModelTouchCallback} */ public interface EpoxyDragCallback extends BaseEpoxyTouchCallback { -// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDragCallback# public abstract interface EpoxyDragCallback extends BaseEpoxyTouchCallback +// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDragCallback# public interface EpoxyDragCallback extends BaseEpoxyTouchCallback // ^ definition com/airbnb/epoxy/EpoxyDragCallback#[T] T extends EpoxyModel // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BaseEpoxyTouchCallback# @@ -27,7 +27,7 @@ public interface EpoxyDragCallback extends BaseEpoxyTouchC * @param adapterPosition The adapter position of the model */ void onDragStarted(T model, View itemView, int adapterPosition); -// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDragCallback#onDragStarted(). public abstract void onDragStarted(T model, unresolved_type itemView, int adapterPosition) +// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDragCallback#onDragStarted(). public void onDragStarted(T model, unresolved_type itemView, int adapterPosition) // ^ reference com/airbnb/epoxy/EpoxyDragCallback#[T] // ^^^^^ definition local0 T model // ^^^^ reference _root_/ @@ -49,7 +49,7 @@ public interface EpoxyDragCallback extends BaseEpoxyTouchC * @param toPosition The new adapter position of the model */ void onModelMoved(int fromPosition, int toPosition, T modelBeingMoved, View itemView); -// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDragCallback#onModelMoved(). public abstract void onModelMoved(int fromPosition, int toPosition, T modelBeingMoved, unresolved_type itemView) +// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDragCallback#onModelMoved(). public void onModelMoved(int fromPosition, int toPosition, T modelBeingMoved, unresolved_type itemView) // ^^^^^^^^^^^^ definition local3 int fromPosition // ^^^^^^^^^^ definition local4 int toPosition // ^ reference com/airbnb/epoxy/EpoxyDragCallback#[T] @@ -72,7 +72,7 @@ public interface EpoxyDragCallback extends BaseEpoxyTouchC * @param itemView The view that was being dragged */ void onDragReleased(T model, View itemView); -// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDragCallback#onDragReleased(). public abstract void onDragReleased(T model, unresolved_type itemView) +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDragCallback#onDragReleased(). public void onDragReleased(T model, unresolved_type itemView) // ^ reference com/airbnb/epoxy/EpoxyDragCallback#[T] // ^^^^^ definition local7 T model // ^^^^ 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 d0513727..33e97d19 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java @@ -648,9 +648,9 @@ public void addIf(@NonNull AddPredicate predicate, @NonNull EpoxyController cont * @see #addIf(AddPredicate, EpoxyController) */ public interface AddPredicate { -// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel#AddPredicate# public abstract static interface AddPredicate +// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel#AddPredicate# public interface AddPredicate boolean addIf(); -// ^^^^^ definition com/airbnb/epoxy/EpoxyModel#AddPredicate#addIf(). public abstract boolean addIf() +// ^^^^^ definition com/airbnb/epoxy/EpoxyModel#AddPredicate#addIf(). public boolean addIf() } /** @@ -913,9 +913,9 @@ public EpoxyModel spanSizeOverride(@Nullable SpanSizeOverrideCallback spanSiz } public interface SpanSizeOverrideCallback { -// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel#SpanSizeOverrideCallback# public abstract static interface SpanSizeOverrideCallback +// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel#SpanSizeOverrideCallback# public interface SpanSizeOverrideCallback int getSpanSize(int totalSpanCount, int position, int itemCount); -// ^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel#SpanSizeOverrideCallback#getSpanSize(). public abstract int getSpanSize(int totalSpanCount, int position, int itemCount) +// ^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel#SpanSizeOverrideCallback#getSpanSize(). public int getSpanSize(int totalSpanCount, int position, int itemCount) // ^^^^^^^^^^^^^^ definition local54 int totalSpanCount // ^^^^^^^^ definition local55 int position // ^^^^^^^^^ definition local56 int itemCount 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 3adc4033..5102de93 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelClass.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelClass.java @@ -48,7 +48,7 @@ */ @LayoutRes int layout() default 0; // ^^^^^^^^^ reference androidx/annotation/LayoutRes# -// ^^^^^^ definition com/airbnb/epoxy/EpoxyModelClass#layout(). @LayoutRes public abstract int layout() +// ^^^^^^ definition com/airbnb/epoxy/EpoxyModelClass#layout(). @LayoutRes public int layout() /** * If true, any layout file name that has {@link #layout()} as a prefix will be included as a @@ -59,5 +59,5 @@ * other layout instead of the default. */ boolean useLayoutOverloads() default false; -// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelClass#useLayoutOverloads(). public abstract boolean useLayoutOverloads() +// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelClass#useLayoutOverloads(). public boolean useLayoutOverloads() } 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 c9da9e28..5613d4f6 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java @@ -540,9 +540,9 @@ private void iterateModels(ModelGroupHolder holder, IterateModelsCallback callba } private interface IterateModelsCallback { -// ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback# private abstract static interface IterateModelsCallback +// ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback# private interface IterateModelsCallback void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex); -// ^^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#onModel(). public abstract void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex) +// ^^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#onModel(). public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex) // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^ definition local56 EpoxyModel model // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxySwipeCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxySwipeCallback.java index e64258ef..f2ad6cab 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxySwipeCallback.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxySwipeCallback.java @@ -19,7 +19,7 @@ * For use with {@link EpoxyModelTouchCallback} */ public interface EpoxySwipeCallback extends BaseEpoxyTouchCallback { -// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxySwipeCallback# public abstract interface EpoxySwipeCallback extends BaseEpoxyTouchCallback +// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxySwipeCallback# public interface EpoxySwipeCallback extends BaseEpoxyTouchCallback // ^ definition com/airbnb/epoxy/EpoxySwipeCallback#[T] T extends EpoxyModel // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BaseEpoxyTouchCallback# @@ -37,7 +37,7 @@ public interface EpoxySwipeCallback extends BaseEpoxyTouch * @param adapterPosition The adapter position of the model */ void onSwipeStarted(T model, View itemView, int adapterPosition); -// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxySwipeCallback#onSwipeStarted(). public abstract void onSwipeStarted(T model, unresolved_type itemView, int adapterPosition) +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxySwipeCallback#onSwipeStarted(). public void onSwipeStarted(T model, unresolved_type itemView, int adapterPosition) // ^ reference com/airbnb/epoxy/EpoxySwipeCallback#[T] // ^^^^^ definition local0 T model // ^^^^ reference _root_/ @@ -59,7 +59,7 @@ public interface EpoxySwipeCallback extends BaseEpoxyTouch * this to support custom swipe animations. */ void onSwipeProgressChanged(T model, View itemView, float swipeProgress, -// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxySwipeCallback#onSwipeProgressChanged(). public abstract void onSwipeProgressChanged(T model, unresolved_type itemView, float swipeProgress, unresolved_type canvas) +// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxySwipeCallback#onSwipeProgressChanged(). public void onSwipeProgressChanged(T model, unresolved_type itemView, float swipeProgress, unresolved_type canvas) // ^ reference com/airbnb/epoxy/EpoxySwipeCallback#[T] // ^^^^^ definition local3 T model // ^^^^ reference _root_/ @@ -79,7 +79,7 @@ void onSwipeProgressChanged(T model, View itemView, float swipeProgress, * @param itemView The view that was being swiped */ void onSwipeReleased(T model, View itemView); -// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxySwipeCallback#onSwipeReleased(). public abstract void onSwipeReleased(T model, unresolved_type itemView) +// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxySwipeCallback#onSwipeReleased(). public void onSwipeReleased(T model, unresolved_type itemView) // ^ reference com/airbnb/epoxy/EpoxySwipeCallback#[T] // ^^^^^ definition local7 T model // ^^^^ reference _root_/ @@ -103,7 +103,7 @@ void onSwipeProgressChanged(T model, View itemView, float swipeProgress, * directions were enabled. */ void onSwipeCompleted(T model, View itemView, int position, int direction); -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxySwipeCallback#onSwipeCompleted(). public abstract void onSwipeCompleted(T model, unresolved_type itemView, int position, int direction) +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxySwipeCallback#onSwipeCompleted(). public void onSwipeCompleted(T model, unresolved_type itemView, int position, int direction) // ^ reference com/airbnb/epoxy/EpoxySwipeCallback#[T] // ^^^^^ definition local9 T model // ^^^^ reference _root_/ diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/GeneratedModel.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/GeneratedModel.java index 10c458fa..070886d9 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/GeneratedModel.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/GeneratedModel.java @@ -2,7 +2,7 @@ /** Interface applied to generated models to allow the base adapter to interact with them. */ public interface GeneratedModel { -// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/GeneratedModel# public abstract interface GeneratedModel +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/GeneratedModel# public interface GeneratedModel // ^ definition com/airbnb/epoxy/GeneratedModel#[T] T /** * Called on the generated model immediately before the main model onBind method has been called. @@ -11,7 +11,7 @@ public interface GeneratedModel { * The ViewHolder is needed to get the model's adapter position when clicked. */ void handlePreBind(EpoxyViewHolder holder, T objectToBind, int position); -// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/GeneratedModel#handlePreBind(). public abstract void handlePreBind(EpoxyViewHolder holder, T objectToBind, int position) +// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/GeneratedModel#handlePreBind(). public void handlePreBind(EpoxyViewHolder holder, T objectToBind, int position) // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# // ^^^^^^ definition local0 EpoxyViewHolder holder // ^ reference com/airbnb/epoxy/GeneratedModel#[T] @@ -27,7 +27,7 @@ public interface GeneratedModel { * the other. We don't want to dispatch two onBind listener calls in that case. */ void handlePostBind(T objectToBind, int position); -// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/GeneratedModel#handlePostBind(). public abstract void handlePostBind(T objectToBind, int position) +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/GeneratedModel#handlePostBind(). public void handlePostBind(T objectToBind, int position) // ^ reference com/airbnb/epoxy/GeneratedModel#[T] // ^^^^^^^^^^^^ definition local3 T objectToBind // ^^^^^^^^ definition local4 int position 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 9d54c5c6..358af134 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelList.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelList.java @@ -62,13 +62,13 @@ class ModelList extends ArrayList> { } interface ModelListObserver { -// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelList#ModelListObserver# abstract static interface ModelListObserver +// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelList#ModelListObserver# interface ModelListObserver void onItemRangeInserted(int positionStart, int itemCount); -// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelList#ModelListObserver#onItemRangeInserted(). public abstract void onItemRangeInserted(int positionStart, int itemCount) +// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelList#ModelListObserver#onItemRangeInserted(). public void onItemRangeInserted(int positionStart, int itemCount) // ^^^^^^^^^^^^^ definition local1 int positionStart // ^^^^^^^^^ definition local2 int itemCount void onItemRangeRemoved(int positionStart, int itemCount); -// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelList#ModelListObserver#onItemRangeRemoved(). public abstract void onItemRangeRemoved(int positionStart, int itemCount) +// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelList#ModelListObserver#onItemRangeRemoved(). public void onItemRangeRemoved(int positionStart, int itemCount) // ^^^^^^^^^^^^^ definition local3 int positionStart // ^^^^^^^^^ definition local4 int itemCount } 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 c68151f6..28b0e1c4 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelProp.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelProp.java @@ -108,7 +108,7 @@ enum Option { // ^^^^^^ reference com/airbnb/epoxy/ModelProp#Option#``(). Option[] options() default {}; //^^^^^^ reference com/airbnb/epoxy/ModelProp#Option# -// ^^^^^^^ definition com/airbnb/epoxy/ModelProp#options(). public abstract Option[] options() +// ^^^^^^^ definition com/airbnb/epoxy/ModelProp#options(). public Option[] options() /** * The same as {@link #options()}, but this allows the shortcut of setting an option eg @@ -116,7 +116,7 @@ enum Option { */ Option[] value() default {}; //^^^^^^ reference com/airbnb/epoxy/ModelProp#Option# -// ^^^^^ definition com/airbnb/epoxy/ModelProp#value(). public abstract Option[] value() +// ^^^^^ definition com/airbnb/epoxy/ModelProp#value(). public Option[] value() /** * The name of the constant field that should be used as the default value for this prop. The @@ -131,7 +131,7 @@ enum Option { */ String defaultValue() default ""; //^^^^^^ reference java/lang/String# -// ^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelProp#defaultValue(). public abstract String defaultValue() +// ^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelProp#defaultValue(). public String defaultValue() /** * Specify an optional group name. Multiple props with the same group name will only allow one of @@ -141,5 +141,5 @@ enum Option { */ String group() default ""; //^^^^^^ reference java/lang/String# -// ^^^^^ definition com/airbnb/epoxy/ModelProp#group(). public abstract String group() +// ^^^^^ definition com/airbnb/epoxy/ModelProp#group(). public String group() } 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 efd0d9ce..3d43810d 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelView.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelView.java @@ -79,7 +79,7 @@ enum Size { */ Size autoLayout() default Size.NONE; //^^^^ reference com/airbnb/epoxy/ModelView#Size# -// ^^^^^^^^^^ definition com/airbnb/epoxy/ModelView#autoLayout(). public abstract Size autoLayout() +// ^^^^^^^^^^ definition com/airbnb/epoxy/ModelView#autoLayout(). public Size autoLayout() // ^^^^ reference com/airbnb/epoxy/ModelView#Size# // ^^^^ reference com/airbnb/epoxy/ModelView#Size#NONE. @@ -91,7 +91,7 @@ enum Size { */ @LayoutRes int defaultLayout() default 0; // ^^^^^^^^^ reference androidx/annotation/LayoutRes# -// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelView#defaultLayout(). @LayoutRes public abstract int defaultLayout() +// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelView#defaultLayout(). @LayoutRes public 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} @@ -100,7 +100,7 @@ enum Size { */ Class baseModelClass() default Void.class; //^^^^^ reference java/lang/Class# -// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelView#baseModelClass(). public abstract Class baseModelClass() +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelView#baseModelClass(). public Class baseModelClass() // ^^^^ reference java/lang/Void# // ^^^^^ reference java/lang/Void#class. /** @@ -109,12 +109,12 @@ enum Size { * see: EpoxyModel#shouldSaveViewState */ boolean saveViewState() default false; -// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelView#saveViewState(). public abstract boolean saveViewState() +// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelView#saveViewState(). public boolean saveViewState() /** * True to have the generated model take up the total available span count. False to instead use a * span count of 1. If you need to programmatically determine your model's span size you can use * the spanSizeCallback method on EpoxyModel. */ boolean fullSpan() default true; -// ^^^^^^^^ definition com/airbnb/epoxy/ModelView#fullSpan(). public abstract boolean fullSpan() +// ^^^^^^^^ definition com/airbnb/epoxy/ModelView#fullSpan(). public boolean fullSpan() } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBoundListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBoundListener.java index 4810dee6..5b385ac2 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBoundListener.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBoundListener.java @@ -2,7 +2,7 @@ /** Used to register an onBind callback with a generated model. */ public interface OnModelBoundListener, V> { -// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelBoundListener# public abstract interface OnModelBoundListener, V> +// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelBoundListener# public interface OnModelBoundListener, V> // ^ definition com/airbnb/epoxy/OnModelBoundListener#[T] T extends EpoxyModel // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^ definition com/airbnb/epoxy/OnModelBoundListener#[V] V @@ -15,7 +15,7 @@ public interface OnModelBoundListener, V> { * @param position The adapter position of the model */ void onModelBound(T model, V view, int position); -// ^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelBoundListener#onModelBound(). public abstract void onModelBound(T model, V view, int position) +// ^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelBoundListener#onModelBound(). public void onModelBound(T model, V view, int position) // ^ reference com/airbnb/epoxy/OnModelBoundListener#[T] // ^^^^^ definition local0 T model // ^ reference com/airbnb/epoxy/OnModelBoundListener#[V] 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 0a63c045..35b906dd 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBuildFinishedListener.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBuildFinishedListener.java @@ -10,13 +10,13 @@ * alerted to new model changes. */ public interface OnModelBuildFinishedListener { -// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelBuildFinishedListener# public abstract interface OnModelBuildFinishedListener +// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelBuildFinishedListener# public interface OnModelBuildFinishedListener /** * Called after {@link EpoxyController#buildModels()} has run and changes have been notified to * the adapter. This will be called even if no changes existed. */ void onModelBuildFinished(@NonNull DiffResult result); -// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelBuildFinishedListener#onModelBuildFinished(). public abstract void onModelBuildFinished(DiffResult result) +// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelBuildFinishedListener#onModelBuildFinished(). public void onModelBuildFinished(DiffResult result) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^ reference com/airbnb/epoxy/DiffResult# // ^^^^^^ definition local0 @NonNull DiffResult result diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelCheckedChangeListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelCheckedChangeListener.java index bb10fa73..8c2e7444 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelCheckedChangeListener.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelCheckedChangeListener.java @@ -6,7 +6,7 @@ // ^^^^^^^^^^^^^^ reference android/widget/CompoundButton# public interface OnModelCheckedChangeListener, V> { -// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelCheckedChangeListener# public abstract interface OnModelCheckedChangeListener, V> +// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelCheckedChangeListener# public interface OnModelCheckedChangeListener, V> // ^ definition com/airbnb/epoxy/OnModelCheckedChangeListener#[T] T extends EpoxyModel // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^ definition com/airbnb/epoxy/OnModelCheckedChangeListener#[V] V @@ -21,7 +21,7 @@ public interface OnModelCheckedChangeListener, V> { * @param position The position of the model in the adapter. */ void onChecked(T model, V parentView, -// ^^^^^^^^^ definition com/airbnb/epoxy/OnModelCheckedChangeListener#onChecked(). public abstract void onChecked(T model, V parentView, unresolved_type checkedView, boolean isChecked, int position) +// ^^^^^^^^^ definition com/airbnb/epoxy/OnModelCheckedChangeListener#onChecked(). public void onChecked(T model, V parentView, unresolved_type checkedView, boolean isChecked, int position) // ^ reference com/airbnb/epoxy/OnModelCheckedChangeListener#[T] // ^^^^^ definition local0 T model // ^ reference com/airbnb/epoxy/OnModelCheckedChangeListener#[V] diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelClickListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelClickListener.java index e171b057..f9542b9f 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelClickListener.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelClickListener.java @@ -7,7 +7,7 @@ /** Used to register a click listener on a generated model. */ public interface OnModelClickListener, V> { -// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelClickListener# public abstract interface OnModelClickListener, V> +// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelClickListener# public interface OnModelClickListener, V> // ^ definition com/airbnb/epoxy/OnModelClickListener#[T] T extends EpoxyModel // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^ definition com/airbnb/epoxy/OnModelClickListener#[V] V @@ -21,7 +21,7 @@ public interface OnModelClickListener, V> { * @param position The position of the model in the adapter. */ void onClick(T model, V parentView, View clickedView, int position); -// ^^^^^^^ definition com/airbnb/epoxy/OnModelClickListener#onClick(). public abstract void onClick(T model, V parentView, unresolved_type clickedView, int position) +// ^^^^^^^ definition com/airbnb/epoxy/OnModelClickListener#onClick(). public void onClick(T model, V parentView, unresolved_type clickedView, int position) // ^ reference com/airbnb/epoxy/OnModelClickListener#[T] // ^^^^^ definition local0 T model // ^ reference com/airbnb/epoxy/OnModelClickListener#[V] diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelLongClickListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelLongClickListener.java index 6c0ffe49..457dba47 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelLongClickListener.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelLongClickListener.java @@ -6,7 +6,7 @@ // ^^^^ reference android/view/View# public interface OnModelLongClickListener, V> { -// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelLongClickListener# public abstract interface OnModelLongClickListener, V> +// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelLongClickListener# public interface OnModelLongClickListener, V> // ^ definition com/airbnb/epoxy/OnModelLongClickListener#[T] T extends EpoxyModel // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^ definition com/airbnb/epoxy/OnModelLongClickListener#[V] V @@ -20,7 +20,7 @@ public interface OnModelLongClickListener, V> { * @param position The position of the model in the adapter. */ boolean onLongClick(T model, V parentView, View clickedView, int position); -// ^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelLongClickListener#onLongClick(). public abstract boolean onLongClick(T model, V parentView, unresolved_type clickedView, int position) +// ^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelLongClickListener#onLongClick(). public boolean onLongClick(T model, V parentView, unresolved_type clickedView, int position) // ^ reference com/airbnb/epoxy/OnModelLongClickListener#[T] // ^^^^^ definition local0 T model // ^ reference com/airbnb/epoxy/OnModelLongClickListener#[V] diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelUnboundListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelUnboundListener.java index c0d65a06..ba959f5e 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelUnboundListener.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelUnboundListener.java @@ -2,7 +2,7 @@ /** Used to register an onUnbind callback with a generated model. */ public interface OnModelUnboundListener, V> { -// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelUnboundListener# public abstract interface OnModelUnboundListener, V> +// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelUnboundListener# public interface OnModelUnboundListener, V> // ^ definition com/airbnb/epoxy/OnModelUnboundListener#[T] T extends EpoxyModel // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^ definition com/airbnb/epoxy/OnModelUnboundListener#[V] V @@ -11,7 +11,7 @@ public interface OnModelUnboundListener, V> { * that were unbound. */ void onModelUnbound(T model, V view); -// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelUnboundListener#onModelUnbound(). public abstract void onModelUnbound(T model, V view) +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelUnboundListener#onModelUnbound(). public void onModelUnbound(T model, V view) // ^ reference com/airbnb/epoxy/OnModelUnboundListener#[T] // ^^^^^ definition local0 T model // ^ reference com/airbnb/epoxy/OnModelUnboundListener#[V] 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 200f50e6..a7c10aa2 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityChangedListener.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityChangedListener.java @@ -11,7 +11,7 @@ /** Used to register an onVisibilityChanged callback with a generated model. */ public interface OnModelVisibilityChangedListener, V> { -// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelVisibilityChangedListener# public abstract interface OnModelVisibilityChangedListener, V> +// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelVisibilityChangedListener# public interface OnModelVisibilityChangedListener, V> // ^ definition com/airbnb/epoxy/OnModelVisibilityChangedListener#[T] T extends EpoxyModel // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^ reference com/airbnb/epoxy/OnModelVisibilityChangedListener#[V] @@ -33,7 +33,7 @@ public interface OnModelVisibilityChangedListener, V> { * @param widthVisible The visible width in pixel */ void onVisibilityChanged(T model, V view, -// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelVisibilityChangedListener#onVisibilityChanged(). public abstract void onVisibilityChanged(T model, V view, float percentVisibleHeight, float percentVisibleWidth, int heightVisible, int widthVisible) +// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelVisibilityChangedListener#onVisibilityChanged(). public void onVisibilityChanged(T model, V view, float percentVisibleHeight, float percentVisibleWidth, int heightVisible, int widthVisible) // ^ reference com/airbnb/epoxy/OnModelVisibilityChangedListener#[T] // ^^^^^ definition local0 T model // ^ reference com/airbnb/epoxy/OnModelVisibilityChangedListener#[V] 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 110e1de6..380d2fcd 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityStateChangedListener.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityStateChangedListener.java @@ -9,7 +9,7 @@ /** Used to register an onVisibilityChanged callback with a generated model. */ public interface OnModelVisibilityStateChangedListener, V> { -// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelVisibilityStateChangedListener# public abstract interface OnModelVisibilityStateChangedListener, V> +// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelVisibilityStateChangedListener# public interface OnModelVisibilityStateChangedListener, V> // ^ definition com/airbnb/epoxy/OnModelVisibilityStateChangedListener#[T] T extends EpoxyModel // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^ reference com/airbnb/epoxy/OnModelVisibilityStateChangedListener#[V] @@ -25,7 +25,7 @@ public interface OnModelVisibilityStateChangedListener, * @see VisibilityState */ void onVisibilityStateChanged(T model, V view, @Visibility int visibilityState); -// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelVisibilityStateChangedListener#onVisibilityStateChanged(). public abstract void onVisibilityStateChanged(T model, V view, int visibilityState) +// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelVisibilityStateChangedListener#onVisibilityStateChanged(). public void onVisibilityStateChanged(T model, V view, int visibilityState) // ^ reference com/airbnb/epoxy/OnModelVisibilityStateChangedListener#[T] // ^^^^^ definition local0 T model // ^ reference com/airbnb/epoxy/OnModelVisibilityStateChangedListener#[V] 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 7b9a769d..1ff05c99 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/PackageEpoxyConfig.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/PackageEpoxyConfig.java @@ -66,7 +66,7 @@ * implement hashCode/equals. */ boolean requireHashCode() default REQUIRE_HASHCODE_DEFAULT; -// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageEpoxyConfig#requireHashCode(). public abstract boolean requireHashCode() +// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageEpoxyConfig#requireHashCode(). public boolean requireHashCode() // ^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/PackageEpoxyConfig#REQUIRE_HASHCODE_DEFAULT. /** @@ -78,7 +78,7 @@ * of the generated class. */ boolean requireAbstractModels() default REQUIRE_ABSTRACT_MODELS_DEFAULT; -// ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageEpoxyConfig#requireAbstractModels(). public abstract boolean requireAbstractModels() +// ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageEpoxyConfig#requireAbstractModels(). public boolean requireAbstractModels() // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/PackageEpoxyConfig#REQUIRE_ABSTRACT_MODELS_DEFAULT. /** @@ -90,6 +90,6 @@ * https://github.com/airbnb/epoxy/wiki/Epoxy-Controller#implicit-adding */ boolean implicitlyAddAutoModels() default IMPLICITLY_ADD_AUTO_MODELS_DEFAULT; -// ^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageEpoxyConfig#implicitlyAddAutoModels(). public abstract boolean implicitlyAddAutoModels() +// ^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageEpoxyConfig#implicitlyAddAutoModels(). public boolean implicitlyAddAutoModels() // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/PackageEpoxyConfig#IMPLICITLY_ADD_AUTO_MODELS_DEFAULT. } 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 dafa6774..1266d5b2 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/PackageModelViewConfig.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/PackageModelViewConfig.java @@ -42,7 +42,7 @@ */ Class rClass(); //^^^^^ reference java/lang/Class# -// ^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#rClass(). public abstract Class rClass() +// ^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#rClass(). public Class rClass() /** * A default layout pattern to be used for specifying layouts for generated models. If this is set * then a layout can be omitted from a view's {@link com.airbnb.epoxy.ModelView} annotation. @@ -53,12 +53,12 @@ */ String defaultLayoutPattern() default "%s"; //^^^^^^ reference java/lang/String# -// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#defaultLayoutPattern(). public abstract String defaultLayoutPattern() +// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#defaultLayoutPattern(). public String defaultLayoutPattern() /** An optional EpoxyModel subclass that generated models should extend. */ Class defaultBaseModelClass() default Void.class; //^^^^^ reference java/lang/Class# -// ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#defaultBaseModelClass(). public abstract Class defaultBaseModelClass() +// ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#defaultBaseModelClass(). public Class defaultBaseModelClass() // ^^^^ reference java/lang/Void# // ^^^^^ reference java/lang/Void#class. @@ -71,14 +71,14 @@ * other layout instead of the default. */ boolean useLayoutOverloads() default false; -// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#useLayoutOverloads(). public abstract boolean useLayoutOverloads() +// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#useLayoutOverloads(). public boolean useLayoutOverloads() /** * Suffix, which will be appended to generated model's names. "Model_" is a default value. */ String generatedModelSuffix() default "Model_"; //^^^^^^ reference java/lang/String# -// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#generatedModelSuffix(). public abstract String generatedModelSuffix() +// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#generatedModelSuffix(). public String generatedModelSuffix() /** * Controls whether "builder" setter functions that returns the model type will be duplicated @@ -93,7 +93,7 @@ */ Option disableGenerateBuilderOverloads() default Option.Default; //^^^^^^ reference com/airbnb/epoxy/PackageModelViewConfig#Option# -// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#disableGenerateBuilderOverloads(). public abstract Option disableGenerateBuilderOverloads() +// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#disableGenerateBuilderOverloads(). public Option disableGenerateBuilderOverloads() // ^^^^^^ reference com/airbnb/epoxy/PackageModelViewConfig#Option# // ^^^^^^^ reference com/airbnb/epoxy/PackageModelViewConfig#Option#Default. @@ -107,7 +107,7 @@ */ Option disableGenerateGetters() default Option.Default; //^^^^^^ reference com/airbnb/epoxy/PackageModelViewConfig#Option# -// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#disableGenerateGetters(). public abstract Option disableGenerateGetters() +// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#disableGenerateGetters(). public Option disableGenerateGetters() // ^^^^^^ reference com/airbnb/epoxy/PackageModelViewConfig#Option# // ^^^^^^^ reference com/airbnb/epoxy/PackageModelViewConfig#Option#Default. @@ -122,7 +122,7 @@ */ Option disableGenerateReset() default Option.Default; //^^^^^^ reference com/airbnb/epoxy/PackageModelViewConfig#Option# -// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#disableGenerateReset(). public abstract Option disableGenerateReset() +// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#disableGenerateReset(). public Option disableGenerateReset() // ^^^^^^ reference com/airbnb/epoxy/PackageModelViewConfig#Option# // ^^^^^^^ reference com/airbnb/epoxy/PackageModelViewConfig#Option#Default. diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/StyleBuilderCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/StyleBuilderCallback.java index 1d4afeba..277d10bb 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/StyleBuilderCallback.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/StyleBuilderCallback.java @@ -5,10 +5,10 @@ * view is set up to be styled with the Paris library. */ public interface StyleBuilderCallback { -// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/StyleBuilderCallback# public abstract interface StyleBuilderCallback +// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/StyleBuilderCallback# public interface StyleBuilderCallback // ^ definition com/airbnb/epoxy/StyleBuilderCallback#[T] T void buildStyle(T builder); -// ^^^^^^^^^^ definition com/airbnb/epoxy/StyleBuilderCallback#buildStyle(). public abstract void buildStyle(T builder) +// ^^^^^^^^^^ definition com/airbnb/epoxy/StyleBuilderCallback#buildStyle(). public void buildStyle(T builder) // ^ reference com/airbnb/epoxy/StyleBuilderCallback#[T] // ^^^^^^^ definition local0 T builder } 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 e554c2fc..16812c8b 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/TextProp.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/TextProp.java @@ -49,5 +49,5 @@ @StringRes int defaultRes() default 0; // ^^^^^^^^^ reference androidx/annotation/StringRes# -// ^^^^^^^^^^ definition com/airbnb/epoxy/TextProp#defaultRes(). @StringRes public abstract int defaultRes() +// ^^^^^^^^^^ definition com/airbnb/epoxy/TextProp#defaultRes(). @StringRes public int defaultRes() } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Timer.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Timer.java index aa88c4a9..187a6492 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Timer.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Timer.java @@ -1,11 +1,11 @@ package com.airbnb.epoxy; interface Timer { -// ^^^^^ definition com/airbnb/epoxy/Timer# abstract interface Timer +// ^^^^^ definition com/airbnb/epoxy/Timer# interface Timer void start(String sectionName); -// ^^^^^ definition com/airbnb/epoxy/Timer#start(). public abstract void start(String sectionName) +// ^^^^^ definition com/airbnb/epoxy/Timer#start(). public void start(String sectionName) // ^^^^^^ reference java/lang/String# // ^^^^^^^^^^^ definition local0 String sectionName void stop(); -// ^^^^ definition com/airbnb/epoxy/Timer#stop(). public abstract void stop() +// ^^^^ definition com/airbnb/epoxy/Timer#stop(). public void stop() } diff --git a/tests/snapshots/src/main/generated/minimized/Annotations.java b/tests/snapshots/src/main/generated/minimized/Annotations.java index 70f4cdaa..ed5bd898 100644 --- a/tests/snapshots/src/main/generated/minimized/Annotations.java +++ b/tests/snapshots/src/main/generated/minimized/Annotations.java @@ -55,9 +55,9 @@ String value() default ""; //^^^^^^ reference java/lang/String# -// ^^^^^ definition minimized/Annotations#value(). public abstract String value() +// ^^^^^ definition minimized/Annotations#value(). public String value() String format() default ""; //^^^^^^ reference java/lang/String# -// ^^^^^^ definition minimized/Annotations#format(). public abstract String format() +// ^^^^^^ definition minimized/Annotations#format(). public String format() } diff --git a/tests/snapshots/src/main/generated/minimized/InnerClasses.java b/tests/snapshots/src/main/generated/minimized/InnerClasses.java index 61309437..7df72d87 100644 --- a/tests/snapshots/src/main/generated/minimized/InnerClasses.java +++ b/tests/snapshots/src/main/generated/minimized/InnerClasses.java @@ -26,12 +26,12 @@ public enum InnerEnum { } public interface InnerInterface { -// ^^^^^^^^^^^^^^ definition minimized/InnerClasses#InnerInterface# public abstract static interface InnerInterface +// ^^^^^^^^^^^^^^ definition minimized/InnerClasses#InnerInterface# public interface InnerInterface // ^ definition minimized/InnerClasses#InnerInterface#[A] A // ^ definition minimized/InnerClasses#InnerInterface#[B] B B apply(A a); // ^ reference minimized/InnerClasses#InnerInterface#[B] -// ^^^^^ definition minimized/InnerClasses#InnerInterface#apply(). public abstract B apply(A a) +// ^^^^^ definition minimized/InnerClasses#InnerInterface#apply(). public B apply(A a) // ^ reference minimized/InnerClasses#InnerInterface#[A] // ^ definition local1 A a } diff --git a/tests/snapshots/src/main/generated/minimized/Interfaces.java b/tests/snapshots/src/main/generated/minimized/Interfaces.java index efe8cc35..85eb3227 100644 --- a/tests/snapshots/src/main/generated/minimized/Interfaces.java +++ b/tests/snapshots/src/main/generated/minimized/Interfaces.java @@ -1,14 +1,14 @@ package minimized; public interface Interfaces { -// ^^^^^^^^^^ definition minimized/Interfaces# public abstract interface Interfaces +// ^^^^^^^^^^ definition minimized/Interfaces# public interface Interfaces String abstractInterfaceMethod(); //^^^^^^ reference java/lang/String# -// ^^^^^^^^^^^^^^^^^^^^^^^ definition minimized/Interfaces#abstractInterfaceMethod(). public abstract String abstractInterfaceMethod() +// ^^^^^^^^^^^^^^^^^^^^^^^ definition minimized/Interfaces#abstractInterfaceMethod(). public String abstractInterfaceMethod() default String defaultInterfaceMethod() { // ^^^^^^ reference java/lang/String# -// ^^^^^^^^^^^^^^^^^^^^^^ definition minimized/Interfaces#defaultInterfaceMethod(). public abstract String defaultInterfaceMethod() +// ^^^^^^^^^^^^^^^^^^^^^^ definition minimized/Interfaces#defaultInterfaceMethod(). public String defaultInterfaceMethod() return "default"; } } diff --git a/tests/snapshots/src/main/generated/minimized/TypeVariables.java b/tests/snapshots/src/main/generated/minimized/TypeVariables.java index f1b85a72..81e20767 100644 --- a/tests/snapshots/src/main/generated/minimized/TypeVariables.java +++ b/tests/snapshots/src/main/generated/minimized/TypeVariables.java @@ -18,9 +18,9 @@ void mCPackage() {} } interface I { -// ^ definition minimized/TypeVariables#I# abstract static interface I +// ^ definition minimized/TypeVariables#I# interface I void mI(); -// ^^ definition minimized/TypeVariables#I#mI(). public abstract void mI() +// ^^ definition minimized/TypeVariables#I#mI(). public void mI() } static class CT extends C implements I { From a6b612727fe60ab3934c465485317a38a5768593 Mon Sep 17 00:00:00 2001 From: Noah Santschi-Cooney Date: Wed, 21 Apr 2021 16:09:46 +0100 Subject: [PATCH 2/2] pretty-print 'default' modifier --- .../lsif_semanticdb/SignatureFormatter.java | 21 +++++++------------ .../src/main/protobuf/semanticdb.proto | 1 + .../semanticdb_javac/SemanticdbVisitor.java | 6 +++++- .../src/main/java/minimized/Interfaces.java | 2 ++ .../com/airbnb/epoxy/AsyncEpoxyDiffer.java | 2 +- .../airbnb/epoxy/BaseEpoxyTouchCallback.java | 4 ++-- .../com/airbnb/epoxy/EpoxyAttribute.java | 6 +++--- .../com/airbnb/epoxy/EpoxyController.java | 8 +++---- .../airbnb/epoxy/EpoxyDataBindingLayouts.java | 4 ++-- .../airbnb/epoxy/EpoxyDataBindingPattern.java | 6 +++--- .../com/airbnb/epoxy/EpoxyDragCallback.java | 6 +++--- .../com/airbnb/epoxy/EpoxyModel.java | 4 ++-- .../com/airbnb/epoxy/EpoxyModelClass.java | 4 ++-- .../com/airbnb/epoxy/EpoxyModelGroup.java | 2 +- .../com/airbnb/epoxy/EpoxySwipeCallback.java | 8 +++---- .../com/airbnb/epoxy/GeneratedModel.java | 4 ++-- .../generated/com/airbnb/epoxy/ModelList.java | 4 ++-- .../generated/com/airbnb/epoxy/ModelProp.java | 8 +++---- .../generated/com/airbnb/epoxy/ModelView.java | 10 ++++----- .../airbnb/epoxy/OnModelBoundListener.java | 2 +- .../epoxy/OnModelBuildFinishedListener.java | 2 +- .../epoxy/OnModelCheckedChangeListener.java | 2 +- .../airbnb/epoxy/OnModelClickListener.java | 2 +- .../epoxy/OnModelLongClickListener.java | 2 +- .../airbnb/epoxy/OnModelUnboundListener.java | 2 +- .../OnModelVisibilityChangedListener.java | 2 +- ...OnModelVisibilityStateChangedListener.java | 2 +- .../com/airbnb/epoxy/PackageEpoxyConfig.java | 6 +++--- .../airbnb/epoxy/PackageModelViewConfig.java | 16 +++++++------- .../airbnb/epoxy/StyleBuilderCallback.java | 2 +- .../generated/com/airbnb/epoxy/TextProp.java | 2 +- .../generated/com/airbnb/epoxy/Timer.java | 4 ++-- .../main/generated/minimized/Annotations.java | 4 ++-- .../generated/minimized/InnerClasses.java | 2 +- .../main/generated/minimized/Interfaces.java | 7 +++++-- .../generated/minimized/TypeVariables.java | 2 +- 36 files changed, 87 insertions(+), 84 deletions(-) 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 b838f98f..6c98ec96 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 @@ -151,11 +151,7 @@ private void formatMethodSignature(MethodSignature methodSignature) { printKeywordln(formatAnnotations()); printKeyword(formatAccess()); - String owner = SymbolDescriptor.parseFromSymbol(symbolInformation.getSymbol()).owner; - SymbolInformation ownerSymbol = - symtab.symbols.get(SymbolDescriptor.parseFromSymbol(symbolInformation.getSymbol()).owner); - if (ownerSymbol != null && ownerSymbol.getKind() != SymbolInformation.Kind.INTERFACE) - printKeyword(formatModifiers()); + printKeyword(formatModifiers()); List typeParameters = getSymlinks(methodSignature.getTypeParameters()); if (!typeParameters.isEmpty()) { @@ -169,6 +165,7 @@ private void formatMethodSignature(MethodSignature methodSignature) { printKeyword(formatType(methodSignature.getReturnType())); s.append(symbolInformation.getDisplayName()); } else { + String owner = SymbolDescriptor.parseFromSymbol(symbolInformation.getSymbol()).owner; // Fix for https://github.com/sourcegraph/lsif-java/issues/150 if (!owner.equals(SemanticdbSymbols.NONE)) { s.append(SymbolDescriptor.parseFromSymbol(owner).descriptor.name); @@ -402,17 +399,13 @@ private String formatAccess() { return ""; } + // https://checkstyle.sourceforge.io/config_modifier.html#ModifierOrder private String formatModifiers() { ArrayList modifiers = new ArrayList<>(); - if (has(Property.ABSTRACT)) { - modifiers.add("abstract"); - } - if (has(Property.STATIC)) { - modifiers.add("static"); - } - if (has(Property.FINAL)) { - modifiers.add("final"); - } + if (has(Property.ABSTRACT)) modifiers.add("abstract"); + if (has(Property.DEFAULT)) modifiers.add("default"); + if (has(Property.STATIC)) modifiers.add("static"); + if (has(Property.FINAL)) modifiers.add("final"); return String.join(" ", modifiers); } diff --git a/semanticdb-java/src/main/protobuf/semanticdb.proto b/semanticdb-java/src/main/protobuf/semanticdb.proto index dd277fdd..d25a1b89 100644 --- a/semanticdb-java/src/main/protobuf/semanticdb.proto +++ b/semanticdb-java/src/main/protobuf/semanticdb.proto @@ -97,6 +97,7 @@ message SymbolInformation { SEALED = 0x10; STATIC = 0x1000; ENUM = 0x4000; + DEFAULT = 0x8000; } reserved 2, 6, 7, 8, 9, 10, 11, 12, 14, 15; string symbol = 1; 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 89ea09fa..5b3c9ec1 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 @@ -530,8 +530,12 @@ private int semanticdbSymbolInfoProperties(Symbol sym) { int properties = 0; properties |= sym.isEnum() ? Property.ENUM_VALUE : 0; properties |= sym.isStatic() ? Property.STATIC_VALUE : 0; - properties |= (sym.flags() & Flags.ABSTRACT) > 0 ? Property.ABSTRACT_VALUE : 0; + // for default interface methods, Flags.ABSTRACT is also set... + boolean abstractNotDefault = + ((sym.flags() & Flags.ABSTRACT) > 0) && ((sym.flags() & Flags.DEFAULT) == 0); + properties |= abstractNotDefault ? Property.ABSTRACT_VALUE : 0; properties |= (sym.flags() & Flags.FINAL) > 0 ? Property.FINAL_VALUE : 0; + properties |= (sym.flags() & Flags.DEFAULT) > 0 ? Property.DEFAULT_VALUE : 0; return properties; } diff --git a/tests/minimized/src/main/java/minimized/Interfaces.java b/tests/minimized/src/main/java/minimized/Interfaces.java index 0f2ac6f4..c06faea6 100644 --- a/tests/minimized/src/main/java/minimized/Interfaces.java +++ b/tests/minimized/src/main/java/minimized/Interfaces.java @@ -1,6 +1,8 @@ package minimized; public interface Interfaces { + static void staticInterfaceMethod() {} + String abstractInterfaceMethod(); default String defaultInterfaceMethod() { 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 442f576d..1137e049 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyDiffer.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyDiffer.java @@ -55,7 +55,7 @@ class AsyncEpoxyDiffer { interface ResultCallback { // ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#ResultCallback# interface ResultCallback void onResult(@NonNull DiffResult result); -// ^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#ResultCallback#onResult(). public void onResult(DiffResult result) +// ^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#ResultCallback#onResult(). public abstract void onResult(DiffResult result) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^ reference com/airbnb/epoxy/DiffResult# // ^^^^^^ definition local0 @NonNull DiffResult result diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyTouchCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyTouchCallback.java index 02fd3b05..94524eb9 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyTouchCallback.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyTouchCallback.java @@ -21,7 +21,7 @@ interface BaseEpoxyTouchCallback { * @see androidx.recyclerview.widget.ItemTouchHelper.Callback#getMovementFlags */ int getMovementFlagsForModel(T model, int adapterPosition); -// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyTouchCallback#getMovementFlagsForModel(). public int getMovementFlagsForModel(T model, int adapterPosition) +// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyTouchCallback#getMovementFlagsForModel(). public abstract int getMovementFlagsForModel(T model, int adapterPosition) // ^ reference com/airbnb/epoxy/BaseEpoxyTouchCallback#[T] // ^^^^^ definition local0 T model // ^^^^^^^^^^^^^^^ definition local1 int adapterPosition @@ -37,7 +37,7 @@ interface BaseEpoxyTouchCallback { * @param itemView The view being cleared. */ void clearView(T model, View itemView); -// ^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyTouchCallback#clearView(). public void clearView(T model, unresolved_type itemView) +// ^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyTouchCallback#clearView(). public abstract void clearView(T model, unresolved_type itemView) // ^ reference com/airbnb/epoxy/BaseEpoxyTouchCallback#[T] // ^^^^^ definition local2 T model // ^^^^ reference _root_/ 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 4eb5fe78..c10a0b6b 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAttribute.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAttribute.java @@ -104,7 +104,7 @@ enum Option { // ^^^^^^ reference com/airbnb/epoxy/EpoxyAttribute#Option#``(). Option[] value() default {}; //^^^^^^ reference com/airbnb/epoxy/EpoxyAttribute#Option# -// ^^^^^ definition com/airbnb/epoxy/EpoxyAttribute#value(). public Option[] value() +// ^^^^^ definition com/airbnb/epoxy/EpoxyAttribute#value(). public abstract Option[] value() /** * Whether or not to include this attribute in equals and hashCode calculations. @@ -117,7 +117,7 @@ enum Option { @Deprecated // ^^^^^^^^^^ reference java/lang/Deprecated# boolean hash() default true; -// ^^^^ definition com/airbnb/epoxy/EpoxyAttribute#hash(). @Deprecated public boolean hash() +// ^^^^ definition com/airbnb/epoxy/EpoxyAttribute#hash(). @Deprecated public abstract boolean hash() /** * Whether or not to generate setter for this attribute. @@ -130,5 +130,5 @@ enum Option { @Deprecated // ^^^^^^^^^^ reference java/lang/Deprecated# boolean setter() default true; -// ^^^^^^ definition com/airbnb/epoxy/EpoxyAttribute#setter(). @Deprecated public 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 e57a3133..5423189a 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java @@ -672,11 +672,11 @@ void addAfterInterceptorCallback(ModelInterceptorCallback callback) { interface ModelInterceptorCallback { // ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback# interface ModelInterceptorCallback void onInterceptorsStarted(EpoxyController controller); -// ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#onInterceptorsStarted(). public void onInterceptorsStarted(EpoxyController controller) +// ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#onInterceptorsStarted(). public abstract void onInterceptorsStarted(EpoxyController controller) // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController# // ^^^^^^^^^^ definition local18 EpoxyController controller void onInterceptorsFinished(EpoxyController controller); -// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#onInterceptorsFinished(). public void onInterceptorsFinished(EpoxyController controller) +// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#onInterceptorsFinished(). public abstract void onInterceptorsFinished(EpoxyController controller) // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController# // ^^^^^^^^^^ definition local19 EpoxyController controller } @@ -750,7 +750,7 @@ public interface Interceptor { * exception. */ void intercept(@NonNull List> models); -// ^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#Interceptor#intercept(). public void intercept(List> models) +// ^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#Interceptor#intercept(). public abstract void intercept(List> models) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^ reference java/util/List# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# @@ -1448,7 +1448,7 @@ public interface ExceptionHandler { * @param controller The EpoxyController that the error occurred in. */ void onException(@NonNull EpoxyController controller, @NonNull RuntimeException exception); -// ^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#ExceptionHandler#onException(). public void onException(EpoxyController controller, RuntimeException exception) +// ^^^^^^^^^^^ 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 @NonNull EpoxyController controller 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 f2b2965d..e02e4b26 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDataBindingLayouts.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDataBindingLayouts.java @@ -50,7 +50,7 @@ /** 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(). @LayoutRes public 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 @@ -62,5 +62,5 @@ * For details on the nuances of this, see https://github.com/airbnb/epoxy/wiki/DoNotHash */ boolean enableDoNotHash() default true; -// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDataBindingLayouts#enableDoNotHash(). public boolean enableDoNotHash() +// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDataBindingLayouts#enableDoNotHash(). public abstract boolean enableDoNotHash() } 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 290bd1f3..52a62d54 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDataBindingPattern.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDataBindingPattern.java @@ -45,7 +45,7 @@ */ Class rClass(); //^^^^^ reference java/lang/Class# -// ^^^^^^ definition com/airbnb/epoxy/EpoxyDataBindingPattern#rClass(). public Class rClass() +// ^^^^^^ definition com/airbnb/epoxy/EpoxyDataBindingPattern#rClass(). public abstract Class rClass() /** * A string prefix that your databinding layouts start with. Epoxy will generate a model for each * databinding layout whose name starts with this. @@ -55,7 +55,7 @@ */ String layoutPrefix(); //^^^^^^ reference java/lang/String# -// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDataBindingPattern#layoutPrefix(). public String layoutPrefix() +// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDataBindingPattern#layoutPrefix(). public abstract String layoutPrefix() /** * If true, any variable whose type does not implement equals and hashcode will have the @@ -67,5 +67,5 @@ * For details on the nuances of this, see https://github.com/airbnb/epoxy/wiki/DoNotHash */ boolean enableDoNotHash() default true; -// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDataBindingPattern#enableDoNotHash(). public boolean enableDoNotHash() +// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDataBindingPattern#enableDoNotHash(). public abstract boolean enableDoNotHash() } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDragCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDragCallback.java index 8977277c..1686d2a4 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDragCallback.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDragCallback.java @@ -27,7 +27,7 @@ public interface EpoxyDragCallback extends BaseEpoxyTouchC * @param adapterPosition The adapter position of the model */ void onDragStarted(T model, View itemView, int adapterPosition); -// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDragCallback#onDragStarted(). public void onDragStarted(T model, unresolved_type itemView, int adapterPosition) +// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDragCallback#onDragStarted(). public abstract void onDragStarted(T model, unresolved_type itemView, int adapterPosition) // ^ reference com/airbnb/epoxy/EpoxyDragCallback#[T] // ^^^^^ definition local0 T model // ^^^^ reference _root_/ @@ -49,7 +49,7 @@ public interface EpoxyDragCallback extends BaseEpoxyTouchC * @param toPosition The new adapter position of the model */ void onModelMoved(int fromPosition, int toPosition, T modelBeingMoved, View itemView); -// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDragCallback#onModelMoved(). public void onModelMoved(int fromPosition, int toPosition, T modelBeingMoved, unresolved_type itemView) +// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDragCallback#onModelMoved(). public abstract void onModelMoved(int fromPosition, int toPosition, T modelBeingMoved, unresolved_type itemView) // ^^^^^^^^^^^^ definition local3 int fromPosition // ^^^^^^^^^^ definition local4 int toPosition // ^ reference com/airbnb/epoxy/EpoxyDragCallback#[T] @@ -72,7 +72,7 @@ public interface EpoxyDragCallback extends BaseEpoxyTouchC * @param itemView The view that was being dragged */ void onDragReleased(T model, View itemView); -// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDragCallback#onDragReleased(). public void onDragReleased(T model, unresolved_type itemView) +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDragCallback#onDragReleased(). public abstract void onDragReleased(T model, unresolved_type itemView) // ^ reference com/airbnb/epoxy/EpoxyDragCallback#[T] // ^^^^^ definition local7 T model // ^^^^ 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 33e97d19..7c1ab69c 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java @@ -650,7 +650,7 @@ public void addIf(@NonNull AddPredicate predicate, @NonNull EpoxyController cont public interface AddPredicate { // ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel#AddPredicate# public interface AddPredicate boolean addIf(); -// ^^^^^ definition com/airbnb/epoxy/EpoxyModel#AddPredicate#addIf(). public boolean addIf() +// ^^^^^ definition com/airbnb/epoxy/EpoxyModel#AddPredicate#addIf(). public abstract boolean addIf() } /** @@ -915,7 +915,7 @@ public EpoxyModel spanSizeOverride(@Nullable SpanSizeOverrideCallback spanSiz public interface SpanSizeOverrideCallback { // ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel#SpanSizeOverrideCallback# public interface SpanSizeOverrideCallback int getSpanSize(int totalSpanCount, int position, int itemCount); -// ^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel#SpanSizeOverrideCallback#getSpanSize(). public int getSpanSize(int totalSpanCount, int position, int itemCount) +// ^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel#SpanSizeOverrideCallback#getSpanSize(). public abstract int getSpanSize(int totalSpanCount, int position, int itemCount) // ^^^^^^^^^^^^^^ definition local54 int totalSpanCount // ^^^^^^^^ definition local55 int position // ^^^^^^^^^ definition local56 int itemCount 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 5102de93..3adc4033 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelClass.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelClass.java @@ -48,7 +48,7 @@ */ @LayoutRes int layout() default 0; // ^^^^^^^^^ reference androidx/annotation/LayoutRes# -// ^^^^^^ definition com/airbnb/epoxy/EpoxyModelClass#layout(). @LayoutRes public 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 @@ -59,5 +59,5 @@ * other layout instead of the default. */ boolean useLayoutOverloads() default false; -// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelClass#useLayoutOverloads(). public boolean useLayoutOverloads() +// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelClass#useLayoutOverloads(). public abstract boolean useLayoutOverloads() } 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 5613d4f6..9efbb69d 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java @@ -542,7 +542,7 @@ private void iterateModels(ModelGroupHolder holder, IterateModelsCallback callba private interface IterateModelsCallback { // ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback# private interface IterateModelsCallback void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex); -// ^^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#onModel(). public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex) +// ^^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#onModel(). public abstract void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex) // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^ definition local56 EpoxyModel model // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxySwipeCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxySwipeCallback.java index f2ad6cab..b5684a6a 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxySwipeCallback.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxySwipeCallback.java @@ -37,7 +37,7 @@ public interface EpoxySwipeCallback extends BaseEpoxyTouch * @param adapterPosition The adapter position of the model */ void onSwipeStarted(T model, View itemView, int adapterPosition); -// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxySwipeCallback#onSwipeStarted(). public void onSwipeStarted(T model, unresolved_type itemView, int adapterPosition) +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxySwipeCallback#onSwipeStarted(). public abstract void onSwipeStarted(T model, unresolved_type itemView, int adapterPosition) // ^ reference com/airbnb/epoxy/EpoxySwipeCallback#[T] // ^^^^^ definition local0 T model // ^^^^ reference _root_/ @@ -59,7 +59,7 @@ public interface EpoxySwipeCallback extends BaseEpoxyTouch * this to support custom swipe animations. */ void onSwipeProgressChanged(T model, View itemView, float swipeProgress, -// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxySwipeCallback#onSwipeProgressChanged(). public void onSwipeProgressChanged(T model, unresolved_type itemView, float swipeProgress, unresolved_type canvas) +// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxySwipeCallback#onSwipeProgressChanged(). public abstract void onSwipeProgressChanged(T model, unresolved_type itemView, float swipeProgress, unresolved_type canvas) // ^ reference com/airbnb/epoxy/EpoxySwipeCallback#[T] // ^^^^^ definition local3 T model // ^^^^ reference _root_/ @@ -79,7 +79,7 @@ void onSwipeProgressChanged(T model, View itemView, float swipeProgress, * @param itemView The view that was being swiped */ void onSwipeReleased(T model, View itemView); -// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxySwipeCallback#onSwipeReleased(). public void onSwipeReleased(T model, unresolved_type itemView) +// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxySwipeCallback#onSwipeReleased(). public abstract void onSwipeReleased(T model, unresolved_type itemView) // ^ reference com/airbnb/epoxy/EpoxySwipeCallback#[T] // ^^^^^ definition local7 T model // ^^^^ reference _root_/ @@ -103,7 +103,7 @@ void onSwipeProgressChanged(T model, View itemView, float swipeProgress, * directions were enabled. */ void onSwipeCompleted(T model, View itemView, int position, int direction); -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxySwipeCallback#onSwipeCompleted(). public void onSwipeCompleted(T model, unresolved_type itemView, int position, int direction) +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxySwipeCallback#onSwipeCompleted(). public abstract void onSwipeCompleted(T model, unresolved_type itemView, int position, int direction) // ^ reference com/airbnb/epoxy/EpoxySwipeCallback#[T] // ^^^^^ definition local9 T model // ^^^^ reference _root_/ diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/GeneratedModel.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/GeneratedModel.java index 070886d9..5aa92e18 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/GeneratedModel.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/GeneratedModel.java @@ -11,7 +11,7 @@ public interface GeneratedModel { * The ViewHolder is needed to get the model's adapter position when clicked. */ void handlePreBind(EpoxyViewHolder holder, T objectToBind, int position); -// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/GeneratedModel#handlePreBind(). public void handlePreBind(EpoxyViewHolder holder, T objectToBind, int position) +// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/GeneratedModel#handlePreBind(). public abstract void handlePreBind(EpoxyViewHolder holder, T objectToBind, int position) // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# // ^^^^^^ definition local0 EpoxyViewHolder holder // ^ reference com/airbnb/epoxy/GeneratedModel#[T] @@ -27,7 +27,7 @@ public interface GeneratedModel { * the other. We don't want to dispatch two onBind listener calls in that case. */ void handlePostBind(T objectToBind, int position); -// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/GeneratedModel#handlePostBind(). public void handlePostBind(T objectToBind, int position) +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/GeneratedModel#handlePostBind(). public abstract void handlePostBind(T objectToBind, int position) // ^ reference com/airbnb/epoxy/GeneratedModel#[T] // ^^^^^^^^^^^^ definition local3 T objectToBind // ^^^^^^^^ definition local4 int position 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 358af134..e15d89d4 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelList.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelList.java @@ -64,11 +64,11 @@ class ModelList extends ArrayList> { interface ModelListObserver { // ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelList#ModelListObserver# interface ModelListObserver void onItemRangeInserted(int positionStart, int itemCount); -// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelList#ModelListObserver#onItemRangeInserted(). public void onItemRangeInserted(int positionStart, int itemCount) +// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelList#ModelListObserver#onItemRangeInserted(). public abstract void onItemRangeInserted(int positionStart, int itemCount) // ^^^^^^^^^^^^^ definition local1 int positionStart // ^^^^^^^^^ definition local2 int itemCount void onItemRangeRemoved(int positionStart, int itemCount); -// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelList#ModelListObserver#onItemRangeRemoved(). public void onItemRangeRemoved(int positionStart, int itemCount) +// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelList#ModelListObserver#onItemRangeRemoved(). public abstract void onItemRangeRemoved(int positionStart, int itemCount) // ^^^^^^^^^^^^^ definition local3 int positionStart // ^^^^^^^^^ definition local4 int itemCount } 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 28b0e1c4..c68151f6 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelProp.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelProp.java @@ -108,7 +108,7 @@ enum Option { // ^^^^^^ reference com/airbnb/epoxy/ModelProp#Option#``(). Option[] options() default {}; //^^^^^^ reference com/airbnb/epoxy/ModelProp#Option# -// ^^^^^^^ definition com/airbnb/epoxy/ModelProp#options(). public Option[] options() +// ^^^^^^^ definition com/airbnb/epoxy/ModelProp#options(). public abstract Option[] options() /** * The same as {@link #options()}, but this allows the shortcut of setting an option eg @@ -116,7 +116,7 @@ enum Option { */ Option[] value() default {}; //^^^^^^ reference com/airbnb/epoxy/ModelProp#Option# -// ^^^^^ definition com/airbnb/epoxy/ModelProp#value(). public Option[] value() +// ^^^^^ definition com/airbnb/epoxy/ModelProp#value(). public abstract Option[] value() /** * The name of the constant field that should be used as the default value for this prop. The @@ -131,7 +131,7 @@ enum Option { */ String defaultValue() default ""; //^^^^^^ reference java/lang/String# -// ^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelProp#defaultValue(). public String defaultValue() +// ^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelProp#defaultValue(). public abstract String defaultValue() /** * Specify an optional group name. Multiple props with the same group name will only allow one of @@ -141,5 +141,5 @@ enum Option { */ String group() default ""; //^^^^^^ reference java/lang/String# -// ^^^^^ definition com/airbnb/epoxy/ModelProp#group(). public String group() +// ^^^^^ definition com/airbnb/epoxy/ModelProp#group(). public abstract String group() } 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 3d43810d..efd0d9ce 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelView.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelView.java @@ -79,7 +79,7 @@ enum Size { */ Size autoLayout() default Size.NONE; //^^^^ reference com/airbnb/epoxy/ModelView#Size# -// ^^^^^^^^^^ definition com/airbnb/epoxy/ModelView#autoLayout(). public Size autoLayout() +// ^^^^^^^^^^ definition com/airbnb/epoxy/ModelView#autoLayout(). public abstract Size autoLayout() // ^^^^ reference com/airbnb/epoxy/ModelView#Size# // ^^^^ reference com/airbnb/epoxy/ModelView#Size#NONE. @@ -91,7 +91,7 @@ enum Size { */ @LayoutRes int defaultLayout() default 0; // ^^^^^^^^^ reference androidx/annotation/LayoutRes# -// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelView#defaultLayout(). @LayoutRes public 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} @@ -100,7 +100,7 @@ enum Size { */ Class baseModelClass() default Void.class; //^^^^^ reference java/lang/Class# -// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelView#baseModelClass(). public Class baseModelClass() +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelView#baseModelClass(). public abstract Class baseModelClass() // ^^^^ reference java/lang/Void# // ^^^^^ reference java/lang/Void#class. /** @@ -109,12 +109,12 @@ enum Size { * see: EpoxyModel#shouldSaveViewState */ boolean saveViewState() default false; -// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelView#saveViewState(). public boolean saveViewState() +// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelView#saveViewState(). public abstract boolean saveViewState() /** * True to have the generated model take up the total available span count. False to instead use a * span count of 1. If you need to programmatically determine your model's span size you can use * the spanSizeCallback method on EpoxyModel. */ boolean fullSpan() default true; -// ^^^^^^^^ definition com/airbnb/epoxy/ModelView#fullSpan(). public boolean fullSpan() +// ^^^^^^^^ definition com/airbnb/epoxy/ModelView#fullSpan(). public abstract boolean fullSpan() } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBoundListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBoundListener.java index 5b385ac2..a64878fa 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBoundListener.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBoundListener.java @@ -15,7 +15,7 @@ public interface OnModelBoundListener, V> { * @param position The adapter position of the model */ void onModelBound(T model, V view, int position); -// ^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelBoundListener#onModelBound(). public void onModelBound(T model, V view, int position) +// ^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelBoundListener#onModelBound(). public abstract void onModelBound(T model, V view, int position) // ^ reference com/airbnb/epoxy/OnModelBoundListener#[T] // ^^^^^ definition local0 T model // ^ reference com/airbnb/epoxy/OnModelBoundListener#[V] 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 35b906dd..b2ca42f5 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBuildFinishedListener.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBuildFinishedListener.java @@ -16,7 +16,7 @@ public interface OnModelBuildFinishedListener { * the adapter. This will be called even if no changes existed. */ void onModelBuildFinished(@NonNull DiffResult result); -// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelBuildFinishedListener#onModelBuildFinished(). public void onModelBuildFinished(DiffResult result) +// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelBuildFinishedListener#onModelBuildFinished(). public abstract void onModelBuildFinished(DiffResult result) // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^^^^^^^ reference com/airbnb/epoxy/DiffResult# // ^^^^^^ definition local0 @NonNull DiffResult result diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelCheckedChangeListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelCheckedChangeListener.java index 8c2e7444..76239ddc 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelCheckedChangeListener.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelCheckedChangeListener.java @@ -21,7 +21,7 @@ public interface OnModelCheckedChangeListener, V> { * @param position The position of the model in the adapter. */ void onChecked(T model, V parentView, -// ^^^^^^^^^ definition com/airbnb/epoxy/OnModelCheckedChangeListener#onChecked(). public void onChecked(T model, V parentView, unresolved_type checkedView, boolean isChecked, int position) +// ^^^^^^^^^ definition com/airbnb/epoxy/OnModelCheckedChangeListener#onChecked(). public abstract void onChecked(T model, V parentView, unresolved_type checkedView, boolean isChecked, int position) // ^ reference com/airbnb/epoxy/OnModelCheckedChangeListener#[T] // ^^^^^ definition local0 T model // ^ reference com/airbnb/epoxy/OnModelCheckedChangeListener#[V] diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelClickListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelClickListener.java index f9542b9f..415a7b0b 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelClickListener.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelClickListener.java @@ -21,7 +21,7 @@ public interface OnModelClickListener, V> { * @param position The position of the model in the adapter. */ void onClick(T model, V parentView, View clickedView, int position); -// ^^^^^^^ definition com/airbnb/epoxy/OnModelClickListener#onClick(). public void onClick(T model, V parentView, unresolved_type clickedView, int position) +// ^^^^^^^ definition com/airbnb/epoxy/OnModelClickListener#onClick(). public abstract void onClick(T model, V parentView, unresolved_type clickedView, int position) // ^ reference com/airbnb/epoxy/OnModelClickListener#[T] // ^^^^^ definition local0 T model // ^ reference com/airbnb/epoxy/OnModelClickListener#[V] diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelLongClickListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelLongClickListener.java index 457dba47..374dfd13 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelLongClickListener.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelLongClickListener.java @@ -20,7 +20,7 @@ public interface OnModelLongClickListener, V> { * @param position The position of the model in the adapter. */ boolean onLongClick(T model, V parentView, View clickedView, int position); -// ^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelLongClickListener#onLongClick(). public boolean onLongClick(T model, V parentView, unresolved_type clickedView, int position) +// ^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelLongClickListener#onLongClick(). public abstract boolean onLongClick(T model, V parentView, unresolved_type clickedView, int position) // ^ reference com/airbnb/epoxy/OnModelLongClickListener#[T] // ^^^^^ definition local0 T model // ^ reference com/airbnb/epoxy/OnModelLongClickListener#[V] diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelUnboundListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelUnboundListener.java index ba959f5e..0f9aac16 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelUnboundListener.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelUnboundListener.java @@ -11,7 +11,7 @@ public interface OnModelUnboundListener, V> { * that were unbound. */ void onModelUnbound(T model, V view); -// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelUnboundListener#onModelUnbound(). public void onModelUnbound(T model, V view) +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelUnboundListener#onModelUnbound(). public abstract void onModelUnbound(T model, V view) // ^ reference com/airbnb/epoxy/OnModelUnboundListener#[T] // ^^^^^ definition local0 T model // ^ reference com/airbnb/epoxy/OnModelUnboundListener#[V] 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 a7c10aa2..48c1c197 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityChangedListener.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityChangedListener.java @@ -33,7 +33,7 @@ public interface OnModelVisibilityChangedListener, V> { * @param widthVisible The visible width in pixel */ void onVisibilityChanged(T model, V view, -// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelVisibilityChangedListener#onVisibilityChanged(). public void onVisibilityChanged(T model, V view, float percentVisibleHeight, float percentVisibleWidth, int heightVisible, int widthVisible) +// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelVisibilityChangedListener#onVisibilityChanged(). public abstract void onVisibilityChanged(T model, V view, float percentVisibleHeight, float percentVisibleWidth, int heightVisible, int widthVisible) // ^ reference com/airbnb/epoxy/OnModelVisibilityChangedListener#[T] // ^^^^^ definition local0 T model // ^ reference com/airbnb/epoxy/OnModelVisibilityChangedListener#[V] 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 380d2fcd..dac6496f 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityStateChangedListener.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelVisibilityStateChangedListener.java @@ -25,7 +25,7 @@ public interface OnModelVisibilityStateChangedListener, * @see VisibilityState */ void onVisibilityStateChanged(T model, V view, @Visibility int visibilityState); -// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelVisibilityStateChangedListener#onVisibilityStateChanged(). public void onVisibilityStateChanged(T model, V view, int visibilityState) +// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelVisibilityStateChangedListener#onVisibilityStateChanged(). public abstract void onVisibilityStateChanged(T model, V view, int visibilityState) // ^ reference com/airbnb/epoxy/OnModelVisibilityStateChangedListener#[T] // ^^^^^ definition local0 T model // ^ reference com/airbnb/epoxy/OnModelVisibilityStateChangedListener#[V] 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 1ff05c99..7b9a769d 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/PackageEpoxyConfig.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/PackageEpoxyConfig.java @@ -66,7 +66,7 @@ * implement hashCode/equals. */ boolean requireHashCode() default REQUIRE_HASHCODE_DEFAULT; -// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageEpoxyConfig#requireHashCode(). public boolean requireHashCode() +// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageEpoxyConfig#requireHashCode(). public abstract boolean requireHashCode() // ^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/PackageEpoxyConfig#REQUIRE_HASHCODE_DEFAULT. /** @@ -78,7 +78,7 @@ * of the generated class. */ boolean requireAbstractModels() default REQUIRE_ABSTRACT_MODELS_DEFAULT; -// ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageEpoxyConfig#requireAbstractModels(). public boolean requireAbstractModels() +// ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageEpoxyConfig#requireAbstractModels(). public abstract boolean requireAbstractModels() // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/PackageEpoxyConfig#REQUIRE_ABSTRACT_MODELS_DEFAULT. /** @@ -90,6 +90,6 @@ * https://github.com/airbnb/epoxy/wiki/Epoxy-Controller#implicit-adding */ boolean implicitlyAddAutoModels() default IMPLICITLY_ADD_AUTO_MODELS_DEFAULT; -// ^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageEpoxyConfig#implicitlyAddAutoModels(). public boolean implicitlyAddAutoModels() +// ^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageEpoxyConfig#implicitlyAddAutoModels(). public abstract boolean implicitlyAddAutoModels() // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/PackageEpoxyConfig#IMPLICITLY_ADD_AUTO_MODELS_DEFAULT. } 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 1266d5b2..dafa6774 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/PackageModelViewConfig.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/PackageModelViewConfig.java @@ -42,7 +42,7 @@ */ Class rClass(); //^^^^^ reference java/lang/Class# -// ^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#rClass(). public Class rClass() +// ^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#rClass(). public abstract Class rClass() /** * A default layout pattern to be used for specifying layouts for generated models. If this is set * then a layout can be omitted from a view's {@link com.airbnb.epoxy.ModelView} annotation. @@ -53,12 +53,12 @@ */ String defaultLayoutPattern() default "%s"; //^^^^^^ reference java/lang/String# -// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#defaultLayoutPattern(). public String defaultLayoutPattern() +// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#defaultLayoutPattern(). public abstract String defaultLayoutPattern() /** An optional EpoxyModel subclass that generated models should extend. */ Class defaultBaseModelClass() default Void.class; //^^^^^ reference java/lang/Class# -// ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#defaultBaseModelClass(). public Class defaultBaseModelClass() +// ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#defaultBaseModelClass(). public abstract Class defaultBaseModelClass() // ^^^^ reference java/lang/Void# // ^^^^^ reference java/lang/Void#class. @@ -71,14 +71,14 @@ * other layout instead of the default. */ boolean useLayoutOverloads() default false; -// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#useLayoutOverloads(). public boolean useLayoutOverloads() +// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#useLayoutOverloads(). public abstract boolean useLayoutOverloads() /** * Suffix, which will be appended to generated model's names. "Model_" is a default value. */ String generatedModelSuffix() default "Model_"; //^^^^^^ reference java/lang/String# -// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#generatedModelSuffix(). public String generatedModelSuffix() +// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#generatedModelSuffix(). public abstract String generatedModelSuffix() /** * Controls whether "builder" setter functions that returns the model type will be duplicated @@ -93,7 +93,7 @@ */ Option disableGenerateBuilderOverloads() default Option.Default; //^^^^^^ reference com/airbnb/epoxy/PackageModelViewConfig#Option# -// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#disableGenerateBuilderOverloads(). public Option disableGenerateBuilderOverloads() +// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#disableGenerateBuilderOverloads(). public abstract Option disableGenerateBuilderOverloads() // ^^^^^^ reference com/airbnb/epoxy/PackageModelViewConfig#Option# // ^^^^^^^ reference com/airbnb/epoxy/PackageModelViewConfig#Option#Default. @@ -107,7 +107,7 @@ */ Option disableGenerateGetters() default Option.Default; //^^^^^^ reference com/airbnb/epoxy/PackageModelViewConfig#Option# -// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#disableGenerateGetters(). public Option disableGenerateGetters() +// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#disableGenerateGetters(). public abstract Option disableGenerateGetters() // ^^^^^^ reference com/airbnb/epoxy/PackageModelViewConfig#Option# // ^^^^^^^ reference com/airbnb/epoxy/PackageModelViewConfig#Option#Default. @@ -122,7 +122,7 @@ */ Option disableGenerateReset() default Option.Default; //^^^^^^ reference com/airbnb/epoxy/PackageModelViewConfig#Option# -// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#disableGenerateReset(). public Option disableGenerateReset() +// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#disableGenerateReset(). public abstract Option disableGenerateReset() // ^^^^^^ reference com/airbnb/epoxy/PackageModelViewConfig#Option# // ^^^^^^^ reference com/airbnb/epoxy/PackageModelViewConfig#Option#Default. diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/StyleBuilderCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/StyleBuilderCallback.java index 277d10bb..d99f5699 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/StyleBuilderCallback.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/StyleBuilderCallback.java @@ -8,7 +8,7 @@ public interface StyleBuilderCallback { // ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/StyleBuilderCallback# public interface StyleBuilderCallback // ^ definition com/airbnb/epoxy/StyleBuilderCallback#[T] T void buildStyle(T builder); -// ^^^^^^^^^^ definition com/airbnb/epoxy/StyleBuilderCallback#buildStyle(). public void buildStyle(T builder) +// ^^^^^^^^^^ definition com/airbnb/epoxy/StyleBuilderCallback#buildStyle(). public abstract void buildStyle(T builder) // ^ reference com/airbnb/epoxy/StyleBuilderCallback#[T] // ^^^^^^^ definition local0 T builder } 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 16812c8b..e554c2fc 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/TextProp.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/TextProp.java @@ -49,5 +49,5 @@ @StringRes int defaultRes() default 0; // ^^^^^^^^^ reference androidx/annotation/StringRes# -// ^^^^^^^^^^ definition com/airbnb/epoxy/TextProp#defaultRes(). @StringRes public int defaultRes() +// ^^^^^^^^^^ definition com/airbnb/epoxy/TextProp#defaultRes(). @StringRes public abstract int defaultRes() } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Timer.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Timer.java index 187a6492..a703490f 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Timer.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Timer.java @@ -3,9 +3,9 @@ interface Timer { // ^^^^^ definition com/airbnb/epoxy/Timer# interface Timer void start(String sectionName); -// ^^^^^ definition com/airbnb/epoxy/Timer#start(). public void start(String sectionName) +// ^^^^^ definition com/airbnb/epoxy/Timer#start(). public abstract void start(String sectionName) // ^^^^^^ reference java/lang/String# // ^^^^^^^^^^^ definition local0 String sectionName void stop(); -// ^^^^ definition com/airbnb/epoxy/Timer#stop(). public void stop() +// ^^^^ definition com/airbnb/epoxy/Timer#stop(). public abstract void stop() } diff --git a/tests/snapshots/src/main/generated/minimized/Annotations.java b/tests/snapshots/src/main/generated/minimized/Annotations.java index ed5bd898..70f4cdaa 100644 --- a/tests/snapshots/src/main/generated/minimized/Annotations.java +++ b/tests/snapshots/src/main/generated/minimized/Annotations.java @@ -55,9 +55,9 @@ String value() default ""; //^^^^^^ reference java/lang/String# -// ^^^^^ definition minimized/Annotations#value(). public String value() +// ^^^^^ definition minimized/Annotations#value(). public abstract String value() String format() default ""; //^^^^^^ reference java/lang/String# -// ^^^^^^ definition minimized/Annotations#format(). public String format() +// ^^^^^^ definition minimized/Annotations#format(). public abstract String format() } diff --git a/tests/snapshots/src/main/generated/minimized/InnerClasses.java b/tests/snapshots/src/main/generated/minimized/InnerClasses.java index 7df72d87..0ed00bb9 100644 --- a/tests/snapshots/src/main/generated/minimized/InnerClasses.java +++ b/tests/snapshots/src/main/generated/minimized/InnerClasses.java @@ -31,7 +31,7 @@ public interface InnerInterface { // ^ definition minimized/InnerClasses#InnerInterface#[B] B B apply(A a); // ^ reference minimized/InnerClasses#InnerInterface#[B] -// ^^^^^ definition minimized/InnerClasses#InnerInterface#apply(). public B apply(A a) +// ^^^^^ definition minimized/InnerClasses#InnerInterface#apply(). public abstract B apply(A a) // ^ reference minimized/InnerClasses#InnerInterface#[A] // ^ definition local1 A a } diff --git a/tests/snapshots/src/main/generated/minimized/Interfaces.java b/tests/snapshots/src/main/generated/minimized/Interfaces.java index 85eb3227..cfc1253c 100644 --- a/tests/snapshots/src/main/generated/minimized/Interfaces.java +++ b/tests/snapshots/src/main/generated/minimized/Interfaces.java @@ -2,13 +2,16 @@ public interface Interfaces { // ^^^^^^^^^^ definition minimized/Interfaces# public interface Interfaces + static void staticInterfaceMethod() {} +// ^^^^^^^^^^^^^^^^^^^^^ definition minimized/Interfaces#staticInterfaceMethod(). public static void staticInterfaceMethod() + String abstractInterfaceMethod(); //^^^^^^ reference java/lang/String# -// ^^^^^^^^^^^^^^^^^^^^^^^ definition minimized/Interfaces#abstractInterfaceMethod(). public String abstractInterfaceMethod() +// ^^^^^^^^^^^^^^^^^^^^^^^ definition minimized/Interfaces#abstractInterfaceMethod(). public abstract String abstractInterfaceMethod() default String defaultInterfaceMethod() { // ^^^^^^ reference java/lang/String# -// ^^^^^^^^^^^^^^^^^^^^^^ definition minimized/Interfaces#defaultInterfaceMethod(). public String defaultInterfaceMethod() +// ^^^^^^^^^^^^^^^^^^^^^^ definition minimized/Interfaces#defaultInterfaceMethod(). public default String defaultInterfaceMethod() return "default"; } } diff --git a/tests/snapshots/src/main/generated/minimized/TypeVariables.java b/tests/snapshots/src/main/generated/minimized/TypeVariables.java index 81e20767..df8605d3 100644 --- a/tests/snapshots/src/main/generated/minimized/TypeVariables.java +++ b/tests/snapshots/src/main/generated/minimized/TypeVariables.java @@ -20,7 +20,7 @@ void mCPackage() {} interface I { // ^ definition minimized/TypeVariables#I# interface I void mI(); -// ^^ definition minimized/TypeVariables#I#mI(). public void mI() +// ^^ definition minimized/TypeVariables#I#mI(). public abstract void mI() } static class CT extends C implements I {