switch式を使用する (IDE0066)

diff --git a/OpenTween/Models/TabModel.cs b/OpenTween/Models/TabModel.cs
index 1b16ccd..8d8cd11 100644 (file)
--- a/OpenTween/Models/TabModel.cs
+++ b/OpenTween/Models/TabModel.cs
@@ -238,23 +238,13 @@ namespace OpenTween.Models
             }
             else
             {
-                Comparison<PostClass> postComparison;
-                switch (this.SortMode)
+                Comparison<PostClass> postComparison = this.SortMode switch
                 {
-                    default:
-                    case ComparerMode.Data:
-                        postComparison = (x, y) => Comparer<string?>.Default.Compare(x?.TextFromApi, y?.TextFromApi);
-                        break;
-                    case ComparerMode.Name:
-                        postComparison = (x, y) => Comparer<string?>.Default.Compare(x?.ScreenName, y?.ScreenName);
-                        break;
-                    case ComparerMode.Nickname:
-                        postComparison = (x, y) => Comparer<string?>.Default.Compare(x?.Nickname, y?.Nickname);
-                        break;
-                    case ComparerMode.Source:
-                        postComparison = (x, y) => Comparer<string?>.Default.Compare(x?.Source, y?.Source);
-                        break;
-                }
+                    ComparerMode.Name => (x, y) => Comparer<string?>.Default.Compare(x?.ScreenName, y?.ScreenName),
+                    ComparerMode.Nickname => (x, y) => Comparer<string?>.Default.Compare(x?.Nickname, y?.Nickname),
+                    ComparerMode.Source => (x, y) => Comparer<string?>.Default.Compare(x?.Source, y?.Source),
+                    _ => (x, y) => Comparer<string?>.Default.Compare(x?.TextFromApi, y?.TextFromApi),
+                };
 
                 comparison = (x, y) =>
                 {

diff --git a/OpenTween/Twitter.cs b/OpenTween/Twitter.cs
index 1e5eccc..2b92d22 100644 (file)
--- a/OpenTween/Twitter.cs
+++ b/OpenTween/Twitter.cs
@@ -1789,18 +1789,13 @@ namespace OpenTween
         /// </remarks>
         public static string CreateProfileImageUrl(string normalUrl, string size)
         {
-            switch (size)
+            return size switch
             {
-                case "original":
-                    return normalUrl.Replace("_normal.", ".");
-                case "normal":
-                    return normalUrl;
-                case "bigger":
-                case "mini":
-                    return normalUrl.Replace("_normal.", $"_{size}.");
-                default:
-                    throw new ArgumentException($"Invalid size: ${size}", nameof(size));
-            }
+                "original" => normalUrl.Replace("_normal.", "."),
+                "normal" => normalUrl,
+                "bigger" or "mini" => normalUrl.Replace("_normal.", $"_{size}."),
+                _ => throw new ArgumentException($"Invalid size: ${size}", nameof(size)),
+            };
         }
 
         public static string DecideProfileImageSize(int sizePx)