Compact lambda expressions in some (not all) places

OpenRA.Game/Settings.cs

@@ -230,10 +230,7 @@ namespace OpenRA
 			var err1 = FieldLoader.UnknownFieldAction;
 			var err2 = FieldLoader.InvalidValueAction;
 
-			FieldLoader.UnknownFieldAction = (s, f) =>
+			FieldLoader.UnknownFieldAction = (s, f) => Console.WriteLine("Ignoring unknown field `{0}` on `{1}`".F(s, f.Name));
-			{
-				Console.WriteLine("Ignoring unknown field `{0}` on `{1}`".F(s, f.Name));
-			};
 
 			if (File.Exists(settingsFile))
 			{

OpenRA.Game/Widgets/ButtonWidget.cs

@@ -60,7 +60,7 @@ namespace OpenRA.Widgets
 		{
 			this.modRules = modRules;
 
-			GetText = () => { return Text; };
+			GetText = () => Text;
 			GetColor = () => TextColor;
 			GetColorDisabled = () => TextColorDisabled;
 			GetContrastColor = () => ContrastColor;

OpenRA.Game/Widgets/SpriteWidget.cs

@@ -24,7 +24,7 @@ namespace OpenRA.Widgets
 		[ObjectCreator.UseCtor]
 		public SpriteWidget(WorldRenderer worldRenderer)
 		{
-			GetPalette = () => { return Palette; };
+			GetPalette = () => Palette;
 
 			this.worldRenderer = worldRenderer;
 		}

OpenRA.Mods.RA/DemoTruck.cs

@@ -22,10 +22,7 @@ namespace OpenRA.Mods.RA
 	{
 		static void Explode(Actor self)
 		{
-			self.World.AddFrameEndTask(w =>
+			self.World.AddFrameEndTask(w => self.InflictDamage(self, int.MaxValue, null));
-			{
-				self.InflictDamage(self, int.MaxValue, null);
-			});
 		}
 
 		public IEnumerable<IOrderTargeter> Orders

OpenRA.Mods.RA/Render/RenderUnit.cs

@@ -31,7 +31,7 @@ namespace OpenRA.Mods.RA.Render
 		public void PlayCustomAnimRepeating(Actor self, string name)
 		{
 			DefaultAnimation.PlayThen(name,
-				() => { PlayCustomAnimRepeating(self, name); });
+				() => PlayCustomAnimRepeating(self, name));
 		}
 
 		public void PlayCustomAnimBackwards(Actor self, string name, Action after)

OpenRA.Mods.RA/Widgets/Logic/DownloadPackagesLogic.cs

@@ -65,19 +65,13 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 					mirror != null ? new Uri(mirror).Host : "unknown host");
 			};
 
-			Action<string> onExtractProgress = s =>
+			Action<string> onExtractProgress = s => Game.RunAfterTick(() => statusLabel.GetText = () => s);
-			{
-					Game.RunAfterTick(() => statusLabel.GetText = () => s);
-			};
 
-			Action<string> onError = s =>
+			Action<string> onError = s => Game.RunAfterTick(() =>
 			{
-				Game.RunAfterTick(() =>
+				statusLabel.GetText = () => "Error: " + s;
-				{
+				retryButton.IsVisible = () => true;
-					statusLabel.GetText = () => "Error: " + s;
+			});
-					retryButton.IsVisible = () => true;
-				});
-			};
 
 			Action<AsyncCompletedEventArgs, bool> onDownloadComplete = (i, cancelled) =>
 			{

OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs

@@ -66,10 +66,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 					});
 				};
 
-				Action<string> onRetry = password =>
+				Action<string> onRetry = password => ConnectionLogic.Connect(om.Host, om.Port, password, onConnect, onExit);
-				{
-					ConnectionLogic.Connect(om.Host, om.Port, password, onConnect, onExit);
-				};
 
 				Ui.OpenWindow("CONNECTIONFAILED_PANEL", new WidgetArgs()
 				{

OpenRA.Mods.RA/Widgets/Logic/ReplayBrowserLogic.cs

@@ -58,8 +58,8 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 				{
 					replays = Directory
 						.GetFiles(dir, "*.rep")
-						.Select((filename) => ReplayMetadata.Read(filename))
+						.Select(ReplayMetadata.Read)
-						.Where((r) => r != null)
+						.Where(r => r != null)
 						.OrderByDescending(r => r.GameInfo.StartTimeUtc)
 						.ToList();
 				}
@@ -365,14 +365,11 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 						"Rename Replay",
 						"Enter a new file name:",
 						initialName,
-						onAccept: (newName) =>
+						onAccept: newName => RenameReplay(r, newName),
-						{
-							RenameReplay(r, newName);
-						},
 						onCancel: null,
 						acceptText: "Rename",
 						cancelText: null,
-						inputValidator: (newName) =>
+						inputValidator: newName =>
 						{
 							if (newName == initialName)
 								return false;
@@ -439,7 +436,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 						"Delete {0} replays?".F(list.Count),
 						() =>
 						{
-							list.ForEach((r) => DeleteReplay(r));
+							list.ForEach(DeleteReplay);
 							if (selectedReplay == null)
 								SelectFirstVisibleReplay();
 						},