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

J2K: refactored code to make createDefaultCodeConverter() private

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-10-17 22:09:36 +04:00
committed by valentin
parent 7941314c60
commit e81631a3af
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/src/org/jetbrains/jet/j2k/Converter.kt
+5 -2
View File
@@ -26,6 +26,7 @@ import com.intellij.psi.util.PsiMethodUtil
import com.intellij.psi.util.PsiTreeUtil import com.intellij.psi.util.PsiTreeUtil
import org.jetbrains.jet.j2k.usageProcessing.UsageProcessing import org.jetbrains.jet.j2k.usageProcessing.UsageProcessing
import org.jetbrains.jet.j2k.usageProcessing.FieldToPropertyProcessing import org.jetbrains.jet.j2k.usageProcessing.FieldToPropertyProcessing
import org.jetbrains.jet.j2k.usageProcessing.UsageProcessingExpressionConverter
class Converter private(private val elementToConvert: PsiElement, class Converter private(private val elementToConvert: PsiElement,
val settings: ConverterSettings, val settings: ConverterSettings,
@@ -69,7 +70,7 @@ class Converter private(private val elementToConvert: PsiElement,
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)
/*TODO: it should be private*/ fun createDefaultCodeConverter() = CodeConverter(this, DefaultExpressionConverter(), DefaultStatementConverter(), null) private fun createDefaultCodeConverter() = CodeConverter(this, DefaultExpressionConverter(), DefaultStatementConverter(), null)
public fun convert(): Element? = convertTopElement(elementToConvert) public fun convert(): Element? = convertTopElement(elementToConvert)
@@ -90,7 +91,9 @@ class Converter private(private val elementToConvert: PsiElement,
public val usageProcessings: Collection<UsageProcessing> public val usageProcessings: Collection<UsageProcessing>
get() = commonState.usageProcessings get() = commonState.usageProcessings
public fun unfoldLazyElements(codeConverter: CodeConverter) { public fun unfoldLazyElements(usageProcessings: Collection<UsageProcessing>) {
val codeConverter = createDefaultCodeConverter().withSpecialExpressionConverter(UsageProcessingExpressionConverter(usageProcessings))
// we use loop with index because new lazy elements can be added during unfolding // we use loop with index because new lazy elements can be added during unfolding
var i = 0 var i = 0
while (i < commonState.lazyElements.size) { while (i < commonState.lazyElements.size) {
j2k/src/org/jetbrains/jet/j2k/JavaToKotlinConverter.kt
+1 -4
View File
@@ -53,10 +53,7 @@ public class JavaToKotlinConverter(private val project: Project,
val converter = Converter.create(psiElement, settings, conversionScope, referenceSearcher, postProcessor) val converter = Converter.create(psiElement, settings, conversionScope, referenceSearcher, postProcessor)
val element = converter.convert() ?: return "" val element = converter.convert() ?: return ""
val codeConverter = converter.createDefaultCodeConverter() converter.unfoldLazyElements(converter.usageProcessings)
.withSpecialExpressionConverter(UsageProcessingExpressionConverter(converter.usageProcessings))
converter.unfoldLazyElements(codeConverter)
val builder = CodeBuilder(psiElement) val builder = CodeBuilder(psiElement)
builder.append(element) builder.append(element)