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

Renamed parameter

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-10-29 19:43:19 +03:00
committed by valentin
parent 0b4c7588da
commit 245e70100d
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/src/org/jetbrains/jet/j2k/Converter.kt
+4 -4
View File
@@ -34,7 +34,7 @@ class Converter private(private val elementToConvert: PsiElement,
val settings: ConverterSettings, val settings: ConverterSettings,
val conversionScope: ConversionScope, val conversionScope: ConversionScope,
val referenceSearcher: ReferenceSearcher, val referenceSearcher: ReferenceSearcher,
val lazyResolveSessionGetter: ((JetElement) -> KotlinCodeAnalyzer)?, val resolveSessionGetter: ((JetElement) -> KotlinCodeAnalyzer)?,
private val postProcessor: PostProcessor?, private val postProcessor: PostProcessor?,
private val commonState: Converter.CommonState, private val commonState: Converter.CommonState,
private val personalState: Converter.PersonalState) { private val personalState: Converter.PersonalState) {
@@ -61,16 +61,16 @@ class Converter private(private val elementToConvert: PsiElement,
class object { class object {
public fun create(elementToConvert: PsiElement, settings: ConverterSettings, conversionScope: ConversionScope, public fun create(elementToConvert: PsiElement, settings: ConverterSettings, conversionScope: ConversionScope,
referenceSearcher: ReferenceSearcher, lazyResolveSessionGetter: ((JetElement) -> KotlinCodeAnalyzer)?, postProcessor: PostProcessor?, referenceSearcher: ReferenceSearcher, resolveSessionGetter: ((JetElement) -> KotlinCodeAnalyzer)?, postProcessor: PostProcessor?,
usageProcessingsCollector: (UsageProcessing) -> Unit): Converter { usageProcessingsCollector: (UsageProcessing) -> Unit): Converter {
return Converter(elementToConvert, settings, conversionScope, referenceSearcher, lazyResolveSessionGetter, postProcessor, CommonState(usageProcessingsCollector), PersonalState(null)) return Converter(elementToConvert, settings, conversionScope, referenceSearcher, resolveSessionGetter, postProcessor, CommonState(usageProcessingsCollector), PersonalState(null))
} }
} }
public fun withSpecialContext(context: PsiElement): Converter = withState(PersonalState(context)) public fun withSpecialContext(context: PsiElement): Converter = withState(PersonalState(context))
private fun withState(state: PersonalState): Converter private fun withState(state: PersonalState): Converter
= Converter(elementToConvert, settings, conversionScope, referenceSearcher, lazyResolveSessionGetter, postProcessor, commonState, state) = Converter(elementToConvert, settings, conversionScope, referenceSearcher, resolveSessionGetter, postProcessor, commonState, state)
private fun createDefaultCodeConverter() = CodeConverter(this, DefaultExpressionConverter(), DefaultStatementConverter(), null) private fun createDefaultCodeConverter() = CodeConverter(this, DefaultExpressionConverter(), DefaultStatementConverter(), null)
j2k/src/org/jetbrains/jet/j2k/JavaToKotlinConverter.kt
+2 -2
View File
@@ -48,7 +48,7 @@ public class JavaToKotlinConverter(private val project: Project,
private val settings: ConverterSettings, private val settings: ConverterSettings,
private val conversionScope: ConversionScope /*TODO: drop this parameter*/, private val conversionScope: ConversionScope /*TODO: drop this parameter*/,
private val referenceSearcher: ReferenceSearcher, private val referenceSearcher: ReferenceSearcher,
private val lazyResolveSessionGetter: ((JetElement) -> KotlinCodeAnalyzer)?) { private val resolveSessionGetter: ((JetElement) -> KotlinCodeAnalyzer)?) {
private val LOG = Logger.getInstance("#org.jetbrains.jet.j2k.JavaToKotlinConverter") private val LOG = Logger.getInstance("#org.jetbrains.jet.j2k.JavaToKotlinConverter")
public fun elementsToKotlin(psiElementsAndProcessors: List<Pair<PsiElement, PostProcessor?>>): List<String> { public fun elementsToKotlin(psiElementsAndProcessors: List<Pair<PsiElement, PostProcessor?>>): List<String> {
@@ -61,7 +61,7 @@ public class JavaToKotlinConverter(private val project: Project,
usageProcessings.put(usageProcessing.targetElement, usageProcessing) usageProcessings.put(usageProcessing.targetElement, usageProcessing)
} }
for ((psiElement, postProcessor) in psiElementsAndProcessors) { for ((psiElement, postProcessor) in psiElementsAndProcessors) {
val converter = Converter.create(psiElement, settings, conversionScope, referenceSearcher, lazyResolveSessionGetter, postProcessor, usageProcessingCollector) val converter = Converter.create(psiElement, settings, conversionScope, referenceSearcher, resolveSessionGetter, postProcessor, usageProcessingCollector)
val result = converter.convert() val result = converter.convert()
intermediateResults.add(result) intermediateResults.add(result)
} }
j2k/src/org/jetbrains/jet/j2k/TypeConverter.kt
+1 -1
View File
@@ -370,7 +370,7 @@ class TypeConverter(val converter: Converter) {
override fun fromAnnotations(owner: PsiModifierListOwner): Mutability { override fun fromAnnotations(owner: PsiModifierListOwner): Mutability {
if (owner is KotlinLightElement<*, *>) { if (owner is KotlinLightElement<*, *>) {
val jetDeclaration = owner.origin as? JetCallableDeclaration ?: return Mutability.Default val jetDeclaration = owner.origin as? JetCallableDeclaration ?: return Mutability.Default
val codeAnalyzer = converter.lazyResolveSessionGetter?.invoke(jetDeclaration) val codeAnalyzer = converter.resolveSessionGetter?.invoke(jetDeclaration)
val descriptor = codeAnalyzer?.resolveToDescriptor(jetDeclaration) val descriptor = codeAnalyzer?.resolveToDescriptor(jetDeclaration)
as? CallableDescriptor ?: return Mutability.Default as? CallableDescriptor ?: return Mutability.Default
val type = descriptor.getReturnType() ?: return Mutability.Default val type = descriptor.getReturnType() ?: return Mutability.Default