Skip to content

dont emit references for 'this' #159

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 2 commits into from
Apr 16, 2021
Merged

dont emit references for 'this' #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
280203c
dont emit references for 'this'
Strum355 Apr 15, 2021
be665e3
continue emitting refs for 'this' constructor calls
Strum355 Apr 16, 2021
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
3 changes: 0 additions & 3 deletions semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/GlobalSymbolsCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,6 @@ private SemanticdbSymbols.Descriptor semanticdbDescriptor(Symbol sym) {
return new SemanticdbSymbols.Descriptor(
SemanticdbSymbols.Descriptor.Kind.TypeParameter, sym.name.toString());
} else if (sym instanceof Symbol.VarSymbol) {
if (sym.name.toString().equals("this")) {
return new SemanticdbSymbols.Descriptor(SemanticdbSymbols.Descriptor.Kind.None, "");
}
return new SemanticdbSymbols.Descriptor(
SemanticdbSymbols.Descriptor.Kind.Term, sym.name.toString());
} else {
Expand Down
3 changes: 3 additions & 0 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 @@ -13,6 +13,7 @@
import com.sourcegraph.semanticdb_javac.Semanticdb.SymbolInformation.Property;
import com.sourcegraph.semanticdb_javac.Semanticdb.SymbolOccurrence.Role;

import javax.lang.model.element.ElementKind;
import javax.lang.model.util.Elements;
import java.io.IOException;
import java.nio.file.Path;
Expand Down Expand Up @@ -193,6 +194,8 @@ public Void visitVariable(VariableTree node, Void unused) {
public Void visitIdentifier(IdentifierTree node, Void unused) {
if (node instanceof JCTree.JCIdent) {
JCTree.JCIdent ident = (JCTree.JCIdent) node;
if (ident.name.toString().equals("this") && ident.sym.getKind() != ElementKind.CONSTRUCTOR)
return null;
emitSymbolOccurrence(ident.sym, ident, Role.REFERENCE, CompilerRange.FROM_START_TO_END);
}
return super.visitIdentifier(node, unused);
Expand Down
7 changes: 0 additions & 7 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 @@ -93,16 +93,13 @@ interface ResultCallback {
// ^^^^^^^^^^^^ definition local3 @NonNull unresolved_type diffCallback
) {
this.executor = new HandlerExecutor(handler);
// ^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#
// ^^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#executor.
// ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/HandlerExecutor#`<init>`().
// ^^^^^^^ reference local1
this.resultCallback = resultCallback;
// ^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#
// ^^^^^^^^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#resultCallback.
// ^^^^^^^^^^^^^^ reference local2
this.diffCallback = diffCallback;
// ^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#
// ^^^^^^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#diffCallback.
// ^^^^^^^^^^^^ reference local3
}
Expand Down Expand Up @@ -239,7 +236,6 @@ public void submitList(@Nullable final List<? extends EpoxyModel<?>> newList) {
// ^^^^^^^^^^^^ definition local9 @Nullable final List<? extends EpoxyModel<?>> previousList

synchronized (this) {
// ^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#
// Incrementing generation means any currently-running diffs are discarded when they finish
// We synchronize to guarantee list object and generation number are in sync
runGeneration = generationTracker.incrementAndGetNextScheduled();
Expand Down Expand Up @@ -530,15 +526,12 @@ private static class DiffCallback extends DiffUtil.Callback {
// ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#
// ^^^^^^^^^^^^ definition local30 unresolved_type diffCallback
this.oldList = oldList;
// ^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#
// ^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#oldList.
// ^^^^^^^ reference local28
this.newList = newList;
// ^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#
// ^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#newList.
// ^^^^^^^ reference local29
this.diffCallback = diffCallback;
// ^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#
// ^^^^^^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#DiffCallback#diffCallback.
// ^^^^^^^^^^^^ reference local30
}
Expand Down
2 changes: 0 additions & 2 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 @@ -213,7 +213,6 @@ public EpoxyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
// ^^^^^ definition local9 EpoxyModel<?> model
// ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BaseEpoxyAdapter#viewTypeManager.
// ^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ViewTypeManager#getModelForViewType().
// ^^^^ reference com/airbnb/epoxy/BaseEpoxyAdapter#
// ^^^^^^^^ reference local8
View view = model.buildView(parent);
// ^^^^ reference _root_/
Expand Down Expand Up @@ -633,7 +632,6 @@ public void setSpanCount(int spanCount) {
// ^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter#setSpanCount(). public void setSpanCount(int spanCount)
// ^^^^^^^^^ definition local44 int spanCount
this.spanCount = spanCount;
// ^^^^ reference com/airbnb/epoxy/BaseEpoxyAdapter#
// ^^^^^^^^^ reference com/airbnb/epoxy/BaseEpoxyAdapter#spanCount.
// ^^^^^^^^^ reference local44
}
Expand Down
10 changes: 0 additions & 10 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 @@ -225,7 +225,6 @@ && getPaddingBottom() == 0) {
// ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#SnapHelperFactory#buildSnapHelper().
// ^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#getContext#
// ^^^^^^^^^^^^^^^^^^^^ reference `<any>`#attachToRecyclerView#
// ^^^^ reference com/airbnb/epoxy/Carousel#
}

// Carousels will be detached when their parent recyclerview is
Expand Down Expand Up @@ -437,7 +436,6 @@ private int getSpaceForChildren(boolean horizontal) {
// ^^^^^^^^^^ reference local24
return getTotalWidthPx(this)
// ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#getTotalWidthPx().
// ^^^^ reference com/airbnb/epoxy/Carousel#
- getPaddingLeft()
// ^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#getPaddingLeft#
- (getClipToPadding() ? getPaddingRight() : 0);
Expand All @@ -449,7 +447,6 @@ private int getSpaceForChildren(boolean horizontal) {
} else {
return getTotalHeightPx(this)
// ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#getTotalHeightPx().
// ^^^^ reference com/airbnb/epoxy/Carousel#
- getPaddingTop()
// ^^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#getPaddingTop#
- (getClipToPadding() ? getPaddingBottom() : 0);
Expand Down Expand Up @@ -1013,27 +1010,21 @@ private Padding(
// ^^^^^^^^^^^ definition local64 PaddingType paddingType

this.left = left;
// ^^^^ reference com/airbnb/epoxy/Carousel#Padding#
// ^^^^ reference com/airbnb/epoxy/Carousel#Padding#left.
// ^^^^ reference local59
this.top = top;
// ^^^^ reference com/airbnb/epoxy/Carousel#Padding#
// ^^^ reference com/airbnb/epoxy/Carousel#Padding#top.
// ^^^ reference local60
this.right = right;
// ^^^^ reference com/airbnb/epoxy/Carousel#Padding#
// ^^^^^ reference com/airbnb/epoxy/Carousel#Padding#right.
// ^^^^^ reference local61
this.bottom = bottom;
// ^^^^ reference com/airbnb/epoxy/Carousel#Padding#
// ^^^^^^ reference com/airbnb/epoxy/Carousel#Padding#bottom.
// ^^^^^^ reference local62
this.itemSpacing = itemSpacing;
// ^^^^ reference com/airbnb/epoxy/Carousel#Padding#
// ^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#Padding#itemSpacing.
// ^^^^^^^^^^^ reference local63
this.paddingType = paddingType;
// ^^^^ reference com/airbnb/epoxy/Carousel#Padding#
// ^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#Padding#paddingType.
// ^^^^^^^^^^^ reference local64
}
Expand All @@ -1045,7 +1036,6 @@ public boolean equals(Object o) {
// ^^^^^^ reference java/lang/Object#
// ^ definition local65 Object o
if (this == o) {
// ^^^^ reference com/airbnb/epoxy/Carousel#Padding#
// ^ reference local65
return true;
}
Expand Down
2 changes: 0 additions & 2 deletions tests/snapshots/src/main/generated/com/airbnb/epoxy/DebugTimer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ class DebugTimer implements Timer {
// ^^^^^^ reference java/lang/String#
// ^^^ definition local0 String tag
this.tag = tag;
// ^^^^ reference com/airbnb/epoxy/DebugTimer#
// ^^^ reference com/airbnb/epoxy/DebugTimer#tag.
// ^^^ reference local0
reset();
Expand Down Expand Up @@ -55,7 +54,6 @@ public void start(String sectionName) {
// ^^^^^^ reference java/lang/System#
// ^^^^^^^^ reference java/lang/System#nanoTime().
this.sectionName = sectionName;
// ^^^^ reference com/airbnb/epoxy/DebugTimer#
// ^^^^^^^^^^^ reference com/airbnb/epoxy/DebugTimer#sectionName.
// ^^^^^^^^^^^ reference local1
}
Expand Down
2 changes: 0 additions & 2 deletions tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,9 @@ class DiffHelper {
// ^^^^^^^ definition local0 BaseEpoxyAdapter adapter
// ^^^^^^^^^^^^^^^ definition local1 boolean immutableModels
this.adapter = adapter;
// ^^^^ reference com/airbnb/epoxy/DiffHelper#
// ^^^^^^^ reference com/airbnb/epoxy/DiffHelper#adapter.
// ^^^^^^^ reference local0
this.immutableModels = immutableModels;
// ^^^^ reference com/airbnb/epoxy/DiffHelper#
// ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/DiffHelper#immutableModels.
// ^^^^^^^^^^^^^^^ reference local1
adapter.registerAdapterDataObserver(observer);
Expand Down
3 changes: 0 additions & 3 deletions tests/snapshots/src/main/generated/com/airbnb/epoxy/DiffResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,15 +168,12 @@ private DiffResult(
// ^^^^^^^^^^^^ definition local8 @Nullable unresolved_type differResult
) {
this.previousModels = previousModels;
// ^^^^ reference com/airbnb/epoxy/DiffResult#
// ^^^^^^^^^^^^^^ reference com/airbnb/epoxy/DiffResult#previousModels.
// ^^^^^^^^^^^^^^ reference local6
this.newModels = newModels;
// ^^^^ reference com/airbnb/epoxy/DiffResult#
// ^^^^^^^^^ reference com/airbnb/epoxy/DiffResult#newModels.
// ^^^^^^^^^ reference local7
this.differResult = differResult;
// ^^^^ reference com/airbnb/epoxy/DiffResult#
// ^^^^^^^^^^^^ reference com/airbnb/epoxy/DiffResult#differResult.
// ^^^^^^^^^^^^ reference local8
}
Expand Down
1 change: 0 additions & 1 deletion tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ protected void enableDiffing() {
diffHelper = new DiffHelper(this, false);
// ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyAdapter#diffHelper.
// ^^^^^^^^^^ reference com/airbnb/epoxy/DiffHelper#`<init>`().
// ^^^^ reference com/airbnb/epoxy/EpoxyAdapter#
}

@Override
Expand Down
8 changes: 0 additions & 8 deletions tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,6 @@ public abstract class EpoxyController implements ModelCollector, StickyHeaderCal
// ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ControllerHelper#
// ^^^^^^ definition com/airbnb/epoxy/EpoxyController#helper. private final ControllerHelper helper
// ^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ControllerHelperLookup#getHelperForController().
// ^^^^ reference com/airbnb/epoxy/EpoxyController#
private ControllerModelList modelsBeingBuilt;
// ^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ControllerModelList#
// ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#modelsBeingBuilt. private ControllerModelList modelsBeingBuilt
Expand Down Expand Up @@ -238,7 +237,6 @@ public EpoxyController(Handler modelBuildingHandler, Handler diffingHandler) {
adapter = new EpoxyControllerAdapter(this, diffingHandler);
// ^^^^^^^ reference com/airbnb/epoxy/EpoxyController#adapter.
// ^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyControllerAdapter#`<init>`().
// ^^^^ reference com/airbnb/epoxy/EpoxyController#
// ^^^^^^^^^^^^^^ reference local1
modelBuildHandler = modelBuildingHandler;
// ^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#modelBuildHandler.
Expand Down Expand Up @@ -698,7 +696,6 @@ private void runInterceptors() {
callback.onInterceptorsStarted(this);
// ^^^^^^^^ reference local20
// ^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#onInterceptorsStarted().
// ^^^^ reference com/airbnb/epoxy/EpoxyController#
}
}

Expand Down Expand Up @@ -729,7 +726,6 @@ private void runInterceptors() {
callback.onInterceptorsFinished(this);
// ^^^^^^^^ reference local22
// ^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#onInterceptorsFinished().
// ^^^^ reference com/airbnb/epoxy/EpoxyController#
}
}
}
Expand Down Expand Up @@ -840,7 +836,6 @@ public void add(@NonNull EpoxyModel<?> model) {
model.addTo(this);
// ^^^^^ reference local26
// ^^^^^ reference com/airbnb/epoxy/EpoxyModel#addTo().
// ^^^^ reference com/airbnb/epoxy/EpoxyController#
}

/**
Expand Down Expand Up @@ -974,7 +969,6 @@ void addCurrentlyStagedModelIfExists() {
stagedModel.addTo(this);
// ^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#stagedModel.
// ^^^^^ reference com/airbnb/epoxy/EpoxyModel#addTo().
// ^^^^ reference com/airbnb/epoxy/EpoxyController#
}
stagedModel = null;
// ^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#stagedModel.
Expand Down Expand Up @@ -1139,7 +1133,6 @@ public void setFilterDuplicates(boolean filterDuplicates) {
// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#setFilterDuplicates(). public void setFilterDuplicates(boolean filterDuplicates)
// ^^^^^^^^^^^^^^^^ definition local46 boolean filterDuplicates
this.filterDuplicates = filterDuplicates;
// ^^^^ reference com/airbnb/epoxy/EpoxyController#
// ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#filterDuplicates.
// ^^^^^^^^^^^^^^^^ reference local46
}
Expand Down Expand Up @@ -1390,7 +1383,6 @@ protected void onExceptionSwallowed(@NonNull RuntimeException exception) {
globalExceptionHandler.onException(this, exception);
// ^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#globalExceptionHandler.
// ^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#ExceptionHandler#onException().
// ^^^^ reference com/airbnb/epoxy/EpoxyController#
// ^^^^^^^^^ reference local56
}

Expand Down
3 changes: 0 additions & 3 deletions tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyControllerAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ public final class EpoxyControllerAdapter extends BaseEpoxyAdapter implements Re
// ^^^^^^^ reference _root_/
// ^^^^^^^^^^^^^^ definition local1 unresolved_type diffingHandler
this.epoxyController = epoxyController;
// ^^^^ reference com/airbnb/epoxy/EpoxyControllerAdapter#
// ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyControllerAdapter#epoxyController.
// ^^^^^^^^^^^^^^^ reference local0
differ = new AsyncEpoxyDiffer(
Expand All @@ -94,7 +93,6 @@ public final class EpoxyControllerAdapter extends BaseEpoxyAdapter implements Re
diffingHandler,
// ^^^^^^^^^^^^^^ reference local1
this,
// ^^^^ reference com/airbnb/epoxy/EpoxyControllerAdapter#
ITEM_CALLBACK
// ^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyControllerAdapter#ITEM_CALLBACK.
);
Expand Down Expand Up @@ -223,7 +221,6 @@ public void onResult(@NonNull DiffResult result) {
result.dispatchTo(this);
// ^^^^^^ reference local7
// ^^^^^^^^^^ reference com/airbnb/epoxy/DiffResult#dispatchTo().
// ^^^^ reference com/airbnb/epoxy/EpoxyControllerAdapter#
notifyBlocker.blockChanges();
// ^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyControllerAdapter#notifyBlocker.
// ^^^^^^^^^^^^ reference com/airbnb/epoxy/NotifyBlocker#blockChanges().
Expand Down
1 change: 0 additions & 1 deletion tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyDiffLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ public EpoxyDiffLogger(String tag) {
// ^^^^^^ reference java/lang/String#
// ^^^ definition local0 String tag
this.tag = tag;
// ^^^^ reference com/airbnb/epoxy/EpoxyDiffLogger#
// ^^^ reference com/airbnb/epoxy/EpoxyDiffLogger#tag.
// ^^^ reference local0
}
Expand Down
1 change: 0 additions & 1 deletion tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyItemSpacingDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ public void setPxBetweenItems(@Px int pxBetweenItems) {
// ^^ reference androidx/annotation/Px#
// ^^^^^^^^^^^^^^ definition local1 @Px int pxBetweenItems
this.pxBetweenItems = pxBetweenItems;
// ^^^^ reference com/airbnb/epoxy/EpoxyItemSpacingDecorator#
// ^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyItemSpacingDecorator#pxBetweenItems.
// ^^^^^^^^^^^^^^ reference local1
}
Expand Down
Loading