From 280203c3451c55a03a55eb12b154db9d36d9bf81 Mon Sep 17 00:00:00 2001 From: Noah Santschi-Cooney Date: Thu, 15 Apr 2021 17:11:12 +0100 Subject: [PATCH 1/2] dont emit references for 'this' --- .../semanticdb_javac/GlobalSymbolsCache.java | 3 --- .../semanticdb_javac/SemanticdbVisitor.java | 1 + .../airbnb/epoxy/AsyncEpoxyController.java | 2 -- .../com/airbnb/epoxy/AsyncEpoxyDiffer.java | 7 ------ .../com/airbnb/epoxy/BaseEpoxyAdapter.java | 2 -- .../generated/com/airbnb/epoxy/Carousel.java | 12 ---------- .../com/airbnb/epoxy/DebugTimer.java | 2 -- .../com/airbnb/epoxy/DiffHelper.java | 2 -- .../com/airbnb/epoxy/DiffPayload.java | 1 - .../com/airbnb/epoxy/DiffResult.java | 3 --- .../com/airbnb/epoxy/EpoxyAdapter.java | 1 - .../com/airbnb/epoxy/EpoxyController.java | 9 -------- .../airbnb/epoxy/EpoxyControllerAdapter.java | 3 --- .../com/airbnb/epoxy/EpoxyDiffLogger.java | 1 - .../com/airbnb/epoxy/EpoxyHolder.java | 1 - .../epoxy/EpoxyItemSpacingDecorator.java | 2 -- .../com/airbnb/epoxy/EpoxyModel.java | 22 +------------------ .../com/airbnb/epoxy/EpoxyModelGroup.java | 8 ------- .../airbnb/epoxy/EpoxyModelTouchCallback.java | 2 -- .../com/airbnb/epoxy/EpoxyTouchHelper.java | 18 --------------- .../com/airbnb/epoxy/EpoxyViewHolder.java | 3 --- .../com/airbnb/epoxy/HandlerExecutor.java | 1 - .../airbnb/epoxy/ImmutableModelException.java | 1 - .../generated/com/airbnb/epoxy/ModelList.java | 13 +++++------ .../com/airbnb/epoxy/ModelState.java | 1 - .../epoxy/QuantityStringResAttribute.java | 5 ----- .../com/airbnb/epoxy/SimpleEpoxyModel.java | 5 ----- .../com/airbnb/epoxy/StringAttributeData.java | 9 -------- .../airbnb/epoxy/Typed2EpoxyController.java | 2 -- .../airbnb/epoxy/Typed3EpoxyController.java | 3 --- .../airbnb/epoxy/Typed4EpoxyController.java | 4 ---- .../com/airbnb/epoxy/ViewHolderState.java | 2 -- ...rappedEpoxyModelCheckedChangeListener.java | 2 -- .../src/main/generated/minimized/Enums.java | 1 - .../generated/minimized/InnerClasses.java | 2 -- 35 files changed, 7 insertions(+), 149 deletions(-) diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/GlobalSymbolsCache.java b/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/GlobalSymbolsCache.java index 400b9c2a..2af332e6 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/GlobalSymbolsCache.java +++ b/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/GlobalSymbolsCache.java @@ -80,9 +80,6 @@ private SemanticdbSymbols.Descriptor semanticdbDescriptor(Symbol sym) { return new SemanticdbSymbols.Descriptor( SemanticdbSymbols.Descriptor.Kind.TypeParameter, sym.name.toString()); } else if (sym instanceof Symbol.VarSymbol) { - if (sym.name.toString().equals("this")) { - return new SemanticdbSymbols.Descriptor(SemanticdbSymbols.Descriptor.Kind.None, ""); - } return new SemanticdbSymbols.Descriptor( SemanticdbSymbols.Descriptor.Kind.Term, sym.name.toString()); } else { 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 44a75a28..56b825b2 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 @@ -193,6 +193,7 @@ public Void visitVariable(VariableTree node, Void unused) { public Void visitIdentifier(IdentifierTree node, Void unused) { if (node instanceof JCTree.JCIdent) { JCTree.JCIdent ident = (JCTree.JCIdent) node; + if (ident.name.toString().equals("this")) return null; emitSymbolOccurrence(ident.sym, ident, Role.REFERENCE, CompilerRange.FROM_START_TO_END); } return super.visitIdentifier(node, unused); diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyController.java index 071e7728..a70aee6f 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyController.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyController.java @@ -32,7 +32,6 @@ public abstract class AsyncEpoxyController extends EpoxyController { public AsyncEpoxyController() { // ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyController#``(). public AsyncEpoxyController() this(true); -// ^^^^ reference com/airbnb/epoxy/AsyncEpoxyController#``(+1). } /** @@ -43,7 +42,6 @@ public AsyncEpoxyController(boolean enableAsync) { // ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyController#``(+1). public AsyncEpoxyController(boolean enableAsync) // ^^^^^^^^^^^ definition local0 boolean enableAsync this(enableAsync, enableAsync); -// ^^^^ reference com/airbnb/epoxy/AsyncEpoxyController#``(+2). // ^^^^^^^^^^^ reference local0 // ^^^^^^^^^^^ reference local0 } 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 fe536e35..6ae4b7d6 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyDiffer.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyDiffer.java @@ -93,16 +93,13 @@ interface ResultCallback { // ^^^^^^^^^^^^ definition local3 @NonNull unresolved_type diffCallback ) { this.executor = new HandlerExecutor(handler); -// ^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer# // ^^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#executor. // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/HandlerExecutor#``(). // ^^^^^^^ reference local1 this.resultCallback = resultCallback; -// ^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer# // ^^^^^^^^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#resultCallback. // ^^^^^^^^^^^^^^ reference local2 this.diffCallback = diffCallback; -// ^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer# // ^^^^^^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#diffCallback. // ^^^^^^^^^^^^ reference local3 } @@ -239,7 +236,6 @@ public void submitList(@Nullable final List> newList) { // ^^^^^^^^^^^^ definition local9 @Nullable final List> previousList synchronized (this) { -// ^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer# // Incrementing generation means any currently-running diffs are discarded when they finish // We synchronize to guarantee list object and generation number are in sync runGeneration = generationTracker.incrementAndGetNextScheduled(); @@ -530,15 +526,12 @@ private static class DiffCallback extends DiffUtil.Callback { // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^^^^^^^^ definition local30 unresolved_type diffCallback this.oldList = oldList; -// ^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback# // ^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#oldList. // ^^^^^^^ reference local28 this.newList = newList; -// ^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback# // ^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#newList. // ^^^^^^^ reference local29 this.diffCallback = diffCallback; -// ^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback# // ^^^^^^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#diffCallback. // ^^^^^^^^^^^^ reference local30 } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyAdapter.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyAdapter.java index c43be856..b38c999d 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyAdapter.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyAdapter.java @@ -213,7 +213,6 @@ public EpoxyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { // ^^^^^ definition local9 EpoxyModel model // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BaseEpoxyAdapter#viewTypeManager. // ^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ViewTypeManager#getModelForViewType(). -// ^^^^ reference com/airbnb/epoxy/BaseEpoxyAdapter# // ^^^^^^^^ reference local8 View view = model.buildView(parent); // ^^^^ reference _root_/ @@ -633,7 +632,6 @@ public void setSpanCount(int spanCount) { // ^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#setSpanCount(). public void setSpanCount(int spanCount) // ^^^^^^^^^ definition local44 int spanCount this.spanCount = spanCount; -// ^^^^ reference com/airbnb/epoxy/BaseEpoxyAdapter# // ^^^^^^^^^ reference com/airbnb/epoxy/BaseEpoxyAdapter#spanCount. // ^^^^^^^^^ reference local44 } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java index 05548de3..0998d7f9 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java @@ -225,7 +225,6 @@ && getPaddingBottom() == 0) { // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#SnapHelperFactory#buildSnapHelper(). // ^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#getContext# // ^^^^^^^^^^^^^^^^^^^^ reference ``#attachToRecyclerView# -// ^^^^ reference com/airbnb/epoxy/Carousel# } // Carousels will be detached when their parent recyclerview is @@ -437,7 +436,6 @@ private int getSpaceForChildren(boolean horizontal) { // ^^^^^^^^^^ reference local24 return getTotalWidthPx(this) // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#getTotalWidthPx(). -// ^^^^ reference com/airbnb/epoxy/Carousel# - getPaddingLeft() // ^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#getPaddingLeft# - (getClipToPadding() ? getPaddingRight() : 0); @@ -449,7 +447,6 @@ private int getSpaceForChildren(boolean horizontal) { } else { return getTotalHeightPx(this) // ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#getTotalHeightPx(). -// ^^^^ reference com/airbnb/epoxy/Carousel# - getPaddingTop() // ^^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#getPaddingTop# - (getClipToPadding() ? getPaddingBottom() : 0); @@ -950,7 +947,6 @@ public Padding(@Px int paddingPx, @Px int itemSpacingPx) { // ^^ reference androidx/annotation/Px# // ^^^^^^^^^^^^^ definition local53 @Px int itemSpacingPx this(paddingPx, paddingPx, paddingPx, paddingPx, itemSpacingPx, PaddingType.PX); -// ^^^^ reference com/airbnb/epoxy/Carousel#Padding#``(+2). // ^^^^^^^^^ reference local52 // ^^^^^^^^^ reference local52 // ^^^^^^^^^ reference local52 @@ -982,7 +978,6 @@ public Padding( // ^^ reference androidx/annotation/Px# // ^^^^^^^^^^^^^ definition local58 @Px int itemSpacingPx this(leftPx, topPx, rightPx, bottomPx, itemSpacingPx, PaddingType.PX); -// ^^^^ reference com/airbnb/epoxy/Carousel#Padding#``(+2). // ^^^^^^ reference local54 // ^^^^^ reference local55 // ^^^^^^^ reference local56 @@ -1013,27 +1008,21 @@ private Padding( // ^^^^^^^^^^^ definition local64 PaddingType paddingType this.left = left; -// ^^^^ reference com/airbnb/epoxy/Carousel#Padding# // ^^^^ reference com/airbnb/epoxy/Carousel#Padding#left. // ^^^^ reference local59 this.top = top; -// ^^^^ reference com/airbnb/epoxy/Carousel#Padding# // ^^^ reference com/airbnb/epoxy/Carousel#Padding#top. // ^^^ reference local60 this.right = right; -// ^^^^ reference com/airbnb/epoxy/Carousel#Padding# // ^^^^^ reference com/airbnb/epoxy/Carousel#Padding#right. // ^^^^^ reference local61 this.bottom = bottom; -// ^^^^ reference com/airbnb/epoxy/Carousel#Padding# // ^^^^^^ reference com/airbnb/epoxy/Carousel#Padding#bottom. // ^^^^^^ reference local62 this.itemSpacing = itemSpacing; -// ^^^^ reference com/airbnb/epoxy/Carousel#Padding# // ^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#Padding#itemSpacing. // ^^^^^^^^^^^ reference local63 this.paddingType = paddingType; -// ^^^^ reference com/airbnb/epoxy/Carousel#Padding# // ^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#Padding#paddingType. // ^^^^^^^^^^^ reference local64 } @@ -1045,7 +1034,6 @@ public boolean equals(Object o) { // ^^^^^^ reference java/lang/Object# // ^ definition local65 Object o if (this == o) { -// ^^^^ reference com/airbnb/epoxy/Carousel#Padding# // ^ reference local65 return true; } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DebugTimer.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DebugTimer.java index 5eb7b225..db70bedc 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DebugTimer.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DebugTimer.java @@ -23,7 +23,6 @@ class DebugTimer implements Timer { // ^^^^^^ reference java/lang/String# // ^^^ definition local0 String tag this.tag = tag; -// ^^^^ reference com/airbnb/epoxy/DebugTimer# // ^^^ reference com/airbnb/epoxy/DebugTimer#tag. // ^^^ reference local0 reset(); @@ -55,7 +54,6 @@ public void start(String sectionName) { // ^^^^^^ reference java/lang/System# // ^^^^^^^^ reference java/lang/System#nanoTime(). this.sectionName = sectionName; -// ^^^^ reference com/airbnb/epoxy/DebugTimer# // ^^^^^^^^^^^ reference com/airbnb/epoxy/DebugTimer#sectionName. // ^^^^^^^^^^^ reference local1 } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffHelper.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffHelper.java index 6460a0fa..36729b09 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffHelper.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffHelper.java @@ -74,11 +74,9 @@ class DiffHelper { // ^^^^^^^ definition local0 BaseEpoxyAdapter adapter // ^^^^^^^^^^^^^^^ definition local1 boolean immutableModels this.adapter = adapter; -// ^^^^ reference com/airbnb/epoxy/DiffHelper# // ^^^^^^^ reference com/airbnb/epoxy/DiffHelper#adapter. // ^^^^^^^ reference local0 this.immutableModels = immutableModels; -// ^^^^ reference com/airbnb/epoxy/DiffHelper# // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/DiffHelper#immutableModels. // ^^^^^^^^^^^^^^^ reference local1 adapter.registerAdapterDataObserver(observer); diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffPayload.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffPayload.java index 1e8aae60..9c46af91 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffPayload.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffPayload.java @@ -90,7 +90,6 @@ public DiffPayload(EpoxyModel changedItem) { // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^^^^^^^ definition local3 EpoxyModel changedItem this(Collections.singletonList(changedItem)); -// ^^^^ reference com/airbnb/epoxy/DiffPayload#``(). // ^^^^^^^^^^^ reference java/util/Collections# // ^^^^^^^^^^^^^ reference java/util/Collections#singletonList(). // ^^^^^^^^^^^ reference local3 diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffResult.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffResult.java index 6dabd13b..e2f8c13d 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffResult.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffResult.java @@ -168,15 +168,12 @@ private DiffResult( // ^^^^^^^^^^^^ definition local8 @Nullable unresolved_type differResult ) { this.previousModels = previousModels; -// ^^^^ reference com/airbnb/epoxy/DiffResult# // ^^^^^^^^^^^^^^ reference com/airbnb/epoxy/DiffResult#previousModels. // ^^^^^^^^^^^^^^ reference local6 this.newModels = newModels; -// ^^^^ reference com/airbnb/epoxy/DiffResult# // ^^^^^^^^^ reference com/airbnb/epoxy/DiffResult#newModels. // ^^^^^^^^^ reference local7 this.differResult = differResult; -// ^^^^ reference com/airbnb/epoxy/DiffResult# // ^^^^^^^^^^^^ reference com/airbnb/epoxy/DiffResult#differResult. // ^^^^^^^^^^^^ reference local8 } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAdapter.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAdapter.java index 1456bdec..5c524fe4 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAdapter.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAdapter.java @@ -96,7 +96,6 @@ protected void enableDiffing() { diffHelper = new DiffHelper(this, false); // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyAdapter#diffHelper. // ^^^^^^^^^^ reference com/airbnb/epoxy/DiffHelper#``(). -// ^^^^ reference com/airbnb/epoxy/EpoxyAdapter# } @Override 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 568db920..0a981f0a 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java @@ -207,7 +207,6 @@ public abstract class EpoxyController implements ModelCollector, StickyHeaderCal // ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ControllerHelper# // ^^^^^^ definition com/airbnb/epoxy/EpoxyController#helper. private final ControllerHelper helper // ^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ControllerHelperLookup#getHelperForController(). -// ^^^^ reference com/airbnb/epoxy/EpoxyController# private ControllerModelList modelsBeingBuilt; // ^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ControllerModelList# // ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#modelsBeingBuilt. private ControllerModelList modelsBeingBuilt @@ -224,7 +223,6 @@ public abstract class EpoxyController implements ModelCollector, StickyHeaderCal public EpoxyController() { // ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#``(). public EpoxyController() this(defaultModelBuildingHandler, defaultDiffingHandler); -// ^^^^ reference com/airbnb/epoxy/EpoxyController#``(+1). // ^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#defaultModelBuildingHandler. // ^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#defaultDiffingHandler. } @@ -238,7 +236,6 @@ public EpoxyController(Handler modelBuildingHandler, Handler diffingHandler) { adapter = new EpoxyControllerAdapter(this, diffingHandler); // ^^^^^^^ reference com/airbnb/epoxy/EpoxyController#adapter. // ^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyControllerAdapter#``(). -// ^^^^ reference com/airbnb/epoxy/EpoxyController# // ^^^^^^^^^^^^^^ reference local1 modelBuildHandler = modelBuildingHandler; // ^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#modelBuildHandler. @@ -698,7 +695,6 @@ private void runInterceptors() { callback.onInterceptorsStarted(this); // ^^^^^^^^ reference local20 // ^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#onInterceptorsStarted(). -// ^^^^ reference com/airbnb/epoxy/EpoxyController# } } @@ -729,7 +725,6 @@ private void runInterceptors() { callback.onInterceptorsFinished(this); // ^^^^^^^^ reference local22 // ^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#onInterceptorsFinished(). -// ^^^^ reference com/airbnb/epoxy/EpoxyController# } } } @@ -840,7 +835,6 @@ public void add(@NonNull EpoxyModel model) { model.addTo(this); // ^^^^^ reference local26 // ^^^^^ reference com/airbnb/epoxy/EpoxyModel#addTo(). -// ^^^^ reference com/airbnb/epoxy/EpoxyController# } /** @@ -974,7 +968,6 @@ void addCurrentlyStagedModelIfExists() { stagedModel.addTo(this); // ^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#stagedModel. // ^^^^^ reference com/airbnb/epoxy/EpoxyModel#addTo(). -// ^^^^ reference com/airbnb/epoxy/EpoxyController# } stagedModel = null; // ^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#stagedModel. @@ -1139,7 +1132,6 @@ public void setFilterDuplicates(boolean filterDuplicates) { // ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#setFilterDuplicates(). public void setFilterDuplicates(boolean filterDuplicates) // ^^^^^^^^^^^^^^^^ definition local46 boolean filterDuplicates this.filterDuplicates = filterDuplicates; -// ^^^^ reference com/airbnb/epoxy/EpoxyController# // ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#filterDuplicates. // ^^^^^^^^^^^^^^^^ reference local46 } @@ -1390,7 +1382,6 @@ protected void onExceptionSwallowed(@NonNull RuntimeException exception) { globalExceptionHandler.onException(this, exception); // ^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#globalExceptionHandler. // ^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#ExceptionHandler#onException(). -// ^^^^ reference com/airbnb/epoxy/EpoxyController# // ^^^^^^^^^ reference local56 } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyControllerAdapter.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyControllerAdapter.java index 51956adf..3a2b0665 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyControllerAdapter.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyControllerAdapter.java @@ -85,7 +85,6 @@ public final class EpoxyControllerAdapter extends BaseEpoxyAdapter implements Re // ^^^^^^^ reference _root_/ // ^^^^^^^^^^^^^^ definition local1 unresolved_type diffingHandler this.epoxyController = epoxyController; -// ^^^^ reference com/airbnb/epoxy/EpoxyControllerAdapter# // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyControllerAdapter#epoxyController. // ^^^^^^^^^^^^^^^ reference local0 differ = new AsyncEpoxyDiffer( @@ -94,7 +93,6 @@ public final class EpoxyControllerAdapter extends BaseEpoxyAdapter implements Re diffingHandler, // ^^^^^^^^^^^^^^ reference local1 this, -// ^^^^ reference com/airbnb/epoxy/EpoxyControllerAdapter# ITEM_CALLBACK // ^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyControllerAdapter#ITEM_CALLBACK. ); @@ -223,7 +221,6 @@ public void onResult(@NonNull DiffResult result) { result.dispatchTo(this); // ^^^^^^ reference local7 // ^^^^^^^^^^ reference com/airbnb/epoxy/DiffResult#dispatchTo(). -// ^^^^ reference com/airbnb/epoxy/EpoxyControllerAdapter# notifyBlocker.blockChanges(); // ^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyControllerAdapter#notifyBlocker. // ^^^^^^^^^^^^ reference com/airbnb/epoxy/NotifyBlocker#blockChanges(). diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDiffLogger.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDiffLogger.java index c94d73fa..d8260c9f 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDiffLogger.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDiffLogger.java @@ -39,7 +39,6 @@ public EpoxyDiffLogger(String tag) { // ^^^^^^ reference java/lang/String# // ^^^ definition local0 String tag this.tag = tag; -// ^^^^ reference com/airbnb/epoxy/EpoxyDiffLogger# // ^^^ reference com/airbnb/epoxy/EpoxyDiffLogger#tag. // ^^^ reference local0 } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyHolder.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyHolder.java index b9ae644c..f1bc0f16 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyHolder.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyHolder.java @@ -27,7 +27,6 @@ public EpoxyHolder(@NonNull ViewParent parent) { // ^^^^^^^^^^ reference _root_/ // ^^^^^^ definition local0 @NonNull unresolved_type parent this(); -// ^^^^ reference com/airbnb/epoxy/EpoxyHolder#``(+1). } public EpoxyHolder() { diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyItemSpacingDecorator.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyItemSpacingDecorator.java index 14efe295..2808df5e 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyItemSpacingDecorator.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyItemSpacingDecorator.java @@ -85,7 +85,6 @@ public class EpoxyItemSpacingDecorator extends RecyclerView.ItemDecoration { public EpoxyItemSpacingDecorator() { // ^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyItemSpacingDecorator#``(). public EpoxyItemSpacingDecorator() this(0); -// ^^^^ reference com/airbnb/epoxy/EpoxyItemSpacingDecorator#``(+1). } public EpoxyItemSpacingDecorator(@Px int pxBetweenItems) { @@ -102,7 +101,6 @@ public void setPxBetweenItems(@Px int pxBetweenItems) { // ^^ reference androidx/annotation/Px# // ^^^^^^^^^^^^^^ definition local1 @Px int pxBetweenItems this.pxBetweenItems = pxBetweenItems; -// ^^^^ reference com/airbnb/epoxy/EpoxyItemSpacingDecorator# // ^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyItemSpacingDecorator#pxBetweenItems. // ^^^^^^^^^^^^^^ reference local1 } 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 4b752dff..0288e8b6 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java @@ -138,7 +138,6 @@ protected EpoxyModel(long id) { public EpoxyModel() { // ^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel#``(+1). public EpoxyModel() this(idCounter--); -// ^^^^ reference com/airbnb/epoxy/EpoxyModel#``(). // ^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#idCounter. hasDefaultId = true; // ^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#hasDefaultId. @@ -343,7 +342,6 @@ public EpoxyModel id(long id) { // ^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#addedToAdapter. // ^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#firstControllerAddedTo. // ^^ reference local15 -// ^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^ reference com/airbnb/epoxy/EpoxyModel#id. throw new IllegalEpoxyUsage( // ^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/IllegalEpoxyUsage#``(). @@ -353,11 +351,9 @@ public EpoxyModel id(long id) { hasDefaultId = false; // ^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#hasDefaultId. this.id = id; -// ^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^ reference com/airbnb/epoxy/EpoxyModel#id. // ^^ reference local15 return this; -// ^^^^ reference com/airbnb/epoxy/EpoxyModel# } /** @@ -446,7 +442,6 @@ public EpoxyModel id(@Nullable CharSequence key) { // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/IdUtils#hashString64Bit(). // ^^^ reference local22 return this; -// ^^^^ reference com/airbnb/epoxy/EpoxyModel# } /** @@ -519,7 +514,6 @@ public EpoxyModel id(@Nullable CharSequence key, long id) { // ^^ reference com/airbnb/epoxy/EpoxyModel#id(+1). // ^^^^^^ reference local29 return this; -// ^^^^ reference com/airbnb/epoxy/EpoxyModel# } /** @@ -552,7 +546,6 @@ public EpoxyModel layout(@LayoutRes int layoutRes) { // ^^^^^^ reference com/airbnb/epoxy/EpoxyModel#layout. // ^^^^^^^^^ reference local30 return this; -// ^^^^ reference com/airbnb/epoxy/EpoxyModel# } @LayoutRes @@ -587,7 +580,6 @@ public EpoxyModel reset() { // ^^^^^ reference com/airbnb/epoxy/EpoxyModel#shown. return this; -// ^^^^ reference com/airbnb/epoxy/EpoxyModel# } /** @@ -602,7 +594,6 @@ public void addTo(@NonNull EpoxyController controller) { controller.addInternal(this); // ^^^^^^^^^^ reference local31 // ^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#addInternal(). -// ^^^^ reference com/airbnb/epoxy/EpoxyModel# } /** @@ -628,7 +619,6 @@ public void addIf(boolean condition, @NonNull EpoxyController controller) { controllerToStageTo.clearModelFromStaging(this); // ^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#controllerToStageTo. // ^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#clearModelFromStaging(). -// ^^^^ reference com/airbnb/epoxy/EpoxyModel# controllerToStageTo = null; // ^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#controllerToStageTo. } @@ -680,14 +670,12 @@ protected final void addWithDebugValidation(@NonNull EpoxyController controller) if (controller.isModelAddedMultipleTimes(this)) { // ^^^^^^^^^^ reference local36 // ^^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#isModelAddedMultipleTimes(). -// ^^^^ reference com/airbnb/epoxy/EpoxyModel# throw new IllegalEpoxyUsage( // ^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/IllegalEpoxyUsage#``(). "This model was already added to the controller at position " + controller.getFirstIndexOfModelInBuildingList(this)); // ^^^^^^^^^^ reference local36 // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#getFirstIndexOfModelInBuildingList(). -// ^^^^ reference com/airbnb/epoxy/EpoxyModel# } if (firstControllerAddedTo == null) { @@ -730,7 +718,7 @@ public void onInterceptorsFinished(EpoxyController controller) { hashCodeWhenAdded = EpoxyModel.this.hashCode(); // ^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#hashCodeWhenAdded. // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# -// ^^^^ reference com/airbnb/epoxy/EpoxyModel# +// ^^^^ reference com/airbnb/epoxy/EpoxyModel#this. // ^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#hashCode(). currentlyInInterceptors = false; // ^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#currentlyInInterceptors. @@ -765,11 +753,9 @@ protected final void onMutation() { // ^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#currentlyInInterceptors. throw new ImmutableModelException(this, // ^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ImmutableModelException#``(). -// ^^^^ reference com/airbnb/epoxy/EpoxyModel# getPosition(firstControllerAddedTo, this)); // ^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#getPosition(). // ^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#firstControllerAddedTo. -// ^^^^ reference com/airbnb/epoxy/EpoxyModel# } if (controllerToStageTo != null) { @@ -777,7 +763,6 @@ protected final void onMutation() { controllerToStageTo.setStagedModel(this); // ^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#controllerToStageTo. // ^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#setStagedModel(). -// ^^^^ reference com/airbnb/epoxy/EpoxyModel# } } @@ -833,7 +818,6 @@ protected final void validateStateHasNotChangedSinceAdded(String descriptionOfCh // ^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#hashCode(). throw new ImmutableModelException(this, descriptionOfChange, modelPosition); // ^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ImmutableModelException#``(+1). -// ^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^^^^^^^^^^^^^^^ reference local45 // ^^^^^^^^^^^^^ reference local46 } @@ -846,7 +830,6 @@ public boolean equals(Object o) { // ^^^^^^ reference java/lang/Object# // ^ definition local47 Object o if (this == o) { -// ^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^ reference local47 return true; } @@ -924,11 +907,9 @@ public EpoxyModel spanSizeOverride(@Nullable SpanSizeOverrideCallback spanSiz // ^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#SpanSizeOverrideCallback# // ^^^^^^^^^^^^^^^^ definition local53 @Nullable SpanSizeOverrideCallback spanSizeCallback this.spanSizeOverride = spanSizeCallback; -// ^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#spanSizeOverride. // ^^^^^^^^^^^^^^^^ reference local53 return this; -// ^^^^ reference com/airbnb/epoxy/EpoxyModel# } public interface SpanSizeOverrideCallback { @@ -999,7 +980,6 @@ public EpoxyModel show(boolean show) { // ^^^^^ reference com/airbnb/epoxy/EpoxyModel#shown. // ^^^^ reference local60 return this; -// ^^^^ reference com/airbnb/epoxy/EpoxyModel# } /** 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 89a77d81..0209b0a6 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java @@ -127,7 +127,6 @@ public EpoxyModelGroup(@LayoutRes int layoutRes, Collection> models this(layoutRes, new ArrayList<>(models)); -// ^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#``(+2). // ^^^^^^^^^ reference local0 // ^^^^^^^^^ reference java/util/ArrayList#``(+2). // ^^^^^^ reference local1 @@ -144,7 +143,6 @@ public EpoxyModelGroup(@LayoutRes int layoutRes, EpoxyModel... models) { // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^^ definition local3 EpoxyModel[] models this(layoutRes, new ArrayList<>(Arrays.asList(models))); -// ^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#``(+2). // ^^^^^^^^^ reference local2 // ^^^^^^^^^ reference java/util/ArrayList#``(+2). // ^^^^^^ reference java/util/Arrays# @@ -171,7 +169,6 @@ private EpoxyModelGroup(@LayoutRes int layoutRes, List> models) { } this.models = models; -// ^^^^ reference com/airbnb/epoxy/EpoxyModelGroup# // ^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#models. // ^^^^^^ reference local5 layout(layoutRes); @@ -223,7 +220,6 @@ protected EpoxyModelGroup(@LayoutRes int layoutRes) { // ^^^^^^^^^ reference androidx/annotation/LayoutRes# // ^^^^^^^^^ definition local8 @LayoutRes int layoutRes this(); -// ^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#``(+3). layout(layoutRes); // ^^^^^^ reference com/airbnb/epoxy/EpoxyModel#layout(). // ^^^^^^^^^ reference local8 @@ -521,7 +517,6 @@ private void iterateModels(ModelGroupHolder holder, IterateModelsCallback callba holder.bindGroupIfNeeded(this); // ^^^^^^ reference local52 // ^^^^^^^^^^^^^^^^^ reference bindGroupIfNeeded# -// ^^^^ reference com/airbnb/epoxy/EpoxyModelGroup# int modelCount = models.size(); // ^^^^^^^^^^ definition local54 int modelCount // ^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#models. @@ -592,11 +587,9 @@ public EpoxyModelGroup shouldSaveViewState(boolean shouldSaveViewState) { onMutation(); // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#onMutation(). this.shouldSaveViewState = shouldSaveViewState; -// ^^^^ reference com/airbnb/epoxy/EpoxyModelGroup# // ^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#shouldSaveViewState. // ^^^^^^^^^^^^^^^^^^^ reference local62 return this; -// ^^^^ reference com/airbnb/epoxy/EpoxyModelGroup# } @Override @@ -652,7 +645,6 @@ public boolean equals(Object o) { // ^^^^^^ reference java/lang/Object# // ^ definition local66 Object o if (this == o) { -// ^^^^ reference com/airbnb/epoxy/EpoxyModelGroup# // ^ reference local66 return true; } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelTouchCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelTouchCallback.java index 8eb92bcf..00120c2a 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelTouchCallback.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelTouchCallback.java @@ -76,11 +76,9 @@ public EpoxyModelTouchCallback(@Nullable EpoxyController controller, Class ta // ^ reference com/airbnb/epoxy/EpoxyModelTouchCallback#[T] // ^^^^^^^^^^^^^^^^ definition local1 Class targetModelClass this.controller = controller; -// ^^^^ reference com/airbnb/epoxy/EpoxyModelTouchCallback# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelTouchCallback#controller. // ^^^^^^^^^^ reference local0 this.targetModelClass = targetModelClass; -// ^^^^ reference com/airbnb/epoxy/EpoxyModelTouchCallback# // ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelTouchCallback#targetModelClass. // ^^^^^^^^^^^^^^^^ reference local1 } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelper.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelper.java index 614e5177..293747fe 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelper.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelper.java @@ -95,7 +95,6 @@ private DragBuilder(EpoxyController controller) { // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController# // ^^^^^^^^^^ definition local1 EpoxyController controller this.controller = controller; -// ^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder#controller. // ^^^^^^^^^^ reference local1 } @@ -134,11 +133,9 @@ private DragBuilder2(EpoxyController controller, RecyclerView recyclerView) { // ^^^^^^^^^^^^ reference _root_/ // ^^^^^^^^^^^^ definition local4 unresolved_type recyclerView this.controller = controller; -// ^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#controller. // ^^^^^^^^^^ reference local3 this.recyclerView = recyclerView; -// ^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2# // ^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2#recyclerView. // ^^^^^^^^^^^^ reference local4 } @@ -226,15 +223,12 @@ private DragBuilder3(EpoxyController controller, RecyclerView recyclerView, int // ^^^^^^^^^^^^ definition local7 unresolved_type recyclerView // ^^^^^^^^^^^^^ definition local8 int movementFlags this.controller = controller; -// ^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#controller. // ^^^^^^^^^^ reference local6 this.recyclerView = recyclerView; -// ^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3# // ^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#recyclerView. // ^^^^^^^^^^^^ reference local7 this.movementFlags = movementFlags; -// ^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3# // ^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3#movementFlags. // ^^^^^^^^^^^^^ reference local8 } @@ -357,23 +351,18 @@ private DragBuilder4(EpoxyController controller, // ^^^^^^^^^^^^^^^^^^ definition local16 List> targetModelClasses this.controller = controller; -// ^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#controller. // ^^^^^^^^^^ reference local12 this.recyclerView = recyclerView; -// ^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4# // ^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#recyclerView. // ^^^^^^^^^^^^ reference local13 this.movementFlags = movementFlags; -// ^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4# // ^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#movementFlags. // ^^^^^^^^^^^^^ reference local14 this.targetModelClass = targetModelClass; -// ^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4# // ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#targetModelClass. // ^^^^^^^^^^^^^^^^ reference local15 this.targetModelClasses = targetModelClasses; -// ^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4# // ^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#targetModelClasses. // ^^^^^^^^^^^^^^^^^^ reference local16 } @@ -639,7 +628,6 @@ private SwipeBuilder(RecyclerView recyclerView) { // ^^^^^^^^^^^^ reference _root_/ // ^^^^^^^^^^^^ definition local60 unresolved_type recyclerView this.recyclerView = recyclerView; -// ^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder# // ^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder#recyclerView. // ^^^^^^^^^^^^ reference local60 } @@ -713,11 +701,9 @@ private SwipeBuilder2(RecyclerView recyclerView, int movementFlags) { // ^^^^^^^^^^^^^ definition local63 int movementFlags this.recyclerView = recyclerView; -// ^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2# // ^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#recyclerView. // ^^^^^^^^^^^^ reference local62 this.movementFlags = movementFlags; -// ^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2# // ^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2#movementFlags. // ^^^^^^^^^^^^^ reference local63 } @@ -834,19 +820,15 @@ private SwipeBuilder3( // ^^^^^^^^^^^^^^^^^^ definition local70 List> targetModelClasses this.recyclerView = recyclerView; -// ^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3# // ^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#recyclerView. // ^^^^^^^^^^^^ reference local67 this.movementFlags = movementFlags; -// ^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3# // ^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#movementFlags. // ^^^^^^^^^^^^^ reference local68 this.targetModelClass = targetModelClass; -// ^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3# // ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#targetModelClass. // ^^^^^^^^^^^^^^^^ reference local69 this.targetModelClasses = targetModelClasses; -// ^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3# // ^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#targetModelClasses. // ^^^^^^^^^^^^^^^^^^ reference local70 } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyViewHolder.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyViewHolder.java index c9c383a7..34cef4f8 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyViewHolder.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyViewHolder.java @@ -88,7 +88,6 @@ public EpoxyViewHolder(ViewParent parent, View view, boolean saveInitialState) { // ^^^^ reference local1 this.parent = parent; -// ^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# // ^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder#parent. // ^^^^^^ reference local0 if (saveInitialState) { @@ -131,7 +130,6 @@ public void bind(@SuppressWarnings("rawtypes") EpoxyModel model, // ^^^^^^^^ definition local5 List payloads // ^^^^^^^^ definition local6 int position this.payloads = payloads; -// ^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# // ^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder#payloads. // ^^^^^^^^ reference local5 @@ -163,7 +161,6 @@ public void bind(@SuppressWarnings("rawtypes") EpoxyModel model, // ^^^^^^^^^^^^^^ reference com/airbnb/epoxy/GeneratedModel# // ^^^^^ reference local3 // ^^^^^^^^^^^^^ reference com/airbnb/epoxy/GeneratedModel#handlePreBind(). -// ^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# // ^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder#objectToBind(). // ^^^^^^^^ reference local6 } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/HandlerExecutor.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/HandlerExecutor.java index df2f7bbc..8a534467 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/HandlerExecutor.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/HandlerExecutor.java @@ -38,7 +38,6 @@ class HandlerExecutor implements Executor { // ^^^^^^^ reference _root_/ // ^^^^^^^ definition local0 unresolved_type handler this.handler = handler; -// ^^^^ reference com/airbnb/epoxy/HandlerExecutor# // ^^^^^^^ reference com/airbnb/epoxy/HandlerExecutor#handler. // ^^^^^^^ reference local0 } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ImmutableModelException.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ImmutableModelException.java index c9512b8f..e638fdd3 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ImmutableModelException.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ImmutableModelException.java @@ -28,7 +28,6 @@ class ImmutableModelException extends RuntimeException { // ^^^^^ definition local0 EpoxyModel model // ^^^^^^^^^^^^^ definition local1 int modelPosition this(model, "", modelPosition); -// ^^^^ reference com/airbnb/epoxy/ImmutableModelException#``(+1). // ^^^^^ reference local0 // ^^^^^^^^^^^^^ reference local1 } 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 68c23af8..9d54c5c6 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelList.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelList.java @@ -106,7 +106,6 @@ void setObserver(ModelListObserver observer) { // ^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ModelList#ModelListObserver# // ^^^^^^^^ definition local5 ModelListObserver observer this.observer = observer; -// ^^^^ reference com/airbnb/epoxy/ModelList# // ^^^^^^^^ reference com/airbnb/epoxy/ModelList#observer. // ^^^^^^^^ reference local5 } @@ -448,7 +447,7 @@ public EpoxyModel next() { // ^ reference local30 return ModelList.this.get(i); // ^^^^^^^^^ reference com/airbnb/epoxy/ModelList# -// ^^^^ reference com/airbnb/epoxy/ModelList# +// ^^^^ reference com/airbnb/epoxy/ModelList#this. // ^^^ reference java/util/ArrayList#get(). // ^ reference local30 } @@ -466,7 +465,7 @@ public void remove() { try { ModelList.this.remove(lastRet); // ^^^^^^^^^ reference com/airbnb/epoxy/ModelList# -// ^^^^ reference com/airbnb/epoxy/ModelList# +// ^^^^ reference com/airbnb/epoxy/ModelList#this. // ^^^^^^ reference com/airbnb/epoxy/ModelList#remove(). // ^^^^^^^ reference com/airbnb/epoxy/ModelList#Itr#lastRet. cursor = lastRet; @@ -583,7 +582,7 @@ public EpoxyModel previous() { // ^ reference local34 return ModelList.this.get(i); // ^^^^^^^^^ reference com/airbnb/epoxy/ModelList# -// ^^^^ reference com/airbnb/epoxy/ModelList# +// ^^^^ reference com/airbnb/epoxy/ModelList#this. // ^^^ reference java/util/ArrayList#get(). // ^ reference local34 } @@ -603,7 +602,7 @@ public void set(EpoxyModel e) { try { ModelList.this.set(lastRet, e); // ^^^^^^^^^ reference com/airbnb/epoxy/ModelList# -// ^^^^ reference com/airbnb/epoxy/ModelList# +// ^^^^ reference com/airbnb/epoxy/ModelList#this. // ^^^ reference com/airbnb/epoxy/ModelList#set(). // ^^^^^^^ reference com/airbnb/epoxy/ModelList#Itr#lastRet. // ^ reference local35 @@ -628,7 +627,7 @@ public void add(EpoxyModel e) { // ^^^^^^ reference com/airbnb/epoxy/ModelList#Itr#cursor. ModelList.this.add(i, e); // ^^^^^^^^^ reference com/airbnb/epoxy/ModelList# -// ^^^^ reference com/airbnb/epoxy/ModelList# +// ^^^^ reference com/airbnb/epoxy/ModelList#this. // ^^^ reference com/airbnb/epoxy/ModelList#add(+1). // ^ reference local38 // ^ reference local37 @@ -668,7 +667,6 @@ public List> subList(int start, int end) { // ^^^ reference local41 return new SubList(this, start, end); // ^^^^^^^ reference com/airbnb/epoxy/ModelList#SubList#``(). -// ^^^^ reference com/airbnb/epoxy/ModelList# // ^^^^^ reference local40 // ^^^ reference local41 } @@ -1047,7 +1045,6 @@ public ListIterator> listIterator(int location) { // ^^^^^^^^^^^^ reference com/airbnb/epoxy/ModelList#listIterator(+1). // ^^^^^^^^ reference local60 // ^^^^^^ reference com/airbnb/epoxy/ModelList#SubList#offset. -// ^^^^ reference com/airbnb/epoxy/ModelList#SubList# // ^^^^^^ reference com/airbnb/epoxy/ModelList#SubList#offset. // ^^^^ reference com/airbnb/epoxy/ModelList#SubList#size. } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelState.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelState.java index c5ec8497..701acf9d 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelState.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelState.java @@ -113,7 +113,6 @@ void pairWithSelf() { pair.pair = this; // ^^^^ reference com/airbnb/epoxy/ModelState#pair. // ^^^^ reference com/airbnb/epoxy/ModelState#pair. -// ^^^^ reference com/airbnb/epoxy/ModelState# pair.model = model; // ^^^^ reference com/airbnb/epoxy/ModelState#pair. // ^^^^^ reference com/airbnb/epoxy/ModelState#model. diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/QuantityStringResAttribute.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/QuantityStringResAttribute.java index 75a2787a..0b417b3c 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/QuantityStringResAttribute.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/QuantityStringResAttribute.java @@ -41,15 +41,12 @@ public QuantityStringResAttribute(@PluralsRes int id, int quantity, // ^^^^^^ reference java/lang/Object# // ^^^^^^^^^^ definition local2 @Nullable Object[] formatArgs this.quantity = quantity; -// ^^^^ reference com/airbnb/epoxy/QuantityStringResAttribute# // ^^^^^^^^ reference com/airbnb/epoxy/QuantityStringResAttribute#quantity. // ^^^^^^^^ reference local1 this.id = id; -// ^^^^ reference com/airbnb/epoxy/QuantityStringResAttribute# // ^^ reference com/airbnb/epoxy/QuantityStringResAttribute#id. // ^^ reference local0 this.formatArgs = formatArgs; -// ^^^^ reference com/airbnb/epoxy/QuantityStringResAttribute# // ^^^^^^^^^^ reference com/airbnb/epoxy/QuantityStringResAttribute#formatArgs. // ^^^^^^^^^^ reference local2 } @@ -59,7 +56,6 @@ public QuantityStringResAttribute(int id, int quantity) { // ^^ definition local3 int id // ^^^^^^^^ definition local4 int quantity this(id, quantity, null); -// ^^^^ reference com/airbnb/epoxy/QuantityStringResAttribute#``(). // ^^ reference local3 // ^^^^^^^^ reference local4 } @@ -120,7 +116,6 @@ public boolean equals(Object o) { // ^^^^^^ reference java/lang/Object# // ^ definition local6 Object o if (this == o) { -// ^^^^ reference com/airbnb/epoxy/QuantityStringResAttribute# // ^ reference local6 return true; } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyModel.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyModel.java index 563b75ca..310e9fff 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyModel.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyModel.java @@ -43,7 +43,6 @@ public SimpleEpoxyModel(@LayoutRes int layoutRes) { // ^^^^^^^^^ reference androidx/annotation/LayoutRes# // ^^^^^^^^^ definition local0 @LayoutRes int layoutRes this.layoutRes = layoutRes; -// ^^^^ reference com/airbnb/epoxy/SimpleEpoxyModel# // ^^^^^^^^^ reference com/airbnb/epoxy/SimpleEpoxyModel#layoutRes. // ^^^^^^^^^ reference local0 } @@ -55,11 +54,9 @@ public SimpleEpoxyModel onClick(View.OnClickListener listener) { // ^^^^^^^^^^^^^^^ reference View/OnClickListener# // ^^^^^^^^ definition local1 unresolved_type listener this.onClickListener = listener; -// ^^^^ reference com/airbnb/epoxy/SimpleEpoxyModel# // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/SimpleEpoxyModel#onClickListener. // ^^^^^^^^ reference local1 return this; -// ^^^^ reference com/airbnb/epoxy/SimpleEpoxyModel# } public SimpleEpoxyModel span(int span) { @@ -70,7 +67,6 @@ public SimpleEpoxyModel span(int span) { // ^^^^^^^^^ reference com/airbnb/epoxy/SimpleEpoxyModel#spanCount. // ^^^^ reference local2 return this; -// ^^^^ reference com/airbnb/epoxy/SimpleEpoxyModel# } @CallSuper @@ -140,7 +136,6 @@ public boolean equals(Object o) { // ^^^^^^ reference java/lang/Object# // ^ definition local8 Object o if (this == o) { -// ^^^^ reference com/airbnb/epoxy/SimpleEpoxyModel# // ^ reference local8 return true; } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/StringAttributeData.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/StringAttributeData.java index 3ff67fa7..e943dcb1 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/StringAttributeData.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/StringAttributeData.java @@ -70,7 +70,6 @@ public StringAttributeData(@Nullable CharSequence defaultString) { hasDefault = true; // ^^^^^^^^^^ reference com/airbnb/epoxy/StringAttributeData#hasDefault. this.defaultString = defaultString; -// ^^^^ reference com/airbnb/epoxy/StringAttributeData# // ^^^^^^^^^^^^^ reference com/airbnb/epoxy/StringAttributeData#defaultString. // ^^^^^^^^^^^^^ reference local0 string = defaultString; @@ -87,7 +86,6 @@ public StringAttributeData(@StringRes int defaultStringRes) { hasDefault = true; // ^^^^^^^^^^ reference com/airbnb/epoxy/StringAttributeData#hasDefault. this.defaultStringRes = defaultStringRes; -// ^^^^ reference com/airbnb/epoxy/StringAttributeData# // ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/StringAttributeData#defaultStringRes. // ^^^^^^^^^^^^^^^^ reference local1 stringRes = defaultStringRes; @@ -103,7 +101,6 @@ public void setValue(@Nullable CharSequence string) { // ^^^^^^^^^^^^ reference java/lang/CharSequence# // ^^^^^^ definition local2 @Nullable CharSequence string this.string = string; -// ^^^^ reference com/airbnb/epoxy/StringAttributeData# // ^^^^^^ reference com/airbnb/epoxy/StringAttributeData#string. // ^^^^^^ reference local2 stringRes = 0; @@ -131,11 +128,9 @@ public void setValue(@StringRes int stringRes, @Nullable Object[] formatArgs) { if (stringRes != 0) { // ^^^^^^^^^ reference local4 this.stringRes = stringRes; -// ^^^^ reference com/airbnb/epoxy/StringAttributeData# // ^^^^^^^^^ reference com/airbnb/epoxy/StringAttributeData#stringRes. // ^^^^^^^^^ reference local4 this.formatArgs = formatArgs; -// ^^^^ reference com/airbnb/epoxy/StringAttributeData# // ^^^^^^^^^^ reference com/airbnb/epoxy/StringAttributeData#formatArgs. // ^^^^^^^^^^ reference local5 string = null; @@ -179,15 +174,12 @@ public void setValue(@PluralsRes int pluralRes, int quantity, @Nullable Object[] if (pluralRes != 0) { // ^^^^^^^^^ reference local6 this.pluralRes = pluralRes; -// ^^^^ reference com/airbnb/epoxy/StringAttributeData# // ^^^^^^^^^ reference com/airbnb/epoxy/StringAttributeData#pluralRes. // ^^^^^^^^^ reference local6 this.quantity = quantity; -// ^^^^ reference com/airbnb/epoxy/StringAttributeData# // ^^^^^^^^ reference com/airbnb/epoxy/StringAttributeData#quantity. // ^^^^^^^^ reference local7 this.formatArgs = formatArgs; -// ^^^^ reference com/airbnb/epoxy/StringAttributeData# // ^^^^^^^^^^ reference com/airbnb/epoxy/StringAttributeData#formatArgs. // ^^^^^^^^^^ reference local8 string = null; @@ -254,7 +246,6 @@ public boolean equals(Object o) { // ^^^^^^ reference java/lang/Object# // ^ definition local10 Object o if (this == o) { -// ^^^^ reference com/airbnb/epoxy/StringAttributeData# // ^ reference local10 return true; } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed2EpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed2EpoxyController.java index a141cb3c..6683bc47 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed2EpoxyController.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed2EpoxyController.java @@ -61,11 +61,9 @@ public void setData(T data1, U data2) { // ^ reference com/airbnb/epoxy/Typed2EpoxyController#[U] // ^^^^^ definition local3 U data2 this.data1 = data1; -// ^^^^ reference com/airbnb/epoxy/Typed2EpoxyController# // ^^^^^ reference com/airbnb/epoxy/Typed2EpoxyController#data1. // ^^^^^ reference local2 this.data2 = data2; -// ^^^^ reference com/airbnb/epoxy/Typed2EpoxyController# // ^^^^^ reference com/airbnb/epoxy/Typed2EpoxyController#data2. // ^^^^^ reference local3 allowModelBuildRequests = true; diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed3EpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed3EpoxyController.java index 3dd02126..9d472703 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed3EpoxyController.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed3EpoxyController.java @@ -67,15 +67,12 @@ public void setData(T data1, U data2, V data3) { // ^ reference com/airbnb/epoxy/Typed3EpoxyController#[V] // ^^^^^ definition local4 V data3 this.data1 = data1; -// ^^^^ reference com/airbnb/epoxy/Typed3EpoxyController# // ^^^^^ reference com/airbnb/epoxy/Typed3EpoxyController#data1. // ^^^^^ reference local2 this.data2 = data2; -// ^^^^ reference com/airbnb/epoxy/Typed3EpoxyController# // ^^^^^ reference com/airbnb/epoxy/Typed3EpoxyController#data2. // ^^^^^ reference local3 this.data3 = data3; -// ^^^^ reference com/airbnb/epoxy/Typed3EpoxyController# // ^^^^^ reference com/airbnb/epoxy/Typed3EpoxyController#data3. // ^^^^^ reference local4 allowModelBuildRequests = true; diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed4EpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed4EpoxyController.java index efabc0eb..e93a4943 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed4EpoxyController.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed4EpoxyController.java @@ -73,19 +73,15 @@ public void setData(T data1, U data2, V data3, W data4) { // ^ reference com/airbnb/epoxy/Typed4EpoxyController#[W] // ^^^^^ definition local5 W data4 this.data1 = data1; -// ^^^^ reference com/airbnb/epoxy/Typed4EpoxyController# // ^^^^^ reference com/airbnb/epoxy/Typed4EpoxyController#data1. // ^^^^^ reference local2 this.data2 = data2; -// ^^^^ reference com/airbnb/epoxy/Typed4EpoxyController# // ^^^^^ reference com/airbnb/epoxy/Typed4EpoxyController#data2. // ^^^^^ reference local3 this.data3 = data3; -// ^^^^ reference com/airbnb/epoxy/Typed4EpoxyController# // ^^^^^ reference com/airbnb/epoxy/Typed4EpoxyController#data3. // ^^^^^ reference local4 this.data4 = data4; -// ^^^^ reference com/airbnb/epoxy/Typed4EpoxyController# // ^^^^^ reference com/airbnb/epoxy/Typed4EpoxyController#data4. // ^^^^^ reference local5 allowModelBuildRequests = true; diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewHolderState.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewHolderState.java index ba9b80b4..7e53abd1 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewHolderState.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewHolderState.java @@ -327,7 +327,6 @@ public void save(View view) { view.saveHierarchyState(this); // ^^^^ reference local26 // ^^^^^^^^^^^^^^^^^^ reference saveHierarchyState# -// ^^^^ reference com/airbnb/epoxy/ViewHolderState#ViewState# view.setId(originalId); // ^^^^ reference local26 // ^^^^^ reference setId# @@ -349,7 +348,6 @@ public void restore(View view) { view.restoreHierarchyState(this); // ^^^^ reference local28 // ^^^^^^^^^^^^^^^^^^^^^ reference restoreHierarchyState# -// ^^^^ reference com/airbnb/epoxy/ViewHolderState#ViewState# view.setId(originalId); // ^^^^ reference local28 // ^^^^^ reference setId# diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener.java index 4315b3bd..2a84a7e2 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener.java @@ -49,7 +49,6 @@ public WrappedEpoxyModelCheckedChangeListener( } this.originalCheckedChangeListener = checkedListener; -// ^^^^ reference com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener# // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#originalCheckedChangeListener. // ^^^^^^^^^^^^^^^ reference local0 } @@ -110,7 +109,6 @@ public boolean equals(Object o) { // ^^^^^^ reference java/lang/Object# // ^ definition local5 Object o if (this == o) { -// ^^^^ reference com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener# // ^ reference local5 return true; } diff --git a/tests/snapshots/src/main/generated/minimized/Enums.java b/tests/snapshots/src/main/generated/minimized/Enums.java index 1a67fbff..9d63e02d 100644 --- a/tests/snapshots/src/main/generated/minimized/Enums.java +++ b/tests/snapshots/src/main/generated/minimized/Enums.java @@ -27,7 +27,6 @@ enum Enums { // ^^^^^ definition local0 String value // ^ definition local1 int a this.value = value; -// ^^^^ reference minimized/Enums# // ^^^^^ reference minimized/Enums#value. // ^^^^^ reference local0 } diff --git a/tests/snapshots/src/main/generated/minimized/InnerClasses.java b/tests/snapshots/src/main/generated/minimized/InnerClasses.java index f180cabe..967313ef 100644 --- a/tests/snapshots/src/main/generated/minimized/InnerClasses.java +++ b/tests/snapshots/src/main/generated/minimized/InnerClasses.java @@ -10,7 +10,6 @@ public InnerClasses(int exampleField) { // ^^^^^^^^^^^^ definition minimized/InnerClasses#``(). public InnerClasses(int exampleField) // ^^^^^^^^^^^^ definition local0 int exampleField this.exampleField = exampleField; -// ^^^^ reference minimized/InnerClasses# // ^^^^^^^^^^^^ reference minimized/InnerClasses#exampleField. // ^^^^^^^^^^^^ reference local0 } @@ -56,7 +55,6 @@ public InnerClass(int field) { // ^^^^^^^^^^ definition minimized/InnerClasses#InnerClass#``(). public InnerClass(int field) // ^^^^^ definition local2 int field this.field = field; -// ^^^^ reference minimized/InnerClasses#InnerClass# // ^^^^^ reference minimized/InnerClasses#InnerClass#field. // ^^^^^ reference local2 } From be665e331e72284f3635bdefe9a0ec15d6b59410 Mon Sep 17 00:00:00 2001 From: Noah Santschi-Cooney Date: Fri, 16 Apr 2021 14:00:26 +0100 Subject: [PATCH 2/2] continue emitting refs for 'this' constructor calls --- .../com/sourcegraph/semanticdb_javac/SemanticdbVisitor.java | 4 +++- .../main/generated/com/airbnb/epoxy/AsyncEpoxyController.java | 2 ++ .../src/main/generated/com/airbnb/epoxy/Carousel.java | 2 ++ .../src/main/generated/com/airbnb/epoxy/DiffPayload.java | 1 + .../src/main/generated/com/airbnb/epoxy/EpoxyController.java | 1 + .../src/main/generated/com/airbnb/epoxy/EpoxyHolder.java | 1 + .../generated/com/airbnb/epoxy/EpoxyItemSpacingDecorator.java | 1 + .../src/main/generated/com/airbnb/epoxy/EpoxyModel.java | 1 + .../src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java | 3 +++ .../generated/com/airbnb/epoxy/ImmutableModelException.java | 1 + .../com/airbnb/epoxy/QuantityStringResAttribute.java | 1 + 11 files changed, 17 insertions(+), 1 deletion(-) 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 56b825b2..520fa3e6 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 @@ -13,6 +13,7 @@ import com.sourcegraph.semanticdb_javac.Semanticdb.SymbolInformation.Property; import com.sourcegraph.semanticdb_javac.Semanticdb.SymbolOccurrence.Role; +import javax.lang.model.element.ElementKind; import javax.lang.model.util.Elements; import java.io.IOException; import java.nio.file.Path; @@ -193,7 +194,8 @@ public Void visitVariable(VariableTree node, Void unused) { public Void visitIdentifier(IdentifierTree node, Void unused) { if (node instanceof JCTree.JCIdent) { JCTree.JCIdent ident = (JCTree.JCIdent) node; - if (ident.name.toString().equals("this")) return null; + if (ident.name.toString().equals("this") && ident.sym.getKind() != ElementKind.CONSTRUCTOR) + return null; emitSymbolOccurrence(ident.sym, ident, Role.REFERENCE, CompilerRange.FROM_START_TO_END); } return super.visitIdentifier(node, unused); diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyController.java index a70aee6f..071e7728 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyController.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyController.java @@ -32,6 +32,7 @@ public abstract class AsyncEpoxyController extends EpoxyController { public AsyncEpoxyController() { // ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyController#``(). public AsyncEpoxyController() this(true); +// ^^^^ reference com/airbnb/epoxy/AsyncEpoxyController#``(+1). } /** @@ -42,6 +43,7 @@ public AsyncEpoxyController(boolean enableAsync) { // ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyController#``(+1). public AsyncEpoxyController(boolean enableAsync) // ^^^^^^^^^^^ definition local0 boolean enableAsync this(enableAsync, enableAsync); +// ^^^^ reference com/airbnb/epoxy/AsyncEpoxyController#``(+2). // ^^^^^^^^^^^ reference local0 // ^^^^^^^^^^^ reference local0 } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java index 0998d7f9..1b54b1f6 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java @@ -947,6 +947,7 @@ public Padding(@Px int paddingPx, @Px int itemSpacingPx) { // ^^ reference androidx/annotation/Px# // ^^^^^^^^^^^^^ definition local53 @Px int itemSpacingPx this(paddingPx, paddingPx, paddingPx, paddingPx, itemSpacingPx, PaddingType.PX); +// ^^^^ reference com/airbnb/epoxy/Carousel#Padding#``(+2). // ^^^^^^^^^ reference local52 // ^^^^^^^^^ reference local52 // ^^^^^^^^^ reference local52 @@ -978,6 +979,7 @@ public Padding( // ^^ reference androidx/annotation/Px# // ^^^^^^^^^^^^^ definition local58 @Px int itemSpacingPx this(leftPx, topPx, rightPx, bottomPx, itemSpacingPx, PaddingType.PX); +// ^^^^ reference com/airbnb/epoxy/Carousel#Padding#``(+2). // ^^^^^^ reference local54 // ^^^^^ reference local55 // ^^^^^^^ reference local56 diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffPayload.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffPayload.java index 9c46af91..1e8aae60 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffPayload.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffPayload.java @@ -90,6 +90,7 @@ public DiffPayload(EpoxyModel changedItem) { // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^^^^^^^ definition local3 EpoxyModel changedItem this(Collections.singletonList(changedItem)); +// ^^^^ reference com/airbnb/epoxy/DiffPayload#``(). // ^^^^^^^^^^^ reference java/util/Collections# // ^^^^^^^^^^^^^ reference java/util/Collections#singletonList(). // ^^^^^^^^^^^ reference local3 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 0a981f0a..26be11a0 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java @@ -223,6 +223,7 @@ public abstract class EpoxyController implements ModelCollector, StickyHeaderCal public EpoxyController() { // ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#``(). public EpoxyController() this(defaultModelBuildingHandler, defaultDiffingHandler); +// ^^^^ reference com/airbnb/epoxy/EpoxyController#``(+1). // ^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#defaultModelBuildingHandler. // ^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#defaultDiffingHandler. } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyHolder.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyHolder.java index f1bc0f16..b9ae644c 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyHolder.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyHolder.java @@ -27,6 +27,7 @@ public EpoxyHolder(@NonNull ViewParent parent) { // ^^^^^^^^^^ reference _root_/ // ^^^^^^ definition local0 @NonNull unresolved_type parent this(); +// ^^^^ reference com/airbnb/epoxy/EpoxyHolder#``(+1). } public EpoxyHolder() { diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyItemSpacingDecorator.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyItemSpacingDecorator.java index 2808df5e..e6ab81bf 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyItemSpacingDecorator.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyItemSpacingDecorator.java @@ -85,6 +85,7 @@ public class EpoxyItemSpacingDecorator extends RecyclerView.ItemDecoration { public EpoxyItemSpacingDecorator() { // ^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyItemSpacingDecorator#``(). public EpoxyItemSpacingDecorator() this(0); +// ^^^^ reference com/airbnb/epoxy/EpoxyItemSpacingDecorator#``(+1). } public EpoxyItemSpacingDecorator(@Px int pxBetweenItems) { 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 0288e8b6..70dec729 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java @@ -138,6 +138,7 @@ protected EpoxyModel(long id) { public EpoxyModel() { // ^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel#``(+1). public EpoxyModel() this(idCounter--); +// ^^^^ reference com/airbnb/epoxy/EpoxyModel#``(). // ^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#idCounter. hasDefaultId = true; // ^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#hasDefaultId. 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 0209b0a6..d417cbce 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java @@ -127,6 +127,7 @@ public EpoxyModelGroup(@LayoutRes int layoutRes, Collection> models this(layoutRes, new ArrayList<>(models)); +// ^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#``(+2). // ^^^^^^^^^ reference local0 // ^^^^^^^^^ reference java/util/ArrayList#``(+2). // ^^^^^^ reference local1 @@ -143,6 +144,7 @@ public EpoxyModelGroup(@LayoutRes int layoutRes, EpoxyModel... models) { // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^^ definition local3 EpoxyModel[] models this(layoutRes, new ArrayList<>(Arrays.asList(models))); +// ^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#``(+2). // ^^^^^^^^^ reference local2 // ^^^^^^^^^ reference java/util/ArrayList#``(+2). // ^^^^^^ reference java/util/Arrays# @@ -220,6 +222,7 @@ protected EpoxyModelGroup(@LayoutRes int layoutRes) { // ^^^^^^^^^ reference androidx/annotation/LayoutRes# // ^^^^^^^^^ definition local8 @LayoutRes int layoutRes this(); +// ^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#``(+3). layout(layoutRes); // ^^^^^^ reference com/airbnb/epoxy/EpoxyModel#layout(). // ^^^^^^^^^ reference local8 diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ImmutableModelException.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ImmutableModelException.java index e638fdd3..c9512b8f 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ImmutableModelException.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ImmutableModelException.java @@ -28,6 +28,7 @@ class ImmutableModelException extends RuntimeException { // ^^^^^ definition local0 EpoxyModel model // ^^^^^^^^^^^^^ definition local1 int modelPosition this(model, "", modelPosition); +// ^^^^ reference com/airbnb/epoxy/ImmutableModelException#``(+1). // ^^^^^ reference local0 // ^^^^^^^^^^^^^ reference local1 } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/QuantityStringResAttribute.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/QuantityStringResAttribute.java index 0b417b3c..b53ca8c3 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/QuantityStringResAttribute.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/QuantityStringResAttribute.java @@ -56,6 +56,7 @@ public QuantityStringResAttribute(int id, int quantity) { // ^^ definition local3 int id // ^^^^^^^^ definition local4 int quantity this(id, quantity, null); +// ^^^^ reference com/airbnb/epoxy/QuantityStringResAttribute#``(). // ^^ reference local3 // ^^^^^^^^ reference local4 }