review

Author: Frotty

src/main/kotlin/file/CoreJassProvider.kt

@@ -175,11 +175,7 @@ object CoreJassProvider {
     fun fetchJassHistoryVersions(): List<String> {
         val versionListUrl = "$JASS_HISTORY_RAW/$JASS_HISTORY_REF/$VERSION_LIST_FILE"
         return try {
-            URI(versionListUrl).toURL().readText()
-                .lineSequence()
-                .map { it.substringBefore("#").trim() }
-                .filter(::looksLikeJassHistoryFolder)
-                .toList()
+            parseJassHistoryVersionList(URI(versionListUrl).toURL().readText())
                 .asReversed()
                 .distinct()
                 .ifEmpty { supportedPatches }
@@ -189,6 +185,19 @@ object CoreJassProvider {
         }
     }
 
+    internal fun parseJassHistoryVersionList(content: String): List<String> {
+        return content
+            .lineSequence()
+            .flatMap { line ->
+                line.substringBefore("#")
+                    .trim()
+                    .splitToSequence(Regex("""\s+"""))
+                    .filter(String::isNotBlank)
+            }
+            .filter(::looksLikeJassHistoryFolder)
+            .toList()
+    }
+
     fun recommendedPatchOptions(versions: List<String>): List<String> {
         val base = listOf(DEFAULT_PATCH, "v1.31", PRE_129_PATCH)
         val latestExactVersion = versions.firstOrNull { version ->

src/main/kotlin/file/YamlHelper.kt

@@ -90,8 +90,8 @@ object YamlHelper {
         putIfNotBlank(result, "name", name)
         putIfNotBlank(result, "fileName", fileName)
         putIfNotBlank(result, "author", author)
-        scenarioData.toYamlValue()?.let { result["scenarioData"] = it }
-        optionsFlags.toYamlValue()?.let { result["optionsFlags"] = it }
+        scenarioData?.toYamlValue()?.let { result["scenarioData"] = it }
+        optionsFlags?.toYamlValue()?.let { result["optionsFlags"] = it }
         if (players.isNotEmpty()) {
             result["players"] = players.map { it.toYamlValue() }
         }
@@ -142,7 +142,7 @@ object YamlHelper {
     private fun WurstProjectBuildForce.toYamlValue(): Map<String, Any?> {
         val result = linkedMapOf<String, Any?>()
         putIfNotBlank(result, "name", name)
-        flags.toYamlValue()?.let { result["flags"] = it }
+        flags?.toYamlValue()?.let { result["flags"] = it }
         if (playerIds.isNotEmpty()) {
             result["playerIds"] = playerIds
         }

src/test/kotlin/GenerateTests.kt

@@ -98,6 +98,23 @@ class GenerateTests {
         )
     }
 
+    @Test(priority = 10)
+    fun testJassHistoryVersionListSplitsWhitespaceSeparatedTokens() {
+        val parsed = CoreJassProvider.parseJassHistoryVersionList(
+            """
+            Beta-ROC-v1.21 TFT-v1.27b-ru Reforged-v2.0.4.23745
+            # comments and blank chunks should be ignored
+            not-a-version   ROC-v1.06-ru
+            """.trimIndent()
+        )
+
+        Assert.assertEquals(
+            parsed,
+            listOf("Beta-ROC-v1.21", "TFT-v1.27b-ru", "Reforged-v2.0.4.23745", "ROC-v1.06-ru")
+        )
+        Assert.assertFalse(parsed.any { it.contains(" ") })
+    }
+
     @Test(priority = 10)
     fun testStdlibDependencyFollowsPatchEra() {
         val legacyStdlib = "https://github.com/wurstscript/wurstStdlib2:pre1.29"

src/test/kotlin/YamlHelperTests.kt

@@ -48,6 +48,31 @@ class YamlHelperTests {
         Assert.assertFalse(dumped.contains("forces: []"))
     }
 
+    @Test
+    fun testDumpBuildMapDataWithOmittedSections() {
+        val dumped = YamlHelper.dumpProjectConfig(
+            newProjectConfig(
+                projectName = "minimal",
+                buildMapData = WurstProjectBuildMapData(
+                    "Minimal Map",
+                    "Minimal Map.w3x",
+                    "Tester",
+                    null,
+                    null,
+                    emptyList(),
+                    emptyList()
+                )
+            )
+        )
+
+        Assert.assertTrue(dumped.contains("buildMapData:"))
+        Assert.assertTrue(dumped.contains("name: Minimal Map"))
+        Assert.assertFalse(dumped.contains("scenarioData:"))
+        Assert.assertFalse(dumped.contains("optionsFlags:"))
+        Assert.assertFalse(dumped.contains("players: []"))
+        Assert.assertFalse(dumped.contains("forces: []"))
+    }
+
     @Test
     fun testLoadMalformedConfigRecoversWithDefaults() {
         val dir = Files.createTempDirectory("wurstsetup-yaml-test")