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

Java to Kotlin action: no infinite recursion for symlinks + more efficient update()

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-10-29 18:17:01 +03:00
committed by valentin
parent 448d444b2d
commit 0b4c7588da
1 changed files with 20 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinAction.kt
+20 -27
View File
@@ -39,10 +39,12 @@ import com.intellij.openapi.vfs.CharsetToolkit
import org.jetbrains.jet.lang.psi.JetFile
import org.jetbrains.jet.utils.addIfNotNull
import org.jetbrains.jet.plugin.caches.resolve.getLazyResolveSession
import com.intellij.openapi.vfs.VfsUtilCore
import com.intellij.openapi.vfs.VirtualFileVisitor
public class JavaToKotlinAction : AnAction() {
override fun actionPerformed(e: AnActionEvent) {
val selectedJavaFiles = selectedJavaFiles(e)
val selectedJavaFiles = selectedJavaFiles(e).toList()
val project = CommonDataKeys.PROJECT.getData(e.getDataContext())!!
CommandProcessor.getInstance().executeCommand(project, object : Runnable {
@@ -59,46 +61,37 @@ public class JavaToKotlinAction : AnAction() {
}
override fun update(e: AnActionEvent) {
val enabled = selectedJavaFiles(e).isNotEmpty()
val enabled = selectedJavaFiles(e).any()
e.getPresentation().setEnabled(enabled)
}
private fun selectedJavaFiles(e: AnActionEvent): List<PsiJavaFile> {
val virtualFiles = e.getData(CommonDataKeys.VIRTUAL_FILE_ARRAY) ?: return listOf()
val project = CommonDataKeys.PROJECT.getData(e.getDataContext()) ?: return listOf()
private fun selectedJavaFiles(e: AnActionEvent): Stream<PsiJavaFile> {
val virtualFiles = e.getData(CommonDataKeys.VIRTUAL_FILE_ARRAY) ?: return streamOf()
val project = CommonDataKeys.PROJECT.getData(e.getDataContext()) ?: return streamOf()
return allJavaFiles(virtualFiles, project)
}
private fun allJavaFiles(filesOrDirs: Array<VirtualFile>, project: Project): List<PsiJavaFile> {
val allFiles = allFiles(filesOrDirs)
private fun allJavaFiles(filesOrDirs: Array<VirtualFile>, project: Project): Stream<PsiJavaFile> {
val manager = PsiManager.getInstance(project)
val result = ArrayList<PsiJavaFile>()
for (file in allFiles) {
val psiFile = manager.findFile(file)
if (psiFile is PsiJavaFile) {
result.add(psiFile)
}
}
return result
return allFiles(filesOrDirs)
.stream()
.map { manager.findFile(it) as? PsiJavaFile }
.filterNotNull()
}
private fun allFiles(filesOrDirs: Array<VirtualFile>): Collection<VirtualFile> {
val result = ArrayList<VirtualFile>()
filesOrDirs.forEach { result.addFilesRecursive(it) }
for (file in filesOrDirs) {
VfsUtilCore.visitChildrenRecursively(file, object : VirtualFileVisitor<Unit>() {
override fun visitFile(file: VirtualFile): Boolean {
result.add(file)
return true
}
})
}
return result
}
private fun MutableCollection<VirtualFile>.addFilesRecursive(root: VirtualFile) {
if (root.isDirectory()) {
root.getChildren()!!.forEach {
addFilesRecursive(it)
}
}
else {
add(root)
}
}
private fun reformatFiles(kotlinFiles: List<VirtualFile>, project: Project) {
for (file in kotlinFiles) {
ApplicationManager.getApplication().runWriteAction {