Add refactoring action to convert stored to computed properties#2622
Open
ahoppen wants to merge 1 commit into
Open
Add refactoring action to convert stored to computed properties#2622ahoppen wants to merge 1 commit into
ahoppen wants to merge 1 commit into
Conversation
ahoppen
commented
Apr 27, 2026
| WorkspaceEdit( | ||
| changes: [ | ||
| uri: [ | ||
| TextEdit(range: positions["1️⃣"]..<positions["3️⃣"], newText: "\n var x :Int{ 25 }") |
Member
Author
There was a problem hiding this comment.
@Padmashree06: It looks like the refactoring action in swift-syntax doesn’t produce correct whitespaces here (it should be x: Int, not x :Int). Would you be able to work on a fix for that in swift-syntax?
There was a problem hiding this comment.
@ahoppen I have fixed the whitespace error in swift-syntax.
Member
Author
|
@swift-ci Please test |
rintaro
reviewed
May 10, 2026
| return .resolveEditLazily | ||
| } | ||
| // Cursor info reports type as `_` if it cannot determine the type. | ||
| if let type = try? await scope.cursorInfo(at: scope.snapshot.position(of: identifier.position)).only?.typeName, |
Member
There was a problem hiding this comment.
As I mentioned in #2588 (comment), I don't think we should allow arbitrary cursorInfo in textDocument/codeAction request.
If the client don't support codeAction/resolve for .edit, imo we should drop this action.
|
|
||
| package func codeActionResolve(_ req: CodeActionResolveRequest) async throws -> CodeAction { | ||
| return req.codeAction | ||
| guard let data = UnresolvedCodeActionData(fromLSPAny: req.codeAction.data) else { |
Member
There was a problem hiding this comment.
IMO the whole mechanism should be something as simple as:
protocol SyntaxCodeActionProvider: SendableMetatype {
// Provider name. default impl: { String(describing: Self.self) }
static var name: String
static func codeActions(in scope: SyntaxCodeActionScope) -> [CodeAction]
static func resolve(_ codeAction: CodeAction, in snapshot: DocumentSnapshot) -> CodeAction
}
struct UnresolvedCodeActionData: LSPAnyCodable {
// Provider name generated the code action.
var provider: String
/// The document on which the code action should be applied.
var document: VersionedTextDocumentIdentifier
// Original `CodeAction.data` attached.
var orignalData: LSPAny?
}func codeAction(_ req: CodeActionRequest) -> CodeActionRequestResponse {
let actions = [(provider: SyntaxCodeActionProvider.Type, action: CodeAction)] = ...
return .codeActions(
actions.map { item
if shouldResolve(item.action) {
var action = item.action
action = UnresolvedCodeActionData(provider: provider.name, codeAction: action.data)
return action
} else {
return item.action
}
}
)
}
func codeActionResolve(_ req: CodeActionResolveRequest) -> CodeAction {
var codeAction = req.codeAction
let data = UnresolvedCodeActionData(fromLSPAny: codeAction.data) else {
return codeAction
}
let provider = getCodeActionProvider(name: data.provider)
codeAction.data = data.originalData
return provider.resolve(
codeAction, in: getSnapshot(data.document) // Probably with some more context to request `cursorInfo`.
)
}Each SyntaxCodeActionProvider should be able to store abitrary LSPAny information necessary for resolving the action, as the CodeAction.data.
This is the first syntactic refactoring action that needs to perform a cursor info request on `codeAction/resolve`, so the majority of this PR is to add infrastructure for that. Based on swiftlang#2496. Co-Authored-By: Padmashree S S <padmashreess2006@gmail.com>
ahoppen
force-pushed
the
stored-to-computed
branch
from
e6c900e to
81df70d
Compare
Member
Author
|
Finally got back to this and updated it to have two distinct code action + resolve phases. Ready for another review. |
Member
Author
|
swiftlang/swift-tools-protocols#72 @swift-ci Please test |
rintaro
reviewed
Jul 8, 2026
| } | ||
| let syntaxTree = await syntaxTreeManager.syntaxTree(for: snapshot) | ||
|
|
||
| // Replay the code action without resolve support. This should now resolve all properties. |
Member
There was a problem hiding this comment.
This comment is not relevant anymore
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is the first syntactic refactoring action that needs to perform a cursor info request on
codeAction/resolve, so the majority of this PR is to add infrastructure for that.Based on #2496.