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

Fix for EA-89556 - (from J2K) ROME: DocumentImpl.replaceString

Browse Source
This commit is contained in:
Simon Ogorodnik
2016-11-24 22:01:01 +03:00
parent 13b8494373
commit 7a4b6a1462
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt
+2 -2
View File
@@ -150,7 +150,7 @@ class JavaToKotlinAction : AnAction() {
} }
override fun actionPerformed(e: AnActionEvent) { override fun actionPerformed(e: AnActionEvent) {
val javaFiles = selectedJavaFiles(e).toList() val javaFiles = selectedJavaFiles(e).filter { it.isWritable }.toList()
val project = CommonDataKeys.PROJECT.getData(e.dataContext)!! val project = CommonDataKeys.PROJECT.getData(e.dataContext)!!
val firstSyntaxError = javaFiles.asSequence().map { PsiTreeUtil.findChildOfType(it, PsiErrorElement::class.java) }.firstOrNull() val firstSyntaxError = javaFiles.asSequence().map { PsiTreeUtil.findChildOfType(it, PsiErrorElement::class.java) }.firstOrNull()
@@ -189,7 +189,7 @@ class JavaToKotlinAction : AnAction() {
private fun isAnyJavaFileSelected(project: Project, files: Array<VirtualFile>): Boolean { private fun isAnyJavaFileSelected(project: Project, files: Array<VirtualFile>): Boolean {
val manager = PsiManager.getInstance(project) val manager = PsiManager.getInstance(project)
if (files.any { manager.findFile(it) is PsiJavaFile }) return true if (files.any { manager.findFile(it) is PsiJavaFile && it.isWritable }) return true
return files.any { it.isDirectory && isAnyJavaFileSelected(project, it.children) } return files.any { it.isDirectory && isAnyJavaFileSelected(project, it.children) }
} }