Fix warnings

Author: tom-englert

src/ResXManager.Model/ResourceTableEntry.cs

@@ -333,7 +333,7 @@ public void SetCommentText(CultureKey culture, string? value)
     }
 
     [DependsOn(nameof(Key))]
-    public bool IsDuplicateKey => _duplicateKeyExpression.Match(Key).Success;
+    public bool IsDuplicateKey => _duplicateKeyExpression.IsMatch(Key);
 
     public ReadOnlyCollection<CodeReference>? CodeReferences { get; set; }
 
@@ -377,7 +377,7 @@ public bool HasRulesMismatches(IEnumerable<object> cultures)
         var neutralValue = Values.GetValue(null);
         var values = cultures.Select(CultureKey.Parse)
             .Where(lang => !lang.IsNeutral)
-            .Select(lang => Values.GetValue(lang))
+            .Select(Values.GetValue)
             .Where(value => !value.IsNullOrEmpty())
             .ToList()
             .AsReadOnly();
@@ -437,7 +437,7 @@ private void OnCommentsChanged()
         OnPropertyChanged(nameof(TranslationState));
     }
 
-    private ICollection<string> GetValueAnnotations(ResourceLanguage language)
+    private string[] GetValueAnnotations(ResourceLanguage language)
     {
         var cultureKey = language.CultureKey;
 
@@ -506,7 +506,7 @@ private IEnumerable<string> GetInvariantMismatches(CultureKey culture, string? v
             yield return Resources.ResourceTableEntry_Error_InvariantWithValue;
     }
 
-    private ICollection<string> GetCommentAnnotations(ResourceLanguage language)
+    private string[] GetCommentAnnotations(ResourceLanguage language)
     {
         return GetSnapshotDifferences(language, Comments.GetValue(language.CultureKey), d => d?.Comment)
             .ToArray();
@@ -557,4 +557,4 @@ private void OnPropertyChanged([CallerMemberName] string? propertyName = null)
     string IDataErrorInfo.this[string? columnName] => (columnName != nameof(Key) ? null : _keyValidationError) ?? string.Empty;
 
     string IDataErrorInfo.Error => string.Empty;
-}
+}

src/ResXManager.Tests/Model/LibreTranslateTranslatorTests.cs

@@ -1,4 +1,6 @@
-namespace ResXManager.Tests.Model;
+#pragma warning disable CA2007
+
+namespace ResXManager.Tests.Model;
 
 using System;
 using System.Globalization;
@@ -14,7 +16,7 @@ public class LibreTranslateTranslatorTests
     [Fact]
     public void LibreTranslateParsesResponseCorrectly()
     {
-        const string input = "{\"translatedText\":\"¡Hola!\"}";
+        const string input = /*lang=json,strict*/ """{"translatedText":"¡Hola!"}""";
 
         var result = Translators.LibreTranslateTranslator.ParseResponse(input).First();
 
@@ -24,7 +26,7 @@ public void LibreTranslateParsesResponseCorrectly()
     [Fact]
     public void LibreTranslateParsesResponseWithDetectedLanguageCorrectly()
     {
-        const string input = "{\"detectedLanguage\":{\"confidence\":90.0,\"language\":\"fr\"},\"translatedText\":\"Hello!\"}";
+        const string input = /*lang=json,strict*/ """{"detectedLanguage":{"confidence":90.0,"language":"fr"},"translatedText":"Hello!"}""";
 
         var result = Translators.LibreTranslateTranslator.ParseResponse(input).First();
 
@@ -44,7 +46,7 @@ public void LibreTranslateParsesEmptyResponseCorrectly()
     [Fact]
     public void LibreTranslateParsesNullTranslatedTextCorrectly()
     {
-        const string input = "{\"translatedText\":null}";
+        const string input = /*lang=json,strict*/ """{"translatedText":null}""";
 
         var result = Translators.LibreTranslateTranslator.ParseResponse(input);
 
@@ -54,10 +56,11 @@ public void LibreTranslateParsesNullTranslatedTextCorrectly()
     [Fact]
     public void LibreTranslateParsesResponseWithAlternativesCorrectly()
     {
-        const string input = "{\"translatedText\":\"Hi\",\"alternatives\":[\"Hello\",\"Hey\"]}";
+        const string input = /*lang=json,strict*/ """{"translatedText":"Hi","alternatives":["Hello","Hey"]}""";
 
         var result = Translators.LibreTranslateTranslator.ParseResponse(input);
 
+        Assert.NotNull(result);
         Assert.Equal(["Hi", "Hello", "Hey"], result);
     }
 
@@ -80,7 +83,7 @@ private static async Task<bool> IsLibreTranslateAvailableAsync()
         try
         {
             using var httpClient = new HttpClient { Timeout = TimeSpan.FromSeconds(2) };
-            var response = await httpClient.GetAsync($"{LocalLibreUrl}/languages");
+            var response = await httpClient.GetAsync(new Uri($"{LocalLibreUrl}/languages"));
             return response.IsSuccessStatusCode;
         }
         catch
@@ -99,7 +102,7 @@ public async Task TranslateEnglishToGerman_ReturnsTranslatedText()
         }
 
         var result = await Translators.LibreTranslateTranslator.TranslateAsync(
-            $"{LocalLibreUrl}/translate",
+            new Uri($"{LocalLibreUrl}/translate"),
             apiKey: null,
             text: "Good morning",
             sourceLanguage: CultureInfo.GetCultureInfo("en"),
@@ -129,7 +132,7 @@ public async Task TranslateWithCancellation_ThrowsOperationCanceledException()
 
         await Assert.ThrowsAnyAsync<OperationCanceledException>(async () =>
             await Translators.LibreTranslateTranslator.TranslateAsync(
-                LocalLibreUrl,
+                new Uri(LocalLibreUrl),
                 apiKey: null,
                 text: "Hello",
                 sourceLanguage: CultureInfo.GetCultureInfo("en"),

src/ResXManager.Translators/LibreTranslateTranslator.cs

@@ -137,7 +137,7 @@ protected override async Task Translate(ITranslationSession translationSession)
                     break;
 
                 var result = await TranslateAsync(
-                    Url,
+                    new Uri(Url),
                     ApiKey,
                     RemoveKeyboardShortcutIndicators(item.Source),
                     translationSession.SourceLanguage,
@@ -167,10 +167,11 @@ await translationSession.MainThread.StartNew(() =>
     /// <param name="text">The text to translate.</param>
     /// <param name="sourceLanguage">The source language.</param>
     /// <param name="targetLanguage">The target language.</param>
+    /// <param name="alternatives">The preferred number of alternative translations.</param>
     /// <param name="cancellationToken">The cancellation token.</param>
     /// <returns>The translated text.</returns>
     public static async Task<string[]?> TranslateAsync(
-        string url,
+        Uri url,
         string? apiKey,
         string text,
         CultureInfo sourceLanguage,
@@ -192,7 +193,7 @@ await translationSession.MainThread.StartNew(() =>
         var json = JsonConvert.SerializeObject(requestModel);
         using var content = new StringContent(json, Encoding.UTF8, "application/json");
 
-        var response = await httpClient.PostAsync(new Uri(url), content, cancellationToken).ConfigureAwait(false);
+        var response = await httpClient.PostAsync(url, content, cancellationToken).ConfigureAwait(false);
         response.EnsureSuccessStatusCode();
 
 #pragma warning disable CA2016 // Forward the 'CancellationToken' parameter to methods => not available in NetFramework
@@ -213,7 +214,7 @@ await translationSession.MainThread.StartNew(() =>
             return null;
         }
 
-        return new[] { result.TranslatedText }.Concat(result.Alternatives ?? Array.Empty<string>()).ToArray();
+        return new[] { result.TranslatedText }.Concat(result.Alternatives ?? []).ToArray();
     }
 
     /// <summary>

src/ResXManager.Translators/TranslatorHost.cs

@@ -121,11 +121,11 @@ private void RegisterChangeEvents(ITranslator[] translators)
     {
         foreach (var translator in translators)
         {
-            translator.PropertyChanged += (_, __) => SaveConfiguration();
+            translator.PropertyChanged += (_, _) => SaveConfiguration();
 
             foreach (var credential in translator.Credentials)
             {
-                credential.PropertyChanged += (_, __) => SaveConfiguration();
+                credential.PropertyChanged += (_, _) => SaveConfiguration();
             }
         }
     }
@@ -134,4 +134,4 @@ public void Dispose()
     {
         ActiveSession?.Dispose();
     }
-}
+}

src/ResXManager.View/Behaviors/EntityFilter.cs

@@ -50,7 +50,7 @@ private void FilterText_Changed()
         try
         {
             var regex = new Regex(value, RegexOptions.IgnoreCase | RegexOptions.Singleline);
-            return item => regex.Match(item?.ToString() ?? string.Empty).Success;
+            return item => regex.IsMatch(item?.ToString() ?? string.Empty);
         }
         catch (ArgumentException)
         {
@@ -59,7 +59,7 @@ private void FilterText_Changed()
         try
         {
             var regex = new Regex(value.Replace(@"\", @"\\", StringComparison.Ordinal), RegexOptions.IgnoreCase | RegexOptions.Singleline);
-            return item => regex.Match(item?.ToString() ?? string.Empty).Success;
+            return item => regex.IsMatch(item?.ToString() ?? string.Empty);
         }
         catch (ArgumentException)
         {