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

Refactoring: extract fun in ObsoleteExperimentalCoroutinesInspection.kt

Browse Source
This commit is contained in:
Nikolay Krasko
2018-09-19 15:36:43 +03:00
parent 58a8411575
commit 0efb4cc5f6
1 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/inspections/migration/ObsoleteExperimentalCoroutinesInspection.kt
+25 -22
View File
@@ -99,26 +99,33 @@ private class ObsoleteCoroutineUsageFix(val delegate: CoroutineFix) : LocalQuick
}
}
private fun isTopLevelCallForReplace(simpleNameExpression: KtSimpleNameExpression, oldFqName: String, newFqName: String): Boolean {
if (simpleNameExpression.parent !is KtCallExpression) return false
val descriptor = simpleNameExpression.resolveMainReferenceToDescriptors().firstOrNull() ?: return false
val callableDescriptor = descriptor as? CallableDescriptor ?: return false
val resolvedToFqName = callableDescriptor.fqNameOrNull()?.asString() ?: return false
if (resolvedToFqName != oldFqName) return false
val project = simpleNameExpression.project
val isInIndex = KotlinTopLevelFunctionFqnNameIndex.getInstance()
.get(newFqName, project, GlobalSearchScope.allScope(project))
.isEmpty()
return !isInIndex
}
private class ObsoleteTopLevelFunctionUsage(
val textMarker: String, val oldFqName: String, val newFqName: String
) : CoroutineMigrationProblem {
override fun report(holder: ProblemsHolder, isOnTheFly: Boolean, simpleNameExpression: KtSimpleNameExpression): Boolean {
if (simpleNameExpression.text != textMarker) return false
if (simpleNameExpression.parent !is KtCallExpression) return false
val descriptor = simpleNameExpression.resolveMainReferenceToDescriptors().firstOrNull() ?: return false
val callableDescriptor = descriptor as? CallableDescriptor ?: return false
val resolvedToFqName = callableDescriptor.fqNameOrNull()?.asString() ?: return false
if (resolvedToFqName != oldFqName) return false
val project = simpleNameExpression.project
KotlinTopLevelFunctionFqnNameIndex.getInstance()
.get(newFqName, project, GlobalSearchScope.allScope(project))
.asSequence()
.firstOrNull() ?: return false
if (!isTopLevelCallForReplace(simpleNameExpression, oldFqName, newFqName)) {
return false
}
val problemDescriptor = holder.manager.createProblemDescriptor(
simpleNameExpression,
@@ -150,18 +157,14 @@ private class ObsoleteTopLevelFunctionUsage(
}
private class ObsoleteExtensionFunctionUsage(
val textMarker: String, val oldFqName: String, newFqName: String
val textMarker: String, val oldFqName: String, val newFqName: String
) : CoroutineMigrationProblem {
override fun report(holder: ProblemsHolder, isOnTheFly: Boolean, simpleNameExpression: KtSimpleNameExpression): Boolean {
if (simpleNameExpression.text != textMarker) return false
if (simpleNameExpression.parent !is KtCallExpression) return false
val descriptor = simpleNameExpression.resolveMainReferenceToDescriptors().firstOrNull() ?: return false
val callableDescriptor = descriptor as? CallableDescriptor ?: return false
val resolvedToFqName = callableDescriptor.fqNameOrNull()?.asString() ?: return false
if (resolvedToFqName != oldFqName) return false
if (!isTopLevelCallForReplace(simpleNameExpression, oldFqName, newFqName)) {
return false
}
val problemDescriptor = holder.manager.createProblemDescriptor(
simpleNameExpression,