add implements vs extends differentiating in pretty-printing

Strum355 · Strum355 · commit 2c6a47d0f1ea · 2021-04-01T22:29:25.000+01:00
diff --git a/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/SignatureFormatter.java b/lsif-semanticdb/src/main/java/com/sourcegraph/lsif_semanticdb/SignatureFormatter.java
@@ -49,12 +49,14 @@ private void formatClassSignature(ClassSignature classSignature) {
         classSignature.getParentsList().stream()
             .anyMatch(t -> t.getTypeRef().getSymbol().equals(ANNOTATION_SYMBOL));
 
+    boolean isEnum = has(Property.ENUM);
+
     printKeyword(formatAccess());
-    if (!has(Property.ENUM) && !isAnnotation) printKeyword(formatModifiers());
+    if (!isEnum && !isAnnotation) printKeyword(formatModifiers());
 
     switch (symbolInformation.getKind()) {
       case CLASS:
-        if (has(Property.ENUM)) {
+        if (isEnum) {
           printKeyword("enum");
         } else {
           printKeyword("class");
@@ -78,19 +80,63 @@ private void formatClassSignature(ClassSignature classSignature) {
               .collect(Collectors.joining(", ", "<", ">")));
     }
 
+    boolean hasSuperClass = !classSignature.getParentsList().contains(OBJECT_TYPE_REF);
+
     List<Type> nonSyntheticParents =
         classSignature.getParentsList().stream()
             .filter(parent -> !parent.equals(OBJECT_TYPE_REF))
             .filter(parent -> !parent.getTypeRef().getSymbol().equals(ENUM_SYMBOL))
             .filter(parent -> !parent.getTypeRef().getSymbol().equals(ANNOTATION_SYMBOL))
             .collect(Collectors.toList());
-    // TODO: extends vs implements
-    if (!nonSyntheticParents.isEmpty()) {
-      printKeyword(" extends");
 
-      String parents =
-          nonSyntheticParents.stream().map(this::formatType).collect(Collectors.joining(", "));
-      s.append(parents);
+    if (nonSyntheticParents.isEmpty()) return;
+
+    // Determine which parents from ClassSignature.parents are classes or interfaces so we know to
+    // use
+    // 'extends' or 'implements'.
+    // The logic is as follows:
+    // 1. If the symbol has type CLASS, there will always be at least 1 parent. For enums, this is
+    //    java/lang/Enum#, otherwise it is java/lang/Object# if no superclass is specified.
+    //    Therefore, if the parents list contains java/lang/Object# type or the symbol is an enum,
+    //    then no superclass was defined and all parents are interfaces and we must print 'implements'
+    //    followed by all superinterfaces.
+    //    Else if it is not an enum and the list of non-synthetic parents is non empty, a superclass
+    //    was specified and we must print it with the 'extends' keyword prefixed, followed by
+    //    'implements' and all superinterfaces, if any.
+    // 2. If the symbol has type INTERFACE, then any defined parents must also be interfaces, so if
+    //    the list of non-synthetic parents is not empty, print 'implements' and all superinterfaces.
+    switch (symbolInformation.getKind()) {
+      case CLASS:
+        // if no superclass or is an enum, every non synthetic parent is an interface
+        if (isEnum || !hasSuperClass) {
+          printKeyword(" implements");
+
+          String superInterfaces =
+              nonSyntheticParents.stream().map(this::formatType).collect(Collectors.joining(", "));
+          s.append(superInterfaces);
+        } else {
+          // else if has a superclass and is not an enum
+          printKeyword(" extends");
+          s.append(formatType(nonSyntheticParents.get(0)));
+
+          String superInterfaces =
+              nonSyntheticParents.stream()
+                  .skip(1)
+                  .map(this::formatType)
+                  .collect(Collectors.joining(", "));
+          if (!superInterfaces.isEmpty()) {
+            printKeyword(" implements");
+            s.append(superInterfaces);
+          }
+        }
+        break;
+      case INTERFACE:
+        // can only extend other interfaces
+        printKeyword(" extends");
+
+        String superInterfaces =
+            nonSyntheticParents.stream().map(this::formatType).collect(Collectors.joining(", "));
+        s.append(superInterfaces);
     }
   }
 
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyAdapter.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BaseEpoxyAdapter.java
@@ -60,7 +60,7 @@
 //                                  ^^^^^^^^^^^^ reference androidx/recyclerview/widget/RecyclerView#
 
 public abstract class BaseEpoxyAdapter
-//                    ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter# public abstract class BaseEpoxyAdapter extends unresolved_type, unresolved_type
+//                    ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BaseEpoxyAdapter# public abstract class BaseEpoxyAdapter extends unresolved_type implements unresolved_type
     extends RecyclerView.Adapter<EpoxyViewHolder>
 //          ^^^^^^^^^^^^ reference RecyclerView/
 //                       ^^^^^^^ reference RecyclerView/Adapter#
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/BoundViewHolders.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/BoundViewHolders.java
@@ -23,7 +23,7 @@
 @SuppressWarnings("WeakerAccess")
 //^^^^^^^^^^^^^^^ reference java/lang/SuppressWarnings#
 public class BoundViewHolders implements Iterable<EpoxyViewHolder> {
-//           ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BoundViewHolders# public class BoundViewHolders extends Iterable<EpoxyViewHolder>
+//           ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BoundViewHolders# public class BoundViewHolders implements Iterable<EpoxyViewHolder>
 //           ^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BoundViewHolders#`<init>`(). public BoundViewHolders()
 //                                       ^^^^^^^^ reference java/lang/Iterable#
 //                                                ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder#
@@ -104,7 +104,7 @@ public EpoxyViewHolder getHolderForModel(EpoxyModel<?> model) {
   }
 
   private class HolderIterator implements Iterator<EpoxyViewHolder> {
-//              ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BoundViewHolders#HolderIterator# private class HolderIterator extends Iterator<EpoxyViewHolder>
+//              ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BoundViewHolders#HolderIterator# private class HolderIterator implements Iterator<EpoxyViewHolder>
 //              ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/BoundViewHolders#HolderIterator#`<init>`(). private HolderIterator()
 //                                        ^^^^^^^^ reference java/util/Iterator#
 //                                                 ^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyViewHolder#
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/DebugTimer.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/DebugTimer.java
@@ -6,7 +6,7 @@
 //                  ^^^ reference android/util/Log#
 
 class DebugTimer implements Timer {
-//    ^^^^^^^^^^ definition com/airbnb/epoxy/DebugTimer# class DebugTimer extends Timer
+//    ^^^^^^^^^^ definition com/airbnb/epoxy/DebugTimer# class DebugTimer implements Timer
 //                          ^^^^^ reference com/airbnb/epoxy/Timer#
 
   private final String tag;
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyController.java
@@ -112,7 +112,7 @@
  * accurate.
  */
 public abstract class EpoxyController implements ModelCollector, StickyHeaderCallbacks {
-//                    ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController# public abstract class EpoxyController extends unresolved_type, unresolved_type
+//                    ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyController# public abstract class EpoxyController implements unresolved_type, unresolved_type
 //                                               ^^^^^^^^^^^^^^ reference _root_/
 //                                                               ^^^^^^^^^^^^^^^^^^^^^ reference _root_/
 
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyControllerAdapter.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyControllerAdapter.java
@@ -56,7 +56,7 @@
 //                                  ^^^^^^^^^^^^ reference androidx/recyclerview/widget/RecyclerView#
 
 public final class EpoxyControllerAdapter extends BaseEpoxyAdapter implements ResultCallback {
-//                 ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter# public final class EpoxyControllerAdapter extends BaseEpoxyAdapter, ResultCallback
+//                 ^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyControllerAdapter# public final class EpoxyControllerAdapter extends BaseEpoxyAdapter implements ResultCallback
 //                                                ^^^^^^^^^^^^^^^^ reference com/airbnb/epoxy/BaseEpoxyAdapter#
 //                                                                            ^^^^^^^^^^^^^^ reference com/airbnb/epoxy/AsyncEpoxyDiffer#ResultCallback#
   private final NotifyBlocker notifyBlocker = new NotifyBlocker();
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelTouchCallback.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyModelTouchCallback.java
@@ -39,7 +39,7 @@
  * your own {@link ItemTouchHelper} if you need extra flexibility or customization.
  */
 public abstract class EpoxyModelTouchCallback<T extends EpoxyModel>
-//                    ^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback# public abstract class EpoxyModelTouchCallback<T extends EpoxyModel> extends EpoxyTouchHelperCallback, EpoxyDragCallback<T>, EpoxySwipeCallback<T>
+//                    ^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyModelTouchCallback# public abstract class EpoxyModelTouchCallback<T extends EpoxyModel> extends EpoxyTouchHelperCallback implements EpoxyDragCallback<T>, EpoxySwipeCallback<T>
 //                                            ^ definition com/airbnb/epoxy/EpoxyModelTouchCallback#[T] T extends EpoxyModel
 //                                                      ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#
     extends EpoxyTouchHelperCallback implements EpoxyDragCallback<T>, EpoxySwipeCallback<T> {
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelper.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/EpoxyTouchHelper.java
@@ -544,7 +544,7 @@ public void clearView(U model, View itemView) {
   }
 
   public abstract static class DragCallbacks<T extends EpoxyModel>
-//                             ^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks# public abstract static class DragCallbacks<T extends EpoxyModel> extends EpoxyDragCallback<T>
+//                             ^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks# public abstract static class DragCallbacks<T extends EpoxyModel> implements EpoxyDragCallback<T>
 //                             ^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#`<init>`(). public DragCallbacks()
 //                                           ^ definition com/airbnb/epoxy/EpoxyTouchHelper#DragCallbacks#[T] T extends EpoxyModel
 //                                                     ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#
@@ -1043,7 +1043,7 @@ public void clearView(U model, View itemView) {
   }
 
   public abstract static class SwipeCallbacks<T extends EpoxyModel>
-//                             ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks# public abstract static class SwipeCallbacks<T extends EpoxyModel> extends EpoxySwipeCallback<T>
+//                             ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks# public abstract static class SwipeCallbacks<T extends EpoxyModel> implements EpoxySwipeCallback<T>
 //                             ^^^^^^^^^^^^^^ definition com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#`<init>`(). public SwipeCallbacks()
 //                                            ^ definition com/airbnb/epoxy/EpoxyTouchHelper#SwipeCallbacks#[T] T extends EpoxyModel
 //                                                      ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/HandlerExecutor.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/HandlerExecutor.java
@@ -27,7 +27,7 @@
  * same as the handler's thread.
  */
 class HandlerExecutor implements Executor {
-//    ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/HandlerExecutor# class HandlerExecutor extends Executor
+//    ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/HandlerExecutor# class HandlerExecutor implements Executor
 //                               ^^^^^^^^ reference java/util/concurrent/Executor#
   final Handler handler;
 //      ^^^^^^^ reference _root_/
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelList.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ModelList.java
@@ -414,7 +414,7 @@ public Iterator<EpoxyModel<?>> iterator() {
    * the parent methods so that the proper notifications are done.
    */
   private class Itr implements Iterator<EpoxyModel<?>> {
-//              ^^^ definition com/airbnb/epoxy/ModelList#Itr# private class Itr extends Iterator<EpoxyModel<?>>
+//              ^^^ definition com/airbnb/epoxy/ModelList#Itr# private class Itr implements Iterator<EpoxyModel<?>>
 //              ^^^ definition com/airbnb/epoxy/ModelList#Itr#`<init>`(). private Itr()
 //                             ^^^^^^^^ reference java/util/Iterator#
 //                                      ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#
@@ -537,7 +537,7 @@ public ListIterator<EpoxyModel<?>> listIterator(int index) {
    * notifications are done.
    */
   private class ListItr extends Itr implements ListIterator<EpoxyModel<?>> {
-//              ^^^^^^^ definition com/airbnb/epoxy/ModelList#ListItr# private class ListItr extends Itr, ListIterator<EpoxyModel<?>>
+//              ^^^^^^^ definition com/airbnb/epoxy/ModelList#ListItr# private class ListItr extends Itr implements ListIterator<EpoxyModel<?>>
 //                              ^^^ reference com/airbnb/epoxy/ModelList#Itr#
 //                                             ^^^^^^^^^^^^ reference java/util/ListIterator#
 //                                                          ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#
@@ -713,7 +713,7 @@ private static class SubList extends AbstractList<EpoxyModel<?>> {
 //              ^^^^ definition com/airbnb/epoxy/ModelList#SubList#size. private int size
 
     private static final class SubListIterator implements ListIterator<EpoxyModel<?>> {
-//                             ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelList#SubList#SubListIterator# private static final class SubListIterator extends ListIterator<EpoxyModel<?>>
+//                             ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ModelList#SubList#SubListIterator# private static final class SubListIterator implements ListIterator<EpoxyModel<?>>
 //                                                        ^^^^^^^^^^^^ reference java/util/ListIterator#
 //                                                                     ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#
       private final SubList subList;
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpTimer.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/NoOpTimer.java
@@ -1,7 +1,7 @@
 package com.airbnb.epoxy;
 
 class NoOpTimer implements Timer {
-//    ^^^^^^^^^ definition com/airbnb/epoxy/NoOpTimer# class NoOpTimer extends Timer
+//    ^^^^^^^^^ definition com/airbnb/epoxy/NoOpTimer# class NoOpTimer implements Timer
 //    ^^^^^^^^^ definition com/airbnb/epoxy/NoOpTimer#`<init>`(). NoOpTimer()
 //                         ^^^^^ reference com/airbnb/epoxy/Timer#
   @Override
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewHolderState.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/ViewHolderState.java
@@ -59,7 +59,7 @@
 @SuppressWarnings("WeakerAccess")
 //^^^^^^^^^^^^^^^ reference java/lang/SuppressWarnings#
 class ViewHolderState extends LongSparseArray<ViewState> implements Parcelable {
-//    ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ViewHolderState# class ViewHolderState extends LongSparseArray<ViewState>, unresolved_type
+//    ^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/ViewHolderState# class ViewHolderState extends LongSparseArray<ViewState> implements unresolved_type
 //                            ^^^^^^^^^^^^^^^ reference androidx/collection/LongSparseArray#
 //                                            ^^^^^^^^^ reference com/airbnb/epoxy/ViewHolderState#ViewState#
 //                                                                  ^^^^^^^^^^ reference _root_/
@@ -286,7 +286,7 @@ public void restore(EpoxyViewHolder holder) {
    * parcelable support.
    */
   public static class ViewState extends SparseArray<Parcelable> implements Parcelable {
-//                    ^^^^^^^^^ definition com/airbnb/epoxy/ViewHolderState#ViewState# public static class ViewState extends unresolved_type, unresolved_type
+//                    ^^^^^^^^^ definition com/airbnb/epoxy/ViewHolderState#ViewState# public static class ViewState extends unresolved_type implements unresolved_type
 //                                      ^^^^^^^^^^^ reference _root_/
 //                                                  ^^^^^^^^^^ reference _root_/
 //                                                                         ^^^^^^^^^^ reference _root_/
diff --git a/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener.java b/tests/snapshots/src/main/generated/com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener.java
@@ -21,7 +21,7 @@
  * checked change.
  */
 public class WrappedEpoxyModelCheckedChangeListener<T extends EpoxyModel<?>, V>
-//           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener# public class WrappedEpoxyModelCheckedChangeListener<T extends EpoxyModel<?>, V> extends unresolved_type
+//           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ definition com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener# public class WrappedEpoxyModelCheckedChangeListener<T extends EpoxyModel<?>, V> implements unresolved_type
 //                                                  ^ definition com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#[T] T extends EpoxyModel<?>
 //                                                            ^^^^^^^^^^ reference com/airbnb/epoxy/EpoxyModel#
 //                                                                           ^ definition com/airbnb/epoxy/WrappedEpoxyModelCheckedChangeListener#[V] V
diff --git a/tests/snapshots/src/main/generated/minimized/InnerClasses.java b/tests/snapshots/src/main/generated/minimized/InnerClasses.java
@@ -45,7 +45,7 @@ public static void innerStaticMethod() {}
   }
 
   public class InnerClass implements InnerInterface<Integer, Integer> {
-//             ^^^^^^^^^^ definition minimized/InnerClasses#InnerClass# public class InnerClass extends InnerInterface<Integer, Integer>
+//             ^^^^^^^^^^ definition minimized/InnerClasses#InnerClass# public class InnerClass implements InnerInterface<Integer, Integer>
 //                                   ^^^^^^^^^^^^^^ reference minimized/InnerClasses#InnerInterface#
 //                                                  ^^^^^^^ reference java/lang/Integer#
 //                                                           ^^^^^^^ reference java/lang/Integer#
diff --git a/tests/snapshots/src/main/generated/minimized/MinimizedScalaMain.scala b/tests/snapshots/src/main/generated/minimized/MinimizedScalaMain.scala
@@ -3,7 +3,7 @@ package minimized
 
 // format: off
 object MinimizedScalaMain {
-//     ^^^^^^^^^^^^^^^^^^ definition minimized/MinimizedScalaMain. public final MinimizedScalaMain extends AnyRef
+//     ^^^^^^^^^^^^^^^^^^ definition minimized/MinimizedScalaMain. public final MinimizedScalaMain
   def main(args: Array[String]): Unit = {
 //    ^^^^ definition minimized/MinimizedScalaMain.main(). public void main(String[] args)
 //         ^^^^ definition minimized/MinimizedScalaMain.main().(args) String[] args
diff --git a/tests/snapshots/src/main/generated/minimized/SubClasses.java b/tests/snapshots/src/main/generated/minimized/SubClasses.java
@@ -1,7 +1,7 @@
 package minimized;
 
 public class SubClasses extends AbstractClasses implements Interfaces {
-//           ^^^^^^^^^^ definition minimized/SubClasses# public class SubClasses extends AbstractClasses, Interfaces
+//           ^^^^^^^^^^ definition minimized/SubClasses# public class SubClasses extends AbstractClasses implements Interfaces
 //           ^^^^^^^^^^ definition minimized/SubClasses#`<init>`(). public SubClasses()
 //                              ^^^^^^^^^^^^^^^ reference minimized/AbstractClasses#
 //                                                         ^^^^^^^^^^ reference minimized/Interfaces#
diff --git a/tests/snapshots/src/main/generated/minimized/TypeVariables.java b/tests/snapshots/src/main/generated/minimized/TypeVariables.java
@@ -24,7 +24,7 @@ interface I {
   }
 
   static class CT extends C implements I {
-//             ^^ definition minimized/TypeVariables#CT# static class CT extends C, I
+//             ^^ definition minimized/TypeVariables#CT# static class CT extends C implements I
 //             ^^ definition minimized/TypeVariables#CT#`<init>`(). CT()
 //                        ^ reference minimized/TypeVariables#C#
 //                                     ^ reference minimized/TypeVariables#I#
