Merge pull request #158 from sourcegraph/nsc/anon-class-tidy

Reduce emitted occurences noise from anonymous classes

Author: Strum355

build.sbt

@@ -104,6 +104,7 @@ lazy val plugin = project
     javaOnlySettings,
     moduleName := "semanticdb-javac",
     javaToolchainVersion := "8",
+    javacOptions += "-g",
     assemblyShadeRules.in(assembly) :=
       Seq(
         ShadeRule

project/JavaToolchainPlugin.scala

@@ -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)

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

@@ -164,7 +164,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);
@@ -227,7 +228,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

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

@@ -312,7 +312,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#
@@ -359,7 +358,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#

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

@@ -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

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

@@ -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#

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

@@ -464,7 +464,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#
@@ -1394,7 +1393,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
@@ -1473,7 +1471,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#

tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModel.java

@@ -698,7 +698,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#

tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelGroup.java

@@ -256,7 +256,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#
@@ -298,7 +297,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#
@@ -352,7 +350,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#
@@ -458,7 +455,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#
@@ -490,7 +486,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#

tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelTouchCallback.java

@@ -494,7 +494,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#