Skip to content

Fix whitespace in convertStoredPropertyToComputed #3326

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
ahoppen merged 2 commits into from
May 8, 2026
Merged

Fix whitespace in convertStoredPropertyToComputed #3326

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0e6b57
Fixed whitespace error
Padmashree06 May 6, 2026
7c0a90b
Remove leading trivia
Padmashree06 May 7, 2026
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
7 changes: 6 additions & 1 deletion Sources/SwiftRefactor/ConvertStoredPropertyToComputed.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,20 @@ public struct ConvertStoredPropertyToComputed: SyntaxRefactoringProvider {
if let existingType = binding.typeAnnotation {
typeAnnotation = existingType
} else if let providedType = context.type {
typeAnnotation = TypeAnnotationSyntax(type: providedType)
typeAnnotation = TypeAnnotationSyntax(
colon: .colonToken(leadingTrivia: [], trailingTrivia: .space),
Copy link
Copy Markdown
Member

@ahoppen ahoppen May 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Leading trivia is empty by default so we don’t need to specify it.

type: providedType
)
} else {
typeAnnotation = TypeAnnotationSyntax(
colon: .colonToken(leadingTrivia: [], trailingTrivia: .space),
type: TypeSyntax(stringLiteral: "<#Type#>")
)
}

let newBinding =
binding
.with(\.pattern, binding.pattern.with(\.trailingTrivia, []))
.with(\.initializer, nil)
.with(\.typeAnnotation, typeAnnotation)
.with(
Expand Down
4 changes: 2 additions & 2 deletions Tests/SwiftRefactorTest/ConvertStoredPropertyToComputedTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,14 +297,14 @@ final class ConvertStoredPropertyToComputedTest: XCTestCase {

func testRefactoringStoredPropertyMissingTypeAnnotation() throws {
let baseline: DeclSyntax = "var foo = \"abc\""
let expected: DeclSyntax = "var foo :<#Type#>{ \"abc\" }"
let expected: DeclSyntax = "var foo: <#Type#>{ \"abc\" }"

try assertRefactorConvert(baseline, expected: expected)
}

func testRefactoringStoredPropertyWithTypeAnnotation() throws {
let baseline: DeclSyntax = "var foo = \"abc\""
let expected: DeclSyntax = "var foo :String{ \"abc\" }"
let expected: DeclSyntax = "var foo: String{ \"abc\" }"

let context = ConvertStoredPropertyToComputed.Context(type: TypeSyntax(stringLiteral: "String"))
try assertRefactorConvert(baseline, expected: expected, context: context)
Expand Down