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

Re-enable optimize on the fly activation when unused imports found

Browse Source 
Remove deprecated usages
This commit is contained in:
Nikolay Krasko
2017-06-28 18:20:06 +03:00
parent 6a5d6854bb
commit 9122f58d5d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/inspections/KotlinUnusedImportInspection.kt
+4 -4
View File
@@ -16,7 +16,7 @@
package org.jetbrains.kotlin.idea.inspections package org.jetbrains.kotlin.idea.inspections
import com.intellij.codeInsight.CodeInsightSettings import com.intellij.codeInsight.CodeInsightWorkspaceSettings
import com.intellij.codeInsight.actions.OptimizeImportsProcessor import com.intellij.codeInsight.actions.OptimizeImportsProcessor
import com.intellij.codeInsight.daemon.QuickFixBundle import com.intellij.codeInsight.daemon.QuickFixBundle
import com.intellij.codeInsight.daemon.impl.DaemonCodeAnalyzerEx import com.intellij.codeInsight.daemon.impl.DaemonCodeAnalyzerEx
@@ -124,7 +124,7 @@ class KotlinUnusedImportInspection : AbstractKotlinInspection() {
val problems = data.unusedImports.map { val problems = data.unusedImports.map {
val fixes = arrayListOf<LocalQuickFix>() val fixes = arrayListOf<LocalQuickFix>()
fixes.add(OptimizeImportsQuickFix(file)) fixes.add(OptimizeImportsQuickFix(file))
if (!CodeInsightSettings.getInstance().OPTIMIZE_IMPORTS_ON_THE_FLY) { if (!CodeInsightWorkspaceSettings.getInstance(file.project).optimizeImportsOnTheFly) {
fixes.add(EnableOptimizeImportsOnTheFlyFix(file)) fixes.add(EnableOptimizeImportsOnTheFlyFix(file))
} }
manager.createProblemDescriptor(it, manager.createProblemDescriptor(it,
@@ -142,7 +142,7 @@ class KotlinUnusedImportInspection : AbstractKotlinInspection() {
} }
private fun scheduleOptimizeImportsOnTheFly(file: KtFile, data: OptimizedImportsBuilder.InputData) { private fun scheduleOptimizeImportsOnTheFly(file: KtFile, data: OptimizedImportsBuilder.InputData) {
if (!CodeInsightSettings.getInstance().OPTIMIZE_IMPORTS_ON_THE_FLY) return if (!CodeInsightWorkspaceSettings.getInstance(file.project).optimizeImportsOnTheFly) return
val optimizedImports = KotlinImportOptimizer.prepareOptimizedImports(file, data) ?: return // return if already optimized val optimizedImports = KotlinImportOptimizer.prepareOptimizedImports(file, data) ?: return // return if already optimized
// unwrap progress indicator // unwrap progress indicator
@@ -229,7 +229,7 @@ class KotlinUnusedImportInspection : AbstractKotlinInspection() {
override fun getFamilyName() = name override fun getFamilyName() = name
override fun applyFix(project: Project, descriptor: ProblemDescriptor) { override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
CodeInsightSettings.getInstance().OPTIMIZE_IMPORTS_ON_THE_FLY = true CodeInsightWorkspaceSettings.getInstance(project).optimizeImportsOnTheFly = true
OptimizeImportsProcessor(project, file).run() // we optimize imports manually because on-the-fly import optimization won't work while the caret is in imports OptimizeImportsProcessor(project, file).run() // we optimize imports manually because on-the-fly import optimization won't work while the caret is in imports
} }
} }