Skip to content

Commit e99a268

Browse files
Strum355Strum355
authored
Merge pull request #159 from sourcegraph/nsc/this-stop-emit
2 parents 5750340 + be665e3 commit e99a268

31 files changed

+9
-135
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,6 @@ private SemanticdbSymbols.Descriptor semanticdbDescriptor(Symbol sym) {
8080
return new SemanticdbSymbols.Descriptor(
8181
SemanticdbSymbols.Descriptor.Kind.TypeParameter, sym.name.toString());
8282
} else if (sym instanceof Symbol.VarSymbol) {
83-
if (sym.name.toString().equals("this")) {
84-
return new SemanticdbSymbols.Descriptor(SemanticdbSymbols.Descriptor.Kind.None, "");
85-
}
8683
return new SemanticdbSymbols.Descriptor(
8784
SemanticdbSymbols.Descriptor.Kind.Term, sym.name.toString());
8885
} else {

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import com.sourcegraph.semanticdb_javac.Semanticdb.SymbolInformation.Property;
1414
import com.sourcegraph.semanticdb_javac.Semanticdb.SymbolOccurrence.Role;
1515

16+
import javax.lang.model.element.ElementKind;
1617
import javax.lang.model.util.Elements;
1718
import java.io.IOException;
1819
import java.nio.file.Path;
@@ -196,6 +197,8 @@ public Void visitVariable(VariableTree node, Void unused) {
196197
public Void visitIdentifier(IdentifierTree node, Void unused) {
197198
if (node instanceof JCTree.JCIdent) {
198199
JCTree.JCIdent ident = (JCTree.JCIdent) node;
200+
if (ident.name.toString().equals("this") && ident.sym.getKind() != ElementKind.CONSTRUCTOR)
201+
return null;
199202
emitSymbolOccurrence(ident.sym, ident, Role.REFERENCE, CompilerRange.FROM_START_TO_END);
200203
}
201204
return super.visitIdentifier(node, unused);

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,16 +93,13 @@ interface ResultCallback {
9393
// ^^^^^^^^^^^^ definition local3 @NonNull unresolved_type diffCallback
9494
) {
9595
this.executor = new HandlerExecutor(handler);
96-
// ^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#
9796
// ^^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#executor.
9897
// ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/HandlerExecutor#`<init>`().
9998
// ^^^^^^^ reference local1
10099
this.resultCallback = resultCallback;
101-
// ^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#
102100
// ^^^^^^^^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#resultCallback.
103101
// ^^^^^^^^^^^^^^ reference local2
104102
this.diffCallback = diffCallback;
105-
// ^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#
106103
// ^^^^^^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#diffCallback.
107104
// ^^^^^^^^^^^^ reference local3
108105
}
@@ -239,7 +236,6 @@ public void submitList(@Nullable final List<? extends EpoxyModel<?>> newList) {
239236
// ^^^^^^^^^^^^ definition local9 @Nullable final List<? extends EpoxyModel<?>> previousList
240237

241238
synchronized (this) {
242-
// ^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#
243239
// Incrementing generation means any currently-running diffs are discarded when they finish
244240
// We synchronize to guarantee list object and generation number are in sync
245241
runGeneration = generationTracker.incrementAndGetNextScheduled();
@@ -530,15 +526,12 @@ private static class DiffCallback extends DiffUtil.Callback {
530526
// ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#
531527
// ^^^^^^^^^^^^ definition local30 unresolved_type diffCallback
532528
this.oldList = oldList;
533-
// ^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#
534529
// ^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#oldList.
535530
// ^^^^^^^ reference local28
536531
this.newList = newList;
537-
// ^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#
538532
// ^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#newList.
539533
// ^^^^^^^ reference local29
540534
this.diffCallback = diffCallback;
541-
// ^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#
542535
// ^^^^^^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#diffCallback.
543536
// ^^^^^^^^^^^^ reference local30
544537
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,6 @@ public EpoxyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
213213
// ^^^^^ definition local9 EpoxyModel<?> model
214214
// ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BaseEpoxyAdapter#viewTypeManager.
215215
// ^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ViewTypeManager#getModelForViewType().
216-
// ^^^^ reference com/airbnb/epoxy/BaseEpoxyAdapter#
217216
// ^^^^^^^^ reference local8
218217
View view = model.buildView(parent);
219218
// ^^^^ reference _root_/
@@ -633,7 +632,6 @@ public void setSpanCount(int spanCount) {
633632
// ^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#setSpanCount(). public void setSpanCount(int spanCount)
634633
// ^^^^^^^^^ definition local44 int spanCount
635634
this.spanCount = spanCount;
636-
// ^^^^ reference com/airbnb/epoxy/BaseEpoxyAdapter#
637635
// ^^^^^^^^^ reference com/airbnb/epoxy/BaseEpoxyAdapter#spanCount.
638636
// ^^^^^^^^^ reference local44
639637
}

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,6 @@ && getPaddingBottom() == 0) {
225225
// ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#SnapHelperFactory#buildSnapHelper().
226226
// ^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#getContext#
227227
// ^^^^^^^^^^^^^^^^^^^^ reference `<any>`#attachToRecyclerView#
228-
// ^^^^ reference com/airbnb/epoxy/Carousel#
229228
}
230229

231230
// Carousels will be detached when their parent recyclerview is
@@ -437,7 +436,6 @@ private int getSpaceForChildren(boolean horizontal) {
437436
// ^^^^^^^^^^ reference local24
438437
return getTotalWidthPx(this)
439438
// ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#getTotalWidthPx().
440-
// ^^^^ reference com/airbnb/epoxy/Carousel#
441439
- getPaddingLeft()
442440
// ^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#getPaddingLeft#
443441
- (getClipToPadding() ? getPaddingRight() : 0);
@@ -449,7 +447,6 @@ private int getSpaceForChildren(boolean horizontal) {
449447
} else {
450448
return getTotalHeightPx(this)
451449
// ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#getTotalHeightPx().
452-
// ^^^^ reference com/airbnb/epoxy/Carousel#
453450
- getPaddingTop()
454451
// ^^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#getPaddingTop#
455452
- (getClipToPadding() ? getPaddingBottom() : 0);
@@ -1013,27 +1010,21 @@ private Padding(
10131010
// ^^^^^^^^^^^ definition local64 PaddingType paddingType
10141011

10151012
this.left = left;
1016-
// ^^^^ reference com/airbnb/epoxy/Carousel#Padding#
10171013
// ^^^^ reference com/airbnb/epoxy/Carousel#Padding#left.
10181014
// ^^^^ reference local59
10191015
this.top = top;
1020-
// ^^^^ reference com/airbnb/epoxy/Carousel#Padding#
10211016
// ^^^ reference com/airbnb/epoxy/Carousel#Padding#top.
10221017
// ^^^ reference local60
10231018
this.right = right;
1024-
// ^^^^ reference com/airbnb/epoxy/Carousel#Padding#
10251019
// ^^^^^ reference com/airbnb/epoxy/Carousel#Padding#right.
10261020
// ^^^^^ reference local61
10271021
this.bottom = bottom;
1028-
// ^^^^ reference com/airbnb/epoxy/Carousel#Padding#
10291022
// ^^^^^^ reference com/airbnb/epoxy/Carousel#Padding#bottom.
10301023
// ^^^^^^ reference local62
10311024
this.itemSpacing = itemSpacing;
1032-
// ^^^^ reference com/airbnb/epoxy/Carousel#Padding#
10331025
// ^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#Padding#itemSpacing.
10341026
// ^^^^^^^^^^^ reference local63
10351027
this.paddingType = paddingType;
1036-
// ^^^^ reference com/airbnb/epoxy/Carousel#Padding#
10371028
// ^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#Padding#paddingType.
10381029
// ^^^^^^^^^^^ reference local64
10391030
}
@@ -1045,7 +1036,6 @@ public boolean equals(Object o) {
10451036
// ^^^^^^ reference java/lang/Object#
10461037
// ^ definition local65 Object o
10471038
if (this == o) {
1048-
// ^^^^ reference com/airbnb/epoxy/Carousel#Padding#
10491039
// ^ reference local65
10501040
return true;
10511041
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ class DebugTimer implements Timer {
2323
// ^^^^^^ reference java/lang/String#
2424
// ^^^ definition local0 String tag
2525
this.tag = tag;
26-
// ^^^^ reference com/airbnb/epoxy/DebugTimer#
2726
// ^^^ reference com/airbnb/epoxy/DebugTimer#tag.
2827
// ^^^ reference local0
2928
reset();
@@ -55,7 +54,6 @@ public void start(String sectionName) {
5554
// ^^^^^^ reference java/lang/System#
5655
// ^^^^^^^^ reference java/lang/System#nanoTime().
5756
this.sectionName = sectionName;
58-
// ^^^^ reference com/airbnb/epoxy/DebugTimer#
5957
// ^^^^^^^^^^^ reference com/airbnb/epoxy/DebugTimer#sectionName.
6058
// ^^^^^^^^^^^ reference local1
6159
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,9 @@ class DiffHelper {
7474
// ^^^^^^^ definition local0 BaseEpoxyAdapter adapter
7575
// ^^^^^^^^^^^^^^^ definition local1 boolean immutableModels
7676
this.adapter = adapter;
77-
// ^^^^ reference com/airbnb/epoxy/DiffHelper#
7877
// ^^^^^^^ reference com/airbnb/epoxy/DiffHelper#adapter.
7978
// ^^^^^^^ reference local0
8079
this.immutableModels = immutableModels;
81-
// ^^^^ reference com/airbnb/epoxy/DiffHelper#
8280
// ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/DiffHelper#immutableModels.
8381
// ^^^^^^^^^^^^^^^ reference local1
8482
adapter.registerAdapterDataObserver(observer);

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,15 +168,12 @@ private DiffResult(
168168
// ^^^^^^^^^^^^ definition local8 @Nullable unresolved_type differResult
169169
) {
170170
this.previousModels = previousModels;
171-
// ^^^^ reference com/airbnb/epoxy/DiffResult#
172171
// ^^^^^^^^^^^^^^ reference com/airbnb/epoxy/DiffResult#previousModels.
173172
// ^^^^^^^^^^^^^^ reference local6
174173
this.newModels = newModels;
175-
// ^^^^ reference com/airbnb/epoxy/DiffResult#
176174
// ^^^^^^^^^ reference com/airbnb/epoxy/DiffResult#newModels.
177175
// ^^^^^^^^^ reference local7
178176
this.differResult = differResult;
179-
// ^^^^ reference com/airbnb/epoxy/DiffResult#
180177
// ^^^^^^^^^^^^ reference com/airbnb/epoxy/DiffResult#differResult.
181178
// ^^^^^^^^^^^^ reference local8
182179
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ protected void enableDiffing() {
9696
diffHelper = new DiffHelper(this, false);
9797
// ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyAdapter#diffHelper.
9898
// ^^^^^^^^^^ reference com/airbnb/epoxy/DiffHelper#`<init>`().
99-
// ^^^^ reference com/airbnb/epoxy/EpoxyAdapter#
10099
}
101100

102101
@Override

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ public abstract class EpoxyController implements ModelCollector, StickyHeaderCal
207207
// ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ControllerHelper#
208208
// ^^^^^^ definition com/airbnb/epoxy/EpoxyController#helper. private final ControllerHelper helper
209209
// ^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ControllerHelperLookup#getHelperForController().
210-
// ^^^^ reference com/airbnb/epoxy/EpoxyController#
211210
private ControllerModelList modelsBeingBuilt;
212211
// ^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ControllerModelList#
213212
// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#modelsBeingBuilt. private ControllerModelList modelsBeingBuilt
@@ -238,7 +237,6 @@ public EpoxyController(Handler modelBuildingHandler, Handler diffingHandler) {
238237
adapter = new EpoxyControllerAdapter(this, diffingHandler);
239238
// ^^^^^^^ reference com/airbnb/epoxy/EpoxyController#adapter.
240239
// ^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyControllerAdapter#`<init>`().
241-
// ^^^^ reference com/airbnb/epoxy/EpoxyController#
242240
// ^^^^^^^^^^^^^^ reference local1
243241
modelBuildHandler = modelBuildingHandler;
244242
// ^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#modelBuildHandler.
@@ -698,7 +696,6 @@ private void runInterceptors() {
698696
callback.onInterceptorsStarted(this);
699697
// ^^^^^^^^ reference local20
700698
// ^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#onInterceptorsStarted().
701-
// ^^^^ reference com/airbnb/epoxy/EpoxyController#
702699
}
703700
}
704701

@@ -729,7 +726,6 @@ private void runInterceptors() {
729726
callback.onInterceptorsFinished(this);
730727
// ^^^^^^^^ reference local22
731728
// ^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#onInterceptorsFinished().
732-
// ^^^^ reference com/airbnb/epoxy/EpoxyController#
733729
}
734730
}
735731
}
@@ -840,7 +836,6 @@ public void add(@NonNull EpoxyModel<?> model) {
840836
model.addTo(this);
841837
// ^^^^^ reference local26
842838
// ^^^^^ reference com/airbnb/epoxy/EpoxyModel#addTo().
843-
// ^^^^ reference com/airbnb/epoxy/EpoxyController#
844839
}
845840

846841
/**
@@ -974,7 +969,6 @@ void addCurrentlyStagedModelIfExists() {
974969
stagedModel.addTo(this);
975970
// ^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#stagedModel.
976971
// ^^^^^ reference com/airbnb/epoxy/EpoxyModel#addTo().
977-
// ^^^^ reference com/airbnb/epoxy/EpoxyController#
978972
}
979973
stagedModel = null;
980974
// ^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#stagedModel.
@@ -1139,7 +1133,6 @@ public void setFilterDuplicates(boolean filterDuplicates) {
11391133
// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#setFilterDuplicates(). public void setFilterDuplicates(boolean filterDuplicates)
11401134
// ^^^^^^^^^^^^^^^^ definition local46 boolean filterDuplicates
11411135
this.filterDuplicates = filterDuplicates;
1142-
// ^^^^ reference com/airbnb/epoxy/EpoxyController#
11431136
// ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#filterDuplicates.
11441137
// ^^^^^^^^^^^^^^^^ reference local46
11451138
}
@@ -1390,7 +1383,6 @@ protected void onExceptionSwallowed(@NonNull RuntimeException exception) {
13901383
globalExceptionHandler.onException(this, exception);
13911384
// ^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#globalExceptionHandler.
13921385
// ^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#ExceptionHandler#onException().
1393-
// ^^^^ reference com/airbnb/epoxy/EpoxyController#
13941386
// ^^^^^^^^^ reference local56
13951387
}
13961388

0 commit comments

Comments
 (0)