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

Revert write actions in utility code (EA-81892)

Browse Source 
Revert commits:
ab0fe0a900
97a97614b5
This commit is contained in:
Nikolay Krasko
2016-04-25 19:43:37 +03:00
parent 7327275bf4
commit cae366f97e
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/ShortenReferences.kt
+1 -2
View File
@@ -33,7 +33,6 @@ import org.jetbrains.kotlin.idea.imports.getImportableTargets
import org.jetbrains.kotlin.idea.util.ImportDescriptorResult
import org.jetbrains.kotlin.idea.util.ImportInsertHelper
import org.jetbrains.kotlin.idea.util.getResolutionScope
import org.jetbrains.kotlin.idea.util.application.runWriteAction
import org.jetbrains.kotlin.incremental.components.NoLookupLocation
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext
@@ -299,7 +298,7 @@ class ShortenReferences(val options: (KtElement) -> Options = { Options.DEFAULT
override fun qualifier(element: KtUserType) = element.qualifier!!
override fun shortenElement(element: KtUserType): KtElement {
runWriteAction { element.deleteQualifier() }
element.deleteQualifier()
return element
}
}
idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt
+4 -7
View File
@@ -30,7 +30,6 @@ import org.jetbrains.kotlin.idea.project.platform
import org.jetbrains.kotlin.idea.refactoring.fqName.isImported
import org.jetbrains.kotlin.idea.util.ImportDescriptorResult
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.incremental.components.NoLookupLocation
import org.jetbrains.kotlin.name.FqName
@@ -399,7 +398,7 @@ class ImportInsertHelperImpl(private val project: Project) : ImportInsertHelper(
val psiFactory = KtPsiFactory(project)
if (file is KtCodeFragment) {
val newDirective = psiFactory.createImportDirective(importPath)
runWriteAction { file.addImportsFromString(newDirective.text) }
file.addImportsFromString(newDirective.text)
return newDirective
}
@@ -408,10 +407,8 @@ class ImportInsertHelperImpl(private val project: Project) : ImportInsertHelper(
val newDirective = psiFactory.createImportDirective(importPath)
val imports = importList.imports
if (imports.isEmpty()) { //TODO: strange hack
return runWriteAction<KtImportDirective> {
importList.add(psiFactory.createNewLine())
importList.add(newDirective) as KtImportDirective
}
importList.add(psiFactory.createNewLine())
return importList.add(newDirective) as KtImportDirective
}
else {
val insertAfter = imports
@@ -419,7 +416,7 @@ class ImportInsertHelperImpl(private val project: Project) : ImportInsertHelper(
val directivePath = it.importPath
directivePath != null && ImportPathComparator.compare(directivePath, importPath) <= 0
}
return runWriteAction { importList.addAfter(newDirective, insertAfter) as KtImportDirective }
return importList.addAfter(newDirective, insertAfter) as KtImportDirective
}
}
else {