From 43407f1c748203a4305878ba10b99f4996943847 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 17 Jun 2016 15:53:05 +0300 Subject: [PATCH] Remove old hack: Idea doesn't expect increasing modification count during highlighting (KT-12526) addImport() is called from ImportAllMembersIntention.isApplicableTo() and increasing modification count during highlighting ruins Idea expectations. #KT-12526 Fixed --- .../jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt b/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt index f21776dc486..f7f0888fdb2 100644 --- a/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt +++ b/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt @@ -18,8 +18,6 @@ package org.jetbrains.kotlin.util import com.intellij.openapi.project.Project import com.intellij.psi.PsiElement -import com.intellij.psi.impl.PsiModificationTrackerImpl -import com.intellij.psi.util.PsiModificationTracker import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings @@ -366,11 +364,6 @@ class ImportInsertHelperImpl(private val project: Project) : ImportInsertHelper( = this.getImportableTargets(resolutionFacade.analyze(this, BodyResolveMode.PARTIAL)) private fun addImport(fqName: FqName, allUnder: Boolean): KtImportDirective { - //TODO: it's a temporary hack for JetCodeFragment's and non-physical files - // We should increment modification tracker after inserting import to invalidate resolve caches. - // Without this modification references with new import won't be resolved. - (PsiModificationTracker.SERVICE.getInstance(project) as PsiModificationTrackerImpl).incOutOfCodeBlockModificationCounter() - val importPath = ImportPath(fqName, allUnder) val psiFactory = KtPsiFactory(project)