Merge pull request #7670 from nathawes/rdar16271632

Use clang-style USRs for swift decls that are exposed to Objective C
This commit is contained in:
Nathan Hawes
2017-02-21 17:00:28 -08:00
committed by GitHub
11 changed files with 362 additions and 145 deletions

View File

@@ -4213,7 +4213,7 @@ var FooSubUnnamedEnumeratorA1: Int { get }
{
key.kind: source.lang.swift.ref.protocol,
key.name: "AnyObject",
key.usr: "s:Ps9AnyObject",
key.usr: "c:objc(pl)AnyObject",
key.offset: 6402,
key.length: 9
},
@@ -4235,7 +4235,7 @@ var FooSubUnnamedEnumeratorA1: Int { get }
{
key.kind: source.lang.swift.ref.protocol,
key.name: "AnyObject",
key.usr: "s:Ps9AnyObject",
key.usr: "c:objc(pl)AnyObject",
key.offset: 6456,
key.length: 9
},
@@ -4302,7 +4302,7 @@ var FooSubUnnamedEnumeratorA1: Int { get }
{
key.kind: source.lang.swift.ref.protocol,
key.name: "AnyObject",
key.usr: "s:Ps9AnyObject",
key.usr: "c:objc(pl)AnyObject",
key.offset: 6565,
key.length: 9
},
@@ -7092,7 +7092,7 @@ var FooSubUnnamedEnumeratorA1: Int { get }
key.usr: "c:objc(cs)FooClassPropertyOwnership(py)assignable",
key.offset: 6370,
key.length: 42,
key.fully_annotated_decl: "<decl.var.instance><syntaxtype.keyword>unowned(unsafe)</syntaxtype.keyword> <syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>assignable</decl.name>: <decl.var.type><ref.protocol usr=\"s:Ps9AnyObject\">AnyObject</ref.protocol>!</decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> <syntaxtype.keyword>set</syntaxtype.keyword> }</decl.var.instance>"
key.fully_annotated_decl: "<decl.var.instance><syntaxtype.keyword>unowned(unsafe)</syntaxtype.keyword> <syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>assignable</decl.name>: <decl.var.type><ref.protocol usr=\"c:objc(pl)AnyObject\">AnyObject</ref.protocol>!</decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> <syntaxtype.keyword>set</syntaxtype.keyword> }</decl.var.instance>"
},
{
key.kind: source.lang.swift.decl.var.instance,
@@ -7100,7 +7100,7 @@ var FooSubUnnamedEnumeratorA1: Int { get }
key.usr: "c:objc(cs)FooClassPropertyOwnership(py)unsafeAssignable",
key.offset: 6418,
key.length: 48,
key.fully_annotated_decl: "<decl.var.instance><syntaxtype.keyword>unowned(unsafe)</syntaxtype.keyword> <syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>unsafeAssignable</decl.name>: <decl.var.type><ref.protocol usr=\"s:Ps9AnyObject\">AnyObject</ref.protocol>!</decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> <syntaxtype.keyword>set</syntaxtype.keyword> }</decl.var.instance>"
key.fully_annotated_decl: "<decl.var.instance><syntaxtype.keyword>unowned(unsafe)</syntaxtype.keyword> <syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>unsafeAssignable</decl.name>: <decl.var.type><ref.protocol usr=\"c:objc(pl)AnyObject\">AnyObject</ref.protocol>!</decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> <syntaxtype.keyword>set</syntaxtype.keyword> }</decl.var.instance>"
},
{
key.kind: source.lang.swift.decl.var.instance,
@@ -7132,7 +7132,7 @@ var FooSubUnnamedEnumeratorA1: Int { get }
key.usr: "c:objc(cs)FooClassPropertyOwnership(py)weakRef",
key.offset: 6547,
key.length: 28,
key.fully_annotated_decl: "<decl.var.instance><syntaxtype.keyword>weak</syntaxtype.keyword> <syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>weakRef</decl.name>: <decl.var.type><ref.protocol usr=\"s:Ps9AnyObject\">AnyObject</ref.protocol>!</decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> <syntaxtype.keyword>set</syntaxtype.keyword> }</decl.var.instance>"
key.fully_annotated_decl: "<decl.var.instance><syntaxtype.keyword>weak</syntaxtype.keyword> <syntaxtype.keyword>var</syntaxtype.keyword> <decl.name>weakRef</decl.name>: <decl.var.type><ref.protocol usr=\"c:objc(pl)AnyObject\">AnyObject</ref.protocol>!</decl.var.type> { <syntaxtype.keyword>get</syntaxtype.keyword> <syntaxtype.keyword>set</syntaxtype.keyword> }</decl.var.instance>"
},
{
key.kind: source.lang.swift.decl.var.instance,