[SourceKit] Add typealias to doc structure (#11143)

johnfairh · nkcsgexi · commit 1f94eca80cd8 · 2017-07-26T09:59:06.000-07:00
From https://bugs.swift.org/browse/SR-4828
diff --git a/include/swift/IDE/SyntaxModel.h b/include/swift/IDE/SyntaxModel.h
@@ -92,6 +92,7 @@ enum class SyntaxStructureKind : uint8_t {
   ClassVariable,
   EnumCase,
   EnumElement,
+  TypeAlias,
 
   ForEachStatement,
   ForStatement,
diff --git a/lib/IDE/SyntaxModel.cpp b/lib/IDE/SyntaxModel.cpp
@@ -954,6 +954,16 @@ bool ModelASTWalker::walkToDeclPre(Decl *D) {
         popStructureNode();
       }
     }
+  } else if (auto *TypeAliasD = dyn_cast<TypeAliasDecl>(D)) {
+    SyntaxStructureNode SN;
+    SN.Dcl = TypeAliasD;
+    SN.Kind = SyntaxStructureKind::TypeAlias;
+    SN.Range = charSourceRangeFromSourceRange(SM,
+                                              TypeAliasD->getSourceRange());
+    SN.NameRange = CharSourceRange(TypeAliasD->getNameLoc(),
+                                   TypeAliasD->getName().getLength());
+    SN.Attrs = TypeAliasD->getAttrs();
+    pushStructureNode(SN, TypeAliasD);
   }
 
   return true;
diff --git a/test/IDE/structure.swift b/test/IDE/structure.swift
@@ -184,3 +184,6 @@ class A {
   func perform() {foo(5, animations: {})}
 // CHECK:  <ifunc>func <name>perform()</name> {<call><name>foo</name>(<arg>5</arg>, <arg><name>animations</name>: <brace>{}</brace></arg>)</call>}</ifunc>
 }
+
+// CHECK: <typealias>typealias <name>OtherA</name> = A</typealias>
+typealias OtherA = A
diff --git a/test/SourceKit/DocumentStructure/access_parse.swift.response b/test/SourceKit/DocumentStructure/access_parse.swift.response
@@ -650,6 +650,42 @@
           key.bodylength: 0
         }
       ]
+    },
+    {
+      key.kind: source.lang.swift.decl.typealias,
+      key.accessibility: source.lang.swift.accessibility.internal,
+      key.name: "defAlias",
+      key.offset: 1633,
+      key.length: 24,
+      key.nameoffset: 1643,
+      key.namelength: 8
+    },
+    {
+      key.kind: source.lang.swift.decl.typealias,
+      key.accessibility: source.lang.swift.accessibility.public,
+      key.name: "pubAlias",
+      key.offset: 1665,
+      key.length: 24,
+      key.nameoffset: 1675,
+      key.namelength: 8
+    },
+    {
+      key.kind: source.lang.swift.decl.typealias,
+      key.accessibility: source.lang.swift.accessibility.private,
+      key.name: "privAlias",
+      key.offset: 1698,
+      key.length: 25,
+      key.nameoffset: 1708,
+      key.namelength: 9
+    },
+    {
+      key.kind: source.lang.swift.decl.typealias,
+      key.accessibility: source.lang.swift.accessibility.internal,
+      key.name: "intAlias",
+      key.offset: 1733,
+      key.length: 24,
+      key.nameoffset: 1743,
+      key.namelength: 8
     }
   ]
 }
diff --git a/test/SourceKit/InterfaceGen/gen_clang_module.swift.response b/test/SourceKit/InterfaceGen/gen_clang_module.swift.response
@@ -4632,6 +4632,15 @@ public class FooOverlayClassDerived : Foo.FooOverlayClassBase {
       }
     ]
   },
+  {
+    key.kind: source.lang.swift.decl.typealias,
+    key.accessibility: source.lang.swift.accessibility.public,
+    key.name: "FooStruct1Pointer",
+    key.offset: 1543,
+    key.length: 62,
+    key.nameoffset: 1553,
+    key.namelength: 17
+  },
   {
     key.kind: source.lang.swift.decl.struct,
     key.accessibility: source.lang.swift.accessibility.public,
@@ -4705,6 +4714,15 @@ public class FooOverlayClassDerived : Foo.FooOverlayClassBase {
       }
     ]
   },
+  {
+    key.kind: source.lang.swift.decl.typealias,
+    key.accessibility: source.lang.swift.accessibility.public,
+    key.name: "FooStructTypedef1",
+    key.offset: 1751,
+    key.length: 40,
+    key.nameoffset: 1761,
+    key.namelength: 17
+  },
   {
     key.kind: source.lang.swift.decl.struct,
     key.accessibility: source.lang.swift.accessibility.public,
@@ -4778,6 +4796,15 @@ public class FooOverlayClassDerived : Foo.FooOverlayClassBase {
       }
     ]
   },
+  {
+    key.kind: source.lang.swift.decl.typealias,
+    key.accessibility: source.lang.swift.accessibility.public,
+    key.name: "FooTypedef1",
+    key.offset: 1974,
+    key.length: 29,
+    key.nameoffset: 1984,
+    key.namelength: 11
+  },
   {
     key.kind: source.lang.swift.decl.var.global,
     key.accessibility: source.lang.swift.accessibility.public,
@@ -5348,6 +5375,15 @@ public class FooOverlayClassDerived : Foo.FooOverlayClassBase {
       }
     ]
   },
+  {
+    key.kind: source.lang.swift.decl.typealias,
+    key.accessibility: source.lang.swift.accessibility.public,
+    key.name: "typedef_int_t",
+    key.offset: 4624,
+    key.length: 31,
+    key.nameoffset: 4634,
+    key.namelength: 13
+  },
   {
     key.kind: source.lang.swift.decl.var.global,
     key.accessibility: source.lang.swift.accessibility.public,
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftLangSupport.cpp b/tools/SourceKit/lib/SwiftLang/SwiftLangSupport.cpp
@@ -375,6 +375,8 @@ UIdent SwiftLangSupport::getUIDForSyntaxStructureKind(
       return KindDeclEnumCase;
     case SyntaxStructureKind::EnumElement:
       return KindDeclEnumElement;
+    case SyntaxStructureKind::TypeAlias:
+      return KindDeclTypeAlias;
     case SyntaxStructureKind::Parameter:
       return KindDeclVarParam;
     case SyntaxStructureKind::ForEachStatement:
diff --git a/tools/swift-ide-test/swift-ide-test.cpp b/tools/swift-ide-test/swift-ide-test.cpp
@@ -1069,6 +1069,7 @@ class StructureAnnotator : public ide::SyntaxModelWalker {
       case SyntaxStructureKind::ClassVariable: return "cvar";
       case SyntaxStructureKind::EnumCase: return "enum-case";
       case SyntaxStructureKind::EnumElement: return "enum-elem";
+      case SyntaxStructureKind::TypeAlias: return "typealias";
       case SyntaxStructureKind::Parameter: return "param";
       case SyntaxStructureKind::ForEachStatement: return "foreach";
       case SyntaxStructureKind::ForStatement: return "for";

Original file line number	Diff line number	Diff line change
`@@ -954,6 +954,16 @@ bool ModelASTWalker::walkToDeclPre(Decl *D) {`
`954`	`954`	`popStructureNode();`
`955`	`955`	`}`
`956`	`956`	`}`
	`957`	`+ } else if (auto *TypeAliasD = dyn_cast<TypeAliasDecl>(D)) {`
	`958`	`+ SyntaxStructureNode SN;`
	`959`	`+ SN.Dcl = TypeAliasD;`
	`960`	`+ SN.Kind = SyntaxStructureKind::TypeAlias;`
	`961`	`+ SN.Range = charSourceRangeFromSourceRange(SM,`
	`962`	`+ TypeAliasD->getSourceRange());`
	`963`	`+ SN.NameRange = CharSourceRange(TypeAliasD->getNameLoc(),`
	`964`	`+ TypeAliasD->getName().getLength());`
	`965`	`+ SN.Attrs = TypeAliasD->getAttrs();`
	`966`	`+ pushStructureNode(SN, TypeAliasD);`
`957`	`967`	`}`
`958`	`968`
`959`	`969`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -184,3 +184,6 @@ class A {`
`184`	`184`	`func perform() {foo(5, animations: {})}`
`185`	`185`	`// CHECK: <ifunc>func <name>perform()</name> {<call><name>foo</name>(<arg>5</arg>, <arg><name>animations</name>: <brace>{}</brace></arg>)</call>}</ifunc>`
`186`	`186`	`}`
	`187`	`+`
	`188`	`+// CHECK: <typealias>typealias <name>OtherA</name> = A</typealias>`
	`189`	`+typealias OtherA = A`
Original file line number	Diff line number	Diff line change
`@@ -4632,6 +4632,15 @@ public class FooOverlayClassDerived : Foo.FooOverlayClassBase {`
`4632`	`4632`	`}`
`4633`	`4633`	`]`
`4634`	`4634`	`},`
	`4635`	`+ {`
	`4636`	`+ key.kind: source.lang.swift.decl.typealias,`
	`4637`	`+ key.accessibility: source.lang.swift.accessibility.public,`
	`4638`	`+ key.name: "FooStruct1Pointer",`
	`4639`	`+ key.offset: 1543,`
	`4640`	`+ key.length: 62,`
	`4641`	`+ key.nameoffset: 1553,`
	`4642`	`+ key.namelength: 17`
	`4643`	`+ },`
`4635`	`4644`	`{`
`4636`	`4645`	`key.kind: source.lang.swift.decl.struct,`
`4637`	`4646`	`key.accessibility: source.lang.swift.accessibility.public,`
`@@ -4705,6 +4714,15 @@ public class FooOverlayClassDerived : Foo.FooOverlayClassBase {`
`4705`	`4714`	`}`
`4706`	`4715`	`]`
`4707`	`4716`	`},`
	`4717`	`+ {`
	`4718`	`+ key.kind: source.lang.swift.decl.typealias,`
	`4719`	`+ key.accessibility: source.lang.swift.accessibility.public,`
	`4720`	`+ key.name: "FooStructTypedef1",`
	`4721`	`+ key.offset: 1751,`
	`4722`	`+ key.length: 40,`
	`4723`	`+ key.nameoffset: 1761,`
	`4724`	`+ key.namelength: 17`
	`4725`	`+ },`
`4708`	`4726`	`{`
`4709`	`4727`	`key.kind: source.lang.swift.decl.struct,`
`4710`	`4728`	`key.accessibility: source.lang.swift.accessibility.public,`
`@@ -4778,6 +4796,15 @@ public class FooOverlayClassDerived : Foo.FooOverlayClassBase {`
`4778`	`4796`	`}`
`4779`	`4797`	`]`
`4780`	`4798`	`},`
	`4799`	`+ {`
	`4800`	`+ key.kind: source.lang.swift.decl.typealias,`
	`4801`	`+ key.accessibility: source.lang.swift.accessibility.public,`
	`4802`	`+ key.name: "FooTypedef1",`
	`4803`	`+ key.offset: 1974,`
	`4804`	`+ key.length: 29,`
	`4805`	`+ key.nameoffset: 1984,`
	`4806`	`+ key.namelength: 11`
	`4807`	`+ },`
`4781`	`4808`	`{`
`4782`	`4809`	`key.kind: source.lang.swift.decl.var.global,`
`4783`	`4810`	`key.accessibility: source.lang.swift.accessibility.public,`
`@@ -5348,6 +5375,15 @@ public class FooOverlayClassDerived : Foo.FooOverlayClassBase {`
`5348`	`5375`	`}`
`5349`	`5376`	`]`
`5350`	`5377`	`},`
	`5378`	`+ {`
	`5379`	`+ key.kind: source.lang.swift.decl.typealias,`
	`5380`	`+ key.accessibility: source.lang.swift.accessibility.public,`
	`5381`	`+ key.name: "typedef_int_t",`
	`5382`	`+ key.offset: 4624,`
	`5383`	`+ key.length: 31,`
	`5384`	`+ key.nameoffset: 4634,`
	`5385`	`+ key.namelength: 13`
	`5386`	`+ },`
`5351`	`5387`	`{`
`5352`	`5388`	`key.kind: source.lang.swift.decl.var.global,`
`5353`	`5389`	`key.accessibility: source.lang.swift.accessibility.public,`