[SourceKit] DocInfo: Update the UIdent for synthesized extensions to respect the synthesized targets instead of the original extended types.

test/SourceKit/DocSupport/doc_clang_module.swift.response

@@ -6582,7 +6582,7 @@ var FooSubUnnamedEnumeratorA1: Int { get }
     ]
   },
   {
-    key.kind: source.lang.swift.decl.extension.struct,
+    key.kind: source.lang.swift.decl.extension.enum,
     key.offset: 1733,
     key.length: 91,
     key.conforms: [
@@ -6618,7 +6618,7 @@ var FooSubUnnamedEnumeratorA1: Int { get }
     ]
   },
   {
-    key.kind: source.lang.swift.decl.extension.struct,
+    key.kind: source.lang.swift.decl.extension.enum,
     key.offset: 1826,
     key.length: 96,
     key.conforms: [
@@ -6654,7 +6654,7 @@ var FooSubUnnamedEnumeratorA1: Int { get }
     ]
   },
   {
-    key.kind: source.lang.swift.decl.extension.struct,
+    key.kind: source.lang.swift.decl.extension.enum,
     key.offset: 1924,
     key.length: 76,
     key.conforms: [
@@ -6690,7 +6690,7 @@ var FooSubUnnamedEnumeratorA1: Int { get }
     ]
   },
   {
-    key.kind: source.lang.swift.decl.extension.struct,
+    key.kind: source.lang.swift.decl.extension.enum,
     key.offset: 2002,
     key.length: 201,
     key.conforms: [
@@ -6813,7 +6813,7 @@ var FooSubUnnamedEnumeratorA1: Int { get }
     ]
   },
   {
-    key.kind: source.lang.swift.decl.extension.struct,
+    key.kind: source.lang.swift.decl.extension.enum,
     key.offset: 2205,
     key.length: 48,
     key.conforms: [
@@ -6830,7 +6830,7 @@ var FooSubUnnamedEnumeratorA1: Int { get }
     }
   },
   {
-    key.kind: source.lang.swift.decl.extension.struct,
+    key.kind: source.lang.swift.decl.extension.enum,
     key.offset: 2255,
     key.length: 91,
     key.conforms: [
@@ -6866,7 +6866,7 @@ var FooSubUnnamedEnumeratorA1: Int { get }
     ]
   },
   {
-    key.kind: source.lang.swift.decl.extension.struct,
+    key.kind: source.lang.swift.decl.extension.enum,
     key.offset: 2348,
     key.length: 129,
     key.conforms: [
@@ -6901,7 +6901,7 @@ var FooSubUnnamedEnumeratorA1: Int { get }
     ]
   },
   {
-    key.kind: source.lang.swift.decl.extension.struct,
+    key.kind: source.lang.swift.decl.extension.enum,
     key.offset: 2479,
     key.length: 43,
     key.conforms: [
@@ -6981,7 +6981,7 @@ var FooSubUnnamedEnumeratorA1: Int { get }
     ]
   },
   {
-    key.kind: source.lang.swift.decl.extension.protocol,
+    key.kind: source.lang.swift.decl.extension.struct,
     key.doc.full_as_xml: "<Other><Name></Name><Declaration>extension FooRuncingOptions</Declaration><Abstract><Para><codeVoice>OptionSet</codeVoice> requirements for which default implementations are supplied.</Para></Abstract><Discussion><Note><Para>A type conforming to <codeVoice>OptionSet</codeVoice> can implement any of these initializers or methods, and those implementations will be used in lieu of these defaults.</Para></Note></Discussion></Other>",
     key.offset: 2710,
     key.length: 158,
@@ -7051,7 +7051,7 @@ var FooSubUnnamedEnumeratorA1: Int { get }
     ]
   },
   {
-    key.kind: source.lang.swift.decl.extension.protocol,
+    key.kind: source.lang.swift.decl.extension.struct,
     key.generic_requirements: [
       {
         key.description: "Element == Self"
@@ -7126,7 +7126,7 @@ var FooSubUnnamedEnumeratorA1: Int { get }
     ]
   },
   {
-    key.kind: source.lang.swift.decl.extension.protocol,
+    key.kind: source.lang.swift.decl.extension.struct,
     key.generic_requirements: [
       {
         key.description: "RawValue : BitwiseOperations"
@@ -7211,7 +7211,7 @@ var FooSubUnnamedEnumeratorA1: Int { get }
     ]
   },
   {
-    key.kind: source.lang.swift.decl.extension.protocol,
+    key.kind: source.lang.swift.decl.extension.struct,
     key.doc.full_as_xml: "<Other><Name></Name><Declaration>extension FooRuncingOptions</Declaration><Abstract><Para><codeVoice>SetAlgebra</codeVoice> requirements for which default implementations are supplied.</Para></Abstract><Discussion><Note><Para>A type conforming to <codeVoice>SetAlgebra</codeVoice> can implement any of these initializers or methods, and those implementations will be used in lieu of these defaults.</Para></Note></Discussion></Other>",
     key.offset: 3247,
     key.length: 744,

test/SourceKit/DocSupport/doc_swift_module.swift.response

@@ -2670,7 +2670,7 @@ func genfoo<T1 : Prot, T2 : cake.C1 where T1.Element == Int, T2.Element == T1.El
     ]
   },
   {
-    key.kind: source.lang.swift.decl.extension.struct,
+    key.kind: source.lang.swift.decl.extension.enum,
     key.offset: 1242,
     key.length: 83,
     key.conforms: [
@@ -2706,7 +2706,7 @@ func genfoo<T1 : Prot, T2 : cake.C1 where T1.Element == Int, T2.Element == T1.El
     ]
   },
   {
-    key.kind: source.lang.swift.decl.extension.struct,
+    key.kind: source.lang.swift.decl.extension.enum,
     key.offset: 1327,
     key.length: 188,
     key.conforms: [
@@ -2829,7 +2829,7 @@ func genfoo<T1 : Prot, T2 : cake.C1 where T1.Element == Int, T2.Element == T1.El
     ]
   },
   {
-    key.kind: source.lang.swift.decl.extension.struct,
+    key.kind: source.lang.swift.decl.extension.enum,
     key.offset: 1517,
     key.length: 63,
     key.conforms: [
@@ -2865,7 +2865,7 @@ func genfoo<T1 : Prot, T2 : cake.C1 where T1.Element == Int, T2.Element == T1.El
     ]
   },
   {
-    key.kind: source.lang.swift.decl.extension.struct,
+    key.kind: source.lang.swift.decl.extension.enum,
     key.offset: 1582,
     key.length: 35,
     key.conforms: [
@@ -2882,7 +2882,7 @@ func genfoo<T1 : Prot, T2 : cake.C1 where T1.Element == Int, T2.Element == T1.El
     }
   },
   {
-    key.kind: source.lang.swift.decl.extension.struct,
+    key.kind: source.lang.swift.decl.extension.enum,
     key.offset: 1619,
     key.length: 78,
     key.conforms: [
@@ -2918,7 +2918,7 @@ func genfoo<T1 : Prot, T2 : cake.C1 where T1.Element == Int, T2.Element == T1.El
     ]
   },
   {
-    key.kind: source.lang.swift.decl.extension.struct,
+    key.kind: source.lang.swift.decl.extension.enum,
     key.offset: 1699,
     key.length: 78,
     key.conforms: [
@@ -2954,7 +2954,7 @@ func genfoo<T1 : Prot, T2 : cake.C1 where T1.Element == Int, T2.Element == T1.El
     ]
   },
   {
-    key.kind: source.lang.swift.decl.extension.struct,
+    key.kind: source.lang.swift.decl.extension.enum,
     key.offset: 1779,
     key.length: 116,
     key.conforms: [
@@ -2989,7 +2989,7 @@ func genfoo<T1 : Prot, T2 : cake.C1 where T1.Element == Int, T2.Element == T1.El
     ]
   },
   {
-    key.kind: source.lang.swift.decl.extension.struct,
+    key.kind: source.lang.swift.decl.extension.enum,
     key.offset: 1897,
     key.length: 30,
     key.conforms: [

tools/SourceKit/lib/SwiftLang/SwiftDocSupport.cpp

@@ -300,7 +300,11 @@ static bool initDocEntityInfo(const Decl *D, const Decl *SynthesizedTarget,
     return false;
   }
 
-  Info.Kind = SwiftLangSupport::getUIDForDecl(D, IsRef);
+  if (IsSynthesizedExtension)
+    Info.Kind = SwiftLangSupport::getUIDForExtensionOfDecl(SynthesizedTarget);
+  else
+    Info.Kind = SwiftLangSupport::getUIDForDecl(D, IsRef);
+
   if (Info.Kind.isInvalid())
     return true;
   if (const ValueDecl *VD = dyn_cast<ValueDecl>(D)) {

tools/SourceKit/lib/SwiftLang/SwiftLangSupport.cpp

@@ -277,6 +277,21 @@ UIdent SwiftLangSupport::getUIDForDecl(const Decl *D, bool IsRef) {
   return UIdentVisitor(IsRef).visit(const_cast<Decl*>(D));
 }
 
+UIdent SwiftLangSupport::getUIDForExtensionOfDecl(const Decl *D) {
+  switch (D->getKind()) {
+    case swift::DeclKind::Struct:
+      return KindDeclExtensionStruct;
+    case swift::DeclKind::Enum:
+      return KindDeclExtensionEnum;
+    case swift::DeclKind::Class:
+      return KindDeclExtensionClass;
+    case swift::DeclKind::Protocol:
+      return KindDeclExtensionProtocol;
+    default:
+      llvm_unreachable("cannot have extension.");
+  }
+}
+
 UIdent SwiftLangSupport::getUIDForLocalVar(bool IsRef) {
   return IsRef ? KindRefVarLocal : KindDeclVarLocal;
 }

tools/SourceKit/lib/SwiftLang/SwiftLangSupport.h

@@ -231,6 +231,7 @@ public:
 
   static SourceKit::UIdent getUIDForDecl(const swift::Decl *D,
                                          bool IsRef = false);
+  static SourceKit::UIdent getUIDForExtensionOfDecl(const swift::Decl *D);
   static SourceKit::UIdent getUIDForLocalVar(bool IsRef = false);
   static SourceKit::UIdent getUIDForCodeCompletionDeclKind(
       swift::ide::CodeCompletionDeclKind Kind, bool IsRef = false);