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

Fix indexing of suspend function types

Browse Source
This commit is contained in:
Denis Zharkov
2016-12-15 21:35:48 +03:00
committed by Stanislav Erokhin
parent b527a4d158
commit f0cda8ac8d
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/IndexUtils.kt
+14 -5
View File
@@ -17,6 +17,7 @@
package org.jetbrains.kotlin.idea.stubindex package org.jetbrains.kotlin.idea.stubindex
import com.intellij.psi.stubs.IndexSink import com.intellij.psi.stubs.IndexSink
import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.stubs.KotlinCallableStubBase import org.jetbrains.kotlin.psi.stubs.KotlinCallableStubBase
import org.jetbrains.kotlin.util.aliasImportMap import org.jetbrains.kotlin.util.aliasImportMap
@@ -24,11 +25,14 @@ import org.jetbrains.kotlin.util.aliasImportMap
fun <TDeclaration : KtCallableDeclaration> indexTopLevelExtension(stub: KotlinCallableStubBase<TDeclaration>, sink: IndexSink) { fun <TDeclaration : KtCallableDeclaration> indexTopLevelExtension(stub: KotlinCallableStubBase<TDeclaration>, sink: IndexSink) {
if (stub.isExtension()) { if (stub.isExtension()) {
val declaration = stub.psi val declaration = stub.psi
declaration.receiverTypeReference!!.typeElement?.index(declaration, sink) val containingTypeReference = declaration.receiverTypeReference!!
containingTypeReference.typeElement?.index(declaration, sink, containingTypeReference)
} }
} }
private fun <TDeclaration : KtCallableDeclaration> KtTypeElement.index(declaration: TDeclaration, sink: IndexSink) { private fun <TDeclaration : KtCallableDeclaration> KtTypeElement.index(
declaration: TDeclaration, sink: IndexSink, containingTypeReference: KtTypeReference
) {
fun occurrence(typeName: String) { fun occurrence(typeName: String) {
val name = declaration.name ?: return val name = declaration.name ?: return
sink.occurrence(KotlinTopLevelExtensionsByReceiverTypeIndex.INSTANCE.key, sink.occurrence(KotlinTopLevelExtensionsByReceiverTypeIndex.INSTANCE.key,
@@ -43,7 +47,7 @@ private fun <TDeclaration : KtCallableDeclaration> KtTypeElement.index(declarati
if (typeParameter != null) { if (typeParameter != null) {
val bound = typeParameter.extendsBound val bound = typeParameter.extendsBound
if (bound != null) { if (bound != null) {
bound.typeElement?.index(declaration, sink) bound.typeElement?.index(declaration, sink, containingTypeReference)
} }
else { else {
occurrence("Any") occurrence("Any")
@@ -56,11 +60,16 @@ private fun <TDeclaration : KtCallableDeclaration> KtTypeElement.index(declarati
aliasImportMap()[referenceName].forEach { occurrence(it) } aliasImportMap()[referenceName].forEach { occurrence(it) }
} }
is KtNullableType -> innerType?.index(declaration, sink) is KtNullableType -> innerType?.index(declaration, sink, containingTypeReference)
is KtFunctionType -> { is KtFunctionType -> {
val arity = parameters.size + (if (receiverTypeReference != null) 1 else 0) val arity = parameters.size + (if (receiverTypeReference != null) 1 else 0)
occurrence("Function$arity") val suspendPrefix =
if (containingTypeReference.modifierList?.hasModifier(KtTokens.SUSPEND_KEYWORD) == true)
"Suspend"
else
""
occurrence("${suspendPrefix}Function$arity")
} }
is KtDynamicType -> occurrence("Any") is KtDynamicType -> occurrence("Any")