refactor: Misc fixes in Stride.Core.Translation.Extractor project

Author: Jklawreszuk

sources/tools/Stride.Core.Translation.Extractor/Exporters/ResxExporter.cs

@@ -34,7 +34,7 @@ internal class CSharpExtractor : ExtractorBase
         private const RegexOptions PatternOptions = RegexOptions.Compiled | RegexOptions.IgnorePatternWhitespace | RegexOptions.Multiline;
 
         private readonly (string, Regex)[] patterns =
-        {
+        [
             (nameof(ITranslationProvider.GetString),                 new Regex($@"{nameof(ITranslationProvider.GetString)}\s*\(\s*{CSharpStringPattern}", PatternOptions)),
             (nameof(ITranslationProvider.GetString),                 new Regex($@"{nameof(Tr._)}\s*\(\s*{CSharpStringPattern}", PatternOptions)),
             (nameof(ITranslationProvider.GetParticularString),       new Regex($@"{nameof(ITranslationProvider.GetParticularString)}\s*\(\s*{CSharpStringPattern}\s*,\s*{CSharpStringPattern}", PatternOptions)),
@@ -43,8 +43,8 @@ private readonly (string, Regex)[] patterns =
             (nameof(ITranslationProvider.GetPluralString),           new Regex($@"{nameof(Tr._n)}\s*\(\s*{CSharpStringPattern}\s*,\s*{CSharpStringPattern}", PatternOptions)),
             (nameof(ITranslationProvider.GetParticularPluralString), new Regex($@"{nameof(ITranslationProvider.GetParticularPluralString)}\s*\(\s*{CSharpStringPattern}\s*,\s*{CSharpStringPattern}\s*,\s*{CSharpStringPattern}", PatternOptions)),
             (nameof(ITranslationProvider.GetParticularPluralString), new Regex($@"{nameof(Tr._pn)}\s*\(\s*{CSharpStringPattern}\s*,\s*{CSharpStringPattern}\s*,\s*{CSharpStringPattern}", PatternOptions)),
-            (nameof(TranslationAttribute),                           new Regex($@"Translation\({CSharpStringPattern}(?:\s*,\s*{CSharpStringPattern})?(?:\s*,\s*{nameof(TranslationAttribute.Context)}\s*\=\s*{CSharpStringPattern})?", PatternOptions)),
-        };
+            (nameof(TranslationAttribute),                           new Regex($@"Translation\({CSharpStringPattern}(?:\s*,\s*{CSharpStringPattern})?(?:\s*,\s*{nameof(TranslationAttribute.Context)}\s*\=\s*{CSharpStringPattern})?", PatternOptions))
+        ];
 
         public CSharpExtractor([NotNull] ICollection<UFile> inputFiles)
             : base(inputFiles, ".cs")

sources/tools/Stride.Core.Translation.Extractor/Extractors/CSharpExtractor.cs

@@ -28,7 +28,7 @@ protected override IEnumerable<Message> ExtractMessagesFromFile(UFile file)
             catch (XamlException ex)
             {
                 Console.Error.WriteLine($"{file.ToOSPath()}: {ex.Message}");
-                return Enumerable.Empty<Message>();
+                return [];
             }
         }
 

sources/tools/Stride.Core.Translation.Extractor/Extractors/XamlExtractor.cs

@@ -14,17 +14,17 @@ internal class Options
         /// <summary>
         /// Patterns to exclude from the list of inputs.
         /// </summary>
-        public List<string> Excludes { get; } = new List<string>();
+        public List<string> Excludes { get; } = [];
 
         /// <summary>
         /// Directories to search for input files.
         /// </summary>
-        public List<string> InputDirs { get; } = new List<string>();
+        public List<string> InputDirs { get; } = [];
 
         /// <summary>
-        /// Patterns or input filnames to extract the messages from.
+        /// Patterns or input file names to extract the messages from.
         /// </summary>
-        public List<string> InputFiles { get; } = new List<string>();
+        public List<string> InputFiles { get; } = [];
 
         /// <summary>
         /// Name of generated catalog file.

sources/tools/Stride.Core.Translation.Extractor/Options.cs

@@ -16,26 +16,23 @@ namespace Stride.Core.Translation.Extractor
 {
     internal static class Program
     {
-        private static readonly LongOpt[] LOpts = {
-            new LongOpt("directory", Argument.Required, null, 'D'),
-            new LongOpt("recursive", Argument.No, null, 'r'),
-            new LongOpt("exclude", Argument.Required, null, 'x'),
-            new LongOpt("domain-name", Argument.Required, null, 'd'),
-            new LongOpt("backup", Argument.No, null, 'b'),
-            new LongOpt("output", Argument.Required, null, 'o'),
-            new LongOpt("merge", Argument.No, null, 'm'),
-            new LongOpt("preserve-comments", Argument.No, null, 'C'),
-            new LongOpt("verbose", Argument.No, null, 'v'),
-            new LongOpt("help", Argument.No, null, 'h'),
-        };
+        private static readonly LongOpt[] LOpts =
+        [
+            new("directory", Argument.Required, null, 'D'),
+            new("recursive", Argument.No, null, 'r'),
+            new("exclude", Argument.Required, null, 'x'),
+            new("domain-name", Argument.Required, null, 'd'),
+            new("backup", Argument.No, null, 'b'),
+            new("output", Argument.Required, null, 'o'),
+            new("merge", Argument.No, null, 'm'),
+            new("preserve-comments", Argument.No, null, 'C'),
+            new("verbose", Argument.No, null, 'v'),
+            new("help", Argument.No, null, 'h')
+        ];
         private static readonly string SOpts = "-:D:rx:d:bo:mCvh";
 
         private static int Main([NotNull] string[] args)
         {
-#if DEBUG
-            // Allow to attach debugger
-            Console.ReadLine();
-#endif // DEBUG
             if (args.Length == 0)
             {
                 ShowUsage();
@@ -66,7 +63,7 @@ private static int Main([NotNull] string[] args)
                 TranslationManager.Instance.RegisterProvider(new GettextTranslationProvider());
 
                 // Compute the list of input files
-                ISet<UFile> inputFiles = new HashSet<UFile>();
+                HashSet<UFile> inputFiles = [];
                 var re = options.Excludes.Count > 0 ? new Regex(string.Join("|", options.Excludes.Select(x => Regex.Escape(x).Replace(@"\*", @".*")))) : null;
                 foreach (var path in options.InputDirs)
                 {