azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reformat: replace with operator assignment

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-05-15 13:28:08 +03:00
parent c49eaf2604
commit bec1ae3d94
1 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/inspections/ReplaceWithOperatorAssignmentInspection.kt
+24 -16
View File
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
class ReplaceWithOperatorAssignmentInspection : AbstractApplicabilityBasedInspection<KtBinaryExpression>( class ReplaceWithOperatorAssignmentInspection : AbstractApplicabilityBasedInspection<KtBinaryExpression>(
KtBinaryExpression::class.java KtBinaryExpression::class.java
) { ) {
override fun isApplicable(element: KtBinaryExpression): Boolean { override fun isApplicable(element: KtBinaryExpression): Boolean {
@@ -57,7 +57,11 @@ class ReplaceWithOperatorAssignmentInspection : AbstractApplicabilityBasedInspec
override fun fixText(element: KtBinaryExpression) = override fun fixText(element: KtBinaryExpression) =
"Replace with '${(element.right as? KtBinaryExpression)?.operationReference?.operationSignTokenType?.value}='" "Replace with '${(element.right as? KtBinaryExpression)?.operationReference?.operationSignTokenType?.value}='"
private fun checkExpressionRepeat(variableExpression: KtNameReferenceExpression, expression: KtBinaryExpression, bindingContext: BindingContext): Boolean { private fun checkExpressionRepeat(
variableExpression: KtNameReferenceExpression,
expression: KtBinaryExpression,
bindingContext: BindingContext
): Boolean {
val descriptor = bindingContext[BindingContext.REFERENCE_TARGET, expression.operationReference]?.containingDeclaration val descriptor = bindingContext[BindingContext.REFERENCE_TARGET, expression.operationReference]?.containingDeclaration
val isPrimitiveOperation = descriptor is ClassDescriptor && KotlinBuiltIns.isPrimitiveType(descriptor.defaultType) val isPrimitiveOperation = descriptor is ClassDescriptor && KotlinBuiltIns.isPrimitiveType(descriptor.defaultType)
@@ -75,7 +79,11 @@ class ReplaceWithOperatorAssignmentInspection : AbstractApplicabilityBasedInspec
expressionLeft is KtBinaryExpression -> { expressionLeft is KtBinaryExpression -> {
val sameCommutativeOperation = expressionLeft.operationToken == operationToken && isCommutative(operationToken) val sameCommutativeOperation = expressionLeft.operationToken == operationToken && isCommutative(operationToken)
isPrimitiveOperation && sameCommutativeOperation && checkExpressionRepeat(variableExpression, expressionLeft, bindingContext) isPrimitiveOperation && sameCommutativeOperation && checkExpressionRepeat(
variableExpression,
expressionLeft,
bindingContext
)
} }
else -> { else -> {
@@ -86,10 +94,10 @@ class ReplaceWithOperatorAssignmentInspection : AbstractApplicabilityBasedInspec
private fun isCommutative(operationToken: IElementType) = operationToken == KtTokens.PLUS || operationToken == KtTokens.MUL private fun isCommutative(operationToken: IElementType) = operationToken == KtTokens.PLUS || operationToken == KtTokens.MUL
private fun isArithmeticOperation(operationToken: IElementType) = operationToken == KtTokens.PLUS || private fun isArithmeticOperation(operationToken: IElementType) = operationToken == KtTokens.PLUS ||
operationToken == KtTokens.MINUS || operationToken == KtTokens.MINUS ||
operationToken == KtTokens.MUL || operationToken == KtTokens.MUL ||
operationToken == KtTokens.DIV || operationToken == KtTokens.DIV ||
operationToken == KtTokens.PERC operationToken == KtTokens.PERC
override fun applyTo(element: PsiElement, project: Project, editor: Editor?) { override fun applyTo(element: PsiElement, project: Project, editor: Editor?) {
(element as? KtBinaryExpression)?.replace(buildOperatorAssignment(element)) (element as? KtBinaryExpression)?.replace(buildOperatorAssignment(element))
@@ -97,17 +105,17 @@ class ReplaceWithOperatorAssignmentInspection : AbstractApplicabilityBasedInspec
private fun buildOperatorAssignment(element: KtBinaryExpression): KtBinaryExpression { private fun buildOperatorAssignment(element: KtBinaryExpression): KtBinaryExpression {
val replacement = buildOperatorAssignmentText( val replacement = buildOperatorAssignmentText(
element.left as KtNameReferenceExpression, element.left as KtNameReferenceExpression,
element.right as KtBinaryExpression, element.right as KtBinaryExpression,
"" ""
) )
return KtPsiFactory(element).createExpression(replacement) as KtBinaryExpression return KtPsiFactory(element).createExpression(replacement) as KtBinaryExpression
} }
private tailrec fun buildOperatorAssignmentText( private tailrec fun buildOperatorAssignmentText(
variableExpression: KtNameReferenceExpression, variableExpression: KtNameReferenceExpression,
expression: KtBinaryExpression, expression: KtBinaryExpression,
tail: String tail: String
): String { ): String {
val operationText = expression.operationReference.text val operationText = expression.operationReference.text
val variableName = variableExpression.text val variableName = variableExpression.text
@@ -123,9 +131,9 @@ class ReplaceWithOperatorAssignmentInspection : AbstractApplicabilityBasedInspec
expression.left is KtBinaryExpression -> expression.left is KtBinaryExpression ->
buildOperatorAssignmentText( buildOperatorAssignmentText(
variableExpression, variableExpression,
expression.left as KtBinaryExpression, expression.left as KtBinaryExpression,
"$operationText ${expression.right!!.text}".appendTail() "$operationText ${expression.right!!.text}".appendTail()
) )
else -> else ->