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

Do not remove all imports if "Optimize Imports" is executed on a file outside source dirs #KT-9925

Browse Source
This commit is contained in:
Yan Zhulanow
2015-12-29 16:09:10 +03:00
parent 4e82fabc7d
commit 32037fdd2e
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt
+4
View File
@@ -22,7 +22,9 @@ import com.intellij.openapi.progress.ProgressIndicatorProvider
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import com.intellij.psi.PsiFile import com.intellij.psi.PsiFile
import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.idea.caches.resolve.ModuleSourceInfo
import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.caches.resolve.getNullableModuleInfo
import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade
import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings
import org.jetbrains.kotlin.idea.references.KtReference import org.jetbrains.kotlin.idea.references.KtReference
@@ -53,6 +55,8 @@ class KotlinImportOptimizer() : ImportOptimizer {
private class OptimizeProcess(private val file: KtFile) { private class OptimizeProcess(private val file: KtFile) {
fun execute() { fun execute() {
if (file.getNullableModuleInfo() !is ModuleSourceInfo) return
val oldImports = file.importDirectives val oldImports = file.importDirectives
if (oldImports.isEmpty()) return if (oldImports.isEmpty()) return