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

Optimize migrational intentions

Browse Source 
- Run read/write action just once for all files
- Ignore file if no task is found
This commit is contained in:
Denis Zharkov
2015-04-22 16:32:47 +03:00
parent 3cb6b61a47
commit 99fffc1b4b
1 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/JetWholeProjectModalAction.kt
+26 -22
View File
@@ -52,23 +52,25 @@ public abstract class JetWholeProjectModalAction<D: Any>(val title: String) : In
object : Task.Modal(project, title, true) { object : Task.Modal(project, title, true) {
override fun run(indicator: ProgressIndicator) { override fun run(indicator: ProgressIndicator) {
val filesToData = HashMap<JetFile, D>() val filesToData = HashMap<JetFile, D>()
val files = runReadAction { PluginJetFilesProvider.allFilesInProject(project) } runReadAction (fun() {
val files = PluginJetFilesProvider.allFilesInProject(project)
for ((i, currentFile) in files.withIndex()) { for ((i, currentFile) in files.withIndex()) {
indicator.setText("Checking file $i of ${files.size()}...") indicator.setText("Checking file $i of ${files.size()}...")
indicator.setText2(currentFile.getVirtualFile().getPath()) indicator.setText2(currentFile.getVirtualFile().getPath())
indicator.setFraction((i + 1) / files.size().toDouble()) indicator.setFraction((i + 1) / files.size().toDouble())
try { try {
val data = runReadAction { collectDataForFile(project, currentFile) } val data = collectDataForFile(project, currentFile)
if (data != null) filesToData[currentFile] = data if (data != null) filesToData[currentFile] = data
}
catch (e: ProcessCanceledException) {
return
}
catch (e: Throwable) {
LOG.error(e)
}
} }
catch (e: ProcessCanceledException) { })
return
}
catch (e: Throwable) {
LOG.error(e)
}
}
applyAll(project, filesToData) applyAll(project, filesToData)
} }
}) })
@@ -76,12 +78,14 @@ public abstract class JetWholeProjectModalAction<D: Any>(val title: String) : In
private fun applyAll(project: Project, filesToData: Map<JetFile, D>) { private fun applyAll(project: Project, filesToData: Map<JetFile, D>) {
UIUtil.invokeLaterIfNeeded { UIUtil.invokeLaterIfNeeded {
project.executeCommand(getText()) { project.executeCommand(getText()) {
filesToData.forEach { runWriteAction {
try { filesToData.forEach {
runWriteAction { applyChangesForFile(project, it.getKey(), it.getValue()) } try {
} applyChangesForFile(project, it.getKey(), it.getValue())
catch (e: Throwable) { }
LOG.error(e) catch (e: Throwable) {
LOG.error(e)
}
} }
} }
} }
@@ -104,7 +108,7 @@ public abstract class JetWholeProjectModalByCollectionAction<T : Any>(modalTitle
override fun collectDataForFile(project: Project, file: JetFile): Collection<T>? { override fun collectDataForFile(project: Project, file: JetFile): Collection<T>? {
val accumulator = arrayListOf<T>() val accumulator = arrayListOf<T>()
collectTasksForFile(project, file, accumulator) collectTasksForFile(project, file, accumulator)
return accumulator return if (!accumulator.isEmpty()) return accumulator else null
} }
abstract fun collectTasksForFile(project: Project, file: JetFile, accumulator: MutableCollection<T>) abstract fun collectTasksForFile(project: Project, file: JetFile, accumulator: MutableCollection<T>)