fix formatter for cases where no short code has been setup

Author: siywilliams

FluentCommandLineParser.Tests/CommandLineOptionFormatterTests.cs

@@ -119,16 +119,18 @@ public void Ensure_Format_Returns_Expected_String()
 			//  Short1          Description1
 			//  Short2:Long2    Description2 
 
-			var mockOption1 = CreateMockOption("Short1", null, "Description1");
-			var mockOption2 = CreateMockOption("Short2", "Long2", "Description2");
+			var mockOptionA = CreateMockOption("a", "aaa", "a-description");
+			var mockOptionB = CreateMockOption("b", null, "b-description1");
+			var mockOptionC = CreateMockOption(null, "ccc", "c-description");
 
 			var expectedSb = new StringBuilder();
 			expectedSb.AppendLine();
-			expectedSb.AppendFormat(CultureInfo.CurrentUICulture, CommandLineOptionFormatter.TextFormat, mockOption1.ShortName, mockOption1.Description);
-			expectedSb.AppendFormat(CultureInfo.CurrentUICulture, CommandLineOptionFormatter.TextFormat, mockOption2.ShortName + ":" + mockOption2.LongName, mockOption2.Description);
+			expectedSb.AppendFormat(CultureInfo.CurrentUICulture, CommandLineOptionFormatter.TextFormat, mockOptionA.ShortName + ":" + mockOptionA.LongName, mockOptionA.Description);
+			expectedSb.AppendFormat(CultureInfo.CurrentUICulture, CommandLineOptionFormatter.TextFormat, mockOptionB.ShortName, mockOptionB.Description);
+			expectedSb.AppendFormat(CultureInfo.CurrentUICulture, CommandLineOptionFormatter.TextFormat, mockOptionC.LongName, mockOptionC.Description);
 
 			var expected = expectedSb.ToString();
-			var actual = formatter.Format(new[] { mockOption1, mockOption2 });
+			var actual = formatter.Format(new[] { mockOptionB, mockOptionA, mockOptionC });
 
 			Assert.AreEqual(expected, actual, "Formatter returned unexpected string");
 		}

FluentCommandLineParser/Internals/CommandLineOptionFormatter.cs

@@ -107,7 +107,11 @@ public string Format(IEnumerable<ICommandLineOption> options)
 				sb.AppendLine();
 			}
 
-			foreach (var cmdOption in list.OrderBy(x => x.ShortName))
+			var ordered = (from option in list
+						  orderby option.ShortName.IsNullOrWhiteSpace() == false descending , option.ShortName
+						  select option).ToList();
+
+			foreach (var cmdOption in ordered)
 				sb.AppendFormat(CultureInfo.CurrentUICulture, TextFormat, FormatValue(cmdOption), cmdOption.Description);
 
 			return sb.ToString();
@@ -118,9 +122,18 @@ public string Format(IEnumerable<ICommandLineOption> options)
 		/// </summary>
 		static string FormatValue(ICommandLineOption cmdOption)
 		{
-			return cmdOption.LongName.IsNullOrWhiteSpace()
-						? cmdOption.ShortName
-						: cmdOption.ShortName + ":" + cmdOption.LongName;
+			if (cmdOption.ShortName.IsNullOrWhiteSpace())
+			{
+				return cmdOption.LongName;
+			}
+			
+			if (cmdOption.LongName.IsNullOrWhiteSpace())
+			{
+				return cmdOption.ShortName;
+			}
+
+			return cmdOption.ShortName + ":" + cmdOption.LongName;
 		}
+		// string = [-|/]f[:|=| ]|[-|/|--]filename[:|=| ] value 
 	}
 }