C# as text source OK

Author: codingseb

RegexDialog/Model/RegexFileResult.cs

@@ -7,30 +7,15 @@ internal class RegexFileResult : RegexResult
         public RegexFileResult(Regex regex, Capture regexElement, int regexElementNb, string fileName) : base(regex, regexElement, regexElementNb, fileName, 0)
         {}
 
-        public override string Name
-        {
-            get
-            {
-                return $"File {RegexElementNb}: {Children.Count} matches found in \"{FileName}\"";
-            }
-        }
+        public override string Name => $"File {RegexElementNb}: {Children.Count} matches found in \"{FileName}\"";
 
         public override bool IsExpanded { get => true; }
 
         public override void RefreshExpands()
         {
-            Children.ForEach(delegate (RegexResult child)
-            {
-                child.RefreshExpands();
-            });
+            Children.ForEach(child => child.RefreshExpands());
         }
 
-        public override string ElementType
-        {
-            get
-            {
-                return "File";
-            }
-        }
+        public override string ElementType => "File";
     }
 }

RegexDialog/Model/RegexMatchResult.cs

@@ -12,7 +12,7 @@ public RegexMatchResult(Regex regex, Match match, int matchNb, string fileName =
             Children = match.Groups
                 .Cast<Group>()
                 .ToList()
-                .ConvertAll(delegate(Group group)
+                .ConvertAll(group =>
                 {
                     RegexResult result = new RegexGroupResult(regex, group, i, fileName, selectionIndex)
                     {
@@ -34,10 +34,7 @@ public override void RefreshExpands()
         {
             if (Config.Instance.MatchesShowLevel > 1)
             {
-                Children.ForEach(delegate(RegexResult child)
-                {
-                    child.RefreshExpands();    
-                });
+                Children.ForEach(child => child.RefreshExpands());
 
                 IsExpanded = true;
             }

RegexDialog/RegExToolDialog.xaml.cs

@@ -226,7 +226,7 @@ private void Init()
 
             // Construit l'arbre des éléments de languages de replace.
             BuildReplaceLanguageElements();
-           
+
             csEval
                 .ReferenceAssemblyOf(this)
                 .ReferenceDomainAssemblies()
@@ -567,6 +567,14 @@ List<RegexResult> GetMatchesFor(string text, string fileName = "", int selection
 
                         MatchesResultLabel.Content = $"{i} matches [Index,Length] + {countAllCaptures - i} empties matches found in {ff}/{ft} files";
                     }
+                    else if(Config.Instance.TextSourceOn == RegexTextSource.CSharpScript)
+                    {
+                        dynamic sourceScript = CSharpTextSourceScript;
+
+                        MatchResultsTreeView.ItemsSource = GetMatchesFor(sourceScript.Get().ToString(), "script");
+
+                        MatchesResultLabel.Content = $"{i} matches [Index,Length] + {countAllCaptures - i} empties matches";
+                    }
                     else
                     {
                         lastMatchesText = GetText();
@@ -681,13 +689,23 @@ private void ReplaceAllButton_Click(object sender, RoutedEventArgs e)
                             nbrOfElementToReplace = regex.Matches(text).Count;
                             lastSelectionStart = GetSelectionStartIndex?.Invoke() ?? 0;
                             lastSelectionLength = GetSelectionLength?.Invoke() ?? 0;
-                            
+
                             SetSelectedText(script.After(regex.Replace(text, match =>
                             {
                                 index++;
                                 return script.Replace(match, index, currentFileName, index, 0);
                             }), currentFileName, null));
                             break;
+                        case RegexTextSource.CSharpScript:
+                            dynamic scriptSource = CSharpTextSourceScript;
+                            text = script.Before(scriptSource.Get().ToString(), "script");
+                            nbrOfElementToReplace = regex.Matches(text).Count;
+                            SetTextInNew(script.After(regex.Replace(text, match =>
+                            {
+                                index++;
+                                return script.Replace(match, index, "script", index, 0);
+                            }), "script", null));
+                            break;
                         default:
                             currentFileName = GetCurrentFileName?.Invoke() ?? string.Empty;
                             text = script.Before(GetCurrentText(), currentFileName);
@@ -754,6 +772,12 @@ private void ReplaceAllButton_Click(object sender, RoutedEventArgs e)
                             nbrOfElementToReplace = regex.Matches(text).Count;
                             SetSelectedText(regex.Replace(text, ReplaceEditor.Text));
                             break;
+                        case RegexTextSource.CSharpScript:
+                            dynamic script = CSharpTextSourceScript;
+                            text = script.Get().ToString();
+                            nbrOfElementToReplace = regex.Matches(text).Count;
+                            SetTextInNew(regex.Replace(text, ReplaceEditor.Text));
+                            break;
                         default:
                             text = GetCurrentText();
                             nbrOfElementToReplace = regex.Matches(text).Count;
@@ -870,6 +894,11 @@ void Extract(string text, string fileName = "")
                     fileNames = GetFiles();
                     fileNames.ForEach(fileName => Extract(File.ReadAllText(fileName), fileName));
                 }
+                else if(Config.Instance.TextSourceOn == RegexTextSource.CSharpScript)
+                {
+                    dynamic sourceScript = CSharpTextSourceScript;
+                    Extract(sourceScript.Get().ToString(), "script");
+                }
                 else
                 {
                     currentFileName = GetCurrentFileName?.Invoke() ?? string.Empty;
@@ -981,14 +1010,17 @@ private void MatchResultsTreeView_SelectedItemChanged(object sender, RoutedPrope
                 {
                     RegexResult regexResult = e.NewValue as RegexResult;
 
-                    if (regexResult?.FileName.Length > 0)
+                    if (!regexResult?.FileName.Equals("script") ?? true)
                     {
-                        if ((TryOpen?.Invoke(regexResult.FileName, true) ?? false) && !(regexResult is RegexFileResult))
+                        if (regexResult?.FileName.Length > 0)
+                        {
+                            if ((TryOpen?.Invoke(regexResult.FileName, true) ?? false) && !(regexResult is RegexFileResult))
+                                SetPosition(regexResult.Index, regexResult.Length);
+                        }
+                        else if (regexResult != null && lastMatchesText.Equals(GetText()))
+                        {
                             SetPosition(regexResult.Index, regexResult.Length);
-                    }
-                    else if (regexResult != null && lastMatchesText.Equals(GetText()))
-                    {
-                        SetPosition(regexResult.Index, regexResult.Length);
+                        }
                     }
                 }
                 catch
@@ -1722,7 +1754,6 @@ private void Save_as_MenuItem_Click(object sender, RoutedEventArgs e)
                         replacePatternElement.AppendChild(replacePatternText);
                         optionsElement.AppendChild(optionsText);
 
-
                         xmlDoc.Save(dialog.FileName);
                     }
                     catch (Exception ex)

RegexDialog/RegexDialog.csproj

@@ -217,6 +217,7 @@
     <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
     </Reference>
+    <Reference Include="System.Web" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.SDK.Expression.Blend.1.0.0\lib\net45\System.Windows.Interactivity.dll</HintPath>