From 4e58319d1b26f92b9c958b38a136a5a97c9c93ed Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 11 May 2017 11:55:29 +0200 Subject: [PATCH] Revert "Deprecated setting was used for import optimization on the fly. (#1049)" This reverts commit 75d231cc37d4a6ce0359ac0c98075b1ae3f571a3. The added API is available only in IDEA 2017.1.1, not in the original 2017.1 build. --- .../idea/inspections/KotlinUnusedImportInspection.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinUnusedImportInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinUnusedImportInspection.kt index e3a28e626c0..661120730dd 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinUnusedImportInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinUnusedImportInspection.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.idea.inspections -import com.intellij.codeInsight.CodeInsightWorkspaceSettings +import com.intellij.codeInsight.CodeInsightSettings import com.intellij.codeInsight.actions.OptimizeImportsProcessor import com.intellij.codeInsight.daemon.QuickFixBundle import com.intellij.codeInsight.daemon.impl.DaemonCodeAnalyzerEx @@ -124,7 +124,7 @@ class KotlinUnusedImportInspection : AbstractKotlinInspection() { val problems = data.unusedImports.map { val fixes = arrayListOf() fixes.add(OptimizeImportsQuickFix(file)) - if (!CodeInsightWorkspaceSettings.getInstance(file.project).optimizeImportsOnTheFly) { + if (!CodeInsightSettings.getInstance().OPTIMIZE_IMPORTS_ON_THE_FLY) { fixes.add(EnableOptimizeImportsOnTheFlyFix(file)) } manager.createProblemDescriptor(it, @@ -142,7 +142,7 @@ class KotlinUnusedImportInspection : AbstractKotlinInspection() { } private fun scheduleOptimizeImportsOnTheFly(file: KtFile, data: OptimizedImportsBuilder.InputData) { - if (!CodeInsightWorkspaceSettings.getInstance(file.project).optimizeImportsOnTheFly) return + if (!CodeInsightSettings.getInstance().OPTIMIZE_IMPORTS_ON_THE_FLY) return val optimizedImports = KotlinImportOptimizer.prepareOptimizedImports(file, data) ?: return // return if already optimized // unwrap progress indicator @@ -231,7 +231,7 @@ class KotlinUnusedImportInspection : AbstractKotlinInspection() { override fun getFamilyName() = name override fun applyFix(project: Project, descriptor: ProblemDescriptor) { - CodeInsightWorkspaceSettings.getInstance(file.project).setOptimizeImportsOnTheFly(true, file.project) + CodeInsightSettings.getInstance().OPTIMIZE_IMPORTS_ON_THE_FLY = true OptimizeImportsProcessor(project, file).run() // we optimize imports manually because on-the-fly import optimization won't work while the caret is in imports } }