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

Get rid of implicit resolve within statsInfo for KotlinAddImportAction (EA-210670)

Browse Source
This commit is contained in:
Vladimir Dolzhenko
2019-09-18 10:43:38 -07:00
parent 3a1d649b30
commit 81c9edfff4
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/actions/KotlinAddImportAction.kt
+5 -6
View File
@@ -24,14 +24,12 @@ import com.intellij.codeInsight.hint.QuestionAction
import com.intellij.ide.util.DefaultPsiElementCellRenderer
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.editor.Editor
import com.intellij.openapi.module.ModuleUtilCore
import com.intellij.openapi.project.Project
import com.intellij.openapi.ui.popup.PopupStep
import com.intellij.openapi.ui.popup.util.BaseListPopupStep
import com.intellij.psi.PsiDocumentManager
import com.intellij.psi.PsiElement
import com.intellij.psi.statistics.StatisticsManager
import com.intellij.psi.util.ProximityLocation
import com.intellij.psi.util.proximity.PsiProximityComparator
import com.intellij.ui.popup.list.ListPopupImpl
import com.intellij.ui.popup.list.PopupListElementRenderer
@@ -43,6 +41,7 @@ import org.jetbrains.kotlin.idea.KotlinBundle
import org.jetbrains.kotlin.idea.KotlinDescriptorIconProvider
import org.jetbrains.kotlin.idea.caches.resolve.resolveImportReference
import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde
import org.jetbrains.kotlin.idea.completion.KotlinStatisticsInfo
import org.jetbrains.kotlin.idea.core.ImportableFqNameClassifier
import org.jetbrains.kotlin.idea.imports.importableFqName
import org.jetbrains.kotlin.idea.references.KtSimpleNameReference
@@ -231,12 +230,12 @@ class KotlinAddImportAction internal constructor(
val file = element.containingKtFile
variant.declarationToImport(project)?.let {
val location = ProximityLocation(element, ModuleUtilCore.findModuleForPsiElement(element))
StatisticsManager.getInstance().incUseCount(PsiProximityComparator.STATISTICS_KEY, it, location)
}
val statisticsManager = StatisticsManager.getInstance()
variant.descriptorsToImport.forEach { descriptor ->
val statisticsInfo = KotlinStatisticsInfo.forDescriptor(descriptor)
statisticsManager.incUseCount(statisticsInfo)
// for class or package we use ShortenReferences because we not necessary insert an import but may want to
// insert partly qualified name