Skip to content

fix ctor range via textsearch & dont emit ref to class in ctor call #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Strum355 merged 1 commit into from
Apr 15, 2021
Merged

fix ctor range via textsearch & dont emit ref to class in ctor call #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/RangeFinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ private static int findNameIn(CharSequence name, int start, String source) {

int offset = source.indexOf(name.toString(), start);
if (offset > -1) {
return offset ;
return offset;
}
return -1;
}
Expand Down
9 changes: 7 additions & 2 deletions semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,14 @@ public Void visitMemberSelect(MemberSelectTree node, Void unused) {
public Void visitNewClass(NewClassTree node, Void unused) {
if (node instanceof JCTree.JCNewClass) {
JCTree.JCNewClass cls = (JCTree.JCNewClass) node;
emitSymbolOccurrence(cls.constructor, cls, Role.REFERENCE, CompilerRange.FROM_START_TO_END);
emitSymbolOccurrence(cls.constructor, cls, Role.REFERENCE, CompilerRange.FROM_TEXT_SEARCH);
}
return super.visitNewClass(node, unused);

// to avoid emitting a reference to the class itself, we manually scan everything
// except the identifier
scan(node.getTypeArguments(), unused);
scan(node.getArguments(), unused);
return scan(node.getClassBody(), unused);
}

// =================================================
Expand Down
11 changes: 3 additions & 8 deletions tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyDiffer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,7 @@ interface ResultCallback {
private final GenerationTracker generationTracker = new GenerationTracker();
// ^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#
// ^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#generationTracker. private final GenerationTracker generationTracker
// ^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#`<init>`().
// ^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#
// ^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#`<init>`().

AsyncEpoxyDiffer(
//^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#`<init>`(). AsyncEpoxyDiffer(unresolved_type handler, ResultCallback resultCallback, unresolved_type diffCallback)
Expand All @@ -96,8 +95,7 @@ interface ResultCallback {
this.executor = new HandlerExecutor(handler);
// ^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#
// ^^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#executor.
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/HandlerExecutor#`<init>`().
// ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/HandlerExecutor#
// ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/HandlerExecutor#`<init>`().
// ^^^^^^^ reference local1
this.resultCallback = resultCallback;
// ^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#
Expand Down Expand Up @@ -310,8 +308,7 @@ public void submitList(@Nullable final List<? extends EpoxyModel<?>> newList) {
final DiffCallback wrappedCallback = new DiffCallback(previousList, newList, diffCallback);
// ^^^^^^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#
// ^^^^^^^^^^^^^^^ definition local11 final DiffCallback wrappedCallback
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#`<init>`().
// ^^^^^^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#
// ^^^^^^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#`<init>`().
// ^^^^^^^^^^^^ reference local9
// ^^^^^^^ reference local7
// ^^^^^^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#diffCallback.
Expand All @@ -320,7 +317,6 @@ public void submitList(@Nullable final List<? extends EpoxyModel<?>> newList) {
// ^^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#executor.
// ^^^^^^^ reference java/util/concurrent/Executor#execute().
// ^^^^^^^^^^^^^^^^ reference local13 6:5
// ^^^^^^^^ reference java/lang/Runnable#
// ^^^^^^^^ reference java/lang/Runnable#
@Override
// ^^^^^^^^ reference java/lang/Override#
Expand Down Expand Up @@ -368,7 +364,6 @@ private void onRunCompleted(
// ^^^^^^^^^^^^^^ reference com/airbnb/epoxy/MainThreadExecutor#ASYNC_INSTANCE.
// ^^^^^^^ reference com/airbnb/epoxy/HandlerExecutor#execute().
// ^^^^^^^^^^^^^^^^ reference local20 8:5
// ^^^^^^^^ reference java/lang/Runnable#
// ^^^^^^^^ reference java/lang/Runnable#
@Override
// ^^^^^^^^ reference java/lang/Override#
Expand Down
23 changes: 7 additions & 16 deletions tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,28 +78,23 @@ public abstract class BaseEpoxyAdapter
private final ViewTypeManager viewTypeManager = new ViewTypeManager();
// ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ViewTypeManager#
// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#viewTypeManager. private final ViewTypeManager viewTypeManager
// ^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ViewTypeManager#`<init>`().
// ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ViewTypeManager#
// ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ViewTypeManager#`<init>`().
/**
* Keeps track of view holders that are currently bound so we can save their state in {@link
* #onSaveInstanceState(Bundle)}.
*/
private final BoundViewHolders boundViewHolders = new BoundViewHolders();
// ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BoundViewHolders#
// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#boundViewHolders. private final BoundViewHolders boundViewHolders
// ^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BoundViewHolders#`<init>`().
// ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BoundViewHolders#
// ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BoundViewHolders#`<init>`().
private ViewHolderState viewHolderState = new ViewHolderState();
// ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ViewHolderState#
// ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#viewHolderState. private ViewHolderState viewHolderState
// ^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ViewHolderState#`<init>`().
// ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ViewHolderState#
// ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ViewHolderState#`<init>`().

private final SpanSizeLookup spanSizeLookup = new SpanSizeLookup() {
// ^^^^^^^^^^^^^^ reference _root_/
// ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#spanSizeLookup. private final unresolved_type spanSizeLookup
// ^^^^^^^^^^^^^^^^^^^^^^ reference `<any>`#`<init>`# 19:3
// ^^^^^^^^^^^^^^ reference _root_/
// ^^^^^^^^^^^^^^ reference _root_/

@Override
Expand Down Expand Up @@ -227,8 +222,7 @@ public EpoxyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
// ^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#buildView().
// ^^^^^^ reference local7
return new EpoxyViewHolder(parent, view, model.shouldSaveViewState());
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder#`<init>`().
// ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder#
// ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder#`<init>`().
// ^^^^^^ reference local7
// ^^^^ reference local10
// ^^^^^ reference local9
Expand Down Expand Up @@ -540,8 +534,7 @@ public void onSaveInstanceState(Bundle outState) {
// ^^^^ reference androidx/collection/LongSparseArray#size().
// ^^^^^^^^^^^^ reference com/airbnb/epoxy/BaseEpoxyAdapter#hasStableIds#
throw new IllegalStateException("Must have stable ids when saving view holder state");
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference java/lang/IllegalStateException#`<init>`(+1).
// ^^^^^^^^^^^^^^^^^^^^^ reference java/lang/IllegalStateException#
// ^^^^^^^^^^^^^^^^^^^^^ reference java/lang/IllegalStateException#`<init>`(+1).
}

outState.putParcelable(SAVED_STATE_ARG_VIEW_HOLDERS, viewHolderState);
Expand All @@ -562,8 +555,7 @@ public void onRestoreInstanceState(@Nullable Bundle inState) {
// ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BaseEpoxyAdapter#boundViewHolders.
// ^^^^ reference com/airbnb/epoxy/BoundViewHolders#size().
throw new IllegalStateException(
// ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference java/lang/IllegalStateException#`<init>`(+1). 2:52
// ^^^^^^^^^^^^^^^^^^^^^ reference java/lang/IllegalStateException#
// ^^^^^^^^^^^^^^^^^^^^^ reference java/lang/IllegalStateException#`<init>`(+1).
"State cannot be restored once views have been bound. It should be done before adding "
+ "the adapter to the recycler view.");
}
Expand All @@ -578,8 +570,7 @@ public void onRestoreInstanceState(@Nullable Bundle inState) {
if (viewHolderState == null) {
// ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BaseEpoxyAdapter#viewHolderState.
throw new IllegalStateException(
// ^^^^^^^^^^^^^^^^^^^^^^^^^^ reference java/lang/IllegalStateException#`<init>`(+1). 1:89
// ^^^^^^^^^^^^^^^^^^^^^ reference java/lang/IllegalStateException#
// ^^^^^^^^^^^^^^^^^^^^^ reference java/lang/IllegalStateException#`<init>`(+1).
"Tried to restore instance state, but onSaveInstanceState was never called.");
}
}
Expand Down
12 changes: 4 additions & 8 deletions tests/snapshots/src/main/generated/com/airbnb/epoxy/BoundViewHolders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ public class BoundViewHolders implements Iterable<EpoxyViewHolder> {
// ^^^^^^^^^^^^^^^ reference androidx/collection/LongSparseArray#
// ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder#
// ^^^^^^^ definition com/airbnb/epoxy/BoundViewHolders#holders. private final LongSparseArray<EpoxyViewHolder> holders
// ^^^^^^^^^^^^^^^^^^^^^^^ reference androidx/collection/LongSparseArray#`<init>`().
// ^^^^^^^^^^^^^^^ reference androidx/collection/LongSparseArray#
// ^^^^^^^^^^^^^^^ reference androidx/collection/LongSparseArray#`<init>`().

@Nullable
// ^^^^^^^^ reference androidx/annotation/Nullable#
Expand Down Expand Up @@ -85,8 +84,7 @@ public Iterator<EpoxyViewHolder> iterator() {
// ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder#
// ^^^^^^^^ definition com/airbnb/epoxy/BoundViewHolders#iterator(). @Override public Iterator<EpoxyViewHolder> iterator()
return new HolderIterator();
// ^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BoundViewHolders#HolderIterator#`<init>`().
// ^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BoundViewHolders#HolderIterator#
// ^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BoundViewHolders#HolderIterator#`<init>`().
}

@Nullable
Expand Down Expand Up @@ -129,8 +127,7 @@ public EpoxyViewHolder next() {
if (!hasNext()) {
// ^^^^^^^ reference com/airbnb/epoxy/BoundViewHolders#HolderIterator#hasNext().
throw new NoSuchElementException();
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference java/util/NoSuchElementException#`<init>`().
// ^^^^^^^^^^^^^^^^^^^^^^ reference java/util/NoSuchElementException#
// ^^^^^^^^^^^^^^^^^^^^^^ reference java/util/NoSuchElementException#`<init>`().
}
return holders.valueAt(position++);
// ^^^^^^^ reference com/airbnb/epoxy/BoundViewHolders#holders.
Expand All @@ -143,8 +140,7 @@ public EpoxyViewHolder next() {
public void remove() {
// ^^^^^^ definition com/airbnb/epoxy/BoundViewHolders#HolderIterator#remove(). @Override public void remove()
throw new UnsupportedOperationException();
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference java/lang/UnsupportedOperationException#`<init>`().
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference java/lang/UnsupportedOperationException#
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference java/lang/UnsupportedOperationException#`<init>`().
}
}
}
22 changes: 9 additions & 13 deletions tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ public class Carousel extends EpoxyRecyclerView {
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#defaultGlobalSnapHelperFactory. private static SnapHelperFactory defaultGlobalSnapHelperFactory
new SnapHelperFactory() {
// ^^^^^^^^^^^^^^^^^^^^^^^^^ reference local1 7:7
// ^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#SnapHelperFactory#
// ^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#SnapHelperFactory#

@Override
Expand All @@ -133,8 +132,7 @@ public SnapHelper buildSnapHelper(Context context) {
// ^^^^^^^ reference _root_/
// ^^^^^^^ definition local3 unresolved_type context
return new LinearSnapHelper();
// ^^^^^^^^^^^^^^^^^^^^^^ reference `<init>`#
// ^^^^^^^^^^^^^^^^ reference _root_/
// ^^^^^^^^^^^^^^^^ reference `<init>`#
}
};

Expand Down Expand Up @@ -339,8 +337,7 @@ public void setInitialPrefetchItemCount(int numItemsToPrefetch) {
if (numItemsToPrefetch < 0) {
// ^^^^^^^^^^^^^^^^^^ reference local15
throw new IllegalStateException("numItemsToPrefetch must be greater than 0");
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference java/lang/IllegalStateException#`<init>`(+1).
// ^^^^^^^^^^^^^^^^^^^^^ reference java/lang/IllegalStateException#
// ^^^^^^^^^^^^^^^^^^^^^ reference java/lang/IllegalStateException#`<init>`(+1).
}

// Use the linearlayoutmanager default of 2 if the user did not specify one
Expand Down Expand Up @@ -806,14 +803,16 @@ public static Padding resource(@DimenRes int paddingRes, @DimenRes int itemSpaci
// ^^^^^^^^ reference androidx/annotation/DimenRes#
// ^^^^^^^^^^^^^^ definition local39 @DimenRes int itemSpacingRes
return new Padding(
// ^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#Padding#`<init>`(+2). 1:95
// ^^^^^^^ reference com/airbnb/epoxy/Carousel#Padding#
// ^^^^^^^ reference com/airbnb/epoxy/Carousel#Padding#`<init>`(+2).
paddingRes, paddingRes, paddingRes, paddingRes, itemSpacingRes, PaddingType.RESOURCE);
// ^^^^^^^^^^ reference local38
// ^^^^^^^^^^ reference local38
// ^^^^^^^^^^ reference local38
// ^^^^^^^^^^ reference local38
// ^^^^^^^^^^^^^^ reference local39
// ^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#Padding#PaddingType#`<init>`().
// ^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#Padding#PaddingType#`<init>`().
// ^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#Padding#PaddingType#`<init>`().
// ^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#Padding#PaddingType#
// ^^^^^^^^ reference com/airbnb/epoxy/Carousel#Padding#PaddingType#RESOURCE.
}
Expand Down Expand Up @@ -845,8 +844,7 @@ public static Padding resource(
// ^^^^^^^^ reference androidx/annotation/DimenRes#
// ^^^^^^^^^^^^^^ definition local44 @DimenRes int itemSpacingRes
return new Padding(
// ^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#Padding#`<init>`(+2). 1:85
// ^^^^^^^ reference com/airbnb/epoxy/Carousel#Padding#
// ^^^^^^^ reference com/airbnb/epoxy/Carousel#Padding#`<init>`(+2).
leftRes, topRes, rightRes, bottomRes, itemSpacingRes, PaddingType.RESOURCE);
// ^^^^^^^ reference local40
// ^^^^^^ reference local41
Expand Down Expand Up @@ -878,8 +876,7 @@ public static Padding dp(
// ^^ reference androidx/annotation/Dimension#DP.
// ^^^^^^^^^^^^^ definition local46 @Dimension(unit = Dimension.DP) int itemSpacingDp
return new Padding(paddingDp, paddingDp, paddingDp, paddingDp, itemSpacingDp, PaddingType.DP);
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#Padding#`<init>`(+2).
// ^^^^^^^ reference com/airbnb/epoxy/Carousel#Padding#
// ^^^^^^^ reference com/airbnb/epoxy/Carousel#Padding#`<init>`(+2).
// ^^^^^^^^^ reference local45
// ^^^^^^^^^ reference local45
// ^^^^^^^^^ reference local45
Expand Down Expand Up @@ -931,8 +928,7 @@ public static Padding dp(
// ^^ reference androidx/annotation/Dimension#DP.
// ^^^^^^^^^^^^^ definition local51 @Dimension(unit = Dimension.DP) int itemSpacingDp
return new Padding(leftDp, topDp, rightDp, bottomDp, itemSpacingDp, PaddingType.DP);
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#Padding#`<init>`(+2).
// ^^^^^^^ reference com/airbnb/epoxy/Carousel#Padding#
// ^^^^^^^ reference com/airbnb/epoxy/Carousel#Padding#`<init>`(+2).
// ^^^^^^ reference local47
// ^^^^^ reference local48
// ^^^^^^^ reference local49
Expand Down
Loading