Handle comments when merging yaml

This commit is contained in:
Gustas
2025-08-20 13:38:09 +03:00
committed by Gustas Kažukauskas
parent cde5208c54
commit bd53aa734e
2 changed files with 42 additions and 0 deletions

View File

@@ -506,6 +506,9 @@ namespace OpenRA
var ret = new List<MiniYamlNode>(existingNodes.Count);
foreach (var n in existingNodes)
{
if (n.Key == null)
continue;
if (keys.Add(n.Key))
ret.Add(n);
else
@@ -529,6 +532,9 @@ namespace OpenRA
for (var i = 0; i < nodes.Count; i++)
{
var node = nodes[i];
if (node.Key == null)
continue;
if (node.Key.StartsWith('-'))
{
if (ret == null)
@@ -599,6 +605,9 @@ namespace OpenRA
void MergeNode(MiniYamlNode node)
{
if (node.Key == null)
return;
// Append Removal nodes to the result.
// Therefore: we know the remainder of the method deals with a plain node.
if (node.Key.StartsWith('-'))