psi parsers: better messages for wrong tails

SumoLogic · Nov 14, 2017 · d1ecea7 · d1ecea7
1 parent 6c577b3
commit d1ecea7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 19 deletions.
diff --git a/...ections-psi-parser-util/src/main/java/ws/epigraph/projections/ProjectionsParsingUtil.java b/...ections-psi-parser-util/src/main/java/ws/epigraph/projections/ProjectionsParsingUtil.java
@@ -335,24 +335,15 @@ TP getTagProjection(
 
     if (targetType == null) {
       throw new PsiProcessingException(
-          String.format(
-              "Unknown tail type '%s'. Supported tail types: {%s}",
-              tailTypeRef.toString(),
-              String.join(", ", supportedEntityTailTypes(vp))
-          ), location, ctx
+          unsupportedTagMsg(tailTypeRef.toString(), supportedEntityTailTypes(vp)), location, ctx
       );
     }
 
     if (targetType.equals(vp.type())) return vp;
 
     if (!hasTail(vp, targetType)) {
       throw new PsiProcessingException(
-          String.format(
-              "Polymorphic tail for type '%s' is not supported. Supported tail types: {%s}",
-              targetType.name(),
-              String.join(", ", supportedEntityTailTypes(vp))
-          ),
-          location, ctx
+          unsupportedTagMsg(tailTypeRef.toString(), supportedEntityTailTypes(vp)), location, ctx
       );
     }
 
@@ -422,11 +413,7 @@ private static void supportedEntityTailTypes(@NotNull GenVarProjection<?, ?, ?>
 
     if (targetType == null) {
       throw new PsiProcessingException(
-          String.format(
-              "Unknown tail type '%s'. Supported tail types: {%s}",
-              tailTypeRef.toString(),
-              String.join(", ", supportedModelTailTypes(mp))
-          ), location, ctx
+          unsupportedTailMsg(tailTypeRef.toString(), supportedModelTailTypes(mp)), location, ctx
       );
     }
     return targetType;
@@ -545,4 +532,8 @@ public static String unsupportedFieldMsg(String name, Collection<String> support
   public static String unsupportedTagMsg(String name, Collection<String> supported) {
     return unsupportedObjMsg("Tag", "tags", name, supported);
   }
+
+  public static String unsupportedTailMsg(String name, Collection<String> supported) {
+    return unsupportedObjMsg("Tail type", "tail types", name, supported);
+  }
 }
diff --git a/.../src/test/java/ws/epigraph/url/projections/req/output/ReqOutputProjectionsParserTest.java b/.../src/test/java/ws/epigraph/url/projections/req/output/ReqOutputProjectionsParserTest.java
@@ -570,7 +570,7 @@ public void testNonExistingEntityTailErrorMsg() {
       fail();
     } catch (@SuppressWarnings("ErrorNotRethrown") AssertionError e) {
       assertTrue(e.getMessage(), e.getMessage()
-          .contains("Unknown tail type 'X'. Supported tail types: {ws.epigraph.tests.User, ws.epigraph.tests.User2}"));
+          .contains("Tag 'X' is not supported, supported tags: (ws.epigraph.tests.User,ws.epigraph.tests.User2)"));
     }
   }
 
@@ -585,7 +585,7 @@ public void testWrongEntityTailErrorMsg() {
       assertTrue(
           message,
           message.contains(
-              "Polymorphic tail for type 'ws.epigraph.tests.SingleTagEntity' is not supported. Supported tail types: {ws.epigraph.tests.User, ws.epigraph.tests.User2}")
+              "Tag 'ws.epigraph.tests.SingleTagEntity' is not supported, did you mean 'ws.epigraph.tests.User'? Supported tags: (ws.epigraph.tests.User,ws.epigraph.tests.User2)")
       );
     }
   }
@@ -597,7 +597,7 @@ public void testNonExistingModelTailErrorMsg() {
       fail();
     } catch (@SuppressWarnings("ErrorNotRethrown") AssertionError e) {
       assertTrue(e.getMessage(), e.getMessage()
-          .contains("Unknown tail type 'X'. Supported tail types: {ws.epigraph.tests.UserRecord}"));
+          .contains("Tail type 'X' is not supported, supported tail types: (ws.epigraph.tests.UserRecord)"));
     }
   }