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

Fixed KT-7682 Conversion from Java to Kotlin - converted file is not added automatically to VCS

Browse Source 
#KT-7682 Fixed
This commit is contained in:
Valentin Kipyatkov
2015-05-14 12:44:43 +03:00
parent 4695aed993
commit 0b809453b5
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
@@ -111,7 +111,7 @@ public class JavaToKotlinAction : AnAction() {
private fun allJavaFiles(filesOrDirs: Array<VirtualFile>, project: Project): Sequence<PsiJavaFile> { private fun allJavaFiles(filesOrDirs: Array<VirtualFile>, project: Project): Sequence<PsiJavaFile> {
val manager = PsiManager.getInstance(project) val manager = PsiManager.getInstance(project)
return allFiles(filesOrDirs) return allFiles(filesOrDirs)
.sequence() .asSequence()
.map { manager.findFile(it) as? PsiJavaFile } .map { manager.findFile(it) as? PsiJavaFile }
.filterNotNull() .filterNotNull()
} }
@@ -134,7 +134,7 @@ public class JavaToKotlinAction : AnAction() {
for ((psiFile, text) in javaFiles.zip(convertedTexts)) { for ((psiFile, text) in javaFiles.zip(convertedTexts)) {
val virtualFile = psiFile.getVirtualFile() val virtualFile = psiFile.getVirtualFile()
try { try {
virtualFile.rename(null, virtualFile.getNameWithoutExtension() + ".kt") virtualFile.rename(this, virtualFile.getNameWithoutExtension() + ".kt")
virtualFile.setBinaryContent(CharsetToolkit.getUtf8Bytes(text)) virtualFile.setBinaryContent(CharsetToolkit.getUtf8Bytes(text))
result.add(virtualFile) result.add(virtualFile)
} }