Skip to content

Commit 37fa3e1

Browse files
author
Sébastien Geiser
committed
Code export in progress
1 parent 968c7cd commit 37fa3e1

File tree

7 files changed

+90
-20
lines changed

7 files changed

+90
-20
lines changed

‎RegexDialog/RegExToolDialog.xaml.cs‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1743,15 +1743,14 @@ private void OpenRegex()
17431743
.Replace("#CSharpTextSource\r\n", string.Empty) ?? string.Empty;
17441744
if(Enum.TryParse(root.SelectNodes("//comment()")
17451745
.Cast<XmlComment>()
1746-
.FirstOrDefault(c => c.Value.StartsWith("#TextSource"))
1746+
.FirstOrDefault(c => c.Value.StartsWith("#TextSource"))?
17471747
.Value
17481748
.Replace("#TextSource ", string.Empty)
17491749
, out RegexTextSource regexTextSource))
17501750
{
17511751
Config.Instance.TextSourceOn = regexTextSource;
17521752
}
17531753

1754-
17551754
string[] xOptions = root.SelectSingleNode("//Options").InnerText.Split(' ');
17561755

17571756
regExOptionViewModelsList.ForEach((RegExOptionViewModel optionModel) => optionModel.Selected = xOptions.Contains(optionModel.Name));
@@ -2133,24 +2132,36 @@ private void ExportToVisualStudio_Click(object sender, RoutedEventArgs e)
21332132
string textSourceFile = Path.Combine(projectDirectory, "TextSource.txt");
21342133
string projectGuid = Guid.NewGuid().ToString();
21352134
string resourcesForCsProj = string.Empty;
2135+
21362136
string options = regExOptionViewModelsList.Count(option => option.Selected) == 0
21372137
? "RegexOptions.None"
21382138
: string.Join(" | ",
21392139
regExOptionViewModelsList
21402140
.FindAll(option => option.Selected)
21412141
.Select(option => "RegexOptions." + option.RegexOptions.ToString()));
21422142

2143+
// The base stuff for the entry code
21432144
string programCode = Res.VSProgram
2144-
.Replace("projectname", projectName)
2145+
.Replace("_projectname_", projectName)
21452146
.Replace("$pattern$", Config.Instance.RegexEditorText.ToLiteral())
2146-
.Replace("$replacement$", Config.Instance.ReplaceEditorText.ToLiteral())
21472147
.Replace("_options_", options);
21482148

21492149
Directory.CreateDirectory(projectDirectory);
21502150

2151+
// Modify entry code for CSharp replace (with a lambda of type Func<Match, string>)
21512152
if (Config.Instance.CSharpReplaceMode)
21522153
{
21532154
File.WriteAllText(replaceFile, ReplaceScriptForMatch);
2155+
programCode = programCode
2156+
.Replace("\r\n private readonly static string replacement = \"$replacement$\";", string.Empty)
2157+
.Replace("//code", string.Empty);
2158+
}
2159+
// Modify entry code for standard replacement.
2160+
else
2161+
{
2162+
programCode = programCode
2163+
.Replace("$replacement$", Config.Instance.ReplaceEditorText.ToLiteral())
2164+
.Replace("//code", Res.StandardReplaceCode);
21542165
}
21552166

21562167
// Write text source as specific cs file if in CSharpScript

‎RegexDialog/RegexDialog.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,8 @@
269269
<DependentUpon>Res.resx</DependentUpon>
270270
</Compile>
271271
<None Include="Resources\VSProgram.cs" />
272+
<Resource Include="Resources\StandardReplaceCode.cs" />
273+
<Resource Include="Resources\CSharpReplaceCallingCode.cs" />
272274
<Compile Include="Utils\Config.cs" />
273275
<Compile Include="Properties\AssemblyInfo.cs" />
274276
<Compile Include="Model\RegexCaptureResult.cs" />

‎RegexDialog/Res.Designer.cs‎

Lines changed: 37 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎RegexDialog/Res.resx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,9 @@
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120120
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121+
<data name="CSharpReplaceCallingCode" type="System.Resources.ResXFileRef, System.Windows.Forms">
122+
<value>resources\csharpreplacecallingcode.cs;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
123+
</data>
121124
<data name="CSharpReplaceContainer" type="System.Resources.ResXFileRef, System.Windows.Forms">
122125
<value>resources\csharpreplacecontainer.cs;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
123126
</data>
@@ -133,6 +136,9 @@
133136
<data name="Replace_syntax_color" type="System.Resources.ResXFileRef, System.Windows.Forms">
134137
<value>resources\replace_syntax_color.xshd;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1</value>
135138
</data>
139+
<data name="StandardReplaceCode" type="System.Resources.ResXFileRef, System.Windows.Forms">
140+
<value>resources\standardreplacecode.cs;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
141+
</data>
136142
<data name="TextSourceAsResourceInCsProj" type="System.Resources.ResXFileRef, System.Windows.Forms">
137143
<value>resources\textsourceasresourceincsproj.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
138144
</data>

‎RegexDialog/Resources/CSharpReplaceCallingCode.cs‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
 CSharpReplaceContainer container = new CSharpReplaceContainer();
2+
3+
string fileName = "-";
4+
5+
input = container.Before(input, fileName);
6+
7+
int index = -1;
8+
// To make a replace
9+
string replace = regex.Replace(input, match =>
10+
{
11+
index++;
12+
container.Replace(match, index, fileName, index, 0);
13+
});
14+
15+
replace = container.After(replace, fileName);
16+
17+
Console.WriteLine(replace);

‎RegexDialog/Resources/StandardReplaceCode.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
 // To make a replace
2+
string replace = regex.Replace(input, replacement);
3+
Console.WriteLine(replace);
4+
5+
//To get all matches
6+
MatchCollection matches = regex.Matches(input);
7+
Console.WriteLine(string.Join("\r\n", matches.Cast<Match>().Select(match => match.Value)));

‎RegexDialog/Resources/VSProgram.cs‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,21 @@
11
using System;
22
using System.Linq;
3-
using System.Text;
43
using System.Text.RegularExpressions;
54

6-
namespace projectname
5+
namespace _projectname_
76
{
87
class Program
98
{
10-
private static string pattern = "$pattern$";
11-
private static string replacement = "$replacement$";
12-
private static RegexOptions options = _options_;
13-
private static Regex regex = new Regex(pattern, options);
9+
private readonly static string pattern = "$pattern$";
10+
private readonly static string replacement = "$replacement$";
11+
private readonly static RegexOptions options = _options_;
12+
private readonly static Regex regex = new Regex(pattern, options);
1413

1514
private static string input = (new TextSourceContainer()).Get().ToString();
1615

1716
static void Main(string[] args)
1817
{
19-
// To make a replace
20-
string replace = regex.Replace(input, replacement);
21-
Console.WriteLine(replace);
22-
23-
//To get all matches
24-
MatchCollection matches = regex.Matches(input);
25-
Console.WriteLine(string.Join("\r\n", matches.Cast<Match>().Select(match => match.Value)));
18+
//code
2619
}
2720
}
2821
}

0 commit comments

Comments
 (0)