Skip to content

Commit 85fd277

Browse files
Strum355Strum355
committed
reduce emitted occurences noise from anonymous classes
1 parent 5750340 commit 85fd277

File tree

13 files changed

+152
-179
lines changed

13 files changed

+152
-179
lines changed

‎build.sbt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ lazy val plugin = project
104104
javaOnlySettings,
105105
moduleName := "semanticdb-javac",
106106
javaToolchainVersion := "8",
107+
javacOptions += "-g",
107108
assemblyShadeRules.in(assembly) :=
108109
Seq(
109110
ShadeRule

‎project/JavaToolchainPlugin.scala‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ object JavaToolchainPlugin extends AutoPlugin {
3535
),
3636
javacOptions.in(doc) --= List("-target", "1.8"),
3737
javacOptions.in(doc) --= bootclasspathSettings(javaToolchainVersion.value),
38+
javacOptions.in(doc) --= List("-g"),
3839
javaHome := Some(getJavaHome(javaToolchainVersion.value)),
3940
javacOptions ++= bootclasspathSettings(javaToolchainVersion.value),
4041
javaOptions ++= bootclasspathSettings(javaToolchainVersion.value)

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,8 @@ public Void visitMethod(MethodTree node, Void unused) {
163163
JCTree.JCMethodDecl meth = (JCTree.JCMethodDecl) node;
164164
if (meth.sym == null) return super.visitMethod(node, unused);
165165
CompilerRange range = CompilerRange.FROM_POINT_TO_SYMBOL_NAME;
166-
if (meth.sym.name.toString().equals("<init>")) {
166+
if (meth.sym.isConstructor()) {
167+
if (meth.sym.owner.isAnonymous()) return null;
167168
range = CompilerRange.FROM_POINT_WITH_TEXT_SEARCH;
168169
}
169170
emitSymbolOccurrence(meth.sym, meth, Role.DEFINITION, range);
@@ -224,7 +225,9 @@ public Void visitMemberSelect(MemberSelectTree node, Void unused) {
224225
public Void visitNewClass(NewClassTree node, Void unused) {
225226
if (node instanceof JCTree.JCNewClass) {
226227
JCTree.JCNewClass cls = (JCTree.JCNewClass) node;
227-
emitSymbolOccurrence(cls.constructor, cls, Role.REFERENCE, CompilerRange.FROM_TEXT_SEARCH);
228+
if (!cls.type.tsym.isAnonymous()) {
229+
emitSymbolOccurrence(cls.constructor, cls, Role.REFERENCE, CompilerRange.FROM_TEXT_SEARCH);
230+
}
228231
}
229232

230233
// to avoid emitting a reference to the class itself, we manually scan everything

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,6 @@ public void submitList(@Nullable final List<? extends EpoxyModel<?>> newList) {
316316
executor.execute(new Runnable() {
317317
// ^^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#executor.
318318
// ^^^^^^^ reference java/util/concurrent/Executor#execute().
319-
// ^^^^^^^^^^^^^^^^ reference local13 6:5
320319
// ^^^^^^^^ reference java/lang/Runnable#
321320
@Override
322321
// ^^^^^^^^ reference java/lang/Override#
@@ -363,7 +362,6 @@ private void onRunCompleted(
363362
// ^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/MainThreadExecutor#
364363
// ^^^^^^^^^^^^^^ reference com/airbnb/epoxy/MainThreadExecutor#ASYNC_INSTANCE.
365364
// ^^^^^^^ reference com/airbnb/epoxy/HandlerExecutor#execute().
366-
// ^^^^^^^^^^^^^^^^ reference local20 8:5
367365
// ^^^^^^^^ reference java/lang/Runnable#
368366
@Override
369367
// ^^^^^^^^ reference java/lang/Override#

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ public class Carousel extends EpoxyRecyclerView {
119119
// ^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#SnapHelperFactory#
120120
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/Carousel#defaultGlobalSnapHelperFactory. private static SnapHelperFactory defaultGlobalSnapHelperFactory
121121
new SnapHelperFactory() {
122-
// ^^^^^^^^^^^^^^^^^^^^^^^^^ reference local1 7:7
123122
// ^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/Carousel#SnapHelperFactory#
124123

125124
@Override

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ class ControllerModelList extends ModelList {
1414
private static final ModelListObserver OBSERVER = new ModelListObserver() {
1515
// ^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ModelList#ModelListObserver#
1616
// ^^^^^^^^ definition com/airbnb/epoxy/ControllerModelList#OBSERVER. private static final ModelListObserver OBSERVER
17-
// ^^^^^^^^^^^^^^^^^^^^^^^^^ reference local1 12:3
1817
// ^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/ModelList#ModelListObserver#
1918
@Override
2019
// ^^^^^^^^ reference java/lang/Override#

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,6 @@ public synchronized void cancelPendingModelBuild() {
466466
private final Runnable buildModelsRunnable = new Runnable() {
467467
// ^^^^^^^^ reference java/lang/Runnable#
468468
// ^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#buildModelsRunnable. private final Runnable buildModelsRunnable
469-
// ^^^^^^^^^^^^^^^^ reference local6 49:3
470469
// ^^^^^^^^ reference java/lang/Runnable#
471470
@Override
472471
// ^^^^^^^^ reference java/lang/Override#
@@ -1402,7 +1401,6 @@ protected void onExceptionSwallowed(@NonNull RuntimeException exception) {
14021401
// ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#ExceptionHandler#
14031402
// ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController#globalExceptionHandler. private static ExceptionHandler globalExceptionHandler
14041403
new ExceptionHandler() {
1405-
// ^^^^^^^^^^^^^^^^^^^^^^^^ reference local58 7:7
14061404
// ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#ExceptionHandler#
14071405

14081406
@Override
@@ -1481,7 +1479,6 @@ void onAttachedToRecyclerViewInternal(RecyclerView recyclerView) {
14811479
// ^^^^^^^^ reference com/airbnb/epoxy/MainThreadExecutor#INSTANCE.
14821480
// ^^^^^^^ reference com/airbnb/epoxy/HandlerExecutor#handler.
14831481
// ^^^^^^^^^^^ reference postDelayed#
1484-
// ^^^^^^^^^^^^^^^^ reference local67 19:7
14851482
// ^^^^^^^^ reference java/lang/Runnable#
14861483
@Override
14871484
// ^^^^^^^^ reference java/lang/Override#

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,6 @@ protected final void addWithDebugValidation(@NonNull EpoxyController controller)
709709
controller.addAfterInterceptorCallback(new ModelInterceptorCallback() {
710710
// ^^^^^^^^^^ reference local36
711711
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#addAfterInterceptorCallback().
712-
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference local38 11:7
713712
// ^^^^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyController#ModelInterceptorCallback#
714713
@Override
715714
// ^^^^^^^^ reference java/lang/Override#

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,6 @@ public void bind(@NonNull ModelGroupHolder holder) {
257257
iterateModels(holder, new IterateModelsCallback() {
258258
// ^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#iterateModels().
259259
// ^^^^^^ reference local10
260-
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference local12 6:5
261260
// ^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#
262261
@Override
263262
// ^^^^^^^^ reference java/lang/Override#
@@ -299,7 +298,6 @@ public void bind(@NonNull ModelGroupHolder holder, @NonNull final List<Object> p
299298
iterateModels(holder, new IterateModelsCallback() {
300299
// ^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#iterateModels().
301300
// ^^^^^^ reference local17
302-
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference local20 6:5
303301
// ^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#
304302
@Override
305303
// ^^^^^^^^ reference java/lang/Override#
@@ -353,7 +351,6 @@ public void bind(@NonNull ModelGroupHolder holder, @NonNull EpoxyModel<?> previo
353351
iterateModels(holder, new IterateModelsCallback() {
354352
// ^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#iterateModels().
355353
// ^^^^^^ reference local25
356-
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference local29 15:5
357354
// ^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#
358355
@Override
359356
// ^^^^^^^^ reference java/lang/Override#
@@ -459,7 +456,6 @@ public void onViewAttachedToWindow(ModelGroupHolder holder) {
459456
iterateModels(holder, new IterateModelsCallback() {
460457
// ^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#iterateModels().
461458
// ^^^^^^ reference local38
462-
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference local40 6:5
463459
// ^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#
464460
@Override
465461
// ^^^^^^^^ reference java/lang/Override#
@@ -491,7 +487,6 @@ public void onViewDetachedFromWindow(ModelGroupHolder holder) {
491487
iterateModels(holder, new IterateModelsCallback() {
492488
// ^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#iterateModels().
493489
// ^^^^^^ reference local45
494-
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ reference local47 6:5
495490
// ^^^^^^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModelGroup#IterateModelsCallback#
496491
@Override
497492
// ^^^^^^^^ reference java/lang/Override#

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,6 @@ protected void clearView(final RecyclerView recyclerView, EpoxyViewHolder viewHo
496496
recyclerView.postDelayed(new Runnable() {
497497
// ^^^^^^^^^^^^ reference local45
498498
// ^^^^^^^^^^^ reference postDelayed#
499-
// ^^^^^^^^^^^^^^^^ reference local48 5:5
500499
// ^^^^^^^^ reference java/lang/Runnable#
501500
@Override
502501
// ^^^^^^^^ reference java/lang/Override#

0 commit comments

Comments
 (0)