Extract RemoveWS

sarbian · Sep 19, 2017 · 180c2ee · 180c2ee
1 parent 6b817fc
commit 180c2ee
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 20 deletions.
diff --git a/ModuleManager/Extensions/StringExtensions.cs b/ModuleManager/Extensions/StringExtensions.cs
@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Text.RegularExpressions;
 
 namespace ModuleManager.Extensions
 {
@@ -19,5 +17,12 @@ public static bool IsBracketBalanced(this string s)
             }
             return level == 0;
         }
+
+        private static Regex whitespaceRegex = new Regex(@"\s+");
+
+        public static string RemoveWS(this string withWhite)
+        {
+            return whitespaceRegex.Replace(withWhite, "");
+        }
     }
 }
diff --git a/ModuleManager/MMPatchLoader.cs b/ModuleManager/MMPatchLoader.cs
@@ -189,7 +189,7 @@ private void PrePatchInit()
                     progress.PatchAdded();
                     if (name.Contains(":FOR["))
                     {
-                        name = RemoveWS(name);
+                        name = name.RemoveWS();
 
                         // check for FOR[] blocks that don't match loaded DLLs and add them to the pass list
                         try
@@ -216,7 +216,7 @@ private void PrePatchInit()
             foreach (string subdir in Directory.GetDirectories(gameData))
             {
                 string name = Path.GetFileName(subdir);
-                string cleanName = RemoveWS(name);
+                string cleanName = name.RemoveWS();
                 if (!mods.Contains(cleanName, StringComparer.OrdinalIgnoreCase))
                 {
                     mods.Add(cleanName);
@@ -947,7 +947,7 @@ private void PurgeUnused()
         {
             foreach (UrlDir.UrlConfig mod in GameDatabase.Instance.root.AllConfigs.ToArray())
             {
-                string name = RemoveWS(mod.type);
+                string name = mod.type.RemoveWS();
 
                 if (CommandParser.Parse(name, out name) != Command.Insert)
                     mod.parent.configs.Remove(mod);
@@ -975,7 +975,7 @@ public IEnumerator ApplyPatch(string Stage, IEnumerable<UrlDir.UrlConfig> patche
             {
                 try
                 {
-                    string name = RemoveWS(mod.type);
+                    string name = mod.type.RemoveWS();
                     Command cmd = CommandParser.Parse(name, out string tmp);
 
                     if (cmd == Command.Insert)
@@ -1386,7 +1386,7 @@ public static ConfigNode ModifyNode(NodeStack original, ConfigNode mod, PatchCon
 
             foreach (ConfigNode subMod in mod.nodes)
             {
-                subMod.name = RemoveWS(subMod.name);
+                subMod.name = subMod.name.RemoveWS();
 
                 if (!subMod.name.IsBracketBalanced())
                 {
@@ -2041,22 +2041,12 @@ private static string ProcessVariableSearch(string value, NodeStack nodeStack, P
 
         #endregion Applying Patches
 
-        #region Sanity checking & Utility functions
-
-        public static string RemoveWS(string withWhite)
-        {
-            // Removes ALL whitespace of a string.
-            return new string(withWhite.ToCharArray().Where(c => !Char.IsWhiteSpace(c)).ToArray());
-        }
-
-        #endregion Sanity checking & Utility functions
-
         #region Condition checking
 
         // Split condiction while not getting lost in embeded brackets
         public static List<string> SplitConstraints(string condition)
         {
-            condition = RemoveWS(condition) + ",";
+            condition = condition.RemoveWS() + ",";
             List<string> conditions = new List<string>();
             int start = 0;
             int level = 0;
@@ -2079,7 +2069,7 @@ public static List<string> SplitConstraints(string condition)
 
         public static bool CheckConstraints(ConfigNode node, string constraints)
         {
-            constraints = RemoveWS(constraints);
+            constraints = constraints.RemoveWS();
 
             if (constraints.Length == 0)
                 return true;

diff --git a/ModuleManagerTests/Extensions/StringExtensionsTest.cs b/ModuleManagerTests/Extensions/StringExtensionsTest.cs
@@ -27,10 +27,17 @@ public void TestIsBracketBalanced__Unbalanced()
             Assert.False("abc[def[ghi[jkl]mno[pqr]]stuvwx".IsBracketBalanced());
             Assert.False("abcdef[ghi[jkl]mno[pqr]]stu]vwx".IsBracketBalanced());
         }
+
         [Fact]
         public void TestIsBracketBalanced__BalancedButNegative()
         {
             Assert.False("abc]def[ghi".IsBracketBalanced());
         }
+
+        [Fact]
+        public void TestRemoveWS()
+        {
+            Assert.Equal("abcdef", " abc \tdef\r\n\t ".RemoveWS());
+        }
     }
 }