Improve defaultErrorMessage() for AsSuperVisitor (typetools#6928)

mernst · Dec 17, 2024 · f8f11f7 · f8f11f7
1 parent 1c8b2ab
commit f8f11f7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/framework/src/main/java/org/checkerframework/framework/type/AsSuperVisitor.java b/framework/src/main/java/org/checkerframework/framework/type/AsSuperVisitor.java
@@ -244,6 +244,22 @@ private boolean areErasedJavaTypesEquivalent(
     return types.isSameType(underlyingTypeA, underlyingTypeB);
   }
 
+  @Override
+  public String defaultErrorMessage(
+      AnnotatedTypeMirror type, AnnotatedTypeMirror superType, Void p) {
+    // Message is on one line, without line breaks, because in a stack trace only the first line
+    // of the message may be shown.
+    return String.format(
+        "%s: unexpected combination:  type: [%s %s] %s  superType: [%s %s] %s",
+        this.getClass().getSimpleName(),
+        type.getKind(),
+        type.getClass(),
+        type,
+        superType.getKind(),
+        superType.getClass(),
+        superType);
+  }
+
   // <editor-fold defaultstate="collapsed" desc="visitArray_Other methods">
   @Override
   public AnnotatedTypeMirror visitArray_Array(

diff --git a/framework/src/main/java/org/checkerframework/framework/type/visitor/AtmComboVisitor.java b/framework/src/main/java/org/checkerframework/framework/type/visitor/AtmComboVisitor.java
@@ -40,7 +40,7 @@ default String defaultErrorMessage(
     // Message is on one line, without line breaks, because in a stack trace only the first line
     // of the message may be shown.
     return String.format(
-        "%s: unexpected combination:  type: [%s %s] %s  supertype: [%s %s] %s",
+        "%s: unexpected combination:  type1: [%s %s] %s  type2: [%s %s] %s",
         this.getClass().getSimpleName(),
         type1.getKind(),
         type1.getClass(),