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

Do not rely on write action lock during preparation phase of RefactoringHelper

Browse Source 
#KT-4631 Fixed
This commit is contained in:
Alexey Sedunov
2014-03-03 15:04:11 +04:00
parent b34b3ccf38
commit 5e87fc35e0
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinShortenReferencesRefactoringHelper.kt
+17 -6
View File
@@ -28,11 +28,19 @@ import org.jetbrains.jet.lang.resolve.name.FqName
import org.jetbrains.jet.plugin.refactoring.changeQualifiedName import org.jetbrains.jet.plugin.refactoring.changeQualifiedName
import org.jetbrains.jet.lang.psi.psiUtil.getQualifiedElementSelector import org.jetbrains.jet.lang.psi.psiUtil.getQualifiedElementSelector
import org.jetbrains.jet.lang.psi.psiUtil.getOutermostNonInterleavingQualifiedElement import org.jetbrains.jet.lang.psi.psiUtil.getOutermostNonInterleavingQualifiedElement
import com.intellij.openapi.diagnostic.Logger
public class KotlinShortenReferencesRefactoringHelper: RefactoringHelper<Set<ReferenceBindRequest>> { public class KotlinShortenReferencesRefactoringHelper: RefactoringHelper<Set<ReferenceBindRequest>> {
private val LOG = Logger.getInstance(javaClass<KotlinShortenReferencesRefactoringHelper>().getCanonicalName())!!
override fun prepareOperation(usages: Array<out UsageInfo>?): Set<ReferenceBindRequest>? { override fun prepareOperation(usages: Array<out UsageInfo>?): Set<ReferenceBindRequest>? {
if (usages != null && usages.isNotEmpty()) { if (usages != null && usages.isNotEmpty()) {
ApplicationManager.getApplication()!!.runWriteAction { usages[0].getProject().getElementsToShorten(true)!!.clear() } val project = usages[0].getProject()
val elementsToShorten = project.getElementsToShorten(false)
if (elementsToShorten != null && !elementsToShorten.isEmpty()) {
LOG.warn("Waiting set for reference shortening is not empty")
project.clearElementsToShorten()
}
} }
return null return null
} }
@@ -40,7 +48,7 @@ public class KotlinShortenReferencesRefactoringHelper: RefactoringHelper<Set<Ref
override fun performOperation(project: Project, operationData: Set<ReferenceBindRequest>?) { override fun performOperation(project: Project, operationData: Set<ReferenceBindRequest>?) {
ApplicationManager.getApplication()!!.runWriteAction { ApplicationManager.getApplication()!!.runWriteAction {
project.getElementsToShorten(false)?.let { bindRequests -> project.getElementsToShorten(false)?.let { bindRequests ->
project.putUserData(ELEMENTS_TO_SHORTEN_KEY, null) project.clearElementsToShorten()
ShortenReferences.process( ShortenReferences.process(
bindRequests bindRequests
.map() { req -> req.process()?.getOutermostNonInterleavingQualifiedElement() } .map() { req -> req.process()?.getOutermostNonInterleavingQualifiedElement() }
@@ -51,8 +59,6 @@ public class KotlinShortenReferencesRefactoringHelper: RefactoringHelper<Set<Ref
} }
} }
private val ELEMENTS_TO_SHORTEN_KEY = Key.create<MutableSet<ReferenceBindRequest>>("ELEMENTS_TO_SHORTEN_KEY")
class ReferenceBindRequest(val refExpression: SmartPsiElementPointer<JetSimpleNameExpression>, val fqName: FqName) { class ReferenceBindRequest(val refExpression: SmartPsiElementPointer<JetSimpleNameExpression>, val fqName: FqName) {
fun process(): JetSimpleNameExpression? { fun process(): JetSimpleNameExpression? {
fun bindToFqName(expression: JetSimpleNameExpression, fqName: FqName): JetSimpleNameExpression { fun bindToFqName(expression: JetSimpleNameExpression, fqName: FqName): JetSimpleNameExpression {
@@ -68,9 +74,10 @@ class ReferenceBindRequest(val refExpression: SmartPsiElementPointer<JetSimpleNa
return bindToFqName(originalExpression, fqName) return bindToFqName(originalExpression, fqName)
} }
} }
private val ELEMENTS_TO_SHORTEN_KEY = Key.create<MutableSet<ReferenceBindRequest>>("ELEMENTS_TO_SHORTEN_KEY")
private fun Project.getElementsToShorten(createIfNeeded: Boolean): MutableSet<ReferenceBindRequest>? { private fun Project.getElementsToShorten(createIfNeeded: Boolean): MutableSet<ReferenceBindRequest>? {
var elementsToShorten = getUserData(ELEMENTS_TO_SHORTEN_KEY) var elementsToShorten = getUserData(ELEMENTS_TO_SHORTEN_KEY)
if (createIfNeeded && elementsToShorten == null) { if (createIfNeeded && elementsToShorten == null) {
@@ -81,7 +88,11 @@ private fun Project.getElementsToShorten(createIfNeeded: Boolean): MutableSet<Re
return elementsToShorten return elementsToShorten
} }
private fun Project.clearElementsToShorten() {
putUserData(ELEMENTS_TO_SHORTEN_KEY, null)
}
public fun Project.addReferenceBindRequest(request: ReferenceBindRequest) { public fun Project.addReferenceBindRequest(request: ReferenceBindRequest) {
assert (ApplicationManager.getApplication()!!.isWriteAccessAllowed(), "Write access needed") assert (ApplicationManager.getApplication()!!.isWriteAccessAllowed(), "Write access needed")
getElementsToShorten(true)!!.add(request) getElementsToShorten(true)!!.add(request)
} }