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

New J2K: Use type instead of typeElement to create JKType

Browse Source 
because first one can fail on array type
This commit is contained in:
Ilya Kirillov
2019-01-28 17:26:13 +03:00
committed by Ilya Kirillov
parent 71780ef442
commit 58fbe7913e
2 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/newSrc/org/jetbrains/kotlin/j2k/JavaToJKTreeBuilder.kt
+16 -25
View File
@@ -61,7 +61,7 @@ class JavaToJKTreeBuilder(
with(declarationMapper) { classes.map { it.toJK() } } with(declarationMapper) { classes.map { it.toJK() } }
) )
private fun PsiPackageStatement.toJK(): JKPackageDeclaration = private fun PsiPackageStatement.toJK(): JKPackageDeclaration =
JKPackageDeclarationImpl(JKNameIdentifierImpl(packageName)) JKPackageDeclarationImpl(JKNameIdentifierImpl(packageName))
private fun PsiImportStatement.toJK(): JKImportStatementImpl { private fun PsiImportStatement.toJK(): JKImportStatementImpl {
@@ -117,7 +117,7 @@ class JavaToJKTreeBuilder(
} }
fun PsiClassObjectAccessExpressionImpl.toJK(): JKClassLiteralExpression { fun PsiClassObjectAccessExpressionImpl.toJK(): JKClassLiteralExpression {
val type = operand.toJK().type.updateNullabilityRecursively(Nullability.NotNull) val type = operand.type.toJK(symbolProvider).updateNullabilityRecursively(Nullability.NotNull)
return JKClassLiteralExpressionImpl( return JKClassLiteralExpressionImpl(
JKTypeElementImpl(type), JKTypeElementImpl(type),
when (type) { when (type) {
@@ -129,7 +129,7 @@ class JavaToJKTreeBuilder(
} }
fun PsiInstanceOfExpression.toJK(): JKKtIsExpression = fun PsiInstanceOfExpression.toJK(): JKKtIsExpression =
JKKtIsExpressionImpl(operand.toJK(), checkType?.toJK() ?: JKTypeElementImpl(JKNoTypeImpl)) JKKtIsExpressionImpl(operand.toJK(), JKTypeElementImpl(checkType?.type?.toJK(symbolProvider) ?: JKNoTypeImpl))
fun PsiAssignmentExpression.toJK(): JKJavaAssignmentExpression { fun PsiAssignmentExpression.toJK(): JKJavaAssignmentExpression {
@@ -375,7 +375,7 @@ class JavaToJKTreeBuilder(
} }
fun PsiTypeCastExpression.toJK(): JKExpression { fun PsiTypeCastExpression.toJK(): JKExpression {
return JKTypeCastExpressionImpl(operand?.toJK() ?: TODO(), castType?.toJK() ?: TODO()) return JKTypeCastExpressionImpl(operand?.toJK() ?: TODO(), castType?.type?.toJK(symbolProvider)?.asTypeElement() ?: TODO())
} }
fun PsiParenthesizedExpression.toJK(): JKExpression { fun PsiParenthesizedExpression.toJK(): JKExpression {
@@ -386,11 +386,6 @@ class JavaToJKTreeBuilder(
return JKExpressionListImpl(this?.expressions?.map { it.toJK() } ?: emptyList()) return JKExpressionListImpl(this?.expressions?.map { it.toJK() } ?: emptyList())
} }
fun PsiTypeElement.toJK(): JKTypeElement {
return JKTypeElementImpl(type.toJK(symbolProvider)).also {
(it as PsiOwner).psi = this
}
}
} }
private inner class DeclarationMapper(val expressionTreeMapper: ExpressionTreeMapper) { private inner class DeclarationMapper(val expressionTreeMapper: ExpressionTreeMapper) {
@@ -539,7 +534,7 @@ class JavaToJKTreeBuilder(
fun PsiField.toJK(): JKJavaField { fun PsiField.toJK(): JKJavaField {
return JKJavaFieldImpl( return JKJavaFieldImpl(
with(expressionTreeMapper) { typeElement?.toJK() } ?: JKTypeElementImpl(JKNoTypeImpl), JKTypeElementImpl(type.toJK(symbolProvider)),
JKNameIdentifierImpl(name), JKNameIdentifierImpl(name),
with(expressionTreeMapper) { initializer.toJK() }, with(expressionTreeMapper) { initializer.toJK() },
annotationList(), annotationList(),
@@ -553,7 +548,7 @@ class JavaToJKTreeBuilder(
} }
} }
fun <T> T.annotationList(): JKAnnotationList where T : JvmAnnotatedElement, T: PsiDocCommentOwner { fun <T> T.annotationList(): JKAnnotationList where T : JvmAnnotatedElement, T : PsiDocCommentOwner {
val plainAnnotations = annotations.map { it.toJK() } val plainAnnotations = annotations.map { it.toJK() }
val deprecatedAnnotation = docComment?.deprecatedAnnotation() ?: return JKAnnotationListImpl(plainAnnotations) val deprecatedAnnotation = docComment?.deprecatedAnnotation() ?: return JKAnnotationListImpl(plainAnnotations)
return JKAnnotationListImpl( return JKAnnotationListImpl(
@@ -603,11 +598,9 @@ class JavaToJKTreeBuilder(
fun PsiAnnotationMethod.toJK(): JKJavaAnnotationMethod = fun PsiAnnotationMethod.toJK(): JKJavaAnnotationMethod =
JKJavaAnnotationMethodImpl( JKJavaAnnotationMethodImpl(
with(expressionTreeMapper) { returnType?.toJK(symbolProvider)?.asTypeElement()
returnTypeElement?.toJK() ?: JKTypeElementImpl(JKJavaVoidType).takeIf { isConstructor }
?: JKTypeElementImpl(JKJavaVoidType).takeIf { isConstructor } ?: TODO(),
?: TODO()
},
JKNameIdentifierImpl(name), JKNameIdentifierImpl(name),
defaultValue?.toJK() ?: JKStubExpressionImpl() defaultValue?.toJK() ?: JKStubExpressionImpl()
).also { ).also {
@@ -617,11 +610,9 @@ class JavaToJKTreeBuilder(
fun PsiMethod.toJK(): JKJavaMethod { fun PsiMethod.toJK(): JKJavaMethod {
return JKJavaMethodImpl( return JKJavaMethodImpl(
with(expressionTreeMapper) { returnType?.toJK(symbolProvider)?.asTypeElement()
returnTypeElement?.toJK() ?: JKTypeElementImpl(JKJavaVoidType).takeIf { isConstructor }
?: JKTypeElementImpl(JKJavaVoidType).takeIf { isConstructor } ?: TODO(),
?: TODO()
},
JKNameIdentifierImpl(name), JKNameIdentifierImpl(name),
parameterList.parameters.map { it.toJK() }, parameterList.parameters.map { it.toJK() },
body?.toJK() ?: JKBodyStub, body?.toJK() ?: JKBodyStub,
@@ -638,10 +629,10 @@ class JavaToJKTreeBuilder(
} }
fun PsiParameter.toJK(): JKParameter { fun PsiParameter.toJK(): JKParameter {
val rawType = with(expressionTreeMapper) { typeElement?.toJK() } ?: JKTypeElementImpl(JKNoTypeImpl) val rawType = type.toJK(symbolProvider)
val type = val type =
if (isVarArgs && rawType.type is JKJavaArrayType) JKTypeElementImpl((rawType.type as JKJavaArrayType).type) if (isVarArgs && rawType is JKJavaArrayType) JKTypeElementImpl(rawType.type)
else rawType else rawType.asTypeElement()
return JKParameterImpl( return JKParameterImpl(
type, type,
JKNameIdentifierImpl(name!!), JKNameIdentifierImpl(name!!),
@@ -658,7 +649,7 @@ class JavaToJKTreeBuilder(
fun PsiLocalVariable.toJK(): JKLocalVariable = fun PsiLocalVariable.toJK(): JKLocalVariable =
JKLocalVariableImpl( JKLocalVariableImpl(
with(expressionTreeMapper) { typeElement.toJK() }, JKTypeElementImpl(type.toJK(symbolProvider)),
JKNameIdentifierImpl(this.name ?: TODO()), JKNameIdentifierImpl(this.name ?: TODO()),
with(expressionTreeMapper) { initializer.toJK() }, with(expressionTreeMapper) { initializer.toJK() },
if (hasModifierProperty(PsiModifier.FINAL)) Mutability.IMMUTABLE else Mutability.UNKNOWN if (hasModifierProperty(PsiModifier.FINAL)) Mutability.IMMUTABLE else Mutability.UNKNOWN
j2k/newSrc/org/jetbrains/kotlin/j2k/tree/types.kt
+4
View File
@@ -116,6 +116,10 @@ fun PsiType.toJK(symbolProvider: JKSymbolProvider, nullability: Nullability = Nu
} }
} }
fun JKType.asTypeElement() =
JKTypeElementImpl(this)
fun JKClassSymbol.asType(nullability: Nullability = Nullability.Default): JKClassType = fun JKClassSymbol.asType(nullability: Nullability = Nullability.Default): JKClassType =
JKClassTypeImpl(this, emptyList(), nullability) JKClassTypeImpl(this, emptyList(), nullability)