averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Parser] Include all AST nodes from every #if region in ParserUnit

Browse Source 
'ParserUnit' is used for analyzing syntax structures _mainly_ in
SourceKit.

Since we removed IfConfigDecl from AST, ParserUnit didn't
inclue any AST in #if ... #endif regions even for active region because
it used to consider all inactive. Instead, consider every region
"active" and include all the AST nodes.

rdar://117387631
This commit is contained in:
Rintaro Ishizaki
2025-02-03 12:57:15 -08:00
parent 3afe8ebdf6
commit 694e815f07
12 changed files with 914 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
test/SourceKit/CodeExpand/code-expand.swift
View File

@@ -147,11 +147,13 @@ braced2(x: {<#T##() -> Void#>}, y: Int)
// CHECK-NEXT: }, y: Int)
braced3({
#if true
<#T##() -> Int#>
#endif
})
// CHECK: braced3 {
// CHECK-NEXT: <#code#>
// CHECK-NEXT: }
// CHECK-NEXT: <#code#>
// CHECK-NEXT: }
func returnTrailing() -> Int {
return withtrail(<#T##() -> ()#>)
@@ -254,6 +256,17 @@ func activeWithTrailing() {
// CHECK: forEach {
// CHECK-NEXT: <#code#>
}
#if false
func inactive() {
foo(<#T##value: Foo##Foo#>)
// CHECK: foo(Foo)
}
func inactiveWithTrailing() {
forEach(<#T##() -> ()#>)
// CHECK: forEach {
// CHECK-NEXT: <#code#>
}
#endif
expandClosureWithInternalParameterNames {
withtrail(<#T##callback: (Int, Int) -> Bool##(_ a: Int, _ b: Int) -> Bool#>)

6
test/SourceKit/CodeFormat/indent-pound-if.swift
View File

@@ -35,7 +35,7 @@ print(false)
// RUN: %FileCheck --strict-whitespace %s <%t.response
// CHECK: key.sourcetext: "#else"
// CHECK: key.sourcetext: "let i = 3"
// CHECK: key.sourcetext: "func b () {"
// CHECK: key.sourcetext: " let i = 3"
// CHECK: key.sourcetext: " func b () {"
// CHECK: key.sourcetext: "#elseif os(OSX)"
// CHECK: key.sourcetext: "func b () {"
// CHECK: key.sourcetext: " func b () {"

183
test/SourceKit/DocumentStructure/structure.swift.empty.response
View File

@@ -1428,6 +1428,106 @@
}
]
},
{
key.kind: source.lang.swift.decl.extension,
key.name: "Result",
key.offset: 2496,
key.length: 36,
key.nameoffset: 2506,
key.namelength: 6,
key.bodyoffset: 2514,
key.bodylength: 17,
key.substructure: [
{
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "foo()",
key.offset: 2517,
key.length: 13,
key.nameoffset: 2522,
key.namelength: 5,
key.bodyoffset: 2529,
key.bodylength: 0
}
]
},
{
key.kind: source.lang.swift.decl.extension,
key.name: "Outer",
key.offset: 2534,
key.length: 53,
key.nameoffset: 2544,
key.namelength: 5,
key.bodyoffset: 2551,
key.bodylength: 35,
key.substructure: [
{
key.kind: source.lang.swift.decl.class,
key.name: "Inner",
key.offset: 2554,
key.length: 31,
key.nameoffset: 2560,
key.namelength: 5,
key.bodyoffset: 2567,
key.bodylength: 17,
key.substructure: [
{
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "deinit",
key.offset: 2572,
key.length: 9,
key.nameoffset: 2572,
key.namelength: 6,
key.bodyoffset: 2580,
key.bodylength: 0
}
]
}
]
},
{
key.kind: source.lang.swift.decl.extension,
key.accessibility: source.lang.swift.accessibility.public,
key.name: "Outer2",
key.offset: 2596,
key.length: 55,
key.nameoffset: 2606,
key.namelength: 6,
key.bodyoffset: 2614,
key.bodylength: 36,
key.attributes: [
{
key.offset: 2589,
key.length: 6,
key.attribute: source.decl.attribute.public
}
],
key.substructure: [
{
key.kind: source.lang.swift.decl.class,
key.accessibility: source.lang.swift.accessibility.public,
key.name: "Inner2",
key.offset: 2617,
key.length: 32,
key.nameoffset: 2623,
key.namelength: 6,
key.bodyoffset: 2631,
key.bodylength: 17,
key.substructure: [
{
key.kind: source.lang.swift.decl.function.method.instance,
key.accessibility: source.lang.swift.accessibility.public,
key.name: "deinit",
key.offset: 2636,
key.length: 9,
key.nameoffset: 2636,
key.namelength: 6,
key.bodyoffset: 2644,
key.bodylength: 0
}
]
}
]
},
{
key.kind: source.lang.swift.decl.protocol,
key.accessibility: source.lang.swift.accessibility.internal,
@@ -1478,6 +1578,50 @@
}
]
},
{
key.kind: source.lang.swift.decl.protocol,
key.accessibility: source.lang.swift.accessibility.internal,
key.name: "MyProtocol",
key.offset: 2780,
key.length: 71,
key.nameoffset: 2789,
key.namelength: 10,
key.bodyoffset: 2819,
key.bodylength: 31,
key.inheritedtypes: [
{
key.name: "NSObjectProtocol"
}
],
key.attributes: [
{
key.offset: 2774,
key.length: 5,
key.attribute: source.decl.attribute.objc
}
],
key.elements: [
{
key.kind: source.lang.swift.structure.elem.typeref,
key.offset: 2801,
key.length: 16
}
],
key.substructure: [
{
key.kind: source.lang.swift.decl.var.instance,
key.accessibility: source.lang.swift.accessibility.internal,
key.name: "thing",
key.offset: 2824,
key.length: 25,
key.typename: "NSObject",
key.nameoffset: 2828,
key.namelength: 5,
key.bodyoffset: 2845,
key.bodylength: 3
}
]
},
{
key.kind: source.lang.swift.decl.class,
key.accessibility: source.lang.swift.accessibility.internal,
@@ -1487,7 +1631,44 @@
key.nameoffset: 2866,
key.namelength: 1,
key.bodyoffset: 2869,
key.bodylength: 59
key.bodylength: 59,
key.substructure: [
{
key.kind: source.lang.swift.decl.function.method.instance,
key.accessibility: source.lang.swift.accessibility.internal,
key.name: "foo(a:)",
key.offset: 2899,
key.length: 19,
key.selector_name: "fooWithA:",
key.nameoffset: 2904,
key.namelength: 11,
key.bodyoffset: 2917,
key.bodylength: 0,
key.attributes: [
{
key.offset: 2893,
key.length: 5,
key.attribute: source.decl.attribute.objc.name
},
{
key.offset: 2883,
key.length: 9,
key.attribute: source.decl.attribute.ibaction
}
],
key.substructure: [
{
key.kind: source.lang.swift.decl.var.parameter,
key.name: "a",
key.offset: 2908,
key.length: 6,
key.typename: "Int",
key.nameoffset: 2908,
key.namelength: 1
}
]
}
]
}
],
key.diagnostics: [

183
test/SourceKit/DocumentStructure/structure.swift.foobar.response
View File

@@ -1428,6 +1428,106 @@
}
]
},
{
key.kind: source.lang.swift.decl.extension,
key.name: "Result",
key.offset: 2496,
key.length: 36,
key.nameoffset: 2506,
key.namelength: 6,
key.bodyoffset: 2514,
key.bodylength: 17,
key.substructure: [
{
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "foo()",
key.offset: 2517,
key.length: 13,
key.nameoffset: 2522,
key.namelength: 5,
key.bodyoffset: 2529,
key.bodylength: 0
}
]
},
{
key.kind: source.lang.swift.decl.extension,
key.name: "Outer",
key.offset: 2534,
key.length: 53,
key.nameoffset: 2544,
key.namelength: 5,
key.bodyoffset: 2551,
key.bodylength: 35,
key.substructure: [
{
key.kind: source.lang.swift.decl.class,
key.name: "Inner",
key.offset: 2554,
key.length: 31,
key.nameoffset: 2560,
key.namelength: 5,
key.bodyoffset: 2567,
key.bodylength: 17,
key.substructure: [
{
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "deinit",
key.offset: 2572,
key.length: 9,
key.nameoffset: 2572,
key.namelength: 6,
key.bodyoffset: 2580,
key.bodylength: 0
}
]
}
]
},
{
key.kind: source.lang.swift.decl.extension,
key.accessibility: source.lang.swift.accessibility.public,
key.name: "Outer2",
key.offset: 2596,
key.length: 55,
key.nameoffset: 2606,
key.namelength: 6,
key.bodyoffset: 2614,
key.bodylength: 36,
key.attributes: [
{
key.offset: 2589,
key.length: 6,
key.attribute: source.decl.attribute.public
}
],
key.substructure: [
{
key.kind: source.lang.swift.decl.class,
key.accessibility: source.lang.swift.accessibility.public,
key.name: "Inner2",
key.offset: 2617,
key.length: 32,
key.nameoffset: 2623,
key.namelength: 6,
key.bodyoffset: 2631,
key.bodylength: 17,
key.substructure: [
{
key.kind: source.lang.swift.decl.function.method.instance,
key.accessibility: source.lang.swift.accessibility.public,
key.name: "deinit",
key.offset: 2636,
key.length: 9,
key.nameoffset: 2636,
key.namelength: 6,
key.bodyoffset: 2644,
key.bodylength: 0
}
]
}
]
},
{
key.kind: source.lang.swift.decl.protocol,
key.accessibility: source.lang.swift.accessibility.internal,
@@ -1478,6 +1578,50 @@
}
]
},
{
key.kind: source.lang.swift.decl.protocol,
key.accessibility: source.lang.swift.accessibility.internal,
key.name: "MyProtocol",
key.offset: 2780,
key.length: 71,
key.nameoffset: 2789,
key.namelength: 10,
key.bodyoffset: 2819,
key.bodylength: 31,
key.inheritedtypes: [
{
key.name: "NSObjectProtocol"
}
],
key.attributes: [
{
key.offset: 2774,
key.length: 5,
key.attribute: source.decl.attribute.objc
}
],
key.elements: [
{
key.kind: source.lang.swift.structure.elem.typeref,
key.offset: 2801,
key.length: 16
}
],
key.substructure: [
{
key.kind: source.lang.swift.decl.var.instance,
key.accessibility: source.lang.swift.accessibility.internal,
key.name: "thing",
key.offset: 2824,
key.length: 25,
key.typename: "NSObject",
key.nameoffset: 2828,
key.namelength: 5,
key.bodyoffset: 2845,
key.bodylength: 3
}
]
},
{
key.kind: source.lang.swift.decl.class,
key.accessibility: source.lang.swift.accessibility.internal,
@@ -1487,7 +1631,44 @@
key.nameoffset: 2866,
key.namelength: 1,
key.bodyoffset: 2869,
key.bodylength: 59
key.bodylength: 59,
key.substructure: [
{
key.kind: source.lang.swift.decl.function.method.instance,
key.accessibility: source.lang.swift.accessibility.internal,
key.name: "foo(a:)",
key.offset: 2899,
key.length: 19,
key.selector_name: "fooWithA:",
key.nameoffset: 2904,
key.namelength: 11,
key.bodyoffset: 2917,
key.bodylength: 0,
key.attributes: [
{
key.offset: 2893,
key.length: 5,
key.attribute: source.decl.attribute.objc.name
},
{
key.offset: 2883,
key.length: 9,
key.attribute: source.decl.attribute.ibaction
}
],
key.substructure: [
{
key.kind: source.lang.swift.decl.var.parameter,
key.name: "a",
key.offset: 2908,
key.length: 6,
key.typename: "Int",
key.nameoffset: 2908,
key.namelength: 1
}
]
}
]
}
],
key.diagnostics: [

183
test/SourceKit/DocumentStructure/structure.swift.response
View File

@@ -1428,6 +1428,106 @@
}
]
},
{
key.kind: source.lang.swift.decl.extension,
key.name: "Result",
key.offset: 2496,
key.length: 36,
key.nameoffset: 2506,
key.namelength: 6,
key.bodyoffset: 2514,
key.bodylength: 17,
key.substructure: [
{
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "foo()",
key.offset: 2517,
key.length: 13,
key.nameoffset: 2522,
key.namelength: 5,
key.bodyoffset: 2529,
key.bodylength: 0
}
]
},
{
key.kind: source.lang.swift.decl.extension,
key.name: "Outer",
key.offset: 2534,
key.length: 53,
key.nameoffset: 2544,
key.namelength: 5,
key.bodyoffset: 2551,
key.bodylength: 35,
key.substructure: [
{
key.kind: source.lang.swift.decl.class,
key.name: "Inner",
key.offset: 2554,
key.length: 31,
key.nameoffset: 2560,
key.namelength: 5,
key.bodyoffset: 2567,
key.bodylength: 17,
key.substructure: [
{
key.kind: source.lang.swift.decl.function.method.instance,
key.name: "deinit",
key.offset: 2572,
key.length: 9,
key.nameoffset: 2572,
key.namelength: 6,
key.bodyoffset: 2580,
key.bodylength: 0
}
]
}
]
},
{
key.kind: source.lang.swift.decl.extension,
key.accessibility: source.lang.swift.accessibility.public,
key.name: "Outer2",
key.offset: 2596,
key.length: 55,
key.nameoffset: 2606,
key.namelength: 6,
key.bodyoffset: 2614,
key.bodylength: 36,
key.attributes: [
{
key.offset: 2589,
key.length: 6,
key.attribute: source.decl.attribute.public
}
],
key.substructure: [
{
key.kind: source.lang.swift.decl.class,
key.accessibility: source.lang.swift.accessibility.public,
key.name: "Inner2",
key.offset: 2617,
key.length: 32,
key.nameoffset: 2623,
key.namelength: 6,
key.bodyoffset: 2631,
key.bodylength: 17,
key.substructure: [
{
key.kind: source.lang.swift.decl.function.method.instance,
key.accessibility: source.lang.swift.accessibility.public,
key.name: "deinit",
key.offset: 2636,
key.length: 9,
key.nameoffset: 2636,
key.namelength: 6,
key.bodyoffset: 2644,
key.bodylength: 0
}
]
}
]
},
{
key.kind: source.lang.swift.decl.protocol,
key.accessibility: source.lang.swift.accessibility.internal,
@@ -1478,6 +1578,50 @@
}
]
},
{
key.kind: source.lang.swift.decl.protocol,
key.accessibility: source.lang.swift.accessibility.internal,
key.name: "MyProtocol",
key.offset: 2780,
key.length: 71,
key.nameoffset: 2789,
key.namelength: 10,
key.bodyoffset: 2819,
key.bodylength: 31,
key.inheritedtypes: [
{
key.name: "NSObjectProtocol"
}
],
key.attributes: [
{
key.offset: 2774,
key.length: 5,
key.attribute: source.decl.attribute.objc
}
],
key.elements: [
{
key.kind: source.lang.swift.structure.elem.typeref,
key.offset: 2801,
key.length: 16
}
],
key.substructure: [
{
key.kind: source.lang.swift.decl.var.instance,
key.accessibility: source.lang.swift.accessibility.internal,
key.name: "thing",
key.offset: 2824,
key.length: 25,
key.typename: "NSObject",
key.nameoffset: 2828,
key.namelength: 5,
key.bodyoffset: 2845,
key.bodylength: 3
}
]
},
{
key.kind: source.lang.swift.decl.class,
key.accessibility: source.lang.swift.accessibility.internal,
@@ -1487,7 +1631,44 @@
key.nameoffset: 2866,
key.namelength: 1,
key.bodyoffset: 2869,
key.bodylength: 59
key.bodylength: 59,
key.substructure: [
{
key.kind: source.lang.swift.decl.function.method.instance,
key.accessibility: source.lang.swift.accessibility.internal,
key.name: "foo(a:)",
key.offset: 2899,
key.length: 19,
key.selector_name: "fooWithA:",
key.nameoffset: 2904,
key.namelength: 11,
key.bodyoffset: 2917,
key.bodylength: 0,
key.attributes: [
{
key.offset: 2893,
key.length: 5,
key.attribute: source.decl.attribute.objc.name
},
{
key.offset: 2883,
key.length: 9,
key.attribute: source.decl.attribute.ibaction
}
],
key.substructure: [
{
key.kind: source.lang.swift.decl.var.parameter,
key.name: "a",
key.offset: 2908,
key.length: 6,
key.typename: "Int",
key.nameoffset: 2908,
key.namelength: 1
}
]
}
]
}
],
key.diagnostics: [

4
test/SourceKit/SyntaxMapData/syntaxmap.swift.response
View File

@@ -79,7 +79,7 @@
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
key.kind: source.lang.swift.syntaxtype.typeidentifier,
key.offset: 153,
key.length: 3
},
@@ -99,7 +99,7 @@
key.length: 1
},
{
key.kind: source.lang.swift.syntaxtype.identifier,
key.kind: source.lang.swift.syntaxtype.typeidentifier,
key.offset: 171,
key.length: 5
},