Skip to content

Add shared cursorInfo infrastructure and forEach-to-forIn code action #2588

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

Open
MoonMao42 wants to merge 14 commits into
base: main
Choose a base branch
from
+1,003 −79
Open

Add shared cursorInfo infrastructure and forEach-to-forIn code action #2588

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
84e3d03
Add shared cursorInfo infrastructure and forEach-to-forIn code action
MoonMao42 Apr 1, 2026
71f7a2a
Address review feedback: simplify SharedCursorInfo, clean up scope API
MoonMao42 Apr 1, 2026
c589d56
Address second round of review feedback
MoonMao42 Apr 2, 2026
2eab090
Fix visitors skipping root closure when checking for return-with-valu…
MoonMao42 Apr 2, 2026
61cab51
Add proper formatting with BasicFormat and improve test coverage
MoonMao42 Apr 4, 2026
b79a34a
Address third round of review feedback
MoonMao42 Apr 8, 2026
6b3eef4
Address fourth round of review feedback
MoonMao42 Apr 10, 2026
e31adb4
Remove redundant try await from async let initializers and reformat
MoonMao42 Apr 14, 2026
52c8ab1
Fix code action scope after main update
MoonMao42 Apr 24, 2026
dd53596
Revert "Fix code action scope after main update"
MoonMao42 Apr 24, 2026
7536d9c
Fix comment code action scope type
MoonMao42 Apr 24, 2026
2c4fc12
Fix Windows build for forEach conversion
MoonMao42 Apr 27, 2026
ab3bd33
Support per-range cursor info caching in code actions
MoonMao42 May 1, 2026
d3fc8f2
Merge remote-tracking branch 'origin/main' into shared-cursorinfo-pr
MoonMao42 May 15, 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
2 changes: 2 additions & 0 deletions Sources/SwiftLanguageService/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ add_library(SwiftLanguageService STATIC
CodeActions/ConvertIntegerLiteral.swift
CodeActions/ConvertJSONToCodableStruct.swift
CodeActions/ConvertStringConcatenationToStringInterpolation.swift
CodeActions/ForEachToForInCodeAction.swift
CodeActions/PackageManifestEdits.swift
CodeActions/RemoveUnusedImports.swift
CodeActions/SharedCursorInfo.swift
CodeActions/SyntaxCodeActionProvider.swift
CodeActions/SyntaxCodeActions.swift
CodeActions/SyntaxRefactoringCodeActionProvider.swift
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftLanguageService/CodeActions/AddDocumentation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ package struct AddDocumentation: EditRefactoringProvider {
}

extension AddDocumentation: SyntaxRefactoringCodeActionProvider {
static func nodeToRefactor(in scope: SyntaxCodeActionScope) -> Input? {
static func nodeToRefactor(in scope: CodeActionScope) -> Input? {
return scope.innermostNodeContainingRange?.findParentOfSelf(
ofType: DeclSyntax.self,
stoppingIf: { $0.is(CodeBlockItemSyntax.self) || $0.is(MemberBlockItemSyntax.self) || $0.is(ExprSyntax.self) }
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftLanguageService/CodeActions/ApplyDeMorganLaw.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ package import SwiftSyntax
///
/// This code action supports both boolean (`!`, `&&`, `||`) and bitwise (`~`, `&`, `|`) operators.
struct ApplyDeMorganLaw: SyntaxCodeActionProvider {
static func codeActions(in scope: SyntaxCodeActionScope) -> [CodeAction] {
static func codeActions(in scope: CodeActionScope) async -> [CodeAction] {
guard let node = scope.innermostNodeContainingRange else {
return []
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftLanguageService/CodeActions/ConvertCommentToDocComment.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ struct ConvertCommentToDocComment: SyntaxRefactoringProvider {
extension ConvertCommentToDocComment: SyntaxRefactoringCodeActionProvider {
static let title = "Convert Comment to Doc Comment"

static func nodeToRefactor(in scope: SyntaxCodeActionScope) -> DeclSyntax? {
static func nodeToRefactor(in scope: CodeActionScope) -> DeclSyntax? {
let cursorPosition = scope.snapshot.absolutePosition(of: scope.request.range.lowerBound)
guard let token = scope.file.token(at: cursorPosition) else {
return nil
Expand Down
4 changes: 2 additions & 2 deletions Sources/SwiftLanguageService/CodeActions/ConvertIfLetToGuard.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import SwiftSyntaxBuilder
/// return value
/// ```
@_spi(Testing) public struct ConvertIfLetToGuard: SyntaxCodeActionProvider {
static func codeActions(in scope: SyntaxCodeActionScope) -> [CodeAction] {
static func codeActions(in scope: CodeActionScope) async -> [CodeAction] {
guard let ifExpr = findConvertibleIfExpr(in: scope) else {
return []
}
Expand Down Expand Up @@ -115,7 +115,7 @@ import SwiftSyntaxBuilder
]
}

private static func findConvertibleIfExpr(in scope: SyntaxCodeActionScope) -> IfExprSyntax? {
private static func findConvertibleIfExpr(in scope: CodeActionScope) -> IfExprSyntax? {
var node: Syntax? = scope.innermostNodeContainingRange
while let c = node, !isFunctionBoundary(c) {
if let ifExpr = c.as(IfExprSyntax.self) {
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftLanguageService/CodeActions/ConvertIntegerLiteral.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ extension IntegerLiteralExprSyntax.Radix {
/// Syntactic code action provider to convert integer literals between
/// different bases.
struct ConvertIntegerLiteral: SyntaxCodeActionProvider {
static func codeActions(in scope: SyntaxCodeActionScope) -> [CodeAction] {
static func codeActions(in scope: CodeActionScope) async -> [CodeAction] {
guard
let token = scope.innermostNodeContainingRange,
let integerExpr = token.parent?.as(IntegerLiteralExprSyntax.self),
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftLanguageService/CodeActions/ConvertJSONToCodableStruct.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ package struct ConvertJSONToCodableStruct: EditRefactoringProvider {
}

extension ConvertJSONToCodableStruct: SyntaxRefactoringCodeActionProvider {
static func nodeToRefactor(in scope: SyntaxCodeActionScope) -> Syntax? {
static func nodeToRefactor(in scope: CodeActionScope) -> Syntax? {
var node: Syntax? = scope.innermostNodeContainingRange
while let unwrappedNode = node, ![.codeBlockItem, .memberBlockItem].contains(unwrappedNode.kind) {
if preflightRefactoring(unwrappedNode) != nil {
Expand Down
2 changes: 1 addition & 1 deletion ...es/SwiftLanguageService/CodeActions/ConvertStringConcatenationToStringInterpolation.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ struct ConvertStringConcatenationToStringInterpolation: SyntaxRefactoringProvide
extension ConvertStringConcatenationToStringInterpolation: SyntaxRefactoringCodeActionProvider {
static let title: String = "Convert String Concatenation to String Interpolation"

static func nodeToRefactor(in scope: SyntaxCodeActionScope) -> SequenceExprSyntax? {
static func nodeToRefactor(in scope: CodeActionScope) -> SequenceExprSyntax? {
guard let expr = scope.innermostNodeContainingRange,
let seqExpr = expr.findParentOfSelf(
ofType: SequenceExprSyntax.self,
Expand Down
Loading