From 722f7ff05664541eb3fa4dffe3bca7b59abb8001 Mon Sep 17 00:00:00 2001 From: Alexander Podkhalyuzin Date: Tue, 5 Nov 2019 11:57:08 +0300 Subject: [PATCH] Now using Kotlin setting instead of Java one --- .../org/jetbrains/kotlin/idea/quickfix/ActualImportFix.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ActualImportFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ActualImportFix.kt index 9e77b7bf196..7e378b0dde0 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ActualImportFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ActualImportFix.kt @@ -5,17 +5,18 @@ package org.jetbrains.kotlin.idea.quickfix -import com.intellij.codeInsight.CodeInsightSettings import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.diagnostics.Diagnostic +import org.jetbrains.kotlin.idea.codeInsight.KotlinCodeInsightWorkspaceSettings import org.jetbrains.kotlin.psi.KtSimpleNameExpression internal class ImportFix(expression: KtSimpleNameExpression): AbstractImportFix(expression, MyFactory) { override fun fixSilently(editor: Editor): Boolean { - if (!CodeInsightSettings.getInstance().ADD_UNAMBIGIOUS_IMPORTS_ON_THE_FLY) return false if (isOutdated()) return false val element = element ?: return false - val addImportAction = createAction(element.project, editor, element) + val project = element.project + if (!KotlinCodeInsightWorkspaceSettings.getInstance(project).addUnambiguousImportsOnTheFly) return false + val addImportAction = createAction(project, editor, element) if (addImportAction.isUnambiguous()) { addImportAction.execute() return true