Bumped version number

DevToys-app · Sep 18, 2022 · 5a8c0a5 · 5a8c0a5
1 parent 7343fc4
commit 5a8c0a5
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 20 deletions.
diff --git 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
+  • JSON Formatter wasn't sorting arrays
+  • JSON Formatter was failing to parse an empty array
+  • Wrong highlighting in Regex Tester
diff --git a/src/dev/impl/DevToys/LanguageManager.cs b/src/dev/impl/DevToys/LanguageManager.cs
@@ -2427,6 +2427,21 @@ public class RegExStrings : ObservableObject
         /// 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
@@ -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>
diff --git a/src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml.cs b/src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml.cs
@@ -317,7 +317,7 @@ private void ExecuteSelectAllCommand()
 
         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
@@ -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
@@ -208,7 +208,7 @@ internal string? ErrorMsg
             }
         }
 
-        internal ExtendedObservableCollection<MatchDetails2> MatchGroups { get; } = new();
+        internal ExtendedObservableCollection<MatchDetails> MatchGroups { get; } = new();
 
         private string? _inputValue;
         internal string? InputValue
@@ -311,16 +311,16 @@ await ThreadHelper.RunOnUIThreadAsync(() =>
                         {
                             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 @@ private int CountLines(string input, int maxLength)
         }
     }
 
-    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
@@ -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
@@ -1 +1 @@
-1.0.9.0
+1.0.10.0