From 0b809453b533afd0d5624e33556df61b0c8527ca Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Thu, 14 May 2015 12:44:43 +0300 Subject: [PATCH] Fixed KT-7682 Conversion from Java to Kotlin - converted file is not added automatically to VCS #KT-7682 Fixed --- .../org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt index c33edcead5e..9be593a4a53 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt @@ -111,7 +111,7 @@ public class JavaToKotlinAction : AnAction() { private fun allJavaFiles(filesOrDirs: Array, project: Project): Sequence { val manager = PsiManager.getInstance(project) return allFiles(filesOrDirs) - .sequence() + .asSequence() .map { manager.findFile(it) as? PsiJavaFile } .filterNotNull() } @@ -134,7 +134,7 @@ public class JavaToKotlinAction : AnAction() { for ((psiFile, text) in javaFiles.zip(convertedTexts)) { val virtualFile = psiFile.getVirtualFile() try { - virtualFile.rename(null, virtualFile.getNameWithoutExtension() + ".kt") + virtualFile.rename(this, virtualFile.getNameWithoutExtension() + ".kt") virtualFile.setBinaryContent(CharsetToolkit.getUtf8Bytes(text)) result.add(virtualFile) }