Skip to content

A Swiss Army knife for developers.

Bumped version number

Etienne Baudouxcfb1f5ff29fb
diff --git a/src/dev/impl/DevToys/Assets/ReleaseNote.txt b/src/dev/impl/DevToys/Assets/ReleaseNote.txt
index f56d08547..2009a728e 100644
--- a/src/dev/impl/DevToys/Assets/ReleaseNote.txt
+++ b/src/dev/impl/DevToys/Assets/ReleaseNote.txt
@@ -1,11 +1,10 @@
ο»ΏπŸŽ‰ New Features
- β€’ CRON Parser!
- β€’ XML Validator!
- β€’ Color Picker & Contrast!
+ β€’ JWT Decoder can now also Encode!
πŸ‘ Improvements
- β€’ Added and updated many translations
- β€’ New option in JSON Formatter, Hash Generator and Settings
- β€’ Consistent font everywhere
- β€’ Start-up performance
+ β€’ Regex Tester shows matching groups
+ β€’ Better handling of brackets in SQL Formatter
+ β€’ Smart Detection now prioritize favorite tools
πŸ› Bug Fixes
- β€’ Inconsistencies in YAML to JSON Converter and JSON Formatter
\ No newline at end of file
+ β€’ JSON Formatter wasn't sorting arrays
+ β€’ JSON Formatter was failing to parse an empty array
+ β€’ Wrong highlighting in Regex Tester
\ No newline at end of file
diff --git a/src/dev/impl/DevToys/LanguageManager.cs b/src/dev/impl/DevToys/LanguageManager.cs
index acbfc2baa..1fb3edd14 100644
--- a/src/dev/impl/DevToys/LanguageManager.cs
+++ b/src/dev/impl/DevToys/LanguageManager.cs
@@ -2427,6 +2427,21 @@ namespace DevToys
/// Gets the resource OutputTitle.
/// </summary>
public string OutputTitle => _resources.GetString("OutputTitle");
+
+ /// <summary>
+ /// Gets the resource Group.
+ /// </summary>
+ public string Group => _resources.GetString("Group");
+
+ /// <summary>
+ /// Gets the resource Match.
+ /// </summary>
+ public string Match => _resources.GetString("Match");
+
+ /// <summary>
+ /// Gets the resource Matches.
+ /// </summary>
+ public string Matches => _resources.GetString("Matches");
}
public class SearchResultStrings : ObservableObject
diff --git a/src/dev/impl/DevToys/Strings/en-US/RegEx.resw b/src/dev/impl/DevToys/Strings/en-US/RegEx.resw
index 7292dac88..f29637918 100644
--- a/src/dev/impl/DevToys/Strings/en-US/RegEx.resw
+++ b/src/dev/impl/DevToys/Strings/en-US/RegEx.resw
@@ -192,4 +192,13 @@
<data name="OutputTitle" xml:space="preserve">
<value>Output</value>
</data>
+ <data name="Group" xml:space="preserve">
+ <value>Group</value>
+ </data>
+ <data name="Match" xml:space="preserve">
+ <value>Match</value>
+ </data>
+ <data name="Matches" xml:space="preserve">
+ <value>Matches</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml.cs b/src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml.cs
index e81e02445..6bc27ccdb 100644
--- a/src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml.cs
+++ b/src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml.cs
@@ -317,7 +317,7 @@ namespace DevToys.UI.Controls
public void SetHighlights(IEnumerable<HighlightSpan>? spans)
{
- _highlightedSpans = spans;
+ _highlightedSpans = spans ?? Array.Empty<HighlightSpan>();
if (!IsRichTextEdit)
{
diff --git a/src/dev/impl/DevToys/UI/Controls/ICustomTextBox.cs b/src/dev/impl/DevToys/UI/Controls/ICustomTextBox.cs
index 6cf33ffd1..9482b542a 100644
--- a/src/dev/impl/DevToys/UI/Controls/ICustomTextBox.cs
+++ b/src/dev/impl/DevToys/UI/Controls/ICustomTextBox.cs
@@ -6,7 +6,7 @@ namespace DevToys.UI.Controls
{
public interface ICustomTextBox
{
- void SetHighlights(IEnumerable<HighlightSpan> spans);
+ void SetHighlights(IEnumerable<HighlightSpan>? spans);
void ScrollToBottom();
}
diff --git a/src/dev/impl/DevToys/ViewModels/Tools/Text/RegEx/RegExToolViewModel.cs b/src/dev/impl/DevToys/ViewModels/Tools/Text/RegEx/RegExToolViewModel.cs
index 350a7d782..f6f9339e7 100644
--- a/src/dev/impl/DevToys/ViewModels/Tools/Text/RegEx/RegExToolViewModel.cs
+++ b/src/dev/impl/DevToys/ViewModels/Tools/Text/RegEx/RegExToolViewModel.cs
@@ -208,7 +208,7 @@ namespace DevToys.ViewModels.Tools.RegEx
}
}
- internal ExtendedObservableCollection<MatchDetails2> MatchGroups { get; } = new();
+ internal ExtendedObservableCollection<MatchDetails> MatchGroups { get; } = new();
private string? _inputValue;
internal string? InputValue
@@ -311,16 +311,16 @@ namespace DevToys.ViewModels.Tools.RegEx
{
MatchTextBox?.SetHighlights(spans);
- IEnumerable<MatchDetails2> matchesGroups
+ IEnumerable<MatchDetails> matchesGroups
= matches
.Cast<Match>()
.SelectMany(
(c, inx) => c.Groups
.Cast<Group>()
.OrderBy(g => g.Index)
- .Select(mm => new MatchDetails2
+ .Select(mm => new MatchDetails
{
- Title = (mm.Name == "0" ? $"Match {inx + 1}:" : $" Group \"{mm.Name}\""),
+ Title = (mm.Name == "0" ? $"{Strings.Match} {inx + 1}:" : $" {Strings.Group} \"{mm.Name}\""),
Range = $"{mm.Index}-{mm.Index + mm.Length}",
Value = mm.Value
}));
@@ -406,10 +406,12 @@ namespace DevToys.ViewModels.Tools.RegEx
}
}
- public record MatchDetails2
+ public record MatchDetails
{
- public string Title { get; set; }
- public string Range { get; set; }
- public string Value { get; set; }
+ public string Title { get; set; } = string.Empty;
+
+ public string Range { get; set; } = string.Empty;
+
+ public string Value { get; set; } = string.Empty;
}
}
diff --git a/src/dev/impl/DevToys/Views/Tools/Text/RegEx/RegExToolPage.xaml b/src/dev/impl/DevToys/Views/Tools/Text/RegEx/RegExToolPage.xaml
index c53bc3b4a..64d09fda5 100644
--- a/src/dev/impl/DevToys/Views/Tools/Text/RegEx/RegExToolPage.xaml
+++ b/src/dev/impl/DevToys/Views/Tools/Text/RegEx/RegExToolPage.xaml
@@ -132,7 +132,7 @@
Text="{x:Bind Mode=TwoWay, Path=ViewModel.Text, UpdateSourceTrigger=PropertyChanged}" />
<StackPanel Grid.Row="4" Spacing="4">
- <TextBlock Style="{StaticResource SubTitleTextBlock}" Text="Matches" />
+ <TextBlock Style="{StaticResource SubTitleTextBlock}" Text="{x:Bind Path=ViewModel.Strings.Matches}" />
<Grid
Grid.Row="4"
diff --git a/tools/app-version-number.txt b/tools/app-version-number.txt
index c92efd02d..eea150725 100644
--- a/tools/app-version-number.txt
+++ b/tools/app-version-number.txt
@@ -1 +1 @@
-1.0.9.0
\ No newline at end of file
+1.0.10.0
\ No newline at end of file