Fix for incorrectly formatted .map files when using the idTech2 hint

Fixes #43

Author: LogicAndTrick

Sledge.Formats.Map.Tests/Units/TestQuakeMapFormat.cs

@@ -1,7 +1,9 @@
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -235,12 +237,12 @@ public void TestWhitespace()
         Assert.AreEqual(2, map.Worldspawn.Children.Count);
     }
 
+    [DataTestMethod]
     [DataRow(QuakeFormatFile, DisplayName = nameof(QuakeFormatFile))]
     [DataRow(ValveFormatFile, DisplayName = nameof(ValveFormatFile))]
     [DataRow(Quake2StandardFormatFile, DisplayName = nameof(Quake2StandardFormatFile))]
     [DataRow(Quake2ValveFormatFile, DisplayName = nameof(Quake2ValveFormatFile))]
     [DataRow(LotsOfWhitespace, DisplayName = nameof(LotsOfWhitespace))]
-    [DataTestMethod]
     public void TestAddCommentToEveryRow(string file)
     {
         var commented = String.Join('\n', file.Split('\n').Select(x => x + " // this is a comment "));
@@ -263,4 +265,40 @@ public void TestLocales(string culture)
 
         Assert.AreEqual(4, map.Worldspawn.Children.Count);
     }
+
+    private static readonly string[] ReparseHints = { "idTech2", "Worldcraft" };
+
+    public static IEnumerable<object[]> GetFileHintCombinations()
+    {
+        foreach (var h in ReparseHints)
+        {
+            yield return new object[] { nameof(QuakeFormatFile), h, QuakeFormatFile };
+            yield return new object[] { nameof(ValveFormatFile), h, ValveFormatFile };
+            yield return new object[] { nameof(Quake2StandardFormatFile), h, Quake2StandardFormatFile };
+            yield return new object[] { nameof(Quake2ValveFormatFile), h, Quake2ValveFormatFile };
+            yield return new object[] { nameof(LotsOfWhitespace), h, LotsOfWhitespace };
+        }
+    }
+
+    public static string GetFileHintCombinationDisplayName(MethodInfo method, object[] data)
+    {
+        return $"{method.Name} ({data[0]}, {data[1]})";
+    }
+
+    [DataTestMethod]
+    [DynamicData(nameof(GetFileHintCombinations), DynamicDataSourceType.Method, DynamicDataDisplayName = nameof(GetFileHintCombinationDisplayName))]
+    public void TestReParse(string name, string hint, string file)
+    {
+        var format = new QuakeMapFormat();
+        var stream = new MemoryStream(Encoding.ASCII.GetBytes(file));
+        var expected = format.Read(stream);
+
+        using var ms = new MemoryStream();
+        format.Write(ms, expected, hint);
+        ms.Seek(0, SeekOrigin.Begin);
+        Console.Write(Encoding.ASCII.GetString(ms.ToArray()));
+
+        var actual = format.Read(ms);
+        TestUtils.AreEqualMap(expected, actual);
+    }
 }

Sledge.Formats.Map/Formats/QuakeMapFormat.cs

@@ -398,7 +398,6 @@ private static void WriteFace(StreamWriter sw, Face face, string styleHint)
             switch (styleHint)
             {
                 case "idTech2":
-                    strings.Add("[");
                     strings.Add(face.XShift.ToString("0.######", CultureInfo.InvariantCulture));
                     strings.Add(face.YShift.ToString("0.######", CultureInfo.InvariantCulture));
                     strings.Add(face.Rotation.ToString("0.######", CultureInfo.InvariantCulture));

Sledge.Formats.Map/Sledge.Formats.Map.csproj

@@ -11,8 +11,8 @@
     <RepositoryUrl>https://github.com/LogicAndTrick/sledge-formats</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <PackageTags>half-life quake valve hammer worldcraft jackhammer jack rmf vmf map jmf</PackageTags>
-    <PackageReleaseNotes>Initial support for JACK prefab libraries (the JACK version with prefabs is in beta, so compatibility might change)</PackageReleaseNotes>
-    <Version>1.2.5</Version>
+    <PackageReleaseNotes>Fix for incorrectly formatted .map files when using the idTech2 hint</PackageReleaseNotes>
+    <Version>1.2.6</Version>
 	<DebugType>full</DebugType>
 	<DebugSymbols>true</DebugSymbols>
   </PropertyGroup>