Skip to content

Reduce emitted occurences noise from anonymous classes #158

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 16, 2021
Merged

Reduce emitted occurences noise from anonymous classes #158

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
1 change: 1 addition & 0 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ lazy val plugin = project
javaOnlySettings,
moduleName := "semanticdb-javac",
javaToolchainVersion := "8",
javacOptions += "-g",
assemblyShadeRules.in(assembly) :=
Seq(
ShadeRule
Expand Down
1 change: 1 addition & 0 deletions project/JavaToolchainPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ object JavaToolchainPlugin extends AutoPlugin {
),
javacOptions.in(doc) --= List("-target", "1.8"),
javacOptions.in(doc) --= bootclasspathSettings(javaToolchainVersion.value),
javacOptions.in(doc) --= List("-g"),
javaHome := Some(getJavaHome(javaToolchainVersion.value)),
javacOptions ++= bootclasspathSettings(javaToolchainVersion.value),
javaOptions ++= bootclasspathSettings(javaToolchainVersion.value)
Expand Down
7 changes: 5 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 @@ -163,7 +163,8 @@ public Void visitMethod(MethodTree node, Void unused) {
JCTree.JCMethodDecl meth = (JCTree.JCMethodDecl) node;
if (meth.sym == null) return super.visitMethod(node, unused);
CompilerRange range = CompilerRange.FROM_POINT_TO_SYMBOL_NAME;
if (meth.sym.name.toString().equals("<init>")) {
if (meth.sym.isConstructor()) {
if (meth.sym.owner.isAnonymous()) return null;
range = CompilerRange.FROM_POINT_WITH_TEXT_SEARCH;
}
emitSymbolOccurrence(meth.sym, meth, Role.DEFINITION, range);
Expand Down Expand Up @@ -224,7 +225,9 @@ 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_TEXT_SEARCH);
if (!cls.type.tsym.isAnonymous()) {
emitSymbolOccurrence(cls.constructor, cls, Role.REFERENCE, CompilerRange.FROM_TEXT_SEARCH);
}
}

// to avoid emitting a reference to the class itself, we manually scan everything
Expand Down
2 changes: 0 additions & 2 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 @@ -316,7 +316,6 @@ public void submitList(@Nullable final List<? extends EpoxyModel<?>> newList) {
executor.execute(new Runnable() {
// ^^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#executor.
// ^^^^^^^ reference java/util/concurrent/Executor#execute().
// ^^^^^^^^^^^^^^^^ reference local13 6:5
// ^^^^^^^^ reference java/lang/Runnable#
@Override
// ^^^^^^^^ reference java/lang/Override#
Expand Down Expand Up @@ -363,7 +362,6 @@ private void onRunCompleted(
// ^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/MainThreadExecutor#
// ^^^^^^^^^^^^^^ reference com/airbnb/epoxy/MainThreadExecutor#ASYNC_INSTANCE.
// ^^^^^^^ reference com/airbnb/epoxy/HandlerExecutor#execute().
// ^^^^^^^^^^^^^^^^ reference local20 8:5
// ^^^^^^^^ reference java/lang/Runnable#
@Override
// ^^^^^^^^ reference java/lang/Override#
Expand Down
1 change: 0 additions & 1 deletion 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 @@ -119,7 +119,6 @@ public class Carousel extends EpoxyRecyclerView {
// ^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#SnapHelperFactory#
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#defaultGlobalSnapHelperFactory. private static SnapHelperFactory defaultGlobalSnapHelperFactory
new SnapHelperFactory() {
// ^^^^^^^^^^^^^^^^^^^^^^^^^ reference local1 7:7
// ^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#SnapHelperFactory#

@Override
Expand Down
1 change: 0 additions & 1 deletion tests/snapshots/src/main/generated/com/airbnb/epoxy/ControllerModelList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ class ControllerModelList extends ModelList {
private static final ModelListObserver OBSERVER = new ModelListObserver() {
// ^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ModelList#ModelListObserver#
// ^^^^^^^^ definition com/airbnb/epoxy/ControllerModelList#OBSERVER. private static final ModelListObserver OBSERVER
// ^^^^^^^^^^^^^^^^^^^^^^^^^ reference local1 12:3
// ^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ModelList#ModelListObserver#
@Override
// ^^^^^^^^ reference java/lang/Override#
Expand Down
3 changes: 0 additions & 3 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 @@ -466,7 +466,6 @@ public synchronized void cancelPendingModelBuild() {
private final Runnable buildModelsRunnable = new Runnable() {
// ^^^^^^^^ reference java/lang/Runnable#
// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#buildModelsRunnable. private final Runnable buildModelsRunnable
// ^^^^^^^^^^^^^^^^ reference local6 49:3
// ^^^^^^^^ reference java/lang/Runnable#
@Override
// ^^^^^^^^ reference java/lang/Override#
Expand Down Expand Up @@ -1402,7 +1401,6 @@ protected void onExceptionSwallowed(@NonNull RuntimeException exception) {
// ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#ExceptionHandler#
// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#globalExceptionHandler. private static ExceptionHandler globalExceptionHandler
new ExceptionHandler() {
// ^^^^^^^^^^^^^^^^^^^^^^^^ reference local58 7:7
// ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#ExceptionHandler#

@Override
Expand Down Expand Up @@ -1481,7 +1479,6 @@ void onAttachedToRecyclerViewInternal(RecyclerView recyclerView) {
// ^^^^^^^^ reference com/airbnb/epoxy/MainThreadExecutor#INSTANCE.
// ^^^^^^^ reference com/airbnb/epoxy/HandlerExecutor#handler.
// ^^^^^^^^^^^ reference postDelayed#
// ^^^^^^^^^^^^^^^^ reference local67 19:7
// ^^^^^^^^ reference java/lang/Runnable#
@Override
// ^^^^^^^^ reference java/lang/Override#
Expand Down
1 change: 0 additions & 1 deletion tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,6 @@ protected final void addWithDebugValidation(@NonNull EpoxyController controller)
controller.addAfterInterceptorCallback(new ModelInterceptorCallback() {
// ^^^^^^^^^^ reference local36
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#addAfterInterceptorCallback().
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference local38 11:7
// ^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#
@Override
// ^^^^^^^^ reference java/lang/Override#
Expand Down
5 changes: 0 additions & 5 deletions tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,6 @@ public void bind(@NonNull ModelGroupHolder holder) {
iterateModels(holder, new IterateModelsCallback() {
// ^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#iterateModels().
// ^^^^^^ reference local10
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference local12 6:5
// ^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#
@Override
// ^^^^^^^^ reference java/lang/Override#
Expand Down Expand Up @@ -299,7 +298,6 @@ public void bind(@NonNull ModelGroupHolder holder, @NonNull final List<Object> p
iterateModels(holder, new IterateModelsCallback() {
// ^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#iterateModels().
// ^^^^^^ reference local17
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference local20 6:5
// ^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#
@Override
// ^^^^^^^^ reference java/lang/Override#
Expand Down Expand Up @@ -353,7 +351,6 @@ public void bind(@NonNull ModelGroupHolder holder, @NonNull EpoxyModel<?> previo
iterateModels(holder, new IterateModelsCallback() {
// ^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#iterateModels().
// ^^^^^^ reference local25
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference local29 15:5
// ^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#
@Override
// ^^^^^^^^ reference java/lang/Override#
Expand Down Expand Up @@ -459,7 +456,6 @@ public void onViewAttachedToWindow(ModelGroupHolder holder) {
iterateModels(holder, new IterateModelsCallback() {
// ^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#iterateModels().
// ^^^^^^ reference local38
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference local40 6:5
// ^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#
@Override
// ^^^^^^^^ reference java/lang/Override#
Expand Down Expand Up @@ -491,7 +487,6 @@ public void onViewDetachedFromWindow(ModelGroupHolder holder) {
iterateModels(holder, new IterateModelsCallback() {
// ^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#iterateModels().
// ^^^^^^ reference local45
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference local47 6:5
// ^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#
@Override
// ^^^^^^^^ reference java/lang/Override#
Expand Down
1 change: 0 additions & 1 deletion tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelTouchCallback.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,6 @@ protected void clearView(final RecyclerView recyclerView, EpoxyViewHolder viewHo
recyclerView.postDelayed(new Runnable() {
// ^^^^^^^^^^^^ reference local45
// ^^^^^^^^^^^ reference postDelayed#
// ^^^^^^^^^^^^^^^^ reference local48 5:5
// ^^^^^^^^ reference java/lang/Runnable#
@Override
// ^^^^^^^^ reference java/lang/Override#
Expand Down
Loading