Skip to content

Commit debdbb2

Browse files
Strum355Strum355
authored
Merge pull request #151 from sourcegraph/nsc/constructor-range-fix
2 parents 6e708c7 + 63b830e commit debdbb2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+83
-83
lines changed

‎semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/RangeFinder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ public static Optional<Semanticdb.Range> findRange(
5151
private static int findNameIn(CharSequence name, int start, String source) {
5252
if (source.equals("")) return -1;
5353

54-
int offset = source.indexOf(" " + name, start);
54+
int offset = source.indexOf(name.toString(), start);
5555
if (offset > -1) {
56-
return offset + 1;
56+
return offset ;
5757
}
5858
return -1;
5959
}

‎semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbVisitor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ public Void visitMethod(MethodTree node, Void unused) {
156156
if (node instanceof JCTree.JCMethodDecl) {
157157
JCTree.JCMethodDecl meth = (JCTree.JCMethodDecl) node;
158158
CompilerRange range = CompilerRange.FROM_POINT_TO_SYMBOL_NAME;
159-
if ((meth.sym.flags() & Flags.GENERATEDCONSTR) != 0L) {
160-
range = CompilerRange.FROM_TEXT_SEARCH;
159+
if (meth.sym.name.toString().equals("<init>")) {
160+
range = CompilerRange.FROM_POINT_WITH_TEXT_SEARCH;
161161
}
162162
emitSymbolOccurrence(meth.sym, meth, Role.DEFINITION, range);
163163

‎tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyController.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public abstract class AsyncEpoxyController extends EpoxyController {
3030
* A new instance that does model building and diffing asynchronously.
3131
*/
3232
public AsyncEpoxyController() {
33-
// ^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyController#`<init>`(). public AsyncEpoxyController()
33+
// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyController#`<init>`(). public AsyncEpoxyController()
3434
this(true);
3535
// ^^^^ reference com/airbnb/epoxy/AsyncEpoxyController#`<init>`(+1).
3636
}
@@ -40,7 +40,7 @@ public AsyncEpoxyController() {
4040
* both on the main thread.
4141
*/
4242
public AsyncEpoxyController(boolean enableAsync) {
43-
// ^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyController#`<init>`(+1). public AsyncEpoxyController(boolean enableAsync)
43+
// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyController#`<init>`(+1). public AsyncEpoxyController(boolean enableAsync)
4444
// ^^^^^^^^^^^ definition local0 boolean enableAsync
4545
this(enableAsync, enableAsync);
4646
// ^^^^ reference com/airbnb/epoxy/AsyncEpoxyController#`<init>`(+2).
@@ -52,7 +52,7 @@ public AsyncEpoxyController(boolean enableAsync) {
5252
* Individually control whether model building and diffing are done async or on the main thread.
5353
*/
5454
public AsyncEpoxyController(boolean enableAsyncModelBuilding, boolean enableAsyncDiffing) {
55-
// ^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyController#`<init>`(+2). public AsyncEpoxyController(boolean enableAsyncModelBuilding, boolean enableAsyncDiffing)
55+
// ^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyController#`<init>`(+2). public AsyncEpoxyController(boolean enableAsyncModelBuilding, boolean enableAsyncDiffing)
5656
// ^^^^^^^^^^^^^^^^^^^^^^^^ definition local1 boolean enableAsyncModelBuilding
5757
// ^^^^^^^^^^^^^^^^^^ definition local2 boolean enableAsyncDiffing
5858
super(getHandler(enableAsyncModelBuilding), getHandler(enableAsyncDiffing));

‎tests/snapshots/src/main/generated/com/airbnb/epoxy/AsyncEpoxyDiffer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ interface ResultCallback {
7878
// ^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#GenerationTracker#
7979

8080
AsyncEpoxyDiffer(
81-
//^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#`<init>`(). AsyncEpoxyDiffer(unresolved_type handler, ResultCallback resultCallback, unresolved_type diffCallback)
81+
//^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#`<init>`(). AsyncEpoxyDiffer(unresolved_type handler, ResultCallback resultCallback, unresolved_type diffCallback)
8282
@NonNull Handler handler,
8383
// ^^^^^^^ reference androidx/annotation/NonNull#
8484
// ^^^^^^^ reference _root_/
@@ -523,7 +523,7 @@ private static class DiffCallback extends DiffUtil.Callback {
523523
// ^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#diffCallback. private final unresolved_type diffCallback
524524

525525
DiffCallback(List<? extends EpoxyModel<?>> oldList, List<? extends EpoxyModel<?>> newList,
526-
// ^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#`<init>`(). DiffCallback(List<? extends EpoxyModel<?>> oldList, List<? extends EpoxyModel<?>> newList, unresolved_type diffCallback)
526+
// ^^^^^^^^^^^^ definition com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#`<init>`(). DiffCallback(List<? extends EpoxyModel<?>> oldList, List<? extends EpoxyModel<?>> newList, unresolved_type diffCallback)
527527
// ^^^^ reference java/util/List#
528528
// ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#
529529
// ^^^^^^^ definition local28 List<? extends EpoxyModel<?>> oldList

‎tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyAdapter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public int getSpanSize(int position) {
135135
};
136136

137137
public BaseEpoxyAdapter() {
138-
// ^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#`<init>`(). public BaseEpoxyAdapter()
138+
// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#`<init>`(). public BaseEpoxyAdapter()
139139
// Defaults to stable ids since view models generate unique ids. Set this to false in the
140140
// subclass if you don't want to support it
141141
setHasStableIds(true);

‎tests/snapshots/src/main/generated/com/airbnb/epoxy/Carousel.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -150,15 +150,15 @@ public SnapHelper buildSnapHelper(Context context) {
150150
// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#numViewsToShowOnScreen. private float numViewsToShowOnScreen
151151

152152
public Carousel(Context context) {
153-
// ^^^^^^ definition com/airbnb/epoxy/Carousel#`<init>`(). public Carousel(unresolved_type context)
153+
// ^^^^^^^^ definition com/airbnb/epoxy/Carousel#`<init>`(). public Carousel(unresolved_type context)
154154
// ^^^^^^^ reference _root_/
155155
// ^^^^^^^ definition local4 unresolved_type context
156156
super(context);
157157
// ^^^^^^^ reference local4
158158
}
159159

160160
public Carousel(Context context, @Nullable AttributeSet attrs) {
161-
// ^^^^^^ definition com/airbnb/epoxy/Carousel#`<init>`(+1). public Carousel(unresolved_type context, unresolved_type attrs)
161+
// ^^^^^^^^ definition com/airbnb/epoxy/Carousel#`<init>`(+1). public Carousel(unresolved_type context, unresolved_type attrs)
162162
// ^^^^^^^ reference _root_/
163163
// ^^^^^^^ definition local5 unresolved_type context
164164
// ^^^^^^^^ reference androidx/annotation/Nullable#
@@ -170,7 +170,7 @@ public Carousel(Context context, @Nullable AttributeSet attrs) {
170170
}
171171

172172
public Carousel(Context context, @Nullable AttributeSet attrs, int defStyle) {
173-
// ^^^^^^ definition com/airbnb/epoxy/Carousel#`<init>`(+2). public Carousel(unresolved_type context, unresolved_type attrs, int defStyle)
173+
// ^^^^^^^^ definition com/airbnb/epoxy/Carousel#`<init>`(+2). public Carousel(unresolved_type context, unresolved_type attrs, int defStyle)
174174
// ^^^^^^^ reference _root_/
175175
// ^^^^^^^ definition local7 unresolved_type context
176176
// ^^^^^^^^ reference androidx/annotation/Nullable#
@@ -948,7 +948,7 @@ public static Padding dp(
948948
* via an item decoration.
949949
*/
950950
public Padding(@Px int paddingPx, @Px int itemSpacingPx) {
951-
// ^^^^^^ definition com/airbnb/epoxy/Carousel#Padding#`<init>`(). public Padding(int paddingPx, int itemSpacingPx)
951+
// ^^^^^^^ definition com/airbnb/epoxy/Carousel#Padding#`<init>`(). public Padding(int paddingPx, int itemSpacingPx)
952952
// ^^ reference androidx/annotation/Px#
953953
// ^^^^^^^^^ definition local52 int paddingPx
954954
// ^^ reference androidx/annotation/Px#
@@ -973,7 +973,7 @@ public Padding(@Px int paddingPx, @Px int itemSpacingPx) {
973973
* via an item decoration.
974974
*/
975975
public Padding(
976-
// ^^^^^^ definition com/airbnb/epoxy/Carousel#Padding#`<init>`(+1). public Padding(int leftPx, int topPx, int rightPx, int bottomPx, int itemSpacingPx)
976+
// ^^^^^^^ definition com/airbnb/epoxy/Carousel#Padding#`<init>`(+1). public Padding(int leftPx, int topPx, int rightPx, int bottomPx, int itemSpacingPx)
977977
@Px int leftPx, @Px int topPx, @Px int rightPx, @Px int bottomPx, @Px int itemSpacingPx) {
978978
// ^^ reference androidx/annotation/Px#
979979
// ^^^^^^ definition local54 int leftPx
@@ -1006,7 +1006,7 @@ public Padding(
10061006
* @param paddingType Unit / Type of the given paddings/ itemspacing.
10071007
*/
10081008
private Padding(
1009-
// ^^^^^^ definition com/airbnb/epoxy/Carousel#Padding#`<init>`(+2). private Padding(int left, int top, int right, int bottom, int itemSpacing, PaddingType paddingType)
1009+
// ^^^^^^^ definition com/airbnb/epoxy/Carousel#Padding#`<init>`(+2). private Padding(int left, int top, int right, int bottom, int itemSpacing, PaddingType paddingType)
10101010
int left, int top, int right, int bottom, int itemSpacing, PaddingType paddingType) {
10111011
// ^^^^ definition local59 int left
10121012
// ^^^ definition local60 int top

‎tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerModelList.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void onItemRangeRemoved(int positionStart, int itemCount) {
4343
};
4444

4545
ControllerModelList(int expectedModelCount) {
46-
//^^^^^^ definition com/airbnb/epoxy/ControllerModelList#`<init>`(). ControllerModelList(int expectedModelCount)
46+
//^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ControllerModelList#`<init>`(). ControllerModelList(int expectedModelCount)
4747
// ^^^^^^^^^^^^^^^^^^ definition local8 int expectedModelCount
4848
super(expectedModelCount);
4949
// ^^^^^ reference com/airbnb/epoxy/ModelList#`<init>`().

‎tests/snapshots/src/main/generated/com/airbnb/epoxy/DebugTimer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class DebugTimer implements Timer {
1919
// ^^^^^^^^^^^ definition com/airbnb/epoxy/DebugTimer#sectionName. private String sectionName
2020

2121
DebugTimer(String tag) {
22-
//^^^^^^ definition com/airbnb/epoxy/DebugTimer#`<init>`(). DebugTimer(String tag)
22+
//^^^^^^^^^^ definition com/airbnb/epoxy/DebugTimer#`<init>`(). DebugTimer(String tag)
2323
// ^^^^^^ reference java/lang/String#
2424
// ^^^ definition local0 String tag
2525
this.tag = tag;

‎tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffHelper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class DiffHelper {
7373

7474

7575
DiffHelper(BaseEpoxyAdapter adapter, boolean immutableModels) {
76-
//^^^^^^ definition com/airbnb/epoxy/DiffHelper#`<init>`(). DiffHelper(BaseEpoxyAdapter adapter, boolean immutableModels)
76+
//^^^^^^^^^^ definition com/airbnb/epoxy/DiffHelper#`<init>`(). DiffHelper(BaseEpoxyAdapter adapter, boolean immutableModels)
7777
// ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BaseEpoxyAdapter#
7878
// ^^^^^^^ definition local0 BaseEpoxyAdapter adapter
7979
// ^^^^^^^^^^^^^^^ definition local1 boolean immutableModels

‎tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffPayload.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class DiffPayload {
3939
// ^^^^^^^^^^ definition com/airbnb/epoxy/DiffPayload#modelsById. private final LongSparseArray<EpoxyModel<?>> modelsById
4040

4141
DiffPayload(List<? extends EpoxyModel<?>> models) {
42-
//^^^^^^ definition com/airbnb/epoxy/DiffPayload#`<init>`(). DiffPayload(List<? extends EpoxyModel<?>> models)
42+
//^^^^^^^^^^^ definition com/airbnb/epoxy/DiffPayload#`<init>`(). DiffPayload(List<? extends EpoxyModel<?>> models)
4343
// ^^^^ reference java/util/List#
4444
// ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#
4545
// ^^^^^^ definition local0 List<? extends EpoxyModel<?>> models
@@ -88,7 +88,7 @@ public class DiffPayload {
8888
}
8989

9090
public DiffPayload(EpoxyModel<?> changedItem) {
91-
// ^^^^^^ definition com/airbnb/epoxy/DiffPayload#`<init>`(+1). public DiffPayload(EpoxyModel<?> changedItem)
91+
// ^^^^^^^^^^^ definition com/airbnb/epoxy/DiffPayload#`<init>`(+1). public DiffPayload(EpoxyModel<?> changedItem)
9292
// ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#
9393
// ^^^^^^^^^^^ definition local3 EpoxyModel<?> changedItem
9494
this(Collections.singletonList(changedItem));

0 commit comments

Comments
 (0)