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..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 @@ -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,6 +150,7 @@ private void formatClassSignature(ClassSignature classSignature) { private void formatMethodSignature(MethodSignature methodSignature) { printKeywordln(formatAnnotations()); printKeyword(formatAccess()); + printKeyword(formatModifiers()); List typeParameters = getSymlinks(methodSignature.getTypeParameters()); @@ -397,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 4e7c9e6c..1137e049 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyDiffer.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyDiffer.java @@ -53,7 +53,7 @@ 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) // ^^^^^^^ reference androidx/annotation/NonNull# 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..94524eb9 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# 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..5423189a 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java @@ -670,7 +670,7 @@ 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) // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController# @@ -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 @@ -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. 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..1686d2a4 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# 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..7c1ab69c 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java @@ -648,7 +648,7 @@ 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() } @@ -913,7 +913,7 @@ 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 local54 int totalSpanCount 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..9efbb69d 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java @@ -540,7 +540,7 @@ 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) // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# 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..b5684a6a 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# 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..5aa92e18 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. 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..e15d89d4 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelList.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelList.java @@ -62,7 +62,7 @@ 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 local1 int positionStart 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..a64878fa 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 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..b2ca42f5 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBuildFinishedListener.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnModelBuildFinishedListener.java @@ -10,7 +10,7 @@ * 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. 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..76239ddc 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 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..415a7b0b 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 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..374dfd13 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 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..0f9aac16 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 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..48c1c197 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] 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..dac6496f 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] 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..d99f5699 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/StyleBuilderCallback.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/StyleBuilderCallback.java @@ -5,7 +5,7 @@ * 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) 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..a703490f 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Timer.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Timer.java @@ -1,7 +1,7 @@ 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) // ^^^^^^ reference java/lang/String# diff --git a/tests/snapshots/src/main/generated/minimized/InnerClasses.java b/tests/snapshots/src/main/generated/minimized/InnerClasses.java index 61309437..0ed00bb9 100644 --- a/tests/snapshots/src/main/generated/minimized/InnerClasses.java +++ b/tests/snapshots/src/main/generated/minimized/InnerClasses.java @@ -26,7 +26,7 @@ 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); diff --git a/tests/snapshots/src/main/generated/minimized/Interfaces.java b/tests/snapshots/src/main/generated/minimized/Interfaces.java index efe8cc35..cfc1253c 100644 --- a/tests/snapshots/src/main/generated/minimized/Interfaces.java +++ b/tests/snapshots/src/main/generated/minimized/Interfaces.java @@ -1,14 +1,17 @@ package minimized; public interface Interfaces { -// ^^^^^^^^^^ definition minimized/Interfaces# public abstract 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 abstract String abstractInterfaceMethod() default String defaultInterfaceMethod() { // ^^^^^^ reference java/lang/String# -// ^^^^^^^^^^^^^^^^^^^^^^ definition minimized/Interfaces#defaultInterfaceMethod(). public abstract 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 f1b85a72..df8605d3 100644 --- a/tests/snapshots/src/main/generated/minimized/TypeVariables.java +++ b/tests/snapshots/src/main/generated/minimized/TypeVariables.java @@ -18,7 +18,7 @@ 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() }