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

Write Action: Wrap import insertion with write action

Browse Source
This commit is contained in:
Nikolay Krasko
2016-04-06 20:04:54 +03:00
parent ab0fe0a900
commit 97a97614b5
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt
+7 -4
View File
@@ -30,6 +30,7 @@ import org.jetbrains.kotlin.idea.project.platform
import org.jetbrains.kotlin.idea.refactoring.fqName.isImported import org.jetbrains.kotlin.idea.refactoring.fqName.isImported
import org.jetbrains.kotlin.idea.util.ImportDescriptorResult import org.jetbrains.kotlin.idea.util.ImportDescriptorResult
import org.jetbrains.kotlin.idea.util.ImportInsertHelper import org.jetbrains.kotlin.idea.util.ImportInsertHelper
import org.jetbrains.kotlin.idea.util.application.runWriteAction
import org.jetbrains.kotlin.idea.util.getFileResolutionScope import org.jetbrains.kotlin.idea.util.getFileResolutionScope
import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.incremental.components.NoLookupLocation
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
@@ -398,7 +399,7 @@ class ImportInsertHelperImpl(private val project: Project) : ImportInsertHelper(
val psiFactory = KtPsiFactory(project) val psiFactory = KtPsiFactory(project)
if (file is KtCodeFragment) { if (file is KtCodeFragment) {
val newDirective = psiFactory.createImportDirective(importPath) val newDirective = psiFactory.createImportDirective(importPath)
file.addImportsFromString(newDirective.text) runWriteAction { file.addImportsFromString(newDirective.text) }
return newDirective return newDirective
} }
@@ -407,8 +408,10 @@ class ImportInsertHelperImpl(private val project: Project) : ImportInsertHelper(
val newDirective = psiFactory.createImportDirective(importPath) val newDirective = psiFactory.createImportDirective(importPath)
val imports = importList.imports val imports = importList.imports
if (imports.isEmpty()) { //TODO: strange hack if (imports.isEmpty()) { //TODO: strange hack
importList.add(psiFactory.createNewLine()) return runWriteAction<KtImportDirective> {
return importList.add(newDirective) as KtImportDirective importList.add(psiFactory.createNewLine())
importList.add(newDirective) as KtImportDirective
}
} }
else { else {
val insertAfter = imports val insertAfter = imports
@@ -416,7 +419,7 @@ class ImportInsertHelperImpl(private val project: Project) : ImportInsertHelper(
val directivePath = it.importPath val directivePath = it.importPath
directivePath != null && ImportPathComparator.compare(directivePath, importPath) <= 0 directivePath != null && ImportPathComparator.compare(directivePath, importPath) <= 0
} }
return importList.addAfter(newDirective, insertAfter) as KtImportDirective return runWriteAction { importList.addAfter(newDirective, insertAfter) as KtImportDirective }
} }
} }
else { else {