Refactoring

Author: Sébastien Geiser

RegexDialog/Converters/ExpressionEvalConverter.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.Windows.Data;
 using System.Windows.Markup;

RegexDialog/RegExToolDialog.xaml.cs

@@ -5,8 +5,6 @@
 using Newtonsoft.Json;
 using Ookii.Dialogs.Wpf;
 using System;
-using System.CodeDom;
-using System.CodeDom.Compiler;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
@@ -76,8 +74,8 @@ private string InjectInReplaceScript(string replaceScript)
                         cSharpReplaceSpecialZoneCleaningRegex.Replace(ReplaceEditor.Text, string.Empty)
                         , match => match.Groups["start"].Value + "\t\t" + match.Groups["notend"].Value)
                     .TrimStart())
-                .RegexReplace("//before[^/]+//end", beforeMatch.Success ? beforeMatch.Groups["before"].Value : "return text;", RegexOptions.Singleline)
-                .RegexReplace("//after[^/]+//end", afterMatch.Success ? afterMatch.Groups["after"].Value : "return text;", RegexOptions.Singleline);
+                .Replace("//before", beforeMatch.Success ? beforeMatch.Groups["before"].Value : "return text;")
+                .Replace("//after", afterMatch.Success ? afterMatch.Groups["after"].Value : "return text;");
         }
 
         public string ReplaceScriptForMatch => InjectInReplaceScript(

RegexDialog/Utils/Extensions.cs

@@ -2,11 +2,8 @@
 using System.CodeDom;
 using System.CodeDom.Compiler;
 using System.IO;
-using System.Linq;
-using System.Reflection;
 using System.Security;
 using System.Text.RegularExpressions;
-using System.Windows.Media;
 
 namespace RegexDialog
 {