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

Move file to package matching directory: run write action manually to avoid AWT events inside

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-01-31 21:24:24 +03:00
parent 72b8b85563
commit a204e57877
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/move/changePackage/MoveFileToPackageMatchingDirectoryIntention.kt
+6 -1
View File
@@ -29,6 +29,7 @@ import com.intellij.refactoring.util.RefactoringMessageUtil
import org.jetbrains.kotlin.idea.core.packageMatchesDirectory
import org.jetbrains.kotlin.idea.intentions.SelfTargetingOffsetIndependentIntention
import org.jetbrains.kotlin.idea.refactoring.isInsideInjectedFragment
import org.jetbrains.kotlin.idea.util.application.runWriteAction
import org.jetbrains.kotlin.psi.KtPackageDirective
class MoveFileToPackageMatchingDirectoryIntention : SelfTargetingOffsetIndependentIntention<KtPackageDirective>(
@@ -44,6 +45,8 @@ class MoveFileToPackageMatchingDirectoryIntention : SelfTargetingOffsetIndepende
return true
}
override fun startInWriteAction() = false
override fun applyTo(element: KtPackageDirective, editor: Editor?) {
val file = element.getContainingKtFile()
val project = file.project
@@ -67,6 +70,8 @@ class MoveFileToPackageMatchingDirectoryIntention : SelfTargetingOffsetIndepende
return
}
MoveFilesOrDirectoriesUtil.doMoveFile(file, targetDirectory)
runWriteAction {
MoveFilesOrDirectoriesUtil.doMoveFile(file, targetDirectory)
}
}
}