Skip to content
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

Jump to bottom

Fixed missing attributes in optional closure type name #1237

Merged
merged 5 commits into from
Dec 15, 2023
Merged

Fixed missing attributes in optional closure type name #1237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ad285a7
Fixed missing attributes in optional closure type name
igor-savelev-bumble Dec 12, 2023
72f1df7
Reverted changes in unwrappedTypeName
igor-savelev-bumble Dec 12, 2023
cca37ec
Added fix for implicitly unwrapped closures
igor-savelev-bumble Dec 14, 2023
50ff6e7
Added forced brackets for optional existential and opaque types
igor-savelev-bumble Dec 14, 2023
c98b8b0
Revert "Added forced brackets for optional existential and opaque types"
igor-savelev-bumble Dec 14, 2023
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
4 changes: 2 additions & 2 deletions SourceryFramework/Sources/Parsing/SwiftSyntax/AST/TypeName+SwiftSyntax.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ extension TypeName {
} else if let typeIdentifier = node.as(OptionalTypeSyntax.self) {
let type = TypeName(typeIdentifier.wrappedType)
let needsWrapping = type.isClosure || type.isProtocolComposition
self.init(name: needsWrapping ? "(\(type.name))" : type.name,
self.init(name: needsWrapping ? "(\(type.asSource))" : type.name,
isOptional: true,
isImplicitlyUnwrappedOptional: false,
tuple: type.tuple,
Expand All @@ -78,7 +78,7 @@ extension TypeName {
} else if let typeIdentifier = node.as(ImplicitlyUnwrappedOptionalTypeSyntax.self) {
let type = TypeName(typeIdentifier.wrappedType)
let needsWrapping = type.isClosure || type.isProtocolComposition
self.init(name: needsWrapping ? "(\(type.name))" : type.name,
self.init(name: needsWrapping ? "(\(type.asSource))" : type.name,
isOptional: false,
isImplicitlyUnwrappedOptional: true,
tuple: type.tuple,
Expand Down
18 changes: 18 additions & 0 deletions SourceryTests/Parsing/FileParser_TypeNameSpec.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,24 @@ class TypeNameSpec: QuickSpec {
expect(typeName("@escaping @autoclosure () -> String").description).to(equal("@autoclosure @escaping () -> String"))
}
}

context("given optional closure type with attributes") {
it("keeps attributes in unwrappedTypeName") {
expect(typeName("(@MainActor @Sendable (Int) -> Void)?").unwrappedTypeName).to(equal("(@MainActor @Sendable (Int) -> Void)"))
}
it("keeps attributes in name") {
expect(typeName("(@MainActor @Sendable (Int) -> Void)?").name).to(equal("(@MainActor @Sendable (Int) -> Void)?"))
}
}

context("given implicitly unwrapped optional closure type with attributes") {
it("keeps attributes in unwrappedTypeName") {
expect(typeName("(@MainActor @Sendable (Int) -> Void)!").unwrappedTypeName).to(equal("(@MainActor @Sendable (Int) -> Void)"))
}
it("keeps attributes in name") {
expect(typeName("(@MainActor @Sendable (Int) -> Void)!").name).to(equal("(@MainActor @Sendable (Int) -> Void)!"))
}
}
}
}
}