From 70ed03ac4b772a587b02d386cc00ecdd26530986 Mon Sep 17 00:00:00 2001 From: Alexander Podkhalyuzin Date: Tue, 5 Nov 2019 13:50:05 +0100 Subject: [PATCH] Now using Kotlin setting instead of Java one in 191 as well --- .../kotlin/idea/quickfix/KotlinReferenceImporter.kt.191 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinReferenceImporter.kt.191 b/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinReferenceImporter.kt.191 index 01d30c8d3b9..64d777c5d51 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinReferenceImporter.kt.191 +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinReferenceImporter.kt.191 @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.idea.quickfix -import com.intellij.codeInsight.CodeInsightSettings import com.intellij.codeInsight.daemon.ReferenceImporter import com.intellij.codeInsight.daemon.impl.DaemonCodeAnalyzerEx import com.intellij.codeInsight.daemon.impl.DaemonListeners @@ -28,6 +27,7 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.idea.actions.createSingleImportAction import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.caches.resolve.resolveImportReference +import org.jetbrains.kotlin.idea.codeInsight.KotlinCodeInsightWorkspaceSettings import org.jetbrains.kotlin.idea.core.targetDescriptors import org.jetbrains.kotlin.idea.references.mainReference import org.jetbrains.kotlin.psi.KtExpression @@ -47,7 +47,7 @@ class KotlinReferenceImporter : ReferenceImporter { val nameExpression = file.findElementAt(offset)?.parent as? KtSimpleNameExpression ?: return false - if (!CodeInsightSettings.getInstance().ADD_UNAMBIGIOUS_IMPORTS_ON_THE_FLY) return false + if (!KotlinCodeInsightWorkspaceSettings.getInstance(file.project).addUnambiguousImportsOnTheFly) return false val importFix: ImportFixBase? = findImportFixAt(editor, file, offset) if (importFix != null && !importFix.isOutdated()) { @@ -107,7 +107,7 @@ class KotlinReferenceImporter : ReferenceImporter { } private fun KtSimpleNameExpression.autoImport(editor: Editor, file: KtFile): Boolean { - if (!CodeInsightSettings.getInstance().ADD_UNAMBIGIOUS_IMPORTS_ON_THE_FLY) return false + if (!KotlinCodeInsightWorkspaceSettings.getInstance(file.project).addUnambiguousImportsOnTheFly) return false if (!DaemonListeners.canChangeFileSilently(file)) return false if (hasUnresolvedImportWhichCanImport(file, getReferencedName())) return false