Skip to content

Commit e4543e3

Browse files
committed
C#ColorHighlighting in replace editor
1 parent bafd9e8 commit e4543e3

File tree

2 files changed

+20
-12
lines changed

2 files changed

+20
-12
lines changed

RegexDialog/RegExToolDialog.xaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,8 @@
330330
<CheckBox x:Name="CSharpReplaceCheckbox"
331331
Margin="5,0"
332332
IsChecked="{Binding CSharpReplaceMode}"
333+
Checked="CSharpReplaceCheckbox_IsChecked_Changed"
334+
Unchecked="CSharpReplaceCheckbox_IsChecked_Changed"
333335
VerticalAlignment="Center"
334336
Content="_C#"
335337
ToolTipService.ShowDuration="600000">

RegexDialog/RegExToolDialog.xaml.cs

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,7 @@ private void Init()
197197

198198
RegexEditor.SyntaxHighlighting = HighlightingLoader.Load(reader, HighlightingManager.Instance);
199199

200-
// Application de la coloration syntaxique pour les chaines de remplacement
201-
XmlReader reader2 = XmlReader.Create(new StringReader(Res.Replace_syntax_color));
202-
203-
ReplaceEditor.SyntaxHighlighting = HighlightingLoader.Load(reader2, HighlightingManager.Instance);
200+
RefreshReplaceEditorSyntaxHighlighting();
204201

205202
// Abonnement au changement de position du curseur de texte pour la coloration des parentèses
206203
RegexEditor.TextArea.Caret.PositionChanged += Caret_PositionChanged;
@@ -1944,18 +1941,27 @@ private void ClearDirectoryFilterHistory_Click(object sender, RoutedEventArgs e)
19441941
}
19451942

19461943
private void CSharpReplaceCheckbox_IsChecked_Changed(object sender, RoutedEventArgs e)
1944+
{
1945+
RefreshReplaceEditorSyntaxHighlighting();
1946+
}
1947+
1948+
public void RefreshReplaceEditorSyntaxHighlighting()
19471949
{
19481950
try
19491951
{
1950-
if (CSharpReplaceCheckbox.IsChecked ?? false)
1952+
if (ReplaceEditor != null)
19511953
{
1952-
ReplaceEditor.SyntaxHighlighting = HighlightingManager.Instance.GetDefinition("C#");
1953-
}
1954-
else
1955-
{
1956-
XmlReader reader2 = XmlReader.Create(new StringReader(Res.Replace_syntax_color));
1957-
1958-
ReplaceEditor.SyntaxHighlighting = HighlightingLoader.Load(reader2, HighlightingManager.Instance);
1954+
if (CSharpReplaceCheckbox.IsChecked ?? false)
1955+
{
1956+
ReplaceEditor.SyntaxHighlighting = HighlightingManager.Instance.GetDefinition("C#");
1957+
}
1958+
else
1959+
{
1960+
using (XmlReader reader2 = XmlReader.Create(new StringReader(Res.Replace_syntax_color)))
1961+
{
1962+
ReplaceEditor.SyntaxHighlighting = HighlightingLoader.Load(reader2, HighlightingManager.Instance);
1963+
}
1964+
}
19591965
}
19601966
}
19611967
catch { }

0 commit comments

Comments
 (0)