Skip to content

[5.2][SourceKit] Avoid calling AbstractStorageDecl::isSettable during syntactic operations #30774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 3, 2020
Merged

[5.2][SourceKit] Avoid calling AbstractStorageDecl::isSettable during syntactic operations #30774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/AST/Decl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3559,7 +3559,7 @@ static Type computeNominalType(NominalTypeDecl *decl, DeclTypeKind kind) {
// Get the parent type.
Type Ty;
DeclContext *dc = decl->getDeclContext();
if (dc->isTypeContext()) {
if (!isa<ProtocolDecl>(decl) && dc->isTypeContext()) {
switch (kind) {
case DeclTypeKind::DeclaredType: {
auto *nominal = dc->getSelfNominalTypeDecl();
Expand Down
6 changes: 6 additions & 0 deletions test/SourceKit/DocumentStructure/Inputs/invalid.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
extension Worker {
public protocol BasicWorker: Worker {
var eventLoop
}
}

class 3 {}

extension OuterCls {
Expand Down
10 changes: 10 additions & 0 deletions test/SourceKit/DocumentStructure/Inputs/main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,3 +165,13 @@ public extension Outer2 {
}
}
#endif

var var_with_didset = 10 {
didSet { print(oldValue) }
}

#if os(iOS)
@objc protocol MyProtocol: NSObjectProtocol {
var thing: NSObject {get}
}
#endif
69 changes: 68 additions & 1 deletion test/SourceKit/DocumentStructure/structure.swift.empty.response
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
key.offset: 0,
key.length: 2587,
key.length: 2744,
key.diagnostic_stage: source.diagnostic.stage.swift.parse,
key.substructure: [
{
Expand Down Expand Up @@ -1615,6 +1615,73 @@
]
}
]
},
{
key.kind: source.lang.swift.decl.var.global,
key.accessibility: source.lang.swift.accessibility.internal,
key.setter_accessibility: source.lang.swift.accessibility.internal,
key.name: "var_with_didset",
key.offset: 2588,
key.length: 57,
key.nameoffset: 2592,
key.namelength: 15,
key.bodyoffset: 2614,
key.bodylength: 30
},
{
key.kind: source.lang.swift.expr.call,
key.name: "print",
key.offset: 2626,
key.length: 15,
key.nameoffset: 2626,
key.namelength: 5,
key.bodyoffset: 2632,
key.bodylength: 8
},
{
key.kind: source.lang.swift.decl.protocol,
key.accessibility: source.lang.swift.accessibility.internal,
key.name: "MyProtocol",
key.offset: 2665,
key.length: 71,
key.runtime_name: "_TtP4main10MyProtocol_",
key.nameoffset: 2674,
key.namelength: 10,
key.bodyoffset: 2704,
key.bodylength: 31,
key.inheritedtypes: [
{
key.name: "NSObjectProtocol"
}
],
key.attributes: [
{
key.offset: 2659,
key.length: 5,
key.attribute: source.decl.attribute.objc
}
],
key.elements: [
{
key.kind: source.lang.swift.structure.elem.typeref,
key.offset: 2686,
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: 2709,
key.length: 25,
key.typename: "NSObject",
key.nameoffset: 2713,
key.namelength: 5,
key.bodyoffset: 2730,
key.bodylength: 3
}
]
}
],
key.diagnostics: [
Expand Down
69 changes: 68 additions & 1 deletion test/SourceKit/DocumentStructure/structure.swift.foobar.response
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
key.offset: 0,
key.length: 2587,
key.length: 2744,
key.diagnostic_stage: source.diagnostic.stage.swift.parse,
key.substructure: [
{
Expand Down Expand Up @@ -1615,6 +1615,73 @@
]
}
]
},
{
key.kind: source.lang.swift.decl.var.global,
key.accessibility: source.lang.swift.accessibility.internal,
key.setter_accessibility: source.lang.swift.accessibility.internal,
key.name: "var_with_didset",
key.offset: 2588,
key.length: 57,
key.nameoffset: 2592,
key.namelength: 15,
key.bodyoffset: 2614,
key.bodylength: 30
},
{
key.kind: source.lang.swift.expr.call,
key.name: "print",
key.offset: 2626,
key.length: 15,
key.nameoffset: 2626,
key.namelength: 5,
key.bodyoffset: 2632,
key.bodylength: 8
},
{
key.kind: source.lang.swift.decl.protocol,
key.accessibility: source.lang.swift.accessibility.internal,
key.name: "MyProtocol",
key.offset: 2665,
key.length: 71,
key.runtime_name: "_TtP4main10MyProtocol_",
key.nameoffset: 2674,
key.namelength: 10,
key.bodyoffset: 2704,
key.bodylength: 31,
key.inheritedtypes: [
{
key.name: "NSObjectProtocol"
}
],
key.attributes: [
{
key.offset: 2659,
key.length: 5,
key.attribute: source.decl.attribute.objc
}
],
key.elements: [
{
key.kind: source.lang.swift.structure.elem.typeref,
key.offset: 2686,
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: 2709,
key.length: 25,
key.typename: "NSObject",
key.nameoffset: 2713,
key.namelength: 5,
key.bodyoffset: 2730,
key.bodylength: 3
}
]
}
],
key.diagnostics: [
Expand Down
96 changes: 75 additions & 21 deletions test/SourceKit/DocumentStructure/structure.swift.invalid.response
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,68 +1,122 @@
{
key.offset: 0,
key.length: 82,
key.length: 166,
key.diagnostic_stage: source.diagnostic.stage.swift.parse,
key.substructure: [
{
key.kind: source.lang.swift.decl.extension,
key.name: "Worker",
key.offset: 0,
key.length: 82,
key.nameoffset: 10,
key.namelength: 6,
key.bodyoffset: 18,
key.bodylength: 63,
key.substructure: [
{
key.kind: source.lang.swift.decl.protocol,
key.accessibility: source.lang.swift.accessibility.public,
key.name: "BasicWorker",
key.offset: 28,
key.length: 52,
key.nameoffset: 37,
key.namelength: 11,
key.bodyoffset: 58,
key.bodylength: 21,
key.inheritedtypes: [
{
key.name: "Worker"
}
],
key.attributes: [
{
key.offset: 21,
key.length: 6,
key.attribute: source.decl.attribute.public
}
],
key.elements: [
{
key.kind: source.lang.swift.structure.elem.typeref,
key.offset: 50,
key.length: 6
}
],
key.substructure: [
{
key.kind: source.lang.swift.decl.var.instance,
key.accessibility: source.lang.swift.accessibility.public,
key.setter_accessibility: source.lang.swift.accessibility.public,
key.name: "eventLoop",
key.offset: 63,
key.length: 13,
key.nameoffset: 67,
key.namelength: 9
}
]
}
]
},
{
key.kind: source.lang.swift.decl.class,
key.accessibility: source.lang.swift.accessibility.internal,
key.name: "3",
key.offset: 0,
key.offset: 84,
key.length: 10,
key.nameoffset: 6,
key.nameoffset: 90,
key.namelength: 1,
key.bodyoffset: 9,
key.bodyoffset: 93,
key.bodylength: 0
},
{
key.kind: source.lang.swift.decl.extension,
key.name: "OuterCls",
key.offset: 12,
key.offset: 96,
key.length: 43,
key.nameoffset: 22,
key.nameoffset: 106,
key.namelength: 8,
key.bodyoffset: 32,
key.bodyoffset: 116,
key.bodylength: 22,
key.substructure: [
{
key.kind: source.lang.swift.decl.class,
key.name: "InnerCls1",
key.offset: 35,
key.offset: 119,
key.length: 18,
key.nameoffset: 41,
key.nameoffset: 125,
key.namelength: 9,
key.bodyoffset: 52,
key.bodyoffset: 136,
key.bodylength: 0
}
]
},
{
key.kind: source.lang.swift.expr.closure,
key.offset: 57,
key.offset: 141,
key.length: 24,
key.nameoffset: 0,
key.namelength: 0,
key.bodyoffset: 58,
key.bodyoffset: 142,
key.bodylength: 22,
key.substructure: [
{
key.kind: source.lang.swift.stmt.brace,
key.offset: 57,
key.offset: 141,
key.length: 24,
key.nameoffset: 0,
key.namelength: 0,
key.bodyoffset: 58,
key.bodyoffset: 142,
key.bodylength: 22,
key.substructure: [
{
key.kind: source.lang.swift.decl.class,
key.accessibility: source.lang.swift.accessibility.private,
key.name: "MyCoolClass",
key.offset: 59,
key.offset: 143,
key.length: 22,
key.nameoffset: 65,
key.nameoffset: 149,
key.namelength: 11,
key.bodyoffset: 78,
key.bodyoffset: 162,
key.bodylength: 2
}
]
Expand All @@ -72,31 +126,31 @@
],
key.diagnostics: [
{
key.line: 1,
key.line: 7,
key.column: 7,
key.filepath: invalid.swift,
key.severity: source.diagnostic.severity.error,
key.description: "class name can only start with a letter or underscore, not a number",
key.diagnostic_stage: source.diagnostic.stage.swift.parse
},
{
key.line: 7,
key.line: 13,
key.column: 1,
key.filepath: invalid.swift,
key.severity: source.diagnostic.severity.error,
key.description: "top-level statement cannot begin with a closure expression",
key.diagnostic_stage: source.diagnostic.stage.swift.parse
},
{
key.line: 11,
key.line: 17,
key.column: 1,
key.filepath: invalid.swift,
key.severity: source.diagnostic.severity.error,
key.description: "expected '}' at end of closure",
key.diagnostic_stage: source.diagnostic.stage.swift.parse,
key.diagnostics: [
{
key.line: 7,
key.line: 13,
key.column: 1,
key.filepath: invalid.swift,
key.severity: source.diagnostic.severity.note,
Expand Down
Loading