[CodeCompletion] Re-order literal suggestions

Move compound types (almost) to the end, put string just behind int and
fix the order of true/false.

Part of rdar://problem/23865118

test/SourceKit/CodeComplete/complete_literals.swift

@@ -5,9 +5,9 @@
 // KEYWORDS-NOT: source.lang.swift.literal
 // KEYWORDS: key.name: "nil"
 // KEYWORDS-NOT: source.lang.swift.literal
-// LITERALS: key.kind: source.lang.swift.literal.boolean
 // LITERALS: key.kind: source.lang.swift.literal.string
 // LITERALS: key.sourcetext: "\"<#{{.*}}#>\""
+// LITERALS: key.kind: source.lang.swift.literal.boolean
 // LITERALS: key.kind: source.lang.swift.literal.array
 // LITERALS: key.sourcetext: "[<#{{.*}}#>]"
 // LITERALS: key.kind: source.lang.swift.literal.dictionary

test/SourceKit/CodeComplete/complete_sort_order.swift

@@ -60,13 +60,13 @@ func test2() {
   (#^EXPR_0^#)
 }
 // EXPR: 0
-// EXPR: false
-// EXPR: true
 // EXPR: "abc"
+// EXPR: true
+// EXPR: false
+// EXPR: [#Color(colorLiteralRed: Float, green: Float, blue: Float, alpha: Float)#]
+// EXPR: [#Image(imageLiteral: String)#]
 // EXPR: [values]
 // EXPR: [key: value]
 // EXPR: (values)
 // EXPR: nil
-// EXPR: [#Color(colorLiteralRed: Float, green: Float, blue: Float, alpha: Float)#]
-// EXPR: [#Image(imageLiteral: String)#]
 // EXPR: foo(a: Int)

tools/SourceKit/lib/SwiftLang/CodeCompletionOrganizer.cpp

@@ -691,14 +691,14 @@ static int compareHighPriorityKeywords(Item &a_, Item &b_) {
 static int compareLiterals(Item &a_, Item &b_) {
   static CodeCompletionLiteralKind order[] = {
     CodeCompletionLiteralKind::IntegerLiteral,
-    CodeCompletionLiteralKind::BooleanLiteral,
     CodeCompletionLiteralKind::StringLiteral,
+    CodeCompletionLiteralKind::BooleanLiteral,
+    CodeCompletionLiteralKind::ColorLiteral,
+    CodeCompletionLiteralKind::ImageLiteral,
     CodeCompletionLiteralKind::ArrayLiteral,
     CodeCompletionLiteralKind::DictionaryLiteral,
     CodeCompletionLiteralKind::Tuple,
     CodeCompletionLiteralKind::NilLiteral,
-    CodeCompletionLiteralKind::ColorLiteral,
-    CodeCompletionLiteralKind::ImageLiteral,
   };
   auto size = sizeof(order) / sizeof(order[0]);
 
@@ -710,7 +710,15 @@ static int compareLiterals(Item &a_, Item &b_) {
 
   auto a = getIndex(a_);
   auto b = getIndex(b_);
-  return a < b ? -1 : (b < a ? 1 : 0);
+
+  if (a != b)
+    return a < b ? -1 : 1;
+
+  // Sort true before false instead of alphabetically.
+  if (cast<Result>(a_).value->getLiteralKind() == CodeCompletionLiteralKind::BooleanLiteral)
+    return a_.name > b_.name;
+
+  return 0;
 }
 
 static void sortRecursive(const Options &options, Group *group) {