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

Refactoring

Browse Source
This commit is contained in:
Valentin Kipyatkov
2016-09-16 19:40:39 +03:00
parent c8260f8d98
commit 32a436e893
1 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/OperatorReferenceSearcher.kt
+21 -29
View File
@@ -141,40 +141,32 @@ abstract class OperatorReferenceSearcher<TReferenceElement : KtElement>(
if (!options.searchForOperatorConventions) return null if (!options.searchForOperatorConventions) return null
if (name == OperatorNameConventions.INVOKE) {
return InvokeOperatorReferenceSearcher(declaration, searchScope, consumer, optimizer)
}
val binaryOp = OperatorConventions.BINARY_OPERATION_NAMES.inverse()[name] val binaryOp = OperatorConventions.BINARY_OPERATION_NAMES.inverse()[name]
if (binaryOp != null) {
val assignmentOp = OperatorConventions.ASSIGNMENT_OPERATION_COUNTERPARTS.inverse()[binaryOp]
val operationTokens = listOf(binaryOp, assignmentOp).filterNotNull()
return BinaryOperatorReferenceSearcher(declaration, operationTokens, searchScope, consumer, optimizer)
}
val assignmentOp = OperatorConventions.ASSIGNMENT_OPERATIONS.inverse()[name] val assignmentOp = OperatorConventions.ASSIGNMENT_OPERATIONS.inverse()[name]
if (assignmentOp != null) {
return BinaryOperatorReferenceSearcher(declaration, listOf(assignmentOp), searchScope, consumer, optimizer)
}
val unaryOp = OperatorConventions.UNARY_OPERATION_NAMES.inverse()[name] val unaryOp = OperatorConventions.UNARY_OPERATION_NAMES.inverse()[name]
if (unaryOp != null) {
return UnaryOperatorReferenceSearcher(declaration, unaryOp, searchScope, consumer, optimizer) when {
binaryOp != null -> {
val counterpartAssignmentOp = OperatorConventions.ASSIGNMENT_OPERATION_COUNTERPARTS.inverse()[binaryOp]
val operationTokens = listOf(binaryOp, counterpartAssignmentOp).filterNotNull()
return BinaryOperatorReferenceSearcher(declaration, operationTokens, searchScope, consumer, optimizer)
}
assignmentOp != null -> return BinaryOperatorReferenceSearcher(declaration, listOf(assignmentOp), searchScope, consumer, optimizer)
unaryOp != null -> return UnaryOperatorReferenceSearcher(declaration, unaryOp, searchScope, consumer, optimizer)
name == OperatorNameConventions.INVOKE -> return InvokeOperatorReferenceSearcher(declaration, searchScope, consumer, optimizer)
name == OperatorNameConventions.GET -> return IndexingOperatorReferenceSearcher(declaration, searchScope, consumer, optimizer, isSet = false)
name == OperatorNameConventions.SET -> return IndexingOperatorReferenceSearcher(declaration, searchScope, consumer, optimizer, isSet = true)
name == OperatorNameConventions.CONTAINS -> return ContainsOperatorReferenceSearcher(declaration, searchScope, consumer, optimizer)
else -> return null
} }
if (name == OperatorNameConventions.GET) {
return IndexingOperatorReferenceSearcher(declaration, searchScope, consumer, optimizer, isSet = false)
}
if (name == OperatorNameConventions.SET) {
return IndexingOperatorReferenceSearcher(declaration, searchScope, consumer, optimizer, isSet = true)
}
if (name == OperatorNameConventions.CONTAINS) {
return ContainsOperatorReferenceSearcher(declaration, searchScope, consumer, optimizer)
}
return null
} }
//TODO: check no light elements here //TODO: check no light elements here