-
Notifications
You must be signed in to change notification settings - Fork 378
Add swap binary operands code action #2694
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.
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
somiljain2006
wants to merge
4
commits into
swiftlang:main
Choose a base branch
from
somiljain2006:code-action
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+567
−0
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
090368b
Add swap binary operands code action
somiljain2006 03a7a61
Refine SwapBinaryOperands operator matching and error handling
somiljain2006 32a2f0d
Refine SwapBinaryOperands implementation
somiljain2006 df46956
Refine SwapBinaryOperands operator selection
somiljain2006 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
171 changes: 171 additions & 0 deletions
171
Sources/SwiftSyntaxCodeActions/SwapBinaryOperands.swift
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,171 @@ | ||
| //===----------------------------------------------------------------------===// | ||
| // | ||
| // This source file is part of the Swift.org open source project | ||
| // | ||
| // Copyright (c) 2014 - 2026 Apple Inc. and the Swift project authors | ||
| // Licensed under Apache License v2.0 with Runtime Library Exception | ||
| // | ||
| // See https://swift.org/LICENSE.txt for license information | ||
| // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors | ||
| // | ||
| //===----------------------------------------------------------------------===// | ||
|
|
||
| internal import LanguageServerProtocol | ||
| internal import SourceKitLSP | ||
| import SwiftBasicFormat | ||
| import SwiftExtensions | ||
| import SwiftOperators | ||
| import SwiftRefactor | ||
| import SwiftSyntax | ||
|
|
||
| struct SwapBinaryOperands: SyntaxRefactoringCodeActionProvider { | ||
| package static let title: String = "Swap operands" | ||
|
|
||
| package static func nodeToRefactor(in scope: SyntaxCodeActionScope) -> ExprSyntax? { | ||
| guard let node = scope.innermostNodeContainingRange else { | ||
| return nil | ||
| } | ||
|
|
||
| guard | ||
| let opExpr = node.findParentOfSelf( | ||
| ofType: ExprSyntax.self, | ||
| stoppingIf: { $0.is(CodeBlockItemSyntax.self) }, | ||
| matching: { $0.is(BinaryOperatorExprSyntax.self) } | ||
| )?.as(BinaryOperatorExprSyntax.self) | ||
| else { | ||
| return nil | ||
| } | ||
|
|
||
| // Only offer the refactoring when the operator participates in a | ||
| // binary expression that can be folded into an InfixOperatorExprSyntax. | ||
| guard | ||
| opExpr.parent?.is(InfixOperatorExprSyntax.self) == true | ||
| || opExpr.parent?.as(ExprListSyntax.self)?.parent?.is(SequenceExprSyntax.self) == true | ||
| else { | ||
| return nil | ||
| } | ||
|
|
||
| let startPos = scope.snapshot.absolutePosition(of: scope.request.range.lowerBound) | ||
| let endPos = scope.snapshot.absolutePosition(of: scope.request.range.upperBound) | ||
| let selectionRange = startPos..<endPos | ||
|
|
||
| // Only offer the refactoring when the cursor or selection targets the | ||
| // operator token. This prevents offering the action when the cursor is placed on | ||
| // either operand or in surrounding trivia. | ||
| let tokenRange = opExpr.operator.trimmedRange | ||
| guard selectionRange.overlapsOrTouches(tokenRange) else { | ||
| return nil | ||
| } | ||
|
|
||
| return ExprSyntax(opExpr) | ||
| } | ||
|
|
||
| package static func textRefactor(syntax opExpr: ExprSyntax, in context: Void) throws -> [SourceEdit] { | ||
| guard let binOp = opExpr.as(BinaryOperatorExprSyntax.self) else { | ||
| throw RefactoringNotApplicableError("Selected expression is not a binary operator") | ||
| } | ||
|
|
||
| // Locate the smallest expression that may contain the operator under the cursor. | ||
| // SequenceExprSyntax needs to be folded before precedence-aware rewriting can occur. | ||
| let exprToFold: ExprSyntax | ||
| if let infixExpr = binOp.parent?.as(InfixOperatorExprSyntax.self) { | ||
| exprToFold = ExprSyntax(infixExpr) | ||
| } else if let seqExpr = binOp.parent?.as(ExprListSyntax.self)?.parent?.as(SequenceExprSyntax.self) { | ||
| exprToFold = ExprSyntax(seqExpr) | ||
| } else { | ||
| throw RefactoringNotApplicableError("Could not find an infix or sequence expression to fold") | ||
| } | ||
|
|
||
| let foldedExpr: ExprSyntax | ||
|
|
||
| // Fold operator precedence so nested expressions such as | ||
| // `1 + -2 * 5` become a structured tree where the selected | ||
| // infix operator can be identified reliably. | ||
| if exprToFold.is(SequenceExprSyntax.self) { | ||
| guard let folded = OperatorTable.standardOperators.foldAll(exprToFold, errorHandler: { _ in }).as(ExprSyntax.self) | ||
| else { | ||
| throw RefactoringNotApplicableError("Failed to fold operator sequence") | ||
| } | ||
| foldedExpr = folded | ||
| } else { | ||
| foldedExpr = exprToFold.detached | ||
| } | ||
|
|
||
| let currentOperatorText = binOp.operator.text | ||
|
|
||
| // Calculate the relative UTF-8 offset. | ||
| let targetRelativeOffset = | ||
| binOp.operator.positionAfterSkippingLeadingTrivia.utf8Offset - exprToFold.position.utf8Offset | ||
| let targetPosition = AbsolutePosition(utf8Offset: foldedExpr.position.utf8Offset + targetRelativeOffset) | ||
|
|
||
| guard | ||
| let token = foldedExpr.token(at: targetPosition), | ||
| let infixExpr = token.parent?.as(BinaryOperatorExprSyntax.self)?.parent?.as(InfixOperatorExprSyntax.self) | ||
| else { | ||
| throw RefactoringNotApplicableError("Could not locate the target operator in the folded tree") | ||
| } | ||
|
|
||
| // Avoid offering the refactoring for malformed expressions such as | ||
| // `a +` or `+ b` while the user is still typing. | ||
| guard !infixExpr.hasError else { | ||
| throw RefactoringNotApplicableError("Expression is malformed or incomplete") | ||
| } | ||
|
|
||
| let newOperatorText: String | ||
|
|
||
| // Comparison operators must be inverted when operands are swapped. | ||
| // Symmetric operators can be reused unchanged. | ||
| switch currentOperatorText { | ||
| case "<": newOperatorText = ">" | ||
| case ">": newOperatorText = "<" | ||
| case "<=": newOperatorText = ">=" | ||
| case ">=": newOperatorText = "<=" | ||
| case "+", "*", "==", "!=", "===", "!==", "&&", "||", "&", "|", "^": | ||
| newOperatorText = currentOperatorText | ||
| default: | ||
| throw RefactoringNotApplicableError("Operator '\(currentOperatorText)' cannot be swapped") | ||
| } | ||
|
|
||
| let leftOperand = infixExpr.leftOperand | ||
| let rightOperand = infixExpr.rightOperand | ||
|
|
||
| // Preserve operand trivia so whitespace and comments remain attached | ||
| // to the same side of the expression after swapping. | ||
| var newLeft = rightOperand | ||
| newLeft.leadingTrivia = leftOperand.leadingTrivia | ||
| newLeft.trailingTrivia = leftOperand.trailingTrivia | ||
|
|
||
| var newRight = leftOperand | ||
| newRight.leadingTrivia = rightOperand.leadingTrivia | ||
| newRight.trailingTrivia = rightOperand.trailingTrivia | ||
|
|
||
| guard let targetBinOp = infixExpr.operator.as(BinaryOperatorExprSyntax.self) else { | ||
| throw RefactoringNotApplicableError("Failed to cast operator to BinaryOperatorExprSyntax") | ||
| } | ||
| let newToken = targetBinOp.operator.with(\.tokenKind, .binaryOperator(newOperatorText)) | ||
| let newOperatorExpr = ExprSyntax(targetBinOp.with(\.operator, newToken)) | ||
|
|
||
| let newInfix = | ||
| infixExpr | ||
| .with(\.leftOperand, newLeft) | ||
| .with(\.operator, newOperatorExpr) | ||
| .with(\.rightOperand, newRight) | ||
|
|
||
| // Calculate the absolute range of the targeted expression in the original source | ||
| // by applying its relative offset from the detached folded tree. | ||
| let rootOffset = exprToFold.position.utf8Offset | ||
| let foldedRootOffset = foldedExpr.position.utf8Offset | ||
|
|
||
| let startOffset = rootOffset + (infixExpr.position.utf8Offset - foldedRootOffset) | ||
| let endOffset = rootOffset + (infixExpr.endPosition.utf8Offset - foldedRootOffset) | ||
|
|
||
| let editRange = AbsolutePosition(utf8Offset: startOffset)..<AbsolutePosition(utf8Offset: endOffset) | ||
|
|
||
| return [ | ||
| SourceEdit( | ||
| range: editRange, | ||
| replacement: newInfix.description | ||
| ) | ||
| ] | ||
| } | ||
| } |
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.