From 637d3430ff0fa5637eb596ad557d11f545ea24de Mon Sep 17 00:00:00 2001 From: Roman Golyshev Date: Mon, 6 Jul 2020 16:27:37 +0300 Subject: [PATCH] KT-39869 Remove redundant `performDelayedRefactoringRequests` call - In `ObsoleteExperimentalCoroutinesInspection` it is redundant because it is performed immediately after the single `bindToFqName` call, so there is no reason to postpone the refactoring and then immediately invoke it - In `ObsoleteKotlinJsPackagesInspection` there are no reason to call it at all (no refactorings are postponed) --- .../migration/ObsoleteExperimentalCoroutinesInspection.kt | 5 +---- .../migration/ObsoleteKotlinJsPackagesInspection.kt | 3 --- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/migration/ObsoleteExperimentalCoroutinesInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/migration/ObsoleteExperimentalCoroutinesInspection.kt index f78ba707e3f..b3305c05f45 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/migration/ObsoleteExperimentalCoroutinesInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/migration/ObsoleteExperimentalCoroutinesInspection.kt @@ -15,7 +15,6 @@ import org.jetbrains.kotlin.config.LanguageVersion import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny -import org.jetbrains.kotlin.idea.codeInsight.shorten.performDelayedRefactoringRequests import org.jetbrains.kotlin.idea.imports.importableFqName import org.jetbrains.kotlin.idea.references.KtSimpleNameReference import org.jetbrains.kotlin.idea.references.mainReference @@ -119,9 +118,7 @@ private class ObsoleteTopLevelFunctionUsageReporter( val element = descriptor.psiElement if (element !is KtSimpleNameExpression) return - element.mainReference.bindToFqName(FqName(fqName), KtSimpleNameReference.ShorteningMode.DELAYED_SHORTENING) - - performDelayedRefactoringRequests(project) + element.mainReference.bindToFqName(FqName(fqName), KtSimpleNameReference.ShorteningMode.FORCED_SHORTENING) } } } diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/migration/ObsoleteKotlinJsPackagesInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/migration/ObsoleteKotlinJsPackagesInspection.kt index 05fbda5288d..177f9db6052 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/migration/ObsoleteKotlinJsPackagesInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/migration/ObsoleteKotlinJsPackagesInspection.kt @@ -11,7 +11,6 @@ import org.jetbrains.kotlin.backend.common.serialization.findPackage import org.jetbrains.kotlin.config.LanguageVersion import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.idea.KotlinBundle -import org.jetbrains.kotlin.idea.codeInsight.shorten.performDelayedRefactoringRequests import org.jetbrains.kotlin.idea.references.resolveMainReferenceToDescriptors import org.jetbrains.kotlin.psi.KtDotQualifiedExpression import org.jetbrains.kotlin.psi.KtPsiFactory @@ -85,8 +84,6 @@ private object KotlinBrowserFullyQualifiedUsageReporter : ObsoleteCodeProblemRep val newQualifier = KtPsiFactory(oldQualifier).createExpression(KOTLINX_BROWSER_PACKAGE) oldQualifier.replace(newQualifier) - - performDelayedRefactoringRequests(project) } } }