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

Fixed optimize imports for operators

Browse Source
This commit is contained in:
Valentin Kipyatkov
2016-09-30 01:19:59 +03:00
parent 95a3a29382
commit 17adee68cd
14 changed files with 141 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/psi/KtOperationReferenceExpression.kt
+3 -7
View File
@@ -23,16 +23,12 @@ import org.jetbrains.kotlin.lexer.KtSingleValueToken
import org.jetbrains.kotlin.lexer.KtToken
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.parsing.KotlinExpressionParsing
import org.jetbrains.kotlin.resolve.constants.evaluate.binaryOperations
import org.jetbrains.kotlin.types.expressions.OperatorConventions
class KtOperationReferenceExpression(node: ASTNode) : KtSimpleNameExpressionImpl(node) {
override fun getReferencedNameElement() = findChildByType<PsiElement?>(KotlinExpressionParsing.ALL_OPERATIONS) ?: this
fun getNameForConventionalOperation(unaryOperations: Boolean = true, binaryOperations: Boolean = true): Name? {
val operator = (firstChild as? TreeElement)?.elementType as? KtToken ?: return null
return OperatorConventions.getNameForOperationSymbol(operator, unaryOperations, binaryOperations)
}
fun isPredefinedOperator() = (firstChild as? TreeElement)?.elementType is KtSingleValueToken
val operationSignTokenType: KtSingleValueToken?
get() = (firstChild as? TreeElement)?.elementType as? KtSingleValueToken
}
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolverUtil.kt
+2 -2
View File
@@ -131,13 +131,13 @@ fun isConventionCall(call: Call): Boolean {
val callElement = call.callElement
if (callElement is KtArrayAccessExpression || callElement is KtDestructuringDeclarationEntry) return true
val calleeExpression = call.calleeExpression as? KtOperationReferenceExpression ?: return false
return calleeExpression.getNameForConventionalOperation() != null
return calleeExpression.operationSignTokenType != null
}
fun isInfixCall(call: Call): Boolean {
val operationRefExpression = call.calleeExpression as? KtOperationReferenceExpression ?: return false
val binaryExpression = operationRefExpression.parent as? KtBinaryExpression ?: return false
return binaryExpression.operationReference === operationRefExpression && !operationRefExpression.isPredefinedOperator()
return binaryExpression.operationReference === operationRefExpression && operationRefExpression.operationSignTokenType == null
}
fun isInvokeCallOnVariable(call: Call): Boolean {
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/OperatorCallChecker.kt
+1 -1
View File
@@ -57,7 +57,7 @@ class OperatorCallChecker : CallChecker {
return
}
val isConventionOperator = element is KtOperationReferenceExpression && element.getNameForConventionalOperation() != null
val isConventionOperator = element is KtOperationReferenceExpression && element.operationSignTokenType != null
if (isConventionOperator || element is KtArrayAccessExpression) {
if (!functionDescriptor.isOperator) {
report(reportOn, functionDescriptor, context.trace)