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

Minor

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-10-28 17:54:23 +03:00
committed by valentin
parent 899a051a8f
commit 0092c952ef
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinAction.kt
+2 -4
View File
@@ -37,6 +37,7 @@ import com.intellij.openapi.ui.ex.MessagesEx
import org.jetbrains.jet.plugin.j2k.J2kPostProcessor import org.jetbrains.jet.plugin.j2k.J2kPostProcessor
import com.intellij.openapi.vfs.CharsetToolkit import com.intellij.openapi.vfs.CharsetToolkit
import org.jetbrains.jet.lang.psi.JetFile import org.jetbrains.jet.lang.psi.JetFile
import org.jetbrains.jet.utils.addIfNotNull
public class JavaToKotlinAction : AnAction() { public class JavaToKotlinAction : AnAction() {
override fun actionPerformed(e: AnActionEvent) { override fun actionPerformed(e: AnActionEvent) {
@@ -116,10 +117,7 @@ public class JavaToKotlinAction : AnAction() {
val result = ArrayList<VirtualFile>() val result = ArrayList<VirtualFile>()
for ((i, psiFile) in javaFiles.withIndices()) { for ((i, psiFile) in javaFiles.withIndices()) {
ApplicationManager.getApplication().runWriteAction { ApplicationManager.getApplication().runWriteAction {
val file = saveConversionResult(psiFile.getVirtualFile(), convertedTexts[i], project) result.addIfNotNull(saveConversionResult(psiFile.getVirtualFile(), convertedTexts[i], project))
if (file != null) {
result.add(file)
}
} }
} }
return result return result
j2k/src/org/jetbrains/jet/j2k/Converter.kt
+1 -2
View File
@@ -64,8 +64,7 @@ class Converter private(private val elementToConvert: PsiElement,
} }
} }
public fun withSpecialContext(context: PsiElement): Converter public fun withSpecialContext(context: PsiElement): Converter = withState(PersonalState(context))
= Converter(elementToConvert, settings, conversionScope, referenceSearcher, postProcessor, commonState, PersonalState(context))
private fun withState(state: PersonalState): Converter private fun withState(state: PersonalState): Converter
= Converter(elementToConvert, settings, conversionScope, referenceSearcher, postProcessor, commonState, state) = Converter(elementToConvert, settings, conversionScope, referenceSearcher, postProcessor, commonState, state)