fileNames in Before and after

Sébastien Geiser · Sébastien Geiser · commit d6d432a4b604 · 2019-05-20T10:56:51.000+02:00
diff --git a/RegexDialog/RegExToolDialog.xaml b/RegexDialog/RegExToolDialog.xaml
@@ -346,8 +346,8 @@
                                     <TextBlock>- <Bold>fileIndex</Bold> : (If in directory search) the index of the file</TextBlock>
                                     <TextBlock Margin="0,5,0,0">You can add specific usings between <Bold>#usings</Bold> and <Bold>#usings</Bold></TextBlock>
                                     <TextBlock>You can declare shared variables, properties or methods putting code between <Bold>#global</Bold> and <Bold>#endglobal</Bold></TextBlock>
-                                    <TextBlock>Between <Bold>#before</Bold> and <Bold>#endbefore</Bold> you get the <Bold>text</Bold> before it is used as input of the regex by returning a string you can redefine it.</TextBlock>
-                                    <TextBlock>Between <Bold>#after</Bold> and <Bold>#endafter</Bold> you get the <Bold>text</Bold> after it is processed by the regex by returning a string you can modify it a last time.</TextBlock>
+                                    <TextBlock>Between <Bold>#before</Bold> and <Bold>#endbefore</Bold> you get the <Bold>text</Bold> and the<Bold>fileName</Bold> before it is used as input of the regex by returning a string you can redefine it.</TextBlock>
+                                    <TextBlock>Between <Bold>#after</Bold> and <Bold>#endafter</Bold> you get the <Bold>text</Bold> and the<Bold>fileName</Bold> after it is processed by the regex by returning a string you can modify it a last time.</TextBlock>
                                 </StackPanel>
                             </CheckBox.ToolTip>
                         </CheckBox>
diff --git a/RegexDialog/RegExToolDialog.xaml.cs b/RegexDialog/RegExToolDialog.xaml.cs
@@ -616,7 +616,7 @@ private void ReplaceAllButton_Click(object sender, RoutedEventArgs e)
                                 {
                                     if (TryOpen?.Invoke(fileName, false) ?? false)
                                     {
-                                        text = script.Before(GetText());
+                                        text = script.Before(GetText(), fileName);
                                         int matchesCount = regex.Matches(text).Count;
 
                                         if (matchesCount > 0)
@@ -628,7 +628,7 @@ private void ReplaceAllButton_Click(object sender, RoutedEventArgs e)
                                                 index++;
                                                 nbrOfElementToReplace++;
                                                 return script.Replace(match, index, fileName, nbrOfElementToReplace, files);
-                                            })));
+                                            }), fileName, null));
 
                                             try
                                             {
@@ -641,7 +641,7 @@ private void ReplaceAllButton_Click(object sender, RoutedEventArgs e)
                                     }
                                     else
                                     {
-                                        text = script.Before(File.ReadAllText(fileName));
+                                        text = script.Before(File.ReadAllText(fileName), fileName);
                                         int matchesCount = regex.Matches(text).Count;
 
                                         if (matchesCount > 0)
@@ -653,7 +653,7 @@ private void ReplaceAllButton_Click(object sender, RoutedEventArgs e)
                                                 index++;
                                                 nbrOfElementToReplace++;
                                                 return script.Replace(match, index, fileName, nbrOfElementToReplace, files);
-                                            })));
+                                            }), fileName, null));
 
                                             files++;
                                         }
@@ -662,24 +662,27 @@ private void ReplaceAllButton_Click(object sender, RoutedEventArgs e)
                             });
                             break;
                         case RegexTextSource.CurrentSelection:
-                            text = script.Before(GetCurrentText());
+                            string currentFileName = GetCurrentFileName?.Invoke() ?? string.Empty;
+                            text = script.Before(GetCurrentText(), currentFileName);
                             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, GetCurrentFileName?.Invoke() ?? string.Empty, index, 0);
-                            })));
+                                return script.Replace(match, index, currentFileName, index, 0);
+                            }), currentFileName, null));
                             break;
                         default:
-                            text = script.Before(GetCurrentText());
+                            currentFileName = GetCurrentFileName?.Invoke() ?? string.Empty;
+                            text = script.Before(GetCurrentText(), currentFileName);
                             nbrOfElementToReplace = regex.Matches(text).Count;
                             SetText(script.After(regex.Replace(text, match =>
                             {
                                 index++;
-                                return script.Replace(match, index, GetCurrentFileName?.Invoke() ?? string.Empty, index, 0);
-                            })));
+                                return script.Replace(match, index, currentFileName, index, 0);
+                            }), currentFileName, null));
                             break;
                     }
                 }
@@ -845,19 +848,24 @@ void Extract(string text, string fileName = "")
                     }
                 }
 
+                string currentFileName = null;
+                List<string> fileNames = null;
+
                 if (Config.Instance.TextSourceOn == RegexTextSource.Directory)
                 {
-                    GetFiles().ForEach(fileName => Extract(File.ReadAllText(fileName), fileName));
+                    fileNames = GetFiles();
+                    fileNames.ForEach(fileName => Extract(File.ReadAllText(fileName), fileName));
                 }
                 else
                 {
-                    Extract(GetCurrentText(), GetCurrentFileName?.Invoke() ?? string.Empty);
+                    currentFileName = GetCurrentFileName?.Invoke() ?? string.Empty;
+                    Extract(GetCurrentText(), currentFileName);
                 }
 
                 try
                 {
                     string result = sb.ToString();
-                    SetTextInNew(script?.After(result) ?? result);
+                    SetTextInNew(script?.After(result, currentFileName, fileNames) ?? result);
                 }
                 catch { }
             }
diff --git a/RegexDialog/Resources/CSharpReplaceContainer.cs b/RegexDialog/Resources/CSharpReplaceContainer.cs
@@ -28,14 +28,14 @@ public string Replace(Match match, Group group, Capture capture, int matchIndex,
         //code
     }
 
-    public string Before(string text)
+    public string Before(string text, string fileName)
     {
         //before
         return text;
         //end
     }
 
-    public string After(string text)
+    public string After(string text, string fileName, List<string> fileNames = null)
     {
         //after
         return text;

Original file line number	Diff line number	Diff line change
`@@ -616,7 +616,7 @@ private void ReplaceAllButton_Click(object sender, RoutedEventArgs e)`
`616`	`616`	`{`
`617`	`617`	`if (TryOpen?.Invoke(fileName, false) ?? false)`
`618`	`618`	`{`
`619`		`- text = script.Before(GetText());`
	`619`	`+ text = script.Before(GetText(), fileName);`
`620`	`620`	`int matchesCount = regex.Matches(text).Count;`
`621`	`621`
`622`	`622`	`if (matchesCount > 0)`
`@@ -628,7 +628,7 @@ private void ReplaceAllButton_Click(object sender, RoutedEventArgs e)`
`628`	`628`	`index++;`
`629`	`629`	`nbrOfElementToReplace++;`
`630`	`630`	`return script.Replace(match, index, fileName, nbrOfElementToReplace, files);`
`631`		`- })));`
	`631`	`+ }), fileName, null));`
`632`	`632`
`633`	`633`	`try`
`634`	`634`	`{`
`@@ -641,7 +641,7 @@ private void ReplaceAllButton_Click(object sender, RoutedEventArgs e)`
`641`	`641`	`}`
`642`	`642`	`else`
`643`	`643`	`{`
`644`		`- text = script.Before(File.ReadAllText(fileName));`
	`644`	`+ text = script.Before(File.ReadAllText(fileName), fileName);`
`645`	`645`	`int matchesCount = regex.Matches(text).Count;`
`646`	`646`
`647`	`647`	`if (matchesCount > 0)`
`@@ -653,7 +653,7 @@ private void ReplaceAllButton_Click(object sender, RoutedEventArgs e)`
`653`	`653`	`index++;`
`654`	`654`	`nbrOfElementToReplace++;`
`655`	`655`	`return script.Replace(match, index, fileName, nbrOfElementToReplace, files);`
`656`		`- })));`
	`656`	`+ }), fileName, null));`
`657`	`657`
`658`	`658`	`files++;`
`659`	`659`	`}`
`@@ -662,24 +662,27 @@ private void ReplaceAllButton_Click(object sender, RoutedEventArgs e)`
`662`	`662`	`});`
`663`	`663`	`break;`
`664`	`664`	`case RegexTextSource.CurrentSelection:`
`665`		`- text = script.Before(GetCurrentText());`
	`665`	`+ string currentFileName = GetCurrentFileName?.Invoke() ?? string.Empty;`
	`666`	`+ text = script.Before(GetCurrentText(), currentFileName);`
`666`	`667`	`nbrOfElementToReplace = regex.Matches(text).Count;`
`667`	`668`	`lastSelectionStart = GetSelectionStartIndex?.Invoke() ?? 0;`
`668`	`669`	`lastSelectionLength = GetSelectionLength?.Invoke() ?? 0;`
	`670`	`+`
`669`	`671`	`SetSelectedText(script.After(regex.Replace(text, match =>`
`670`	`672`	`{`
`671`	`673`	`index++;`
`672`		`- return script.Replace(match, index, GetCurrentFileName?.Invoke() ?? string.Empty, index, 0);`
`673`		`- })));`
	`674`	`+ return script.Replace(match, index, currentFileName, index, 0);`
	`675`	`+ }), currentFileName, null));`
`674`	`676`	`break;`
`675`	`677`	`default:`
`676`		`- text = script.Before(GetCurrentText());`
	`678`	`+ currentFileName = GetCurrentFileName?.Invoke() ?? string.Empty;`
	`679`	`+ text = script.Before(GetCurrentText(), currentFileName);`
`677`	`680`	`nbrOfElementToReplace = regex.Matches(text).Count;`
`678`	`681`	`SetText(script.After(regex.Replace(text, match =>`
`679`	`682`	`{`
`680`	`683`	`index++;`
`681`		`- return script.Replace(match, index, GetCurrentFileName?.Invoke() ?? string.Empty, index, 0);`
`682`		`- })));`
	`684`	`+ return script.Replace(match, index, currentFileName, index, 0);`
	`685`	`+ }), currentFileName, null));`
`683`	`686`	`break;`
`684`	`687`	`}`
`685`	`688`	`}`
`@@ -845,19 +848,24 @@ void Extract(string text, string fileName = "")`
`845`	`848`	`}`
`846`	`849`	`}`
`847`	`850`
	`851`	`+ string currentFileName = null;`
	`852`	`+ List<string> fileNames = null;`
	`853`	`+`
`848`	`854`	`if (Config.Instance.TextSourceOn == RegexTextSource.Directory)`
`849`	`855`	`{`
`850`		`- GetFiles().ForEach(fileName => Extract(File.ReadAllText(fileName), fileName));`
	`856`	`+ fileNames = GetFiles();`
	`857`	`+ fileNames.ForEach(fileName => Extract(File.ReadAllText(fileName), fileName));`
`851`	`858`	`}`
`852`	`859`	`else`
`853`	`860`	`{`
`854`		`- Extract(GetCurrentText(), GetCurrentFileName?.Invoke() ?? string.Empty);`
	`861`	`+ currentFileName = GetCurrentFileName?.Invoke() ?? string.Empty;`
	`862`	`+ Extract(GetCurrentText(), currentFileName);`
`855`	`863`	`}`
`856`	`864`
`857`	`865`	`try`
`858`	`866`	`{`
`859`	`867`	`string result = sb.ToString();`
`860`		`- SetTextInNew(script?.After(result) ?? result);`
	`868`	`+ SetTextInNew(script?.After(result, currentFileName, fileNames) ?? result);`
`861`	`869`	`}`
`862`	`870`	`catch { }`
`863`	`871`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,14 +28,14 @@ public string Replace(Match match, Group group, Capture capture, int matchIndex,`
`28`	`28`	`//code`
`29`	`29`	`}`
`30`	`30`
`31`		`- public string Before(string text)`
	`31`	`+ public string Before(string text, string fileName)`
`32`	`32`	`{`
`33`	`33`	`//before`
`34`	`34`	`return text;`
`35`	`35`	`//end`
`36`	`36`	`}`
`37`	`37`
`38`		`- public string After(string text)`
	`38`	`+ public string After(string text, string fileName, List<string> fileNames = null)`
`39`	`39`	`{`
`40`	`40`	`//after`
`41`	`41`	`return text;`