Prevent comments confusing parser when sanitizing curly braces

Fix failing tests
bcssov · Dec 4, 2022 · 37845c9 · 37845c9
1 parent 882ad24
commit 37845c9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/IronyModManager.Parser.Tests/ModParserTests.cs b/src/IronyModManager.Parser.Tests/ModParserTests.cs
@@ -168,9 +168,12 @@ public void Should_parse_mod_file_with_invalid_quotations()
             sb.AppendLine(@"	""");
             sb.AppendLine(@"}");
 
+            // Behavior changes, parsed as the game would see it (I think)
             var parser = new ModParser(new Logger(), new CodeParser(new Logger()));
             var result = parser.Parse(sb.ToString().Split(Environment.NewLine, StringSplitOptions.RemoveEmptyEntries), Common.DescriptorModType.DescriptorMod);
-            result.Dependencies.Should().BeNull();
+            result.Dependencies.Should().NotBeNull();
+            result.Dependencies.Count().Should().Be(1);
+            result.Dependencies.FirstOrDefault().Should().Be("\r\n}");
             result.FileName.Should().Be("path");
             result.Name.Should().Be("AI Species \"Limit\"");
             result.Picture.Should().Be("thumbnail.png");

diff --git a/src/IronyModManager.Parser/CodeParser.cs b/src/IronyModManager.Parser/CodeParser.cs
@@ -89,9 +89,8 @@ public CodeParser(ILogger logger)
         public virtual IEnumerable<string> CleanCode(string file, IEnumerable<string> lines)
         {
             var commentId = IsLua(file) ? Common.Constants.Scripts.LuaScriptCommentId : Common.Constants.Scripts.ScriptCommentId.ToString();
-            var cleaned = FormatCurlyBraces(string.Join(Environment.NewLine, lines)).Split(Environment.NewLine, StringSplitOptions.RemoveEmptyEntries);
-            return cleaned.Where(p => !string.IsNullOrWhiteSpace(p) && !p.Trim().StartsWith(commentId))
-               .Select(p => FormatCodeTerminators(RemoveInlineComments(commentId, p)));
+            var validCodeLines = lines.Where(p => !string.IsNullOrWhiteSpace(p) && !p.Trim().StartsWith(commentId)).Select(p => RemoveInlineComments(commentId, p));
+            return FormatCurlyBraces(string.Join(Environment.NewLine, validCodeLines)).Split(Environment.NewLine, StringSplitOptions.RemoveEmptyEntries).Select(FormatCodeTerminators);
         }
 
         /// <summary>