From ca52d09e815b776e9e021ae138049b88481063b5 Mon Sep 17 00:00:00 2001
From: Huo Yaoyuan <huoyaoyuan@hotmail.com>
Date: Tue, 12 Nov 2019 18:26:42 +0800
Subject: [PATCH] Enforce expression body for typical simple ones.

---
 .editorconfig                                 | 10 +++---
 .../API/Requests/Responses/CommentBundle.cs   | 13 +++----
 .../BeatmapSet/Scores/ScoresContainer.cs      | 35 +++++++++----------
 osu.Game/Users/User.cs                        |  2 +-
 4 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index abaa003115..a555a3d2bc 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -132,12 +132,13 @@ csharp_preferred_modifier_order = public,private,protected,internal,new,abstract
 # Skipped because roslyn cannot separate +-*/ with << >>
 
 #Style - expression bodies
-csharp_style_expression_bodied_accessors = true:silent
+csharp_style_expression_bodied_accessors = true:warning
 csharp_style_expression_bodied_constructors = false:none
-csharp_style_expression_bodied_indexers = true:silent
+csharp_style_expression_bodied_indexers = true:warning
 csharp_style_expression_bodied_methods = true:silent
-csharp_style_expression_bodied_operators = true:silent
-csharp_style_expression_bodied_properties = true:silent
+csharp_style_expression_bodied_operators = true:warning
+csharp_style_expression_bodied_properties = true:warning
+csharp_style_expression_bodied_local_functions = true:silent
 
 #Style - expression preferences
 dotnet_style_object_initializer = true:warning
@@ -166,7 +167,6 @@ csharp_style_inlined_variable_declaration = true:warning
 csharp_style_deconstructed_variable_declaration = true:warning
 
 #Style - other C# 7.x features
-csharp_style_expression_bodied_local_functions = true:silent
 dotnet_style_prefer_inferred_tuple_names = true:warning
 csharp_prefer_simple_default_expression = true:warning
 csharp_style_pattern_local_over_anonymous_function = true:silent
diff --git a/osu.Game/Online/API/Requests/Responses/CommentBundle.cs b/osu.Game/Online/API/Requests/Responses/CommentBundle.cs
index 7db3126ade..8db5d8d6ad 100644
--- a/osu.Game/Online/API/Requests/Responses/CommentBundle.cs
+++ b/osu.Game/Online/API/Requests/Responses/CommentBundle.cs
@@ -50,17 +50,14 @@ namespace osu.Game.Online.API.Requests.Responses
         [JsonProperty(@"user_votes")]
         private List<long> userVotes
         {
-            set
+            set => value.ForEach(v =>
             {
-                value.ForEach(v =>
+                Comments.ForEach(c =>
                 {
-                    Comments.ForEach(c =>
-                    {
-                        if (v == c.Id)
-                            c.IsVoted = true;
-                    });
+                    if (v == c.Id)
+                        c.IsVoted = true;
                 });
-            }
+            });
         }
 
         private List<User> users;
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
index 4bbcd8d631..80de8f8230 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
@@ -48,31 +48,28 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
 
         protected APILegacyScores Scores
         {
-            set
+            set => Schedule(() =>
             {
-                Schedule(() =>
+                topScoresContainer.Clear();
+
+                if (value?.Scores.Any() != true)
                 {
-                    topScoresContainer.Clear();
+                    scoreTable.Scores = null;
+                    scoreTable.Hide();
+                    return;
+                }
 
-                    if (value?.Scores.Any() != true)
-                    {
-                        scoreTable.Scores = null;
-                        scoreTable.Hide();
-                        return;
-                    }
+                scoreTable.Scores = value.Scores;
+                scoreTable.Show();
 
-                    scoreTable.Scores = value.Scores;
-                    scoreTable.Show();
+                var topScore = value.Scores.First();
+                var userScore = value.UserScore;
 
-                    var topScore = value.Scores.First();
-                    var userScore = value.UserScore;
+                topScoresContainer.Add(new DrawableTopScore(topScore));
 
-                    topScoresContainer.Add(new DrawableTopScore(topScore));
-
-                    if (userScore != null && userScore.Score.OnlineScoreID != topScore.OnlineScoreID)
-                        topScoresContainer.Add(new DrawableTopScore(userScore.Score, userScore.Position));
-                });
-            }
+                if (userScore != null && userScore.Score.OnlineScoreID != topScore.OnlineScoreID)
+                    topScoresContainer.Add(new DrawableTopScore(userScore.Score, userScore.Position));
+            });
         }
 
         public ScoresContainer()
diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index 1cb395fd75..b15789f324 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -129,7 +129,7 @@ namespace osu.Game.Users
         [JsonProperty]
         private string[] playstyle
         {
-            set { PlayStyles = value?.Select(str => Enum.Parse(typeof(PlayStyle), str, true)).Cast<PlayStyle>().ToArray(); }
+            set => PlayStyles = value?.Select(str => Enum.Parse(typeof(PlayStyle), str, true)).Cast<PlayStyle>().ToArray();
         }
 
         public PlayStyle[] PlayStyles;