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

New J2K: Assume specifyLocalVariableTypeByDefault in for loops initializers

Browse Source
This commit is contained in:
Ilya Kirillov
2019-01-28 14:08:30 +03:00
committed by Ilya Kirillov
parent 1e7b1f8716
commit 936c43d2bc
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ForConversion.kt
+5 -6
View File
@@ -35,7 +35,6 @@ class ForConversion(private val context: ConversionContext) : RecursiveApplicabl
val whileStatement = JKWhileStatementImpl(condition, whileBody) val whileStatement = JKWhileStatementImpl(condition, whileBody)
if (loopStatement.initializer is JKEmptyStatement) return whileStatement if (loopStatement.initializer is JKEmptyStatement) return whileStatement
//TODO check for error conflict
val convertedFromForLoopSyntheticWhileStatement = val convertedFromForLoopSyntheticWhileStatement =
JKKtConvertedFromForLoopSyntheticWhileStatementImpl( JKKtConvertedFromForLoopSyntheticWhileStatementImpl(
@@ -131,13 +130,13 @@ class ForConversion(private val context: ConversionContext) : RecursiveApplicabl
else -> return null else -> return null
} }
val range = forIterationRange(start, right, reversed, inclusive, loopVarPsi) val range = forIterationRange(start, right, reversed, inclusive, loopVarPsi)
//TODO for loop explicitType val explicitType =
// val explicitType = if (context.converter.settings.specifyLocalVariableTypeByDefault) if (context.converter.settings.specifyLocalVariableTypeByDefault)
// JKJavaPrimitiveTypeImpl.INT JKJavaPrimitiveTypeImpl.INT
// else null else JKNoTypeImpl
val loopVarDeclaration = val loopVarDeclaration =
JKForLoopVariableImpl( JKForLoopVariableImpl(
JKTypeElementImpl(JKNoTypeImpl), JKTypeElementImpl(explicitType),
loopVar::name.detached(), loopVar::name.detached(),
JKStubExpressionImpl() JKStubExpressionImpl()
) )
j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ForInConversion.kt
+5 -3
View File
@@ -13,12 +13,14 @@ import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.ClassId
class ForInConversion : RecursiveApplicableConversionBase() { class ForInConversion(private val context: ConversionContext) : RecursiveApplicableConversionBase() {
override fun applyToElement(element: JKTreeElement): JKTreeElement { override fun applyToElement(element: JKTreeElement): JKTreeElement {
if (element !is JKForInStatement) return recurse(element) if (element !is JKForInStatement) return recurse(element)
val parameterDeclaration = element.declaration as? JKParameter val parameterDeclaration = element.declaration as? JKVariable
if (parameterDeclaration != null) { if (parameterDeclaration != null
&& !context.converter.settings.specifyLocalVariableTypeByDefault
) {
parameterDeclaration.type = JKTypeElementImpl(JKNoTypeImpl) parameterDeclaration.type = JKTypeElementImpl(JKNoTypeImpl)
} }