epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11464 from Phrohdoh/miniyaml-dont-strip-empty-lines

Browse Source 
Do not remove empty entries in MiniYaml.FromString
This commit is contained in:
Oliver Brakmann
2016-06-18 10:19:32 +02:00
committed by GitHub
parent 16a18e8de1 ee50276c7a
commit ebf3222e06
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/MiniYaml.cs
View File

@@ -254,7 +254,7 @@ namespace OpenRA
public static List<MiniYamlNode> FromString(string text, string fileName = "<no filename available>") public static List<MiniYamlNode> FromString(string text, string fileName = "<no filename available>")
{ {
return FromLines(text.Split(new[] { "\r\n", "\n" }, StringSplitOptions.RemoveEmptyEntries), fileName); return FromLines(text.Split(new[] { "\r\n", "\n" }, StringSplitOptions.None), fileName);
} }
public static List<MiniYamlNode> Merge(IEnumerable<List<MiniYamlNode>> sources) public static List<MiniYamlNode> Merge(IEnumerable<List<MiniYamlNode>> sources)

15
OpenRA.Test/OpenRA.Game/MiniYamlTest.cs
View File

@@ -154,5 +154,20 @@ Test:
Assert.IsFalse(result.First(n => n.Key == "MockString").Value.Nodes.Any(n => n.Key == "AString"), Assert.IsFalse(result.First(n => n.Key == "MockString").Value.Nodes.Any(n => n.Key == "AString"),
"MockString value should have been removed, but was not."); "MockString value should have been removed, but was not.");
} }
[TestCase(TestName = "Empty lines should count toward line numbers")]
public void EmptyLinesShouldCountTowardLineNumbers()
{
var yaml = @"
TestA:
Nothing:
TestB:
Nothing:
";
var result = MiniYaml.FromString(yaml).First(n => n.Key == "TestB");
Assert.AreEqual(5, result.Location.Line);
}
} }
} }