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

Fix NPE in replaceImports() (EA-109700)

Browse Source
This commit is contained in:
Nikolay Krasko
2018-06-25 13:25:31 +03:00
parent 1951d38f40
commit 5df0879538
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt
+2 -2
View File
@@ -22,8 +22,8 @@ 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.project.ModuleSourceInfo import org.jetbrains.kotlin.idea.caches.project.ModuleSourceInfo
import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.caches.project.getNullableModuleInfo import org.jetbrains.kotlin.idea.caches.project.getNullableModuleInfo
import org.jetbrains.kotlin.idea.caches.resolve.analyze
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.KtInvokeFunctionReference import org.jetbrains.kotlin.idea.references.KtInvokeFunctionReference
@@ -183,7 +183,7 @@ class KotlinImportOptimizer : ImportOptimizer {
} }
fun replaceImports(file: KtFile, imports: List<ImportPath>) { fun replaceImports(file: KtFile, imports: List<ImportPath>) {
val importList = file.importList!! val importList = file.importList ?: return
val oldImports = importList.imports val oldImports = importList.imports
val psiFactory = KtPsiFactory(file.project) val psiFactory = KtPsiFactory(file.project)
for (importPath in imports) { for (importPath in imports) {