From c4b3bb1185499744f3394aa9146c04508768900c Mon Sep 17 00:00:00 2001 From: Noah Santschi-Cooney Date: Wed, 10 Mar 2021 21:40:53 +0000 Subject: [PATCH 1/6] fixes range deriving for constructs incl classes/interfaces --- .../semanticdb_javac/CompilerRange.java | 25 +++++++- .../semanticdb_javac/RangeFinder.java | 63 +++++++++++++++++++ .../semanticdb_javac/SemanticdbVisitor.java | 24 ++++--- .../com/airbnb/epoxy/AfterPropsSet.java | 2 +- .../airbnb/epoxy/AsyncEpoxyController.java | 2 +- .../com/airbnb/epoxy/AsyncEpoxyDiffer.java | 12 ++-- .../generated/com/airbnb/epoxy/AutoModel.java | 2 +- .../com/airbnb/epoxy/BaseEpoxyAdapter.java | 2 +- .../airbnb/epoxy/BaseEpoxyTouchCallback.java | 2 +- .../com/airbnb/epoxy/BoundViewHolders.java | 8 +-- .../com/airbnb/epoxy/CallbackProp.java | 2 +- .../generated/com/airbnb/epoxy/Carousel.java | 13 ++-- .../com/airbnb/epoxy/ControllerHelper.java | 4 +- .../airbnb/epoxy/ControllerHelperLookup.java | 4 +- .../com/airbnb/epoxy/ControllerModelList.java | 3 +- .../com/airbnb/epoxy/DebugTimer.java | 2 +- .../com/airbnb/epoxy/DiffHelper.java | 2 +- .../com/airbnb/epoxy/DiffPayload.java | 2 +- .../com/airbnb/epoxy/DiffResult.java | 2 +- .../com/airbnb/epoxy/EpoxyAdapter.java | 4 +- .../com/airbnb/epoxy/EpoxyAsyncUtil.java | 2 +- .../com/airbnb/epoxy/EpoxyAttribute.java | 6 +- .../com/airbnb/epoxy/EpoxyController.java | 13 ++-- .../airbnb/epoxy/EpoxyControllerAdapter.java | 2 +- .../airbnb/epoxy/EpoxyDataBindingLayouts.java | 2 +- .../airbnb/epoxy/EpoxyDataBindingPattern.java | 2 +- .../com/airbnb/epoxy/EpoxyDiffLogger.java | 2 +- .../com/airbnb/epoxy/EpoxyDragCallback.java | 2 +- .../com/airbnb/epoxy/EpoxyHolder.java | 2 +- .../epoxy/EpoxyItemSpacingDecorator.java | 2 +- .../com/airbnb/epoxy/EpoxyModel.java | 7 +-- .../com/airbnb/epoxy/EpoxyModelClass.java | 2 +- .../com/airbnb/epoxy/EpoxyModelGroup.java | 9 +-- .../airbnb/epoxy/EpoxyModelTouchCallback.java | 3 +- .../airbnb/epoxy/EpoxyModelWithHolder.java | 2 +- .../com/airbnb/epoxy/EpoxyModelWithView.java | 4 +- .../com/airbnb/epoxy/EpoxySwipeCallback.java | 2 +- .../com/airbnb/epoxy/EpoxyTouchHelper.java | 26 ++++---- .../epoxy/EpoxyTouchHelperCallback.java | 4 +- .../com/airbnb/epoxy/EpoxyViewHolder.java | 2 +- .../com/airbnb/epoxy/GeneratedModel.java | 2 +- .../com/airbnb/epoxy/HandlerExecutor.java | 2 +- .../com/airbnb/epoxy/HiddenEpoxyModel.java | 4 +- .../generated/com/airbnb/epoxy/IdUtils.java | 2 +- .../com/airbnb/epoxy/IllegalEpoxyUsage.java | 2 +- .../airbnb/epoxy/ImmutableModelException.java | 2 +- .../com/airbnb/epoxy/ListenersUtils.java | 4 +- .../com/airbnb/epoxy/MainThreadExecutor.java | 2 +- .../generated/com/airbnb/epoxy/ModelList.java | 14 ++--- .../generated/com/airbnb/epoxy/ModelProp.java | 6 +- .../com/airbnb/epoxy/ModelState.java | 4 +- .../generated/com/airbnb/epoxy/ModelView.java | 6 +- .../airbnb/epoxy/NoOpControllerHelper.java | 4 +- .../generated/com/airbnb/epoxy/NoOpTimer.java | 4 +- .../com/airbnb/epoxy/NotifyBlocker.java | 4 +- .../airbnb/epoxy/OnModelBoundListener.java | 2 +- .../epoxy/OnModelBuildFinishedListener.java | 2 +- .../epoxy/OnModelCheckedChangeListener.java | 2 +- .../airbnb/epoxy/OnModelClickListener.java | 2 +- .../epoxy/OnModelLongClickListener.java | 2 +- .../airbnb/epoxy/OnModelUnboundListener.java | 2 +- .../OnModelVisibilityChangedListener.java | 2 +- ...OnModelVisibilityStateChangedListener.java | 2 +- .../com/airbnb/epoxy/OnViewRecycled.java | 2 +- .../com/airbnb/epoxy/OnVisibilityChanged.java | 2 +- .../epoxy/OnVisibilityStateChanged.java | 2 +- .../com/airbnb/epoxy/PackageEpoxyConfig.java | 2 +- .../airbnb/epoxy/PackageModelViewConfig.java | 6 +- .../epoxy/QuantityStringResAttribute.java | 2 +- .../com/airbnb/epoxy/SimpleEpoxyAdapter.java | 4 +- .../airbnb/epoxy/SimpleEpoxyController.java | 4 +- .../com/airbnb/epoxy/SimpleEpoxyModel.java | 2 +- .../com/airbnb/epoxy/StringAttributeData.java | 2 +- .../airbnb/epoxy/StyleBuilderCallback.java | 2 +- .../generated/com/airbnb/epoxy/TextProp.java | 2 +- .../generated/com/airbnb/epoxy/Timer.java | 2 +- .../airbnb/epoxy/Typed2EpoxyController.java | 2 +- .../airbnb/epoxy/Typed3EpoxyController.java | 2 +- .../airbnb/epoxy/Typed4EpoxyController.java | 2 +- .../airbnb/epoxy/TypedEpoxyController.java | 2 +- .../generated/com/airbnb/epoxy/UpdateOp.java | 4 +- .../com/airbnb/epoxy/UpdateOpHelper.java | 4 +- .../com/airbnb/epoxy/ViewHolderState.java | 4 +- .../com/airbnb/epoxy/ViewTypeManager.java | 4 +- .../com/airbnb/epoxy/VisibilityState.java | 6 +- ...rappedEpoxyModelCheckedChangeListener.java | 2 +- .../generated/minimized/AbstractClasses.java | 4 +- .../main/generated/minimized/Annotations.java | 2 +- .../generated/minimized/AnonymousClasses.java | 5 +- .../src/main/generated/minimized/Arrays.java | 4 +- .../src/main/generated/minimized/ClassOf.java | 4 +- .../main/generated/minimized/Docstrings.java | 4 +- .../src/main/generated/minimized/Enums.java | 2 +- .../src/main/generated/minimized/Fields.java | 12 ++-- .../minimized/ForComprehensions.java | 4 +- .../generated/minimized/InnerClasses.java | 15 +++-- .../main/generated/minimized/Interfaces.java | 2 +- .../src/main/generated/minimized/Methods.java | 4 +- .../minimized/MinimizedJavaMain.java | 4 +- .../minimized/ParameterizedTypes.java | 4 +- .../main/generated/minimized/Primitives.java | 4 +- .../main/generated/minimized/RawTypes.java | 4 +- .../main/generated/minimized/SubClasses.java | 4 +- .../generated/minimized/TypeVariables.java | 14 ++--- .../scala/tests/SnapshotCommandSuite.scala | 4 +- 105 files changed, 300 insertions(+), 220 deletions(-) create mode 100644 semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/RangeFinder.java diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/CompilerRange.java b/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/CompilerRange.java index 493163cf..36a85f38 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/CompilerRange.java +++ b/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/CompilerRange.java @@ -28,12 +28,35 @@ public enum CompilerRange { * Map the compiler (point + 1) position to SemanticDB start and use (point + symbol name length + * 1) for the SemanticDB end position. */ - FROM_POINT_TO_SYMBOL_NAME_PLUS_ONE; + FROM_POINT_TO_SYMBOL_NAME_PLUS_ONE, + + /** + * Use text search to find the start of the symbol name and use (found start + symbol name length) + * for the SemanticDB end position; + */ + FROM_TEXT_SEARCH, + + /** + * Use text search to find the start of the symbol name, using the point position as the starting + * search offset and using (found start + symbol name length) for the SemanticDB end position; + */ + FROM_POINT_WITH_TEXT_SEARCH; public boolean isFromPoint() { switch (this) { case FROM_POINT_TO_SYMBOL_NAME: case FROM_POINT_TO_SYMBOL_NAME_PLUS_ONE: + case FROM_POINT_WITH_TEXT_SEARCH: + return true; + default: + return false; + } + } + + public boolean isFromTextSearch() { + switch (this) { + case FROM_TEXT_SEARCH: + case FROM_POINT_WITH_TEXT_SEARCH: return true; default: return false; diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/RangeFinder.java b/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/RangeFinder.java new file mode 100644 index 00000000..3814c255 --- /dev/null +++ b/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/RangeFinder.java @@ -0,0 +1,63 @@ +package com.sourcegraph.semanticdb_javac; + +import com.sun.source.tree.CompilationUnitTree; +import com.sun.source.tree.LineMap; +import com.sun.source.util.TreePath; +import com.sun.source.util.Trees; + +import javax.lang.model.element.Element; +import javax.lang.model.element.Name; +import java.io.IOException; +import java.util.Optional; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class RangeFinder { + public static Optional findRange( + TreePath path, Trees trees, CompilationUnitTree root, Element element, int startPos) { + LineMap lineMap = root.getLineMap(); + Name name = element.getSimpleName(); + if (name.contentEquals("")) name = element.getEnclosingElement().getSimpleName(); + + int endPos = (int) trees.getSourcePositions().getEndPosition(root, path.getLeaf()); + // false for anonymous classes + if (name.length() != 0) { + startPos = findNameIn(root, name, startPos, endPos); + endPos = startPos + name.length(); + } + + if (endPos == -1) { + return Optional.empty(); + } + + Semanticdb.Range range = + Semanticdb.Range.newBuilder() + .setStartLine((int) lineMap.getLineNumber(startPos) - 1) + .setStartCharacter((int) lineMap.getColumnNumber(startPos) - 1) + .setEndLine((int) lineMap.getLineNumber(endPos) - 1) + .setEndCharacter((int) lineMap.getColumnNumber(endPos) - 1) + .build(); + return Optional.of(range); + } + + private static int findNameIn(CompilationUnitTree root, CharSequence name, int start, int end) { + String contents; + try { + contents = root.getSourceFile().getCharContent(true).toString(); + } catch (IOException e) { + return -1; + } + + if (end == -1) { + end = contents.length(); + } + + Matcher matcher = Pattern.compile("\\b" + name + "\\b").matcher(contents); + matcher.region(start, end); + if (matcher.find()) { + return matcher.start(); + } else { + return -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 22269a0e..dbcd15c2 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 @@ -1,9 +1,8 @@ package com.sourcegraph.semanticdb_javac; import com.sun.source.tree.*; -import com.sun.source.util.JavacTask; -import com.sun.source.util.TaskEvent; -import com.sun.source.util.TreePathScanner; +import com.sun.source.util.*; +import com.sun.tools.javac.code.Flags; import com.sun.tools.javac.code.Symbol; import com.sun.tools.javac.tree.EndPosTable; import com.sun.tools.javac.tree.JCTree; @@ -11,6 +10,7 @@ import com.sun.tools.javac.util.Position; import com.sourcegraph.semanticdb_javac.Semanticdb.SymbolOccurrence.Role; +import javax.lang.model.element.Element; import javax.lang.model.util.Elements; import java.io.IOException; import java.nio.file.Path; @@ -28,6 +28,7 @@ public class SemanticdbVisitor extends TreePathScanner { private final JavacTask task; private final TaskEvent event; private final SemanticdbOptions options; + private final Trees trees; private final EndPosTable endPosTable; private final ArrayList occurrences; private final ArrayList symbolInfos; @@ -39,6 +40,7 @@ public SemanticdbVisitor( this.locals = new LocalSymbolsCache(); // Fresh cache per compilation unit. this.event = event; this.options = options; + this.trees = Trees.instance(task); if (event.getCompilationUnit() instanceof JCTree.JCCompilationUnit) { this.endPosTable = ((JCTree.JCCompilationUnit) event.getCompilationUnit()).endPositions; } else { @@ -94,7 +96,8 @@ private void emitSymbolInformation(Symbol sym) { public Void visitClass(ClassTree node, Void unused) { if (node instanceof JCTree.JCClassDecl) { JCTree.JCClassDecl cls = (JCTree.JCClassDecl) node; - emitSymbolOccurrence(cls.sym, cls, Role.DEFINITION, CompilerRange.FROM_POINT_TO_SYMBOL_NAME); + emitSymbolOccurrence( + cls.sym, cls, Role.DEFINITION, CompilerRange.FROM_POINT_WITH_TEXT_SEARCH); } return super.visitClass(node, unused); } @@ -103,8 +106,11 @@ public Void visitClass(ClassTree node, Void unused) { public Void visitMethod(MethodTree node, Void unused) { if (node instanceof JCTree.JCMethodDecl) { JCTree.JCMethodDecl meth = (JCTree.JCMethodDecl) node; - emitSymbolOccurrence( - meth.sym, meth, Role.DEFINITION, CompilerRange.FROM_POINT_TO_SYMBOL_NAME); + CompilerRange range = CompilerRange.FROM_POINT_TO_SYMBOL_NAME; + if (meth.params.isEmpty() && (meth.sym.flags() & Flags.GENERATEDCONSTR) != 0L) { + range = CompilerRange.FROM_TEXT_SEARCH; + } + emitSymbolOccurrence(meth.sym, meth, Role.DEFINITION, range); } return super.visitMethod(node, unused); } @@ -177,7 +183,11 @@ private Optional semanticdbRange( start = pos.getStartPosition(); end = pos.getEndPosition(endPosTable); } - if (start != Position.NOPOS && end != Position.NOPOS && end > start) { + + if (kind.isFromTextSearch() && sym.name.length() > 0) { + return RangeFinder.findRange( + getCurrentPath(), trees, getCurrentPath().getCompilationUnit(), sym, start); + } else if (start != Position.NOPOS && end != Position.NOPOS && end > start) { LineMap lineMap = event.getCompilationUnit().getLineMap(); Semanticdb.Range range = Semanticdb.Range.newBuilder() diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AfterPropsSet.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AfterPropsSet.java index 338cb45b..49138951 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AfterPropsSet.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AfterPropsSet.java @@ -39,6 +39,6 @@ // ^^^^^^^^^^^^^^^ reference java/lang/annotation/RetentionPolicy# // ^^^^^ reference java/lang/annotation/RetentionPolicy#CLASS. public @interface AfterPropsSet { -// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/AfterPropsSet# +// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/AfterPropsSet# } 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 790761f4..5b702480 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyController.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyController.java @@ -23,7 +23,7 @@ * See https://github.com/airbnb/epoxy/wiki/Epoxy-Controller#asynchronous-support */ public abstract class AsyncEpoxyController extends EpoxyController { -// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyController# +// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyController# // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController# /** 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 ecb63e2a..4b477b44 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyDiffer.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyDiffer.java @@ -50,10 +50,10 @@ * Also adds support for canceling an in progress diff, and makes everything thread safe. */ class AsyncEpoxyDiffer { -//^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer# +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer# interface ResultCallback { -//^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#ResultCallback# +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#ResultCallback# void onResult(@NonNull DiffResult result); // ^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#ResultCallback#onResult(). // ^^^^^^^ reference androidx/annotation/NonNull# @@ -322,7 +322,6 @@ public void submitList(@Nullable final List> newList) { // ^^^^^^^^^^^^^^^^ reference local13 6:5 // ^^^^^^^^ reference java/lang/Runnable# // ^^^^^^^^ reference java/lang/Runnable# -// ^ definition local13 1:4 @Override // ^^^^^^^^ reference java/lang/Override# public void run() { @@ -371,7 +370,6 @@ private void onRunCompleted( // ^^^^^^^^^^^^^^^^ reference local20 8:5 // ^^^^^^^^ reference java/lang/Runnable# // ^^^^^^^^ reference java/lang/Runnable# -// ^ definition local20 1:4 @Override // ^^^^^^^^ reference java/lang/Override# public void run() { @@ -449,8 +447,8 @@ private synchronized boolean tryLatchList(@Nullable List * generation number is synced with the list state at the time it was created. */ private static class GenerationTracker { -// ^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#``(). -// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker# +// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker# +// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#``(). // Max generation of currently scheduled runnable private volatile int maxScheduledGeneration; @@ -507,7 +505,7 @@ synchronized boolean finishGeneration(int runGeneration) { } private static class DiffCallback extends DiffUtil.Callback { -// ^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback# +// ^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback# // ^^^^^^^^ reference DiffUtil/ // ^^^^^^^^ reference DiffUtil/Callback# diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AutoModel.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AutoModel.java index 97599883..6f3c3ab4 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/AutoModel.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/AutoModel.java @@ -36,6 +36,6 @@ // ^^^^^^^^^^^^^^^ reference java/lang/annotation/RetentionPolicy# // ^^^^^ reference java/lang/annotation/RetentionPolicy#CLASS. public @interface AutoModel { -// ^^^^^^^^^ definition com/airbnb/epoxy/AutoModel# +// ^^^^^^^^^ definition com/airbnb/epoxy/AutoModel# } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyAdapter.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyAdapter.java index 2077848b..54f18ab9 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyAdapter.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyAdapter.java @@ -60,7 +60,7 @@ // ^^^^^^^^^^^^ reference androidx/recyclerview/widget/RecyclerView# public abstract class BaseEpoxyAdapter -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter# +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter# extends RecyclerView.Adapter // ^^^^^^^^^^^^ reference RecyclerView/ // ^^^^^^^ reference RecyclerView/Adapter# 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 a2080641..1c9e4ee1 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# +// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyTouchCallback# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# /** diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BoundViewHolders.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BoundViewHolders.java index 399f3553..7e38d394 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BoundViewHolders.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BoundViewHolders.java @@ -23,8 +23,8 @@ @SuppressWarnings("WeakerAccess") //^^^^^^^^^^^^^^^ reference java/lang/SuppressWarnings# public class BoundViewHolders implements Iterable { -// ^^^^^^ definition com/airbnb/epoxy/BoundViewHolders#``(). -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BoundViewHolders# +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BoundViewHolders# +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BoundViewHolders#``(). // ^^^^^^^^ reference java/lang/Iterable# // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# private final LongSparseArray holders = new LongSparseArray<>(); @@ -104,8 +104,8 @@ public EpoxyViewHolder getHolderForModel(EpoxyModel model) { } private class HolderIterator implements Iterator { -// ^^^^^^ definition com/airbnb/epoxy/BoundViewHolders#HolderIterator#``(). -// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BoundViewHolders#HolderIterator# +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BoundViewHolders#HolderIterator# +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BoundViewHolders#HolderIterator#``(). // ^^^^^^^^ reference java/util/Iterator# // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder# private int position = 0; diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/CallbackProp.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/CallbackProp.java index ad8a3c46..c6335f81 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/CallbackProp.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/CallbackProp.java @@ -45,5 +45,5 @@ // ^^^^^^^^^^^^^^^ reference java/lang/annotation/RetentionPolicy# // ^^^^^ reference java/lang/annotation/RetentionPolicy#CLASS. public @interface CallbackProp { -// ^^^^^^^^^^^^ definition com/airbnb/epoxy/CallbackProp# +// ^^^^^^^^^^^^ definition com/airbnb/epoxy/CallbackProp# } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java index 44bb0cf9..95b618b1 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java @@ -110,7 +110,7 @@ // ^^^^ reference com/airbnb/epoxy/ModelView#Size# // ^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ModelView#Size#MATCH_WIDTH_WRAP_HEIGHT. public class Carousel extends EpoxyRecyclerView { -// ^^^^^^^^ definition com/airbnb/epoxy/Carousel# +// ^^^^^^^^ definition com/airbnb/epoxy/Carousel# // ^^^^^^^^^^^^^^^^^ reference _root_/ public static final int NO_VALUE_SET = -1; // ^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#NO_VALUE_SET. @@ -122,7 +122,6 @@ public class Carousel extends EpoxyRecyclerView { // ^^^^^^^^^^^^^^^^^^^^^^^^^ reference local1 7:7 // ^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#SnapHelperFactory# // ^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#SnapHelperFactory# -// ^ definition local1 2:3 @Override // ^^^^^^^^ reference java/lang/Override# @@ -768,7 +767,7 @@ public void setPadding(@Nullable Padding padding) { * @see #setPadding(Padding) */ public static class Padding { -// ^^^^^^^ definition com/airbnb/epoxy/Carousel#Padding# +// ^^^^^^^ definition com/airbnb/epoxy/Carousel#Padding# public final int left; // ^^^^ definition com/airbnb/epoxy/Carousel#Padding#left. public final int top; @@ -784,8 +783,8 @@ public static class Padding { // ^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#Padding#paddingType. enum PaddingType { -// ^^^^^^ definition com/airbnb/epoxy/Carousel#Padding#PaddingType#``(). -// ^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#Padding#PaddingType# +// ^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#Padding#PaddingType# +// ^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#Padding#PaddingType#``(). PX, // ^^ definition com/airbnb/epoxy/Carousel#Padding#PaddingType#PX. DP, @@ -1151,8 +1150,8 @@ public void clear() { /** Provide a SnapHelper implementation you want to use with a Carousel. */ public abstract static class SnapHelperFactory { -// ^^^^^^ definition com/airbnb/epoxy/Carousel#SnapHelperFactory#``(). -// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#SnapHelperFactory# +// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#SnapHelperFactory# +// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#SnapHelperFactory#``(). /** * Create and return a new instance of a {@link androidx.recyclerview.widget.SnapHelper} for use * with a Carousel. diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelper.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelper.java index 7c17f2cb..dbda8ffc 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelper.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelper.java @@ -11,8 +11,8 @@ * annotation processor. */ public abstract class ControllerHelper { -// ^^^^^^ definition com/airbnb/epoxy/ControllerHelper#``(). -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ControllerHelper# +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ControllerHelper# +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ControllerHelper#``(). // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController# public abstract void resetAutoModels(); // ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ControllerHelper#resetAutoModels(). diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelperLookup.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelperLookup.java index 5274c325..99805cfa 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelperLookup.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerHelperLookup.java @@ -30,8 +30,8 @@ * be returned. */ class ControllerHelperLookup { -//^^^^^^ definition com/airbnb/epoxy/ControllerHelperLookup#``(). -//^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ControllerHelperLookup# +// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ControllerHelperLookup# +// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ControllerHelperLookup#``(). private static final String GENERATED_HELPER_CLASS_SUFFIX = "_EpoxyHelper"; // ^^^^^^ reference java/lang/String# // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ControllerHelperLookup#GENERATED_HELPER_CLASS_SUFFIX. diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerModelList.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerModelList.java index 7bb3046b..e8d4a418 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerModelList.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerModelList.java @@ -8,7 +8,7 @@ * why it doesn't do anything. */ class ControllerModelList extends ModelList { -//^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ControllerModelList# +// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ControllerModelList# // ^^^^^^^^^ reference com/airbnb/epoxy/ModelList# private static final ModelListObserver OBSERVER = new ModelListObserver() { @@ -17,7 +17,6 @@ class ControllerModelList extends ModelList { // ^^^^^^^^^^^^^^^^^^^^^^^^^ reference local1 12:3 // ^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ModelList#ModelListObserver# // ^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ModelList#ModelListObserver# -// ^ definition local1 1:4 @Override // ^^^^^^^^ reference java/lang/Override# public void onItemRangeInserted(int positionStart, int itemCount) { 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 de77fe0d..076131e2 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DebugTimer.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DebugTimer.java @@ -6,7 +6,7 @@ // ^^^ reference android/util/Log# class DebugTimer implements Timer { -//^^^^^^^^^^ definition com/airbnb/epoxy/DebugTimer# +// ^^^^^^^^^^ definition com/airbnb/epoxy/DebugTimer# // ^^^^^ reference com/airbnb/epoxy/Timer# private final String tag; 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 9630542f..14c5daf3 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffHelper.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffHelper.java @@ -36,7 +36,7 @@ * Helper to track changes in the models list. */ class DiffHelper { -//^^^^^^^^^^ definition com/airbnb/epoxy/DiffHelper# +// ^^^^^^^^^^ definition com/airbnb/epoxy/DiffHelper# private ArrayList oldStateList = new ArrayList<>(); // ^^^^^^^^^ reference java/util/ArrayList# // ^^^^^^^^^^ reference com/airbnb/epoxy/ModelState# 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 5bcb6694..336c6f3d 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffPayload.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffPayload.java @@ -29,7 +29,7 @@ * call. */ public class DiffPayload { -// ^^^^^^^^^^^ definition com/airbnb/epoxy/DiffPayload# +// ^^^^^^^^^^^ definition com/airbnb/epoxy/DiffPayload# private final EpoxyModel singleModel; // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^^^^^^^ definition com/airbnb/epoxy/DiffPayload#singleModel. 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 aee592b4..e60fcbf8 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffResult.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffResult.java @@ -43,7 +43,7 @@ * Wraps the result of {@link AsyncEpoxyDiffer#submitList(List)}. */ public class DiffResult { -// ^^^^^^^^^^ definition com/airbnb/epoxy/DiffResult# +// ^^^^^^^^^^ definition com/airbnb/epoxy/DiffResult# @NonNull final List> previousModels; // ^^^^^^^ reference androidx/annotation/NonNull# // ^^^^ reference java/util/List# 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 f17eff4f..df34247c 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAdapter.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAdapter.java @@ -35,8 +35,8 @@ @SuppressWarnings("WeakerAccess") //^^^^^^^^^^^^^^^ reference java/lang/SuppressWarnings# public abstract class EpoxyAdapter extends BaseEpoxyAdapter { -// ^^^^^^ definition com/airbnb/epoxy/EpoxyAdapter#``(). -// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyAdapter# +// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyAdapter# +// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyAdapter#``(). // ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BaseEpoxyAdapter# private final HiddenEpoxyModel hiddenModel = new HiddenEpoxyModel(); // ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/HiddenEpoxyModel# diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAsyncUtil.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAsyncUtil.java index eca4df34..27d3e5bd 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAsyncUtil.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAsyncUtil.java @@ -35,7 +35,7 @@ * Various helpers for running Epoxy operations off the main thread. */ public final class EpoxyAsyncUtil { -// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyAsyncUtil# +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyAsyncUtil# private EpoxyAsyncUtil() { // ^^^^^^ definition com/airbnb/epoxy/EpoxyAsyncUtil#``(). } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAttribute.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAttribute.java index 670979b2..8d401dad 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAttribute.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAttribute.java @@ -35,14 +35,14 @@ // ^^^^^^^^^^^^^^^ reference java/lang/annotation/RetentionPolicy# // ^^^^^ reference java/lang/annotation/RetentionPolicy#CLASS. public @interface EpoxyAttribute { -// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyAttribute# +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyAttribute# /** * Options that can be included on the attribute to affect how the model's generated class is * created. */ enum Option { -//^^^^^^ definition com/airbnb/epoxy/EpoxyAttribute#Option# -//^^^^^^ definition com/airbnb/epoxy/EpoxyAttribute#Option#``(). +// ^^^^^^ definition com/airbnb/epoxy/EpoxyAttribute#Option# +// ^^^^^^ definition com/airbnb/epoxy/EpoxyAttribute#Option#``(). /** * A getter is generated for this attribute by default. Add this option to prevent a getter from * being generated. 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 fd060572..142006ef 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java @@ -112,7 +112,7 @@ * accurate. */ public abstract class EpoxyController implements ModelCollector, StickyHeaderCallbacks { -// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController# +// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController# // ^^^^^^^^^^^^^^ reference _root_/ // ^^^^^^^^^^^^^^^^^^^^^ reference _root_/ @@ -280,7 +280,7 @@ public EpoxyController(Handler modelBuildingHandler, Handler diffingHandler) { // ^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#RequestedModelBuildType# // ^^^^^^^ reference com/airbnb/epoxy/EpoxyController#RequestedModelBuildType#DELAYED. private @interface RequestedModelBuildType { -// ^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#RequestedModelBuildType# +// ^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#RequestedModelBuildType# int NONE = 0; // ^^^^ definition com/airbnb/epoxy/EpoxyController#RequestedModelBuildType#NONE. /** A request has been made to build models immediately. It is posted. */ @@ -474,7 +474,6 @@ public synchronized void cancelPendingModelBuild() { // ^^^^^^^^^^^^^^^^ reference local6 49:3 // ^^^^^^^^ reference java/lang/Runnable# // ^^^^^^^^ reference java/lang/Runnable# -// ^ definition local6 1:4 @Override // ^^^^^^^^ reference java/lang/Override# public void run() { @@ -682,7 +681,7 @@ void addAfterInterceptorCallback(ModelInterceptorCallback callback) { * to allow changes. */ interface ModelInterceptorCallback { -//^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback# +// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback# void onInterceptorsStarted(EpoxyController controller); // ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#onInterceptorsStarted(). // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController# @@ -752,7 +751,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# +// ^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#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 @@ -1423,7 +1422,6 @@ protected void onExceptionSwallowed(@NonNull RuntimeException exception) { // ^^^^^^^^^^^^^^^^^^^^^^^^ reference local58 7:7 // ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#ExceptionHandler# // ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#ExceptionHandler# -// ^ definition local58 2:3 @Override // ^^^^^^^^ reference java/lang/Override# @@ -1467,7 +1465,7 @@ public static void setGlobalExceptionHandler( } public interface ExceptionHandler { -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#ExceptionHandler# +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#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. @@ -1504,7 +1502,6 @@ void onAttachedToRecyclerViewInternal(RecyclerView recyclerView) { // ^^^^^^^^^^^^^^^^ reference local67 19:7 // ^^^^^^^^ reference java/lang/Runnable# // ^^^^^^^^ reference java/lang/Runnable# -// ^ definition local67 1:4 @Override // ^^^^^^^^ reference java/lang/Override# public void run() { 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 4dabab08..a06a323c 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyControllerAdapter.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyControllerAdapter.java @@ -56,7 +56,7 @@ // ^^^^^^^^^^^^ reference androidx/recyclerview/widget/RecyclerView# public final class EpoxyControllerAdapter extends BaseEpoxyAdapter implements ResultCallback { -// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter# +// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter# // ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BaseEpoxyAdapter# // ^^^^^^^^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#ResultCallback# private final NotifyBlocker notifyBlocker = new NotifyBlocker(); diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDataBindingLayouts.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDataBindingLayouts.java index 119763a4..ffe3a450 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDataBindingLayouts.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDataBindingLayouts.java @@ -46,7 +46,7 @@ // ^^^^^^^^^^^^^^^ reference java/lang/annotation/RetentionPolicy# // ^^^^^ reference java/lang/annotation/RetentionPolicy#CLASS. public @interface EpoxyDataBindingLayouts { -// ^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDataBindingLayouts# +// ^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDataBindingLayouts# /** A list of databinding layout resources that should have EpoxyModel's generated for them. */ @LayoutRes int[] value(); // ^^^^^^^^^ reference androidx/annotation/LayoutRes# diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDataBindingPattern.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDataBindingPattern.java index 90125691..79913d6f 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDataBindingPattern.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDataBindingPattern.java @@ -38,7 +38,7 @@ // ^^^^^^^^^^^^^^^ reference java/lang/annotation/RetentionPolicy# // ^^^^^ reference java/lang/annotation/RetentionPolicy#CLASS. public @interface EpoxyDataBindingPattern { -// ^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDataBindingPattern# +// ^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDataBindingPattern# /** * The R class used in this module (eg "com.example.app.R.class"). This is needed so Epoxy can * look up layout files. diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDiffLogger.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDiffLogger.java index e47c8ef1..46f778a6 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDiffLogger.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDiffLogger.java @@ -28,7 +28,7 @@ * optimization. */ public class EpoxyDiffLogger extends AdapterDataObserver { -// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDiffLogger# +// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDiffLogger# // ^^^^^^^^^^^^^^^^^^^ reference _root_/ private final String tag; // ^^^^^^ reference java/lang/String# 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 def2ee60..c238ad4c 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# +// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyDragCallback# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BaseEpoxyTouchCallback# // ^ reference com/airbnb/epoxy/EpoxyDragCallback#[T] 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 3935e1c9..b61338f5 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyHolder.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyHolder.java @@ -19,7 +19,7 @@ * pattern when binding to a model. */ public abstract class EpoxyHolder { -// ^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyHolder# +// ^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyHolder# public EpoxyHolder(@NonNull ViewParent parent) { // ^^^^^^ definition com/airbnb/epoxy/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 7e5da319..c0240e36 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyItemSpacingDecorator.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyItemSpacingDecorator.java @@ -57,7 +57,7 @@ * are on the grid. Only designed to work with standard linear or grid layout managers. */ public class EpoxyItemSpacingDecorator extends RecyclerView.ItemDecoration { -// ^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyItemSpacingDecorator# +// ^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyItemSpacingDecorator# // ^^^^^^^^^^^^ reference RecyclerView/ // ^^^^^^^^^^^^^^ reference RecyclerView/ItemDecoration# private 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 76c51ea0..4825fd48 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java @@ -71,7 +71,7 @@ * @see EpoxyModelWithView */ public abstract class EpoxyModel { -// ^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel# +// ^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel# /** * Counts how many of these objects are created, so that each new object can have a unique id . @@ -657,7 +657,7 @@ public void addIf(@NonNull AddPredicate predicate, @NonNull EpoxyController cont * @see #addIf(AddPredicate, EpoxyController) */ public interface AddPredicate { -// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel#AddPredicate# +// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel#AddPredicate# boolean addIf(); // ^^^^^ definition com/airbnb/epoxy/EpoxyModel#AddPredicate#addIf(). } @@ -714,7 +714,6 @@ protected final void addWithDebugValidation(@NonNull EpoxyController controller) // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference local38 11:7 // ^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback# // ^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback# -// ^ definition local38 1:4 @Override // ^^^^^^^^ reference java/lang/Override# public void onInterceptorsStarted(EpoxyController controller) { @@ -938,7 +937,7 @@ public EpoxyModel spanSizeOverride(@Nullable SpanSizeOverrideCallback spanSiz } public interface SpanSizeOverrideCallback { -// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel#SpanSizeOverrideCallback# +// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel#SpanSizeOverrideCallback# int getSpanSize(int totalSpanCount, int position, int itemCount); // ^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModel#SpanSizeOverrideCallback#getSpanSize(). // ^^^^^^^^^^^^^^ definition local54 diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelClass.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelClass.java index 941c96e3..bc247117 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelClass.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelClass.java @@ -41,7 +41,7 @@ // ^^^^^^^^^^^^^^^ reference java/lang/annotation/RetentionPolicy# // ^^^^^ reference java/lang/annotation/RetentionPolicy#CLASS. public @interface EpoxyModelClass { -// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelClass# +// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelClass# /** * A layout resource that should be used as the default layout for the model. If you set this you * don't have to implement `getDefaultLayout`; it will be generated for you. 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 8d6756e6..929f127f 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java @@ -97,7 +97,7 @@ @SuppressWarnings("rawtypes") //^^^^^^^^^^^^^^^ reference java/lang/SuppressWarnings# public class EpoxyModelGroup extends EpoxyModelWithHolder { -// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup# +// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup# // ^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelWithHolder# // ^^^^^^^^^^^^^^^^ reference _root_/ @@ -264,7 +264,6 @@ public void bind(@NonNull ModelGroupHolder holder) { // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference local12 6:5 // ^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback# // ^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback# -// ^ definition local12 1:4 @Override // ^^^^^^^^ reference java/lang/Override# public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex) { @@ -308,7 +307,6 @@ public void bind(@NonNull ModelGroupHolder holder, @NonNull final List p // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference local20 6:5 // ^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback# // ^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback# -// ^ definition local20 1:4 @Override // ^^^^^^^^ reference java/lang/Override# public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex) { @@ -364,7 +362,6 @@ public void bind(@NonNull ModelGroupHolder holder, @NonNull EpoxyModel previo // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference local29 15:5 // ^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback# // ^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback# -// ^ definition local29 1:4 @Override // ^^^^^^^^ reference java/lang/Override# public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex) { @@ -472,7 +469,6 @@ public void onViewAttachedToWindow(ModelGroupHolder holder) { // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference local40 6:5 // ^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback# // ^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback# -// ^ definition local40 1:4 @Override // ^^^^^^^^ reference java/lang/Override# public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex) { @@ -506,7 +502,6 @@ public void onViewDetachedFromWindow(ModelGroupHolder holder) { // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference local47 6:5 // ^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback# // ^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback# -// ^ definition local47 1:4 @Override // ^^^^^^^^ reference java/lang/Override# public void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex) { @@ -561,7 +556,7 @@ private void iterateModels(ModelGroupHolder holder, IterateModelsCallback callba } private interface IterateModelsCallback { -// ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback# +// ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback# void onModel(EpoxyModel model, EpoxyViewHolder viewHolder, int modelIndex); // ^^^^^^^ definition com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#onModel(). // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# 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 9ff1fead..cd3fcfc2 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelTouchCallback.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelTouchCallback.java @@ -39,7 +39,7 @@ * your own {@link ItemTouchHelper} if you need extra flexibility or customization. */ public abstract class EpoxyModelTouchCallback -// ^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback# +// ^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# extends EpoxyTouchHelperCallback implements EpoxyDragCallback, EpoxySwipeCallback { // ^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyTouchHelperCallback# @@ -502,7 +502,6 @@ protected void clearView(final RecyclerView recyclerView, EpoxyViewHolder viewHo // ^^^^^^^^^^^^^^^^ reference local48 5:5 // ^^^^^^^^ reference java/lang/Runnable# // ^^^^^^^^ reference java/lang/Runnable# -// ^ definition local48 1:4 @Override // ^^^^^^^^ reference java/lang/Override# public void run() { diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithHolder.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithHolder.java index 5415ba1a..85f48e2b 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithHolder.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithHolder.java @@ -35,7 +35,7 @@ * instead of a specific view when binding to your model. */ public abstract class EpoxyModelWithHolder extends EpoxyModel { -// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelWithHolder# +// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelWithHolder# // ^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyHolder# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^ reference com/airbnb/epoxy/EpoxyModelWithHolder#[T] diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithView.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithView.java index bdd42270..f6f6ebd9 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithView.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelWithView.java @@ -35,8 +35,8 @@ * resource file. */ public abstract class EpoxyModelWithView extends EpoxyModel { -// ^^^^^^ definition com/airbnb/epoxy/EpoxyModelWithView#``(). -// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelWithView# +// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelWithView# +// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelWithView#``(). // ^^^^ reference _root_/ // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^ reference com/airbnb/epoxy/EpoxyModelWithView#[T] 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 780a0ae9..09d6b111 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# +// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxySwipeCallback# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BaseEpoxyTouchCallback# // ^ reference com/airbnb/epoxy/EpoxySwipeCallback#[T] 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 5115bdda..276adcbd 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelper.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelper.java @@ -63,8 +63,8 @@ * Epoxy view holders to remove some boilerplate for you. */ public abstract class EpoxyTouchHelper { -// ^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#``(). -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper# +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper# +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#``(). /** * The entry point for setting up drag support. @@ -85,7 +85,7 @@ public static DragBuilder initDragging(EpoxyController controller) { } public static class DragBuilder { -// ^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder# +// ^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder# private final EpoxyController controller; // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController# @@ -120,7 +120,7 @@ public DragBuilder2 withRecyclerView(RecyclerView recyclerView) { } public static class DragBuilder2 { -// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2# +// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder2# private final EpoxyController controller; // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController# @@ -210,7 +210,7 @@ public DragBuilder3 withDirections(int directionFlags) { } public static class DragBuilder3 { -// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3# +// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder3# private final EpoxyController controller; // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController# @@ -322,7 +322,7 @@ public DragBuilder4 forAllModels() { } public static class DragBuilder4 { -// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4# +// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# private final EpoxyController controller; @@ -543,8 +543,8 @@ public void clearView(U model, View itemView) { } public abstract static class DragCallbacks -// ^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#``(). -// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks# +// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks# +// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#``(). // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# implements EpoxyDragCallback { // ^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyDragCallback# @@ -636,7 +636,7 @@ public static SwipeBuilder initSwiping(RecyclerView recyclerView) { } public static class SwipeBuilder { -// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder# +// ^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder# private final RecyclerView recyclerView; // ^^^^^^^^^^^^ reference _root_/ @@ -707,7 +707,7 @@ public SwipeBuilder2 withDirections(int directionFlags) { } public static class SwipeBuilder2 { -// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2# +// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder2# private final RecyclerView recyclerView; // ^^^^^^^^^^^^ reference _root_/ @@ -810,7 +810,7 @@ public SwipeBuilder3 forAllModels() { } public static class SwipeBuilder3 { -// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3# +// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# private final RecyclerView recyclerView; @@ -1040,8 +1040,8 @@ public void clearView(U model, View itemView) { } public abstract static class SwipeCallbacks -// ^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#``(). -// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks# +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks# +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#``(). // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# implements EpoxySwipeCallback { // ^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxySwipeCallback# diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelperCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelperCallback.java index 2789d04a..d5709c16 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelperCallback.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelperCallback.java @@ -32,8 +32,8 @@ * view holders to {@link com.airbnb.epoxy.EpoxyViewHolder} for simpler use with Epoxy. */ public abstract class EpoxyTouchHelperCallback extends ItemTouchHelper.Callback { -// ^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelperCallback#``(). -// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelperCallback# +// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelperCallback# +// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelperCallback#``(). // ^^^^^^^^^^^^^^^ reference ItemTouchHelper/ // ^^^^^^^^ reference ItemTouchHelper/Callback# 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 1bb636e4..c71f8027 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyViewHolder.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyViewHolder.java @@ -52,7 +52,7 @@ @SuppressWarnings("WeakerAccess") //^^^^^^^^^^^^^^^ reference java/lang/SuppressWarnings# public class EpoxyViewHolder extends RecyclerView.ViewHolder { -// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyViewHolder# +// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyViewHolder# // ^^^^^^^^^^^^ reference RecyclerView/ // ^^^^^^^^^^ reference RecyclerView/ViewHolder# @SuppressWarnings("rawtypes") private EpoxyModel epoxyModel; 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 f53705d0..7ef57a4b 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# +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/GeneratedModel# /** * Called on the generated model immediately before the main model onBind method has been called. * This let's the generated model handle binding setup of its own 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 b55ee346..86a00d8f 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/HandlerExecutor.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/HandlerExecutor.java @@ -27,7 +27,7 @@ * same as the handler's thread. */ class HandlerExecutor implements Executor { -//^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/HandlerExecutor# +// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/HandlerExecutor# // ^^^^^^^^ reference java/util/concurrent/Executor# final Handler handler; // ^^^^^^^ reference _root_/ diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/HiddenEpoxyModel.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/HiddenEpoxyModel.java index fc88d274..50b43d93 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/HiddenEpoxyModel.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/HiddenEpoxyModel.java @@ -18,8 +18,8 @@ * view. */ class HiddenEpoxyModel extends EpoxyModel { -//^^^^^^ definition com/airbnb/epoxy/HiddenEpoxyModel#``(). -//^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/HiddenEpoxyModel# +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/HiddenEpoxyModel# +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/HiddenEpoxyModel#``(). // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^^ reference _root_/ @Override diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/IdUtils.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/IdUtils.java index 661e3569..d850104a 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/IdUtils.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/IdUtils.java @@ -9,7 +9,7 @@ * Utilities for generating 64-bit long IDs from types such as {@link CharSequence}. */ public final class IdUtils { -// ^^^^^^^ definition com/airbnb/epoxy/IdUtils# +// ^^^^^^^ definition com/airbnb/epoxy/IdUtils# private IdUtils() { // ^^^^^^ definition com/airbnb/epoxy/IdUtils#``(). } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/IllegalEpoxyUsage.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/IllegalEpoxyUsage.java index 9132a064..43c73165 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/IllegalEpoxyUsage.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/IllegalEpoxyUsage.java @@ -1,7 +1,7 @@ package com.airbnb.epoxy; public class IllegalEpoxyUsage extends RuntimeException { -// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/IllegalEpoxyUsage# +// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/IllegalEpoxyUsage# // ^^^^^^^^^^^^^^^^ reference java/lang/RuntimeException# public IllegalEpoxyUsage(String message) { // ^^^^^^ definition com/airbnb/epoxy/IllegalEpoxyUsage#``(). 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 75727a62..1780099d 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ImmutableModelException.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ImmutableModelException.java @@ -9,7 +9,7 @@ * Thrown if a model is changed after it is added to an {@link com.airbnb.epoxy.EpoxyController}. */ class ImmutableModelException extends RuntimeException { -//^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ImmutableModelException# +// ^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ImmutableModelException# // ^^^^^^^^^^^^^^^^ reference java/lang/RuntimeException# private static final String MODEL_CANNOT_BE_CHANGED_MESSAGE = // ^^^^^^ reference java/lang/String# diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ListenersUtils.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ListenersUtils.java index a58f0158..3b40f870 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ListenersUtils.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ListenersUtils.java @@ -26,8 +26,8 @@ // ^^^^^^^^^^ reference androidx/recyclerview/widget/RecyclerView/ViewHolder# public class ListenersUtils { -// ^^^^^^ definition com/airbnb/epoxy/ListenersUtils#``(). -// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ListenersUtils# +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ListenersUtils# +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ListenersUtils#``(). @Nullable // ^^^^^^^^ reference androidx/annotation/Nullable# diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/MainThreadExecutor.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/MainThreadExecutor.java index 7826cebc..7d65b03c 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/MainThreadExecutor.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/MainThreadExecutor.java @@ -12,7 +12,7 @@ // ^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyAsyncUtil# class MainThreadExecutor extends HandlerExecutor { -//^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/MainThreadExecutor# +// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/MainThreadExecutor# // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/HandlerExecutor# static final MainThreadExecutor INSTANCE = new MainThreadExecutor(false); // ^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/MainThreadExecutor# 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 e0c9e893..6b02233e 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelList.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelList.java @@ -44,7 +44,7 @@ * diffing since we have a knowledge of what changed in the list. */ class ModelList extends ArrayList> { -//^^^^^^^^^ definition com/airbnb/epoxy/ModelList# +// ^^^^^^^^^ definition com/airbnb/epoxy/ModelList# // ^^^^^^^^^ reference java/util/ArrayList# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# @@ -62,7 +62,7 @@ class ModelList extends ArrayList> { } interface ModelListObserver { -//^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelList#ModelListObserver# +// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelList#ModelListObserver# void onItemRangeInserted(int positionStart, int itemCount); // ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelList#ModelListObserver#onItemRangeInserted(). // ^^^^^^^^^^^^^ definition local1 @@ -414,8 +414,8 @@ public Iterator> iterator() { * the parent methods so that the proper notifications are done. */ private class Itr implements Iterator> { -// ^^^ definition com/airbnb/epoxy/ModelList#Itr# -// ^^^^^^ definition com/airbnb/epoxy/ModelList#Itr#``(). +// ^^^ definition com/airbnb/epoxy/ModelList#Itr# +// ^^^ definition com/airbnb/epoxy/ModelList#Itr#``(). // ^^^^^^^^ reference java/util/Iterator# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# int cursor; // index of next element to return @@ -537,7 +537,7 @@ public ListIterator> listIterator(int index) { * notifications are done. */ private class ListItr extends Itr implements ListIterator> { -// ^^^^^^^ definition com/airbnb/epoxy/ModelList#ListItr# +// ^^^^^^^ definition com/airbnb/epoxy/ModelList#ListItr# // ^^^ reference com/airbnb/epoxy/ModelList#Itr# // ^^^^^^^^^^^^ reference java/util/ListIterator# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# @@ -701,7 +701,7 @@ public List> subList(int start, int end) { * the implementation to call the parent methods so that the proper notifications are done. */ private static class SubList extends AbstractList> { -// ^^^^^^^ definition com/airbnb/epoxy/ModelList#SubList# +// ^^^^^^^ definition com/airbnb/epoxy/ModelList#SubList# // ^^^^^^^^^^^^ reference java/util/AbstractList# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# private final ModelList fullList; @@ -713,7 +713,7 @@ private static class SubList extends AbstractList> { // ^^^^ definition com/airbnb/epoxy/ModelList#SubList#size. private static final class SubListIterator implements ListIterator> { -// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelList#SubList#SubListIterator# +// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelList#SubList#SubListIterator# // ^^^^^^^^^^^^ reference java/util/ListIterator# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# private final SubList subList; diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelProp.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelProp.java index 0258756d..01d0fdd9 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelProp.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelProp.java @@ -48,11 +48,11 @@ // ^^^^^^^^^^^^^^^ reference java/lang/annotation/RetentionPolicy# // ^^^^^ reference java/lang/annotation/RetentionPolicy#CLASS. public @interface ModelProp { -// ^^^^^^^^^ definition com/airbnb/epoxy/ModelProp# +// ^^^^^^^^^ definition com/airbnb/epoxy/ModelProp# enum Option { -//^^^^^^ definition com/airbnb/epoxy/ModelProp#Option# -//^^^^^^ definition com/airbnb/epoxy/ModelProp#Option#``(). +// ^^^^^^ definition com/airbnb/epoxy/ModelProp#Option# +// ^^^^^^ definition com/airbnb/epoxy/ModelProp#Option#``(). /** * By default every prop's hashCode and equals method is called when determining the * model's state. This option can be used to exclude an prop's hashCode/equals from 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 3c61b5b6..9965b0fa 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelState.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelState.java @@ -2,8 +2,8 @@ /** Helper to store relevant information about a model that we need to determine if it changed. */ class ModelState { -//^^^^^^ definition com/airbnb/epoxy/ModelState#``(). -//^^^^^^^^^^ definition com/airbnb/epoxy/ModelState# +// ^^^^^^^^^^ definition com/airbnb/epoxy/ModelState# +// ^^^^^^^^^^ definition com/airbnb/epoxy/ModelState#``(). long id; // ^^ definition com/airbnb/epoxy/ModelState#id. int hashCode; diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelView.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelView.java index 814d67c1..50c7fe04 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelView.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelView.java @@ -41,7 +41,7 @@ // ^^^^^^^^^^^^^^^ reference java/lang/annotation/RetentionPolicy# // ^^^^^ reference java/lang/annotation/RetentionPolicy#CLASS. public @interface ModelView { -// ^^^^^^^^^ definition com/airbnb/epoxy/ModelView# +// ^^^^^^^^^ definition com/airbnb/epoxy/ModelView# /** * Use with {@link #autoLayout()} to declare what layout parameters should be used to size your @@ -49,8 +49,8 @@ * layout_width} and {@code layout_height}. */ enum Size { -//^^^^ definition com/airbnb/epoxy/ModelView#Size# -//^^^^^^ definition com/airbnb/epoxy/ModelView#Size#``(). +// ^^^^ definition com/airbnb/epoxy/ModelView#Size# +// ^^^^ definition com/airbnb/epoxy/ModelView#Size#``(). NONE, // ^^^^ definition com/airbnb/epoxy/ModelView#Size#NONE. WRAP_WIDTH_WRAP_HEIGHT, diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpControllerHelper.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpControllerHelper.java index ed6698ee..71bd5268 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpControllerHelper.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpControllerHelper.java @@ -5,8 +5,8 @@ * com.airbnb.epoxy.AutoModel} usage. */ class NoOpControllerHelper extends ControllerHelper { -//^^^^^^ definition com/airbnb/epoxy/NoOpControllerHelper#``(). -//^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/NoOpControllerHelper# +// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/NoOpControllerHelper# +// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/NoOpControllerHelper#``(). // ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ControllerHelper# // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController# diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpTimer.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpTimer.java index cffdd6b2..e148140d 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpTimer.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpTimer.java @@ -1,8 +1,8 @@ package com.airbnb.epoxy; class NoOpTimer implements Timer { -//^^^^^^ definition com/airbnb/epoxy/NoOpTimer#``(). -//^^^^^^^^^ definition com/airbnb/epoxy/NoOpTimer# +// ^^^^^^^^^ definition com/airbnb/epoxy/NoOpTimer# +// ^^^^^^^^^ definition com/airbnb/epoxy/NoOpTimer#``(). // ^^^^^ reference com/airbnb/epoxy/Timer# @Override // ^^^^^^^^ reference java/lang/Override# diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/NotifyBlocker.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/NotifyBlocker.java index 37ec1b5c..55f4d3a3 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/NotifyBlocker.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/NotifyBlocker.java @@ -15,8 +15,8 @@ * This observer throws upon any changes done outside of diffing. */ class NotifyBlocker extends AdapterDataObserver { -//^^^^^^ definition com/airbnb/epoxy/NotifyBlocker#``(). -//^^^^^^^^^^^^^ definition com/airbnb/epoxy/NotifyBlocker# +// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/NotifyBlocker# +// ^^^^^^^^^^^^^ definition com/airbnb/epoxy/NotifyBlocker#``(). // ^^^^^^^^^^^^^^^^^^^ reference _root_/ private boolean changesAllowed; 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 1019b20f..fc0f2c89 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# +// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelBoundListener# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# /** * This will be called immediately after a model was bound, with the model and view that were 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 ecad45cb..1f7631a3 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# +// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/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 a4bf9d40..123262b4 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# +// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelCheckedChangeListener# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# /** * Called when the view bound to the model is checked. 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 daa315a5..2551782b 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# +// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelClickListener# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# /** * Called when the view bound to the model is clicked. 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 032941da..00e38ab8 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# +// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelLongClickListener# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# /** * Called when the view bound to the model is clicked. 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 b77c19e4..468059fb 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# +// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelUnboundListener# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# /** * This will be called immediately after a model is unbound from a view, with the view and model 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 358827e5..efeb5e30 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# +// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelVisibilityChangedListener# // ^^^^^^^^^^ 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 5bb1b959..bf6dd0ae 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# +// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnModelVisibilityStateChangedListener# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^ reference com/airbnb/epoxy/OnModelVisibilityStateChangedListener#[V] diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnViewRecycled.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnViewRecycled.java index c4d330d4..8c5e6bff 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnViewRecycled.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnViewRecycled.java @@ -35,5 +35,5 @@ // ^^^^^^^^^^^^^^^ reference java/lang/annotation/RetentionPolicy# // ^^^^^ reference java/lang/annotation/RetentionPolicy#CLASS. public @interface OnViewRecycled { -// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnViewRecycled# +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnViewRecycled# } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnVisibilityChanged.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnVisibilityChanged.java index c761b52d..b92124c8 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnVisibilityChanged.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnVisibilityChanged.java @@ -45,5 +45,5 @@ // ^^^^^^^^^^^^^^^ reference java/lang/annotation/RetentionPolicy# // ^^^^^ reference java/lang/annotation/RetentionPolicy#CLASS. public @interface OnVisibilityChanged { -// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnVisibilityChanged# +// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnVisibilityChanged# } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnVisibilityStateChanged.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnVisibilityStateChanged.java index 1275f94a..76469c83 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnVisibilityStateChanged.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/OnVisibilityStateChanged.java @@ -47,5 +47,5 @@ // ^^^^^^^^^^^^^^^ reference java/lang/annotation/RetentionPolicy# // ^^^^^ reference java/lang/annotation/RetentionPolicy#CLASS. public @interface OnVisibilityStateChanged { -// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnVisibilityStateChanged# +// ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/OnVisibilityStateChanged# } diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/PackageEpoxyConfig.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/PackageEpoxyConfig.java index f9a4fddb..b94b2da5 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/PackageEpoxyConfig.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/PackageEpoxyConfig.java @@ -39,7 +39,7 @@ // ^^^^^^^^^^^^^^^ reference java/lang/annotation/RetentionPolicy# // ^^^^^ reference java/lang/annotation/RetentionPolicy#CLASS. public @interface PackageEpoxyConfig { -// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageEpoxyConfig# +// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageEpoxyConfig# boolean REQUIRE_HASHCODE_DEFAULT = false; // ^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageEpoxyConfig#REQUIRE_HASHCODE_DEFAULT. boolean REQUIRE_ABSTRACT_MODELS_DEFAULT = false; diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/PackageModelViewConfig.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/PackageModelViewConfig.java index 4414045a..398c8f53 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/PackageModelViewConfig.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/PackageModelViewConfig.java @@ -35,7 +35,7 @@ // ^^^^^^^^^^^^^^^ reference java/lang/annotation/RetentionPolicy# // ^^^^^ reference java/lang/annotation/RetentionPolicy#CLASS. public @interface PackageModelViewConfig { -// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig# +// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig# /** * The R class used in this module (eg "com.example.app.R.class"). This is needed so Epoxy can * look up layout files. @@ -130,8 +130,8 @@ * Enable or Disable an option, or inherit the default. */ enum Option { -//^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#Option# -//^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#Option#``(). +// ^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#Option# +// ^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#Option#``(). Default, // ^^^^^^^ definition com/airbnb/epoxy/PackageModelViewConfig#Option#Default. Enabled, 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 b564f0a7..a4d2623c 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/QuantityStringResAttribute.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/QuantityStringResAttribute.java @@ -20,7 +20,7 @@ // ^^^^^^^^^^ reference androidx/annotation/PluralsRes# public class QuantityStringResAttribute { -// ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/QuantityStringResAttribute# +// ^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/QuantityStringResAttribute# @PluralsRes private final int id; // ^^^^^^^^^^ reference androidx/annotation/PluralsRes# // ^^ definition com/airbnb/epoxy/QuantityStringResAttribute#id. diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyAdapter.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyAdapter.java index 7adc0d2c..06bee3ae 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyAdapter.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyAdapter.java @@ -15,8 +15,8 @@ * to modify the adapter from elsewhere, such as from an activity. */ public class SimpleEpoxyAdapter extends EpoxyAdapter { -// ^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#``(). -// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter# +// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter# +// ^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyAdapter#``(). // ^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyAdapter# public List> getModels() { diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyController.java index f883e056..d0c763c1 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyController.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyController.java @@ -10,8 +10,8 @@ * models directly. */ public class SimpleEpoxyController extends EpoxyController { -// ^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyController#``(). -// ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyController# +// ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyController# +// ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyController#``(). // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController# private List> currentModels; // ^^^^ reference java/util/List# 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 fa99f342..da1dd286 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyModel.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/SimpleEpoxyModel.java @@ -25,7 +25,7 @@ * span size. */ public class SimpleEpoxyModel extends EpoxyModel { -// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyModel# +// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/SimpleEpoxyModel# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# // ^^^^ reference _root_/ @LayoutRes private final int layoutRes; 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 90b30287..bb249502 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/StringAttributeData.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/StringAttributeData.java @@ -24,7 +24,7 @@ // ^^^^^^^^^ reference androidx/annotation/StringRes# public class StringAttributeData { -// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/StringAttributeData# +// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/StringAttributeData# private final boolean hasDefault; // ^^^^^^^^^^ definition com/airbnb/epoxy/StringAttributeData#hasDefault. @Nullable private final CharSequence defaultString; 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 8cc8d650..0bf22e6c 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# +// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/StyleBuilderCallback# void buildStyle(T builder); // ^^^^^^^^^^ definition com/airbnb/epoxy/StyleBuilderCallback#buildStyle(). // ^ reference com/airbnb/epoxy/StyleBuilderCallback#[T] diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/TextProp.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/TextProp.java index 2533a479..0e81f285 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/TextProp.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/TextProp.java @@ -45,7 +45,7 @@ // ^^^^^^^^^^^^^^^ reference java/lang/annotation/RetentionPolicy# // ^^^^^ reference java/lang/annotation/RetentionPolicy#CLASS. public @interface TextProp { -// ^^^^^^^^ definition com/airbnb/epoxy/TextProp# +// ^^^^^^^^ definition com/airbnb/epoxy/TextProp# @StringRes int defaultRes() default 0; // ^^^^^^^^^ reference androidx/annotation/StringRes# 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 48d0feba..1c212296 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# +// ^^^^^ definition com/airbnb/epoxy/Timer# void start(String sectionName); // ^^^^^ definition com/airbnb/epoxy/Timer#start(). // ^^^^^^ reference java/lang/String# 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 82bd60d0..50337595 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed2EpoxyController.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed2EpoxyController.java @@ -20,7 +20,7 @@ * @see Typed4EpoxyController */ public abstract class Typed2EpoxyController extends EpoxyController { -// ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Typed2EpoxyController# +// ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Typed2EpoxyController# // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController# private T data1; 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 28bdc5d1..fa430dd5 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed3EpoxyController.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed3EpoxyController.java @@ -20,7 +20,7 @@ * @see Typed4EpoxyController */ public abstract class Typed3EpoxyController extends EpoxyController { -// ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Typed3EpoxyController# +// ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Typed3EpoxyController# // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController# private T data1; 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 70bc46b4..ddd663de 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed4EpoxyController.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/Typed4EpoxyController.java @@ -20,7 +20,7 @@ * @see Typed3EpoxyController */ public abstract class Typed4EpoxyController extends EpoxyController { -// ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Typed4EpoxyController# +// ^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Typed4EpoxyController# // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController# private T data1; diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/TypedEpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/TypedEpoxyController.java index bbc8b9af..1cbc9981 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/TypedEpoxyController.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/TypedEpoxyController.java @@ -24,7 +24,7 @@ * @see Typed4EpoxyController */ public abstract class TypedEpoxyController extends EpoxyController { -// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/TypedEpoxyController# +// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/TypedEpoxyController# // ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController# private T currentData; // ^ reference com/airbnb/epoxy/TypedEpoxyController#[T] diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOp.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOp.java index 304670bc..e04feb12 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOp.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOp.java @@ -27,7 +27,7 @@ /** Defines an operation that makes a change to the epoxy model list. */ class UpdateOp { -//^^^^^^^^ definition com/airbnb/epoxy/UpdateOp# +// ^^^^^^^^ definition com/airbnb/epoxy/UpdateOp# @IntDef({ADD, REMOVE, UPDATE, MOVE}) // ^^^^^^ reference androidx/annotation/IntDef# @@ -40,7 +40,7 @@ class UpdateOp { // ^^^^^^^^^^^^^^^ reference java/lang/annotation/RetentionPolicy# // ^^^^^^ reference java/lang/annotation/RetentionPolicy#SOURCE. @interface Type { -// ^^^^ definition com/airbnb/epoxy/UpdateOp#Type# +// ^^^^ definition com/airbnb/epoxy/UpdateOp#Type# } static final int ADD = 0; diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOpHelper.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOpHelper.java index 60b2f0e7..1835a550 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOpHelper.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/UpdateOpHelper.java @@ -44,8 +44,8 @@ /** Helper class to collect changes in a diff, batching when possible. */ class UpdateOpHelper { -//^^^^^^ definition com/airbnb/epoxy/UpdateOpHelper#``(). -//^^^^^^^^^^^^^^ definition com/airbnb/epoxy/UpdateOpHelper# +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/UpdateOpHelper# +// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/UpdateOpHelper#``(). final List opList = new ArrayList<>(); // ^^^^ reference java/util/List# // ^^^^^^^^ reference com/airbnb/epoxy/UpdateOp# diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewHolderState.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewHolderState.java index fb33ff60..727497de 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewHolderState.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewHolderState.java @@ -59,7 +59,7 @@ @SuppressWarnings("WeakerAccess") //^^^^^^^^^^^^^^^ reference java/lang/SuppressWarnings# class ViewHolderState extends LongSparseArray implements Parcelable { -//^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ViewHolderState# +// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ViewHolderState# // ^^^^^^^^^^^^^^^ reference androidx/collection/LongSparseArray# // ^^^^^^^^^ reference com/airbnb/epoxy/ViewHolderState#ViewState# // ^^^^^^^^^^ reference _root_/ @@ -286,7 +286,7 @@ public void restore(EpoxyViewHolder holder) { * parcelable support. */ public static class ViewState extends SparseArray implements Parcelable { -// ^^^^^^^^^ definition com/airbnb/epoxy/ViewHolderState#ViewState# +// ^^^^^^^^^ definition com/airbnb/epoxy/ViewHolderState#ViewState# // ^^^^^^^^^^^ reference _root_/ // ^^^^^^^^^^ reference _root_/ // ^^^^^^^^^^ reference _root_/ diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewTypeManager.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewTypeManager.java index 62fa40a4..2d3120b0 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewTypeManager.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewTypeManager.java @@ -19,8 +19,8 @@ // ^^^^^^^^^^^^^^^^^ reference androidx/annotation/VisibleForTesting# class ViewTypeManager { -//^^^^^^ definition com/airbnb/epoxy/ViewTypeManager#``(). -//^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ViewTypeManager# +// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ViewTypeManager# +// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ViewTypeManager#``(). private static final Map VIEW_TYPE_MAP = new HashMap<>(); // ^^^ reference java/util/Map# // ^^^^^ reference java/lang/Class# diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/VisibilityState.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/VisibilityState.java index 0c705626..d21056cf 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/VisibilityState.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/VisibilityState.java @@ -17,8 +17,8 @@ // ^^^^^^ reference androidx/annotation/IntDef# public final class VisibilityState { -// ^^^^^^ definition com/airbnb/epoxy/VisibilityState#``(). -// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/VisibilityState# +// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/VisibilityState# +// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/VisibilityState#``(). @Retention(RetentionPolicy.SOURCE) // ^^^^^^^^^ reference java/lang/annotation/Retention# @@ -40,7 +40,7 @@ public final class VisibilityState { PARTIAL_IMPRESSION_INVISIBLE}) // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/VisibilityState#PARTIAL_IMPRESSION_INVISIBLE. public @interface Visibility { -// ^^^^^^^^^^ definition com/airbnb/epoxy/VisibilityState#Visibility# +// ^^^^^^^^^^ definition com/airbnb/epoxy/VisibilityState#Visibility# } /** diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener.java index 709ccbe4..7c0e9dc3 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener.java @@ -21,7 +21,7 @@ * checked change. */ public class WrappedEpoxyModelCheckedChangeListener, V> -// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener# +// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener# // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel# implements OnCheckedChangeListener { // ^^^^^^^^^^^^^^^^^^^^^^^ reference _root_/ diff --git a/tests/snapshots/src/main/generated/minimized/AbstractClasses.java b/tests/snapshots/src/main/generated/minimized/AbstractClasses.java index 5a384e4e..5857dc08 100644 --- a/tests/snapshots/src/main/generated/minimized/AbstractClasses.java +++ b/tests/snapshots/src/main/generated/minimized/AbstractClasses.java @@ -1,8 +1,8 @@ package minimized; public abstract class AbstractClasses { -// ^^^^^^ definition minimized/AbstractClasses#``(). -// ^^^^^^^^^^^^^^^ definition minimized/AbstractClasses# +// ^^^^^^^^^^^^^^^ definition minimized/AbstractClasses# +// ^^^^^^^^^^^^^^^ definition minimized/AbstractClasses#``(). public String defaultImplementation() { // ^^^^^^ reference java/lang/String# // ^^^^^^^^^^^^^^^^^^^^^ definition minimized/AbstractClasses#defaultImplementation(). diff --git a/tests/snapshots/src/main/generated/minimized/Annotations.java b/tests/snapshots/src/main/generated/minimized/Annotations.java index 216a143a..3e9162e4 100644 --- a/tests/snapshots/src/main/generated/minimized/Annotations.java +++ b/tests/snapshots/src/main/generated/minimized/Annotations.java @@ -44,7 +44,7 @@ // ^^^^^^^^^ reference java/lang/annotation/ElementType#PARAMETER. // ^^^^ reference java/lang/annotation/ElementType#TYPE. public @interface Annotations { -// ^^^^^^^^^^^ definition minimized/Annotations# +// ^^^^^^^^^^^ definition minimized/Annotations# String value() default ""; //^^^^^^ reference java/lang/String# diff --git a/tests/snapshots/src/main/generated/minimized/AnonymousClasses.java b/tests/snapshots/src/main/generated/minimized/AnonymousClasses.java index e579e33b..3ce7d6d8 100644 --- a/tests/snapshots/src/main/generated/minimized/AnonymousClasses.java +++ b/tests/snapshots/src/main/generated/minimized/AnonymousClasses.java @@ -9,8 +9,8 @@ @SuppressWarnings("ALL") //^^^^^^^^^^^^^^^ reference java/lang/SuppressWarnings# public class AnonymousClasses { -// ^^^^^^ definition minimized/AnonymousClasses#``(). -// ^^^^^^^^^^^^^^^^ definition minimized/AnonymousClasses# +// ^^^^^^^^^^^^^^^^ definition minimized/AnonymousClasses# +// ^^^^^^^^^^^^^^^^ definition minimized/AnonymousClasses#``(). public static int app(int n) { // ^^^ definition minimized/AnonymousClasses#app(). // ^ definition local0 @@ -27,7 +27,6 @@ public static int app(int n) { // ^^^^^^^ reference java/lang/Integer# // ^^^^^^^ reference java/lang/Integer# // ^^^^^^^ reference java/lang/Integer# -// ^ definition local3 1:4 @Override // ^^^^^^^^ reference java/lang/Override# public Integer apply(Integer integer) { diff --git a/tests/snapshots/src/main/generated/minimized/Arrays.java b/tests/snapshots/src/main/generated/minimized/Arrays.java index db6d2efa..4f57ba50 100644 --- a/tests/snapshots/src/main/generated/minimized/Arrays.java +++ b/tests/snapshots/src/main/generated/minimized/Arrays.java @@ -1,8 +1,8 @@ package minimized; public class Arrays { -// ^^^^^^ definition minimized/Arrays# -// ^^^^^^ definition minimized/Arrays#``(). +// ^^^^^^ definition minimized/Arrays# +// ^^^^^^ definition minimized/Arrays#``(). public static String app() { // ^^^^^^ reference java/lang/String# // ^^^ definition minimized/Arrays#app(). diff --git a/tests/snapshots/src/main/generated/minimized/ClassOf.java b/tests/snapshots/src/main/generated/minimized/ClassOf.java index 62e989ca..17213ff8 100644 --- a/tests/snapshots/src/main/generated/minimized/ClassOf.java +++ b/tests/snapshots/src/main/generated/minimized/ClassOf.java @@ -1,8 +1,8 @@ package minimized; public class ClassOf { -// ^^^^^^ definition minimized/ClassOf#``(). -// ^^^^^^^ definition minimized/ClassOf# +// ^^^^^^^ definition minimized/ClassOf# +// ^^^^^^^ definition minimized/ClassOf#``(). public static String app() { // ^^^^^^ reference java/lang/String# // ^^^ definition minimized/ClassOf#app(). diff --git a/tests/snapshots/src/main/generated/minimized/Docstrings.java b/tests/snapshots/src/main/generated/minimized/Docstrings.java index a3957f12..6a846874 100644 --- a/tests/snapshots/src/main/generated/minimized/Docstrings.java +++ b/tests/snapshots/src/main/generated/minimized/Docstrings.java @@ -2,8 +2,8 @@ /** Example class docstring. */ public class Docstrings { -// ^^^^^^ definition minimized/Docstrings#``(). -// ^^^^^^^^^^ definition minimized/Docstrings# +// ^^^^^^^^^^ definition minimized/Docstrings# +// ^^^^^^^^^^ definition minimized/Docstrings#``(). /** Example field docstring. */ public static int field = 42; diff --git a/tests/snapshots/src/main/generated/minimized/Enums.java b/tests/snapshots/src/main/generated/minimized/Enums.java index 063e3d7e..0fffe296 100644 --- a/tests/snapshots/src/main/generated/minimized/Enums.java +++ b/tests/snapshots/src/main/generated/minimized/Enums.java @@ -7,7 +7,7 @@ // ^^^^^^ reference java/util/Arrays# public enum Enums { -// ^^^^^ definition minimized/Enums# +// ^^^^^ definition minimized/Enums# A("A"), //^ definition minimized/Enums#A. // ^^^^^ reference minimized/Enums#``(). diff --git a/tests/snapshots/src/main/generated/minimized/Fields.java b/tests/snapshots/src/main/generated/minimized/Fields.java index 5cff3c17..0d8a3410 100644 --- a/tests/snapshots/src/main/generated/minimized/Fields.java +++ b/tests/snapshots/src/main/generated/minimized/Fields.java @@ -1,8 +1,8 @@ package minimized; public class Fields { -// ^^^^^^ definition minimized/Fields# -// ^^^^^^ definition minimized/Fields#``(). +// ^^^^^^ definition minimized/Fields# +// ^^^^^^ definition minimized/Fields#``(). private final int privateField = 0; // ^^^^^^^^^^^^ definition minimized/Fields#privateField. protected int protectedField = 0; @@ -17,16 +17,16 @@ public class Fields { // ^^^^^^^^^^^^^^^^^ definition minimized/Fields#staticPublicField. public class InnerFields { -// ^^^^^^ definition minimized/Fields#InnerFields#``(). -// ^^^^^^^^^^^ definition minimized/Fields#InnerFields# +// ^^^^^^^^^^^ definition minimized/Fields#InnerFields# +// ^^^^^^^^^^^ definition minimized/Fields#InnerFields#``(). public int publicInnerField = publicField; // ^^^^^^^^^^^^^^^^ definition minimized/Fields#InnerFields#publicInnerField. // ^^^^^^^^^^^ reference minimized/Fields#publicField. } public static class InnerStaticFields { -// ^^^^^^ definition minimized/Fields#InnerStaticFields#``(). -// ^^^^^^^^^^^^^^^^^ definition minimized/Fields#InnerStaticFields# +// ^^^^^^^^^^^^^^^^^ definition minimized/Fields#InnerStaticFields# +// ^^^^^^^^^^^^^^^^^ definition minimized/Fields#InnerStaticFields#``(). public int publicNonStaticInnerField = 0; // ^^^^^^^^^^^^^^^^^^^^^^^^^ definition minimized/Fields#InnerStaticFields#publicNonStaticInnerField. public static int publicStaticInnerField = 0; diff --git a/tests/snapshots/src/main/generated/minimized/ForComprehensions.java b/tests/snapshots/src/main/generated/minimized/ForComprehensions.java index 33fd9ef1..ee023b44 100644 --- a/tests/snapshots/src/main/generated/minimized/ForComprehensions.java +++ b/tests/snapshots/src/main/generated/minimized/ForComprehensions.java @@ -10,8 +10,8 @@ // ^^^^ reference java/util/List# public class ForComprehensions { -// ^^^^^^ definition minimized/ForComprehensions#``(). -// ^^^^^^^^^^^^^^^^^ definition minimized/ForComprehensions# +// ^^^^^^^^^^^^^^^^^ definition minimized/ForComprehensions# +// ^^^^^^^^^^^^^^^^^ definition minimized/ForComprehensions#``(). public static int app(int n) { // ^^^ definition minimized/ForComprehensions#app(). // ^ definition local0 diff --git a/tests/snapshots/src/main/generated/minimized/InnerClasses.java b/tests/snapshots/src/main/generated/minimized/InnerClasses.java index 2191991d..3b7f4f77 100644 --- a/tests/snapshots/src/main/generated/minimized/InnerClasses.java +++ b/tests/snapshots/src/main/generated/minimized/InnerClasses.java @@ -1,7 +1,7 @@ package minimized; public class InnerClasses { -// ^^^^^^^^^^^^ definition minimized/InnerClasses# +// ^^^^^^^^^^^^ definition minimized/InnerClasses# private final int exampleField; // ^^^^^^^^^^^^ definition minimized/InnerClasses#exampleField. @@ -16,8 +16,8 @@ public InnerClasses(int exampleField) { } public enum InnerEnum { -// ^^^^^^ definition minimized/InnerClasses#InnerEnum#``(). -// ^^^^^^^^^ definition minimized/InnerClasses#InnerEnum# +// ^^^^^^^^^ definition minimized/InnerClasses#InnerEnum# +// ^^^^^^^^^ definition minimized/InnerClasses#InnerEnum#``(). A, // ^ definition minimized/InnerClasses#InnerEnum#A. B, @@ -27,7 +27,7 @@ public enum InnerEnum { } public interface InnerInterface { -// ^^^^^^^^^^^^^^ definition minimized/InnerClasses#InnerInterface# +// ^^^^^^^^^^^^^^ definition minimized/InnerClasses#InnerInterface# B apply(A a); // ^ reference minimized/InnerClasses#InnerInterface#[B] // ^^^^^ definition minimized/InnerClasses#InnerInterface#apply(). @@ -36,14 +36,14 @@ public interface InnerInterface { } public static class InnerStaticClass { -// ^^^^^^ definition minimized/InnerClasses#InnerStaticClass#``(). -// ^^^^^^^^^^^^^^^^ definition minimized/InnerClasses#InnerStaticClass# +// ^^^^^^^^^^^^^^^^ definition minimized/InnerClasses#InnerStaticClass# +// ^^^^^^^^^^^^^^^^ definition minimized/InnerClasses#InnerStaticClass#``(). public static void innerStaticMethod() {} // ^^^^^^^^^^^^^^^^^ definition minimized/InnerClasses#InnerStaticClass#innerStaticMethod(). } public class InnerClass implements InnerInterface { -// ^^^^^^^^^^ definition minimized/InnerClasses#InnerClass# +// ^^^^^^^^^^ definition minimized/InnerClasses#InnerClass# // ^^^^^^^^^^^^^^ reference minimized/InnerClasses#InnerInterface# // ^^^^^^^ reference java/lang/Integer# // ^^^^^^^ reference java/lang/Integer# @@ -165,7 +165,6 @@ public static void testAnon() { // ^^^^^^ reference java/lang/String# // ^^^^^^ reference java/lang/String# // ^^^^^^ reference java/lang/String# -// ^ definition local9 1:4 @Override // ^^^^^^^^ reference java/lang/Override# public String apply(String s) { diff --git a/tests/snapshots/src/main/generated/minimized/Interfaces.java b/tests/snapshots/src/main/generated/minimized/Interfaces.java index e72aeaa2..e8e7bf64 100644 --- a/tests/snapshots/src/main/generated/minimized/Interfaces.java +++ b/tests/snapshots/src/main/generated/minimized/Interfaces.java @@ -1,7 +1,7 @@ package minimized; public interface Interfaces { -// ^^^^^^^^^^ definition minimized/Interfaces# +// ^^^^^^^^^^ definition minimized/Interfaces# String abstractInterfaceMethod(); //^^^^^^ reference java/lang/String# // ^^^^^^^^^^^^^^^^^^^^^^^ definition minimized/Interfaces#abstractInterfaceMethod(). diff --git a/tests/snapshots/src/main/generated/minimized/Methods.java b/tests/snapshots/src/main/generated/minimized/Methods.java index 7ff0ef30..9fd9bb13 100644 --- a/tests/snapshots/src/main/generated/minimized/Methods.java +++ b/tests/snapshots/src/main/generated/minimized/Methods.java @@ -1,8 +1,8 @@ package minimized; public class Methods { -// ^^^^^^ definition minimized/Methods#``(). -// ^^^^^^^ definition minimized/Methods# +// ^^^^^^^ definition minimized/Methods# +// ^^^^^^^ definition minimized/Methods#``(). private int overload(int value) { // ^^^^^^^^ definition minimized/Methods#overload(). // ^^^^^ definition local0 diff --git a/tests/snapshots/src/main/generated/minimized/MinimizedJavaMain.java b/tests/snapshots/src/main/generated/minimized/MinimizedJavaMain.java index 900e18a6..28289672 100644 --- a/tests/snapshots/src/main/generated/minimized/MinimizedJavaMain.java +++ b/tests/snapshots/src/main/generated/minimized/MinimizedJavaMain.java @@ -5,8 +5,8 @@ // ^^^^^ reference minimized/Annotations#value(). // ^^^^^^ reference minimized/Annotations#format(). public class MinimizedJavaMain { -// ^^^^^^ definition minimized/MinimizedJavaMain#``(). -// ^^^^^^^^^^^^^^^^^ definition minimized/MinimizedJavaMain# +// ^^^^^^^^^^^^^^^^^ definition minimized/MinimizedJavaMain# +// ^^^^^^^^^^^^^^^^^ definition minimized/MinimizedJavaMain#``(). public static void main(String[] args) { // ^^^^ definition minimized/MinimizedJavaMain#main(). // ^^^^^^ reference java/lang/String# diff --git a/tests/snapshots/src/main/generated/minimized/ParameterizedTypes.java b/tests/snapshots/src/main/generated/minimized/ParameterizedTypes.java index fea69416..b6a27665 100644 --- a/tests/snapshots/src/main/generated/minimized/ParameterizedTypes.java +++ b/tests/snapshots/src/main/generated/minimized/ParameterizedTypes.java @@ -1,8 +1,8 @@ package minimized; public class ParameterizedTypes { -// ^^^^^^ definition minimized/ParameterizedTypes#``(). -// ^^^^^^^^^^^^^^^^^^ definition minimized/ParameterizedTypes# +// ^^^^^^^^^^^^^^^^^^ definition minimized/ParameterizedTypes# +// ^^^^^^^^^^^^^^^^^^ definition minimized/ParameterizedTypes#``(). public String app(A a, B b) { // ^^^^^^ reference java/lang/String# // ^^^ definition minimized/ParameterizedTypes#app(). diff --git a/tests/snapshots/src/main/generated/minimized/Primitives.java b/tests/snapshots/src/main/generated/minimized/Primitives.java index 2fd688df..2a317f61 100644 --- a/tests/snapshots/src/main/generated/minimized/Primitives.java +++ b/tests/snapshots/src/main/generated/minimized/Primitives.java @@ -6,8 +6,8 @@ // ^^^^^^ reference java/util/Random# public class Primitives { -// ^^^^^^ definition minimized/Primitives#``(). -// ^^^^^^^^^^ definition minimized/Primitives# +// ^^^^^^^^^^ definition minimized/Primitives# +// ^^^^^^^^^^ definition minimized/Primitives#``(). public static String app() { // ^^^^^^ reference java/lang/String# // ^^^ definition minimized/Primitives#app(). diff --git a/tests/snapshots/src/main/generated/minimized/RawTypes.java b/tests/snapshots/src/main/generated/minimized/RawTypes.java index 05bcd557..3dda3cc3 100644 --- a/tests/snapshots/src/main/generated/minimized/RawTypes.java +++ b/tests/snapshots/src/main/generated/minimized/RawTypes.java @@ -12,8 +12,8 @@ @SuppressWarnings("ALL") //^^^^^^^^^^^^^^^ reference java/lang/SuppressWarnings# public class RawTypes { -// ^^^^^^ definition minimized/RawTypes#``(). -// ^^^^^^^^ definition minimized/RawTypes# +// ^^^^^^^^ definition minimized/RawTypes# +// ^^^^^^^^ definition minimized/RawTypes#``(). public static final List x = Collections.singletonList(42); // ^^^^ reference java/util/List# // ^ definition minimized/RawTypes#x. diff --git a/tests/snapshots/src/main/generated/minimized/SubClasses.java b/tests/snapshots/src/main/generated/minimized/SubClasses.java index 7edf2851..6d3a311f 100644 --- a/tests/snapshots/src/main/generated/minimized/SubClasses.java +++ b/tests/snapshots/src/main/generated/minimized/SubClasses.java @@ -1,8 +1,8 @@ package minimized; public class SubClasses extends AbstractClasses implements Interfaces { -// ^^^^^^ definition minimized/SubClasses#``(). -// ^^^^^^^^^^ definition minimized/SubClasses# +// ^^^^^^^^^^ definition minimized/SubClasses# +// ^^^^^^^^^^ definition minimized/SubClasses#``(). // ^^^^^^^^^^^^^^^ reference minimized/AbstractClasses# // ^^^^^^^^^^ reference minimized/Interfaces# diff --git a/tests/snapshots/src/main/generated/minimized/TypeVariables.java b/tests/snapshots/src/main/generated/minimized/TypeVariables.java index 827608a8..61fb3c1d 100644 --- a/tests/snapshots/src/main/generated/minimized/TypeVariables.java +++ b/tests/snapshots/src/main/generated/minimized/TypeVariables.java @@ -2,11 +2,11 @@ /** Example from https://docs.oracle.com/javase/specs/jls/se8/html/jls-4.html#jls-4.4 */ public class TypeVariables { -// ^^^^^^ definition minimized/TypeVariables#``(). -// ^^^^^^^^^^^^^ definition minimized/TypeVariables# +// ^^^^^^^^^^^^^ definition minimized/TypeVariables# +// ^^^^^^^^^^^^^ definition minimized/TypeVariables#``(). static class C { -// ^ definition minimized/TypeVariables#C# -// ^^^^^^ definition minimized/TypeVariables#C#``(). +// ^ definition minimized/TypeVariables#C# +// ^ definition minimized/TypeVariables#C#``(). public void mCPublic() {} // ^^^^^^^^ definition minimized/TypeVariables#C#mCPublic(). @@ -18,14 +18,14 @@ void mCPackage() {} } interface I { -//^ definition minimized/TypeVariables#I# +// ^ definition minimized/TypeVariables#I# void mI(); // ^^ definition minimized/TypeVariables#I#mI(). } static class CT extends C implements I { -// ^^ definition minimized/TypeVariables#CT# -// ^^^^^^ definition minimized/TypeVariables#CT#``(). +// ^^ definition minimized/TypeVariables#CT# +// ^^ definition minimized/TypeVariables#CT#``(). // ^ reference minimized/TypeVariables#C# // ^ reference minimized/TypeVariables#I# public void mI() {} diff --git a/tests/unit/src/test/scala/tests/SnapshotCommandSuite.scala b/tests/unit/src/test/scala/tests/SnapshotCommandSuite.scala index 7d54209f..dc4cc3e3 100644 --- a/tests/unit/src/test/scala/tests/SnapshotCommandSuite.scala +++ b/tests/unit/src/test/scala/tests/SnapshotCommandSuite.scala @@ -38,8 +38,8 @@ class SnapshotCommandSuite extends MopedSuite(LsifJava.app) { |package main; | |public class Sample { - |// ^^^^^^ definition main/Sample# - |// ^^^^^^ definition main/Sample#``(). + |// ^^^^^^ definition main/Sample# + |// ^^^^^^ definition main/Sample#``(). | public static void main(String[] asdf) {} |// ^^^^ definition main/Sample#main(). |// ^^^^^^ reference java/lang/String# From 26a063e86d53eadfbc4df79a52053580eef9b622 Mon Sep 17 00:00:00 2001 From: Noah Santschi-Cooney Date: Thu, 11 Mar 2021 16:08:48 +0000 Subject: [PATCH 2/6] use indexOf instead of regex --- .../com/sourcegraph/semanticdb_javac/RangeFinder.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/RangeFinder.java b/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/RangeFinder.java index 3814c255..7a41b289 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/RangeFinder.java +++ b/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/RangeFinder.java @@ -52,12 +52,10 @@ private static int findNameIn(CompilationUnitTree root, CharSequence name, int s end = contents.length(); } - Matcher matcher = Pattern.compile("\\b" + name + "\\b").matcher(contents); - matcher.region(start, end); - if (matcher.find()) { - return matcher.start(); - } else { - return -1; + int offset = contents.indexOf(" " + name, start); + if (offset > -1) { + return offset + 1; } + return -1; } } From f3b82e9339b3825678ad9b5eb59f99673584e4b2 Mon Sep 17 00:00:00 2001 From: Noah Santschi-Cooney Date: Thu, 11 Mar 2021 19:53:02 +0000 Subject: [PATCH 3/6] cache computing sourcefile text content --- .../semanticdb_javac/RangeFinder.java | 33 +++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/RangeFinder.java b/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/RangeFinder.java index 7a41b289..27386dc5 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/RangeFinder.java +++ b/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/RangeFinder.java @@ -8,11 +8,16 @@ import javax.lang.model.element.Element; import javax.lang.model.element.Name; import java.io.IOException; +import java.util.HashMap; import java.util.Optional; import java.util.regex.Matcher; import java.util.regex.Pattern; +import static com.sourcegraph.semanticdb_javac.Debugging.pprint; + public class RangeFinder { + private static final HashMap contentsCache = new HashMap<>(); + public static Optional findRange( TreePath path, Trees trees, CompilationUnitTree root, Element element, int startPos) { LineMap lineMap = root.getLineMap(); @@ -22,11 +27,11 @@ public static Optional findRange( int endPos = (int) trees.getSourcePositions().getEndPosition(root, path.getLeaf()); // false for anonymous classes if (name.length() != 0) { - startPos = findNameIn(root, name, startPos, endPos); + startPos = findNameIn(root, name, startPos); endPos = startPos + name.length(); } - if (endPos == -1) { + if (endPos == -1 || startPos == -1) { return Optional.empty(); } @@ -40,19 +45,21 @@ public static Optional findRange( return Optional.of(range); } - private static int findNameIn(CompilationUnitTree root, CharSequence name, int start, int end) { - String contents; - try { - contents = root.getSourceFile().getCharContent(true).toString(); - } catch (IOException e) { - return -1; - } + private static int findNameIn(CompilationUnitTree root, CharSequence name, int start) { + String content = + contentsCache.computeIfAbsent( + root, + (s) -> { + try { + return root.getSourceFile().getCharContent(true).toString(); + } catch (IOException e) { + return null; + } + }); - if (end == -1) { - end = contents.length(); - } + if (content == null) return -1; - int offset = contents.indexOf(" " + name, start); + int offset = content.indexOf(" " + name, start); if (offset > -1) { return offset + 1; } From c8e97ec81be72ebecb44d9720aa2c39ff92970b4 Mon Sep 17 00:00:00 2001 From: Noah Santschi-Cooney Date: Thu, 11 Mar 2021 20:38:45 +0000 Subject: [PATCH 4/6] fix visitMethod generated constructor check for record classes --- .../com/sourcegraph/semanticdb_javac/SemanticdbVisitor.java | 2 +- 1 file changed, 1 insertion(+), 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 dbcd15c2..7e71039f 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 @@ -107,7 +107,7 @@ public Void visitMethod(MethodTree node, Void unused) { if (node instanceof JCTree.JCMethodDecl) { JCTree.JCMethodDecl meth = (JCTree.JCMethodDecl) node; CompilerRange range = CompilerRange.FROM_POINT_TO_SYMBOL_NAME; - if (meth.params.isEmpty() && (meth.sym.flags() & Flags.GENERATEDCONSTR) != 0L) { + if ((meth.sym.flags() & Flags.GENERATEDCONSTR) != 0L) { range = CompilerRange.FROM_TEXT_SEARCH; } emitSymbolOccurrence(meth.sym, meth, Role.DEFINITION, range); From ab3d400789175d745558e7e8c3ff2c3d658e93bc Mon Sep 17 00:00:00 2001 From: Noah Santschi-Cooney Date: Fri, 12 Mar 2021 14:33:36 +0000 Subject: [PATCH 5/6] remove global source cache --- .../semanticdb_javac/RangeFinder.java | 28 +++++++---------- .../semanticdb_javac/SemanticdbVisitor.java | 21 +++++++++---- .../com/airbnb/epoxy/EpoxyTouchHelper.java | 2 -- .../tests/GeneratedConstructorSuite.scala | 30 +++++++++++++++++++ 4 files changed, 55 insertions(+), 26 deletions(-) create mode 100644 tests/unit/src/test/scala/tests/GeneratedConstructorSuite.scala diff --git a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/RangeFinder.java b/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/RangeFinder.java index 27386dc5..871dbf53 100644 --- a/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/RangeFinder.java +++ b/semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/RangeFinder.java @@ -16,10 +16,13 @@ import static com.sourcegraph.semanticdb_javac.Debugging.pprint; public class RangeFinder { - private static final HashMap contentsCache = new HashMap<>(); - public static Optional findRange( - TreePath path, Trees trees, CompilationUnitTree root, Element element, int startPos) { + TreePath path, + Trees trees, + CompilationUnitTree root, + Element element, + int startPos, + String source) { LineMap lineMap = root.getLineMap(); Name name = element.getSimpleName(); if (name.contentEquals("")) name = element.getEnclosingElement().getSimpleName(); @@ -27,7 +30,7 @@ public static Optional findRange( int endPos = (int) trees.getSourcePositions().getEndPosition(root, path.getLeaf()); // false for anonymous classes if (name.length() != 0) { - startPos = findNameIn(root, name, startPos); + startPos = findNameIn(name, startPos, source); endPos = startPos + name.length(); } @@ -45,21 +48,10 @@ public static Optional findRange( return Optional.of(range); } - private static int findNameIn(CompilationUnitTree root, CharSequence name, int start) { - String content = - contentsCache.computeIfAbsent( - root, - (s) -> { - try { - return root.getSourceFile().getCharContent(true).toString(); - } catch (IOException e) { - return null; - } - }); - - if (content == null) return -1; + private static int findNameIn(CharSequence name, int start, String source) { + if (source.equals("")) return -1; - int offset = content.indexOf(" " + name, start); + int offset = source.indexOf(" " + name, start); if (offset > -1) { return offset + 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 7e71039f..9251e543 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 @@ -32,6 +32,7 @@ public class SemanticdbVisitor extends TreePathScanner { private final EndPosTable endPosTable; private final ArrayList occurrences; private final ArrayList symbolInfos; + private String source; public SemanticdbVisitor( JavacTask task, GlobalSymbolsCache globals, TaskEvent event, SemanticdbOptions options) { @@ -48,6 +49,7 @@ public SemanticdbVisitor( } this.occurrences = new ArrayList<>(); this.symbolInfos = new ArrayList<>(); + // this.source = ""; } public Semanticdb.TextDocument buildTextDocument(CompilationUnitTree tree) { @@ -58,7 +60,7 @@ public Semanticdb.TextDocument buildTextDocument(CompilationUnitTree tree) { .setSchema(Semanticdb.Schema.SEMANTICDB4) .setLanguage(Semanticdb.Language.JAVA) .setUri(semanticdbUri()) - .setText(semanticdbText()) + .setText(semanticdbText(!options.includeText)) .setMd5(semanticdbMd5()) .addAllOccurrences(occurrences) .addAllSymbols(symbolInfos) @@ -186,7 +188,12 @@ private Optional semanticdbRange( if (kind.isFromTextSearch() && sym.name.length() > 0) { return RangeFinder.findRange( - getCurrentPath(), trees, getCurrentPath().getCompilationUnit(), sym, start); + getCurrentPath(), + trees, + getCurrentPath().getCompilationUnit(), + sym, + start, + semanticdbText(false)); } else if (start != Position.NOPOS && end != Position.NOPOS && end > start) { LineMap lineMap = event.getCompilationUnit().getLineMap(); Semanticdb.Range range = @@ -223,13 +230,15 @@ private Optional semanticdbOccurrence( } } - private String semanticdbText() { - if (!options.includeText) return ""; + private String semanticdbText(boolean noop) { + if (noop) return ""; + if (source != null) return source; try { - return event.getSourceFile().getCharContent(true).toString(); + source = event.getSourceFile().getCharContent(true).toString(); } catch (IOException e) { - return ""; + source = ""; } + return source; } private String semanticdbMd5() { 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 276adcbd..033de8a0 100644 --- a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelper.java +++ b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelper.java @@ -415,7 +415,6 @@ public ItemTouchHelper andCallbacks(final DragCallbacks callbacks) { // ^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#[U] // ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#controller. // ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#DragBuilder4#targetModelClass. -// ^ definition local20 2:3 // ^ definition local21 2:7 // ^ definition local22 2:13 // reference java/lang/ 2:2 @@ -892,7 +891,6 @@ public ItemTouchHelper andCallbacks(final SwipeCallbacks callbacks) { // ^ reference com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U] // ^ reference com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#[U] // ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyTouchHelper#SwipeBuilder3#targetModelClass. -// ^ definition local74 2:3 // ^ definition local75 2:7 // ^ definition local76 2:13 // reference java/lang/ 2:2 diff --git a/tests/unit/src/test/scala/tests/GeneratedConstructorSuite.scala b/tests/unit/src/test/scala/tests/GeneratedConstructorSuite.scala new file mode 100644 index 00000000..fe948287 --- /dev/null +++ b/tests/unit/src/test/scala/tests/GeneratedConstructorSuite.scala @@ -0,0 +1,30 @@ +package tests + +import com.sourcegraph.semanticdb_javac.Semanticdb.TextDocument +import munit.{FunSuite, TestOptions} + +import scala.meta.inputs.Input + +class GeneratedConstructorSuite extends FunSuite with TempDirectories { + val targetroot = new DirectoryFixture() + + override def munitFixtures: Seq[Fixture[_]] = + super.munitFixtures ++ List(targetroot) + + def doSomething( + options: TestOptions, + original: String, + fn: (TextDocument, List[String]) => Unit, + qualifiedClassName: String = "example.Test" + )(implicit loc: munit.Location): Unit = { + test(options) { + val groups = "<<([0-9a-zA-Z]+)>>".r + val compiler = new TestCompiler(targetroot()) + val trimmedText = groups.replaceAllIn(original, "$1") + val relativePath = qualifiedClassName.replace('.', '/') + ".java" + val input = Input.VirtualFile(relativePath, trimmedText) + + + } + } +} From b405fc6df8ab3f0c8145863bb2eb3d3bd79ed000 Mon Sep 17 00:00:00 2001 From: Noah Santschi-Cooney Date: Fri, 12 Mar 2021 14:41:31 +0000 Subject: [PATCH 6/6] address review comments --- .../semanticdb_javac/SemanticdbVisitor.java | 14 ++++---------- .../scala/tests/GeneratedConstructorSuite.scala | 16 ++++++++-------- 2 files changed, 12 insertions(+), 18 deletions(-) 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 9251e543..72eeeb69 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 @@ -49,7 +49,7 @@ public SemanticdbVisitor( } this.occurrences = new ArrayList<>(); this.symbolInfos = new ArrayList<>(); - // this.source = ""; + this.source = semanticdbText(); } public Semanticdb.TextDocument buildTextDocument(CompilationUnitTree tree) { @@ -60,7 +60,7 @@ public Semanticdb.TextDocument buildTextDocument(CompilationUnitTree tree) { .setSchema(Semanticdb.Schema.SEMANTICDB4) .setLanguage(Semanticdb.Language.JAVA) .setUri(semanticdbUri()) - .setText(semanticdbText(!options.includeText)) + .setText(options.includeText ? this.source : "") .setMd5(semanticdbMd5()) .addAllOccurrences(occurrences) .addAllSymbols(symbolInfos) @@ -188,12 +188,7 @@ private Optional semanticdbRange( if (kind.isFromTextSearch() && sym.name.length() > 0) { return RangeFinder.findRange( - getCurrentPath(), - trees, - getCurrentPath().getCompilationUnit(), - sym, - start, - semanticdbText(false)); + getCurrentPath(), trees, getCurrentPath().getCompilationUnit(), sym, start, this.source); } else if (start != Position.NOPOS && end != Position.NOPOS && end > start) { LineMap lineMap = event.getCompilationUnit().getLineMap(); Semanticdb.Range range = @@ -230,8 +225,7 @@ private Optional semanticdbOccurrence( } } - private String semanticdbText(boolean noop) { - if (noop) return ""; + private String semanticdbText() { if (source != null) return source; try { source = event.getSourceFile().getCharContent(true).toString(); diff --git a/tests/unit/src/test/scala/tests/GeneratedConstructorSuite.scala b/tests/unit/src/test/scala/tests/GeneratedConstructorSuite.scala index fe948287..6862c7d5 100644 --- a/tests/unit/src/test/scala/tests/GeneratedConstructorSuite.scala +++ b/tests/unit/src/test/scala/tests/GeneratedConstructorSuite.scala @@ -1,10 +1,11 @@ package tests -import com.sourcegraph.semanticdb_javac.Semanticdb.TextDocument -import munit.{FunSuite, TestOptions} - import scala.meta.inputs.Input +import com.sourcegraph.semanticdb_javac.Semanticdb.TextDocument +import munit.FunSuite +import munit.TestOptions + class GeneratedConstructorSuite extends FunSuite with TempDirectories { val targetroot = new DirectoryFixture() @@ -12,10 +13,10 @@ class GeneratedConstructorSuite extends FunSuite with TempDirectories { super.munitFixtures ++ List(targetroot) def doSomething( - options: TestOptions, - original: String, - fn: (TextDocument, List[String]) => Unit, - qualifiedClassName: String = "example.Test" + options: TestOptions, + original: String, + fn: (TextDocument, List[String]) => Unit, + qualifiedClassName: String = "example.Test" )(implicit loc: munit.Location): Unit = { test(options) { val groups = "<<([0-9a-zA-Z]+)>>".r @@ -24,7 +25,6 @@ class GeneratedConstructorSuite extends FunSuite with TempDirectories { val relativePath = qualifiedClassName.replace('.', '/') + ".java" val input = Input.VirtualFile(relativePath, trimmedText) - } } }