ModuleGroup: Add several subgroups.

Author: nkcsgexi

stdlib/public/core/GroupInfo.json

@@ -31,7 +31,6 @@
     "CollectionAlgorithms.swift",
     "EmptyCollection.swift",
     "Stride.swift",
-    "HashedCollections.swift",
     "Repeat.swift",
     "Sort.swift",
     "Range.swift",
@@ -69,7 +68,9 @@
         "CocoaArray.swift",
         "ContiguousArrayBuffer.swift",
         "SliceBuffer.swift",
-        "SwiftNativeNSArray.swift"]
+        "SwiftNativeNSArray.swift"],
+      "HashedCollections": [
+        "HashedCollections.swift"]
     }
   ],
   "C": [
@@ -86,14 +87,17 @@
     "ObjCMirrors.swift"
   ],
   "Math": [
-    "FloatingPoint.swift",
-    "FloatingPointOperations.swift",
-    "FloatingPointParsing.swift",
-    "IntegerArithmetic.swift",
-    "FixedPoint.swift",
-    "IntegerParsing.swift",
     "SetAlgebra.swift",
-    "BuiltinMath.swift"
+    "BuiltinMath.swift",
+    {
+    "Integers": [
+      "IntegerArithmetic.swift",
+      "FixedPoint.swift",
+      "IntegerParsing.swift"],
+    "Floating": [
+      "FloatingPoint.swift",
+      "FloatingPointOperations.swift",
+      "FloatingPointParsing.swift"]}
   ],
   "Optional": [
     "ImplicitlyUnwrappedOptional.swift",

test/SourceKit/InterfaceGen/gen_stdlib.swift

@@ -34,20 +34,14 @@ var x: Int
 // CHECK1-NEXT: s:Si
 // CHECK1-NEXT: Int.Type
 // CHECK1-NEXT: Swift{{$}}
-// CHECK1-NEXT: <Group>Math</Group>
+// CHECK1-NEXT: <Group>Math/Integers</Group>
 // CHECK1-NEXT: /<interface-gen>{{$}}
 // CHECK1-NEXT: SYSTEM
 // CHECK1-NEXT: <Declaration>struct Int : <Type usr="s:Ps13SignedInteger">SignedInteger</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-DAG: Assert
-// GROUP1-DAG: String
-// GROUP1-DAG: Collection
-// GROUP1-DAG: Collection/Lazy Views
-// GROUP1-DAG: Bool
-// GROUP1-DAG: Math
-// GROUP1-DAG: Misc
+// GROUP1-NOT: <NULL>
 // GROUP1: <\GROUPS>
 
 // RUN: %sourcekitd-test -req=interface-gen -module Swift -group-name Bool > %t.Bool.response

test/SourceKit/SourceDocInfo/cursor_info.swift

@@ -185,7 +185,7 @@ class C7 {
 // CHECK2-NEXT: s:ZFsoi1pFTSiSi_Si
 // CHECK2-NEXT: (Int, Int) -> Int{{$}}
 // CHECK2-NEXT: Swift{{$}}
-// CHECK2-NEXT: <Group>Math</Group>
+// CHECK2-NEXT: <Group>Math/Integers</Group>
 // CHECK2-NEXT: SYSTEM
 // CHECK2-NEXT: <Declaration>func +(lhs: <Type usr="s:Si">Int</Type>, rhs: <Type usr="s:Si">Int</Type>) -&gt; <Type usr="s:Si">Int</Type></Declaration>
 // CHECK2-NEXT: <decl.function.operator.infix><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>+</decl.name>(<decl.var.parameter><decl.var.parameter.name>lhs</decl.var.parameter.name>: <decl.var.parameter.type><ref.struct usr="s:Si">Int</ref.struct></decl.var.parameter.type></decl.var.parameter>, <decl.var.parameter><decl.var.parameter.name>rhs</decl.var.parameter.name>: <decl.var.parameter.type><ref.struct usr="s:Si">Int</ref.struct></decl.var.parameter.type></decl.var.parameter>) -&gt; <decl.function.returntype><ref.struct usr="s:Si">Int</ref.struct></decl.function.returntype></decl.function.operator.infix>

tools/swift-ide-test/swift-ide-test.cpp

@@ -1640,7 +1640,8 @@ struct GroupNamesPrinter {
   void addDecl(const Decl *D) {
     if(auto VD = dyn_cast<ValueDecl>(D)) {
       if (!VD->isImplicit() && !VD->isPrivateStdlibDecl()) {
-        StringRef Name = VD->getGroupName().getValue();
+        StringRef Name = VD->getGroupName().hasValue() ?
+          VD->getGroupName().getValue() : "";
         Groups.insert(Name.empty() ? "<NULL>" : Name);
       }
     }