Skip to content

[BUG] Harden isOptional resolving #67

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
mobrien-ghost merged 1 commit into from
Jan 17, 2026
Merged

[BUG] Harden isOptional resolving #67

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
28 changes: 7 additions & 21 deletions Sources/SyntaxSparrow/Internal/Extensions/SyntaxProtocol+IsOptional.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,27 +18,13 @@ extension SyntaxProtocol {
func resolveIsSyntaxOptional(viewMode: SyntaxTreeViewMode = .fixedUp) -> Bool {
guard self.as(OptionalTypeSyntax.self) == nil else { return true }
guard parent?.as(OptionalTypeSyntax.self) == nil else { return true }
// Token assessment approach
var result = false
var nextToken = nextToken(viewMode: .fixedUp)
var potentialOptional: Bool = nextToken?.text == "?"
while nextToken != nil {
if nextToken?.text == ")" {
potentialOptional = true
}
if potentialOptional, nextToken?.text == ")" {
break
}
if potentialOptional, nextToken?.text == "?" {
result = true
break
}
nextToken = nextToken?.nextToken(viewMode: .fixedUp)
if let parent = parent?.as(TypeAnnotationSyntax.self) {
return parent.type.as(OptionalTypeSyntax.self) != nil
} else if let tupleElement = self.as(TupleTypeElementSyntax.self) {
return tupleElement.type.as(OptionalTypeSyntax.self) != nil
} else if let generic = self.as(GenericArgumentSyntax.self) {
return generic.argument.as(OptionalTypeSyntax.self) != nil
}
// Fallback child approach
if !result, children(viewMode: viewMode).contains(where: { $0.syntaxNodeType == OptionalTypeSyntax.self }) {
return true
}
return result
return false
}
}
6 changes: 3 additions & 3 deletions Tests/SyntaxSparrowTests/Supporting Types/EntityTypeTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ final class EntityTypeTests: XCTestCase {
func test_array_asVariable_willReturnExpectedTypes() throws {
let source = """
var arrayShorthand: [(name: String, age: Int?)]?
var arrayIdentifier: Array<String>)
var arrayIdentifier: Array<String>?
"""
instanceUnderTest.updateToSource(source)
XCTAssertTrue(instanceUnderTest.isStale)
Expand Down Expand Up @@ -111,11 +111,11 @@ final class EntityTypeTests: XCTestCase {
target = instanceUnderTest.variables[1]
XCTAssertEqual(target.keyword, "var")
XCTAssertEqual(target.name, "arrayIdentifier")
XCTAssertFalse(target.isOptional)
XCTAssertTrue(target.isOptional)

if case let EntityType.array(array) = target.type {
XCTAssertEqual(array.declType, .generic)
XCTAssertFalse(array.isOptional)
XCTAssertTrue(array.isOptional)
XCTAssertEqual(array.elementType, .simple("String"))
} else {
XCTFail("variable type should be Array")
Expand Down
Loading