From 88ffa3836e678598cae3ccf2e3c7b6d0b0589260 Mon Sep 17 00:00:00 2001 From: Dmitri Suvorov Date: Sat, 4 Jul 2015 18:16:31 +0300 Subject: [PATCH 1/5] Removed unused method GetNamedArg --- OpenRA.Utility/Program.cs | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/OpenRA.Utility/Program.cs b/OpenRA.Utility/Program.cs index 5fb87e3f93..8066edfec5 100644 --- a/OpenRA.Utility/Program.cs +++ b/OpenRA.Utility/Program.cs @@ -86,17 +86,5 @@ namespace OpenRA.Utility Console.WriteLine(" {0} {1} ({2})", a.Key, args, desc); } } - - static string GetNamedArg(string[] args, string arg) - { - if (args.Length < 2) - return null; - - var i = Array.IndexOf(args, arg); - if (i < 0 || i == args.Length - 1) // doesnt exist, or doesnt have a value. - return null; - - return args[i + 1]; - } } } From ad97fe850f453ae91c3d1d3c0138504feb5fb1b7 Mon Sep 17 00:00:00 2001 From: Dmitri Suvorov Date: Sat, 4 Jul 2015 18:18:11 +0300 Subject: [PATCH 2/5] Removed redundant using --- OpenRA.Utility/Program.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/OpenRA.Utility/Program.cs b/OpenRA.Utility/Program.cs index 8066edfec5..5296ea37c8 100644 --- a/OpenRA.Utility/Program.cs +++ b/OpenRA.Utility/Program.cs @@ -10,7 +10,6 @@ using System; using System.Collections.Generic; -using System.IO; using System.Linq; using OpenRA.FileSystem; From 6e4ab810d8e842097439cef713bb8b5039f73bfd Mon Sep 17 00:00:00 2001 From: Dmitri Suvorov Date: Sat, 4 Jul 2015 18:22:28 +0300 Subject: [PATCH 3/5] Fixed multiple enumeration of IEnumerable --- OpenRA.Utility/Program.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenRA.Utility/Program.cs b/OpenRA.Utility/Program.cs index 5296ea37c8..750fc1b5b5 100644 --- a/OpenRA.Utility/Program.cs +++ b/OpenRA.Utility/Program.cs @@ -74,13 +74,13 @@ namespace OpenRA.Utility foreach (var a in actions) { var descParts = a.Value.Method.GetCustomAttributes(true) - .SelectMany(d => d.Lines); + .SelectMany(d => d.Lines).ToArray(); - if (!descParts.Any()) + if (descParts.Length == 0) continue; - var args = descParts.Take(descParts.Count() - 1).JoinWith(" "); - var desc = descParts.Last(); + var args = descParts.Take(descParts.Length - 1).JoinWith(" "); + var desc = descParts[descParts.Length - 1]; Console.WriteLine(" {0} {1} ({2})", a.Key, args, desc); } From 2bc6bd74bee5d08639159b53856887ee1a2d9e99 Mon Sep 17 00:00:00 2001 From: Dmitri Suvorov Date: Sun, 5 Jul 2015 02:37:55 +0300 Subject: [PATCH 4/5] Display commands in alphabetical order --- OpenRA.Utility/Program.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/OpenRA.Utility/Program.cs b/OpenRA.Utility/Program.cs index 750fc1b5b5..f775663c2a 100644 --- a/OpenRA.Utility/Program.cs +++ b/OpenRA.Utility/Program.cs @@ -71,9 +71,12 @@ namespace OpenRA.Utility if (actions == null) return; - foreach (var a in actions) + + var keys = actions.Keys.OrderBy(x => x); + + foreach (var key in keys) { - var descParts = a.Value.Method.GetCustomAttributes(true) + var descParts = actions[key].Method.GetCustomAttributes(true) .SelectMany(d => d.Lines).ToArray(); if (descParts.Length == 0) From d625cbe1deb2988bcd7c0e19b42c2b8dd2c49671 Mon Sep 17 00:00:00 2001 From: Dmitri Suvorov Date: Sun, 5 Jul 2015 02:38:09 +0300 Subject: [PATCH 5/5] Updated commands layout --- OpenRA.Utility/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenRA.Utility/Program.cs b/OpenRA.Utility/Program.cs index f775663c2a..b7724ce244 100644 --- a/OpenRA.Utility/Program.cs +++ b/OpenRA.Utility/Program.cs @@ -85,7 +85,7 @@ namespace OpenRA.Utility var args = descParts.Take(descParts.Length - 1).JoinWith(" "); var desc = descParts[descParts.Length - 1]; - Console.WriteLine(" {0} {1} ({2})", a.Key, args, desc); + Console.WriteLine(" {0} {1}{3} {2}{3}", key, args, desc, Environment.NewLine); } } }