Make parseRootWithURLs return URLS on Left case too

ossuminc · Oct 29, 2024 · 60e000b · 60e000b
1 parent af569f7
commit 60e000b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/language/jvm/src/test/scala/com/ossuminc/riddl/language/parsing/TopLevelParserTest.scala b/language/jvm/src/test/scala/com/ossuminc/riddl/language/parsing/TopLevelParserTest.scala
@@ -83,7 +83,7 @@ class TopLevelParserTest extends ParsingTest {
       val rpi: RiddlParserInput = Await.result(RiddlParserInput.fromURL(url), 10.seconds)
       val tlp = TopLevelParser(rpi,false)
       tlp.parseRootWithURLs match {
-        case Left(messages) => fail(messages.format)
+        case Left((messages, _)) => fail(messages.format)
         case Right((root, urls)) =>
           root.domains.head.id.value must be("Everything")
           val paths: Seq[String] = urls.map(_.path)
@@ -92,5 +92,16 @@ class TopLevelParserTest extends ParsingTest {
           paths must contain("language/jvm/src/test/input/everything_full.riddl")
       }
     }
+    "return URLs on failure" in { (td: TestData) =>
+      val rpi: RiddlParserInput = RiddlParserInput("some source that ain't riddl", td)
+      val tlp = TopLevelParser(rpi, false)
+      tlp.parseRootWithURLs match {
+        case Left((messages, urls)) =>
+          urls must be(empty)
+          messages mustNot be(empty)
+          succeed
+        case Right((root, urls)) => fail("Test should have yields Left")
+      }
+    }
   }
 }
diff --git a/.../shared/src/main/scala/com/ossuminc/riddl/language/parsing/ExtensibleTopLevelParser.scala b/.../shared/src/main/scala/com/ossuminc/riddl/language/parsing/ExtensibleTopLevelParser.scala
@@ -65,9 +65,9 @@ trait ExtensibleTopLevelParser(using PlatformContext)
 
   def parseNebula: Either[Messages, Nebula] = doParse[Nebula](nebula(_))
 
-  def parseRootWithURLs: Either[Messages, (Root, Seq[URL])] = {
+  def parseRootWithURLs: Either[(Messages, Seq[URL]), (Root, Seq[URL])] = {
     doParse[Root](root(_)) match {
-      case l @ Left(messages) => Left(messages)
+      case l @ Left(messages) => Left(messages -> this.getURLs)
       case r @ Right(root)    => Right(root -> this.getURLs)
     }
   }