Extraction with replacement when shift key down

Author: Sébastien Geiser

RegexDialog/RegExToolDialog.xaml

@@ -214,7 +214,7 @@
                 </Button>
                 <Button x:Name="ExtractMatchesButton" Click="ExtractMatchesButton_Click">
                     <StackPanel Orientation="Horizontal">
-                        <Image Source="{StaticResource ExtractPicture}" Width="16" Height="16" ToolTip="Extract All Matches"/>
+                        <Image Source="{StaticResource ExtractPicture}" Width="16" Height="16" ToolTip="Extract All Matches (Maintain [Shift] Key down to apply the replacement in the extraction)"/>
                     </StackPanel>
                 </Button>
                 <Button x:Name="ReplaceAllButton" Click="ReplaceAllButton_Click">

RegexDialog/RegExToolDialog.xaml.cs

@@ -392,12 +392,12 @@ private void Caret_PositionChanged(object sender, EventArgs e)
 
                     handled = true;
                 }
-                else if (posStringToMatchingPosDict.ContainsKey((pos).ToString()))
+                else if (posStringToMatchingPosDict.ContainsKey(pos.ToString()))
                 {
                     currentBracketColorizer.StartOffset = pos;
                     currentBracketColorizer.EndOffset = pos + 1;
-                    matchingBracketColorizer.StartOffset = posStringToMatchingPosDict[(pos).ToString()];
-                    matchingBracketColorizer.EndOffset = posStringToMatchingPosDict[(pos).ToString()] + 1;
+                    matchingBracketColorizer.StartOffset = posStringToMatchingPosDict[pos.ToString()];
+                    matchingBracketColorizer.EndOffset = posStringToMatchingPosDict[pos.ToString()] + 1;
 
                     handled = true;
                 }
@@ -902,16 +902,26 @@ void Extract(string text, string fileName = "")
                         if (Config.Instance.PrintFileNameWhenExtract)
                             sb.Append("\r\n").AppendLine(fileName);
 
-                        if (CSharpReplaceCheckbox.IsChecked.GetValueOrDefault())
+                        if (Keyboard.IsKeyDown(Key.LeftShift) || Keyboard.IsKeyDown(Key.LeftShift))
                         {
-                            int index = 0;
+                            if (CSharpReplaceCheckbox.IsChecked.GetValueOrDefault())
+                            {
+                                int index = 0;
 
-                            matches.ForEach(match =>
+                                matches.ForEach(match =>
+                                {
+                                    sb.Append(script.Replace(match, index, fileName, globalIndex, fileIndex));
+                                    globalIndex++;
+                                    index++;
+                                });
+                            }
+                            else
                             {
-                                sb.Append(script.Replace(match, index, fileName, globalIndex, fileIndex));
-                                globalIndex++;
-                                index++;
-                            });
+                                matches.ForEach(match =>
+                                {
+                                    sb.Append(match.Result(ReplaceEditor.Text));
+                                });
+                            }
                         }
                         else
                         {