bugfix: ignore subsystems in comments

Achille44 · Jan 8, 2023 · 98502d9 · 98502d9
1 parent 8006d8f
commit 98502d9
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/FreeSpace2TranslationTools/Services/Regexp.cs b/FreeSpace2TranslationTools/Services/Regexp.cs
@@ -17,8 +17,8 @@ public static class Regexp
         private static readonly Regex _Xstr = new("XSTR\\s*\\(\\s*(\".*?\")\\s*,\\s*(-?\\d+)\\s*\\)", RegexOptions.Singleline | RegexOptions.Compiled);
         public static Regex Xstr { get => _Xstr; }
 
-        // don't select entries in comment...
-        private static readonly Regex _NoAltNames = new(@"([^;]\$Name:[ \t]*(.*?)\r\n(?:[ \t]*\+nocreate[ \t]*\r\n)?)(((?!\$Alt Name|\+nocreate).)*?\r\n)", RegexOptions.Singleline | RegexOptions.Compiled);
+        // don't select entries in comment... but take into account comments between $Name and +nocreate
+        private static readonly Regex _NoAltNames = new(@"([^;]\$Name:[ \t]*(.*?)\r\n(?:;.*?\r\n)?(?:[ \t]*\+nocreate[ \t]*\r\n)?)(((?!\$Alt Name|\+nocreate).)*?\r\n)", RegexOptions.Singleline | RegexOptions.Compiled);
         public static Regex NoAltNames { get => _NoAltNames; }
 
         private static readonly Regex _AlternateTypes = new(@"#Alternate Types:.*?#end\r\n\r\n", RegexOptions.Singleline | RegexOptions.Compiled);
@@ -163,7 +163,7 @@ public static class Regexp
         private static readonly Regex _ShipNames = new(@"\$Name:(.*)$", RegexOptions.Compiled | RegexOptions.Multiline);
         public static Regex ShipNames { get => _ShipNames; }
 
-        private static readonly Regex _Subsystems = new(@"(\$Subsystem:[ \t]*([^\r\n]*?),[^\r\n]*?\r?\n)(.*?)(?=\$Subsystem:|$)", RegexOptions.Compiled | RegexOptions.Singleline);
+        private static readonly Regex _Subsystems = new(@"(?<!;)(\$Subsystem:[ \t]*([^\r\n]*?),[^\r\n]*?\r?\n)(.*?)(?=\$Subsystem:|$)", RegexOptions.Compiled | RegexOptions.Singleline);
         public static Regex Subsystems { get => _Subsystems; }
 
         private static readonly Regex _TechDescriptions = new(@"(\+Tech Description:[ \t]*)(.*?)\r\n", RegexOptions.Compiled);