[Serialization] Use the new group mechanism and update tests accordingly.

Author: nkcsgexi

lib/Serialization/Serialization.cpp

@@ -3614,7 +3614,7 @@ class DeclGroupNameContext {
 
 public:
   DeclGroupNameContext(bool Enable) :
-    pNameCollector(new GroupNameCollectorFromFileName(Enable)) {}
+    pNameCollector(new GroupNameCollectorFromJson(Enable)) {}
   uint32_t getGroupSequence(const ValueDecl *VD) {
     return Map.insert(std::make_pair(pNameCollector->getGroupName(VD),
                                      Map.size())).first->second;

test/SourceKit/InterfaceGen/gen_stdlib.swift

@@ -34,28 +34,29 @@ var x: Int
 // CHECK1-NEXT: s:Si
 // CHECK1-NEXT: Int.Type
 // CHECK1-NEXT: Swift{{$}}
-// CHECK1-NEXT: <Group>FixedPoint</Group>
+// CHECK1-NEXT: <Group>Misc</Group>
 // CHECK1-NEXT: /<interface-gen>{{$}}
 // CHECK1-NEXT: SYSTEM
 // CHECK1-NEXT: <Declaration>struct Int : <Type usr="s:Ps17SignedIntegerType">SignedIntegerType</Type>{{.*}}{{.*}}<Type usr="s:Ps10Comparable">Comparable</Type>{{.*}}<Type usr="s:Ps9Equatable">Equatable</Type>{{.*}}</Declaration>
 
 // RUN: %sourcekitd-test -req=module-groups -module Swift | FileCheck -check-prefix=GROUP1 %s
 // GROUP1: <GROUPS>
-// GROUP1: Algorithm
-// GROUP1: Assert
-// GROUP1: Character
-// GROUP1: Collection
-// GROUP1: FlatMap
-// GROUP1: OutputStream
-// GROUP1: String
-// GROUP1: Zip
+// GROUP1-DAG: Algorithm
+// GROUP1-DAG: Assert
+// GROUP1-DAG: String
+// GROUP1-DAG: Collection
+// GROUP1-DAG: Bool
+// GROUP1-DAG: Math
+// GROUP1-DAG: Misc
 // GROUP1: <\GROUPS>
 
-// RUN: %sourcekitd-test -req=interface-gen -module Swift -group-name Zip > %t.zip.response
-// RUN: FileCheck -check-prefix=CHECK-ZIP -input-file %t.zip.response %s
-// CHECK-ZIP: public func zip<Sequence1 : SequenceType, Sequence2 : SequenceType>(sequence1: Sequence1, _ sequence2: Sequence2) -> Zip2Sequence<Sequence1, Sequence2>
-// CHECK-ZIP: public struct Zip2Generator<Generator1 : GeneratorType, Generator2 : GeneratorType> : GeneratorType {
-// CHECK-ZIP: public struct Zip2Sequence<Sequence1 : SequenceType, Sequence2 : SequenceType> : SequenceType {
-// Zip group cannot include Int
-// CHECK-ZIP-NOT: struct Int : SignedIntegerType, Comparable, Equatable {
-// CHECK-ZIP-NOT: extension String.UTF16View.Index {
+// RUN: %sourcekitd-test -req=interface-gen -module Swift -group-name Bool > %t.Bool.response
+// RUN: FileCheck -check-prefix=CHECK-BOOL -input-file %t.Bool.response %s
+// CHECK-BOOL-DAG: extension Bool : BooleanType {
+// CHECK-BOOL-DAG: extension Bool : BooleanLiteralConvertible {
+
+// These are not in the bool group:
+// CHECK-BOOL-NOT: public struct Zip2Generator<Generator1 : GeneratorType, Generator2 : GeneratorType> : GeneratorType {
+// CHECK-BOOL-NOT: public struct Zip2Sequence<Sequence1 : SequenceType, Sequence2 : SequenceType> : SequenceType {
+// CHECK-BOOL-NOT: struct Int : SignedIntegerType, Comparable, Equatable {
+// CHECK-BOOL-NOT: extension String.UTF16View.Index {

test/SourceKit/SourceDocInfo/cursor_stdlib.swift

@@ -27,10 +27,10 @@ func foo2(var a : [S1]) {
 
 // RUN: %sourcekitd-test -req=cursor -pos=5:13 %s -- %s %mcp_opt %clang-importer-sdk | FileCheck -check-prefix=CHECK-GENERATOR %s
 // CHECK-GENERATOR-NOT: _AnyGeneratorBase
-// CHECK-GENERATOR: <Group>ExistentialCollection</Group>
+// CHECK-GENERATOR: <Group>Collection</Group>
 
 // RUN: %sourcekitd-test -req=cursor -pos=8:10 %s -- %s %mcp_opt %clang-importer-sdk | FileCheck -check-prefix=CHECK-REPLACEMENT1 %s
-// CHECK-REPLACEMENT1: <Group>CollectionAlgorithms</Group>
+// CHECK-REPLACEMENT1: <Group>Collection</Group>
 // CHECK-REPLACEMENT1: <Declaration>@warn_unused_result(mutable_variant=&quot;sortInPlace&quot;) func sort() -&gt; [<Type usr="s:Si">Int</Type>]</Declaration>
 // CHECK-REPLACEMENT1: RELATED BEGIN
 // CHECK-REPLACEMENT1: sort(@noescape _: @noescape (Int, Int) -&gt; Bool) -&gt; [Int]</RelatedName>
@@ -39,16 +39,16 @@ func foo2(var a : [S1]) {
 // CHECK-REPLACEMENT1: RELATED END
 
 // RUN: %sourcekitd-test -req=cursor -pos=9:8 %s -- %s %mcp_opt %clang-importer-sdk | FileCheck -check-prefix=CHECK-REPLACEMENT2 %s
-// CHECK-REPLACEMENT2: <Group>Arrays</Group>
+// CHECK-REPLACEMENT2: <Group>Array</Group>
 // CHECK-REPLACEMENT2: <Declaration>mutating func append(newElement: <Type usr="s:Si">Int</Type>)</Declaration>
 
 // RUN: %sourcekitd-test -req=cursor -pos=15:10 %s -- %s %mcp_opt %clang-importer-sdk | FileCheck -check-prefix=CHECK-REPLACEMENT3 %s
-// CHECK-REPLACEMENT3: <Group>CollectionAlgorithms</Group>
+// CHECK-REPLACEMENT3: <Group>Collection</Group>
 // CHECK-REPLACEMENT3: func sort(@noescape isOrderedBefore: @noescape (<Type usr="s:V13cursor_stdlib2S1">S1</Type>
 // CHECK-REPLACEMENT3: sort() -&gt; [S1]</RelatedName>
 // CHECK-REPLACEMENT3: sort() -&gt; [S1]</RelatedName>
 // CHECK-REPLACEMENT3: sort(@noescape _: @noescape (S1, S1) -&gt; Bool) -&gt; [S1]</RelatedName>
 
 // RUN: %sourcekitd-test -req=cursor -pos=18:8 %s -- %s %mcp_opt %clang-importer-sdk | FileCheck -check-prefix=CHECK-REPLACEMENT4 %s
-// CHECK-REPLACEMENT4: <Group>Arrays</Group>
+// CHECK-REPLACEMENT4: <Group>Array</Group>
 // CHECK-REPLACEMENT4: <Declaration>mutating func append(newElement: <Type usr="s:V13cursor_stdlib2S1">S1</Type>)</Declaration>