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

New J2K: Add more types to JKExpression.type

Browse Source
This commit is contained in:
Ilya Kirillov
2018-12-05 17:07:34 +03:00
committed by Ilya Kirillov
parent d47543820a
commit daf1f6154e
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/misc.xml
Generated
+1 -1
View File
@@ -87,7 +87,7 @@
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
<component name="PsiViewerSettings"> <component name="PsiViewerSettings">
<option name="splitDividerLocation" value="98" /> <option name="splitDividerLocation" value="35" />
</component> </component>
<component name="SuppressABINotification"> <component name="SuppressABINotification">
<option name="modulesWithSuppressedNotConfigured"> <option name="modulesWithSuppressedNotConfigured">
j2k/newSrc/org/jetbrains/kotlin/j2k/tree/types.kt
+3
View File
@@ -44,6 +44,8 @@ fun JKExpression.type(context: ConversionContext): JKType? =
is JKClassAccessExpression -> null is JKClassAccessExpression -> null
is JKJavaNewExpression -> JKClassTypeImpl(classSymbol) is JKJavaNewExpression -> JKClassTypeImpl(classSymbol)
is JKJavaInstanceOfExpression -> kotlinTypeByName(KotlinBuiltIns.FQ_NAMES._boolean.asString(), context.symbolProvider) is JKJavaInstanceOfExpression -> kotlinTypeByName(KotlinBuiltIns.FQ_NAMES._boolean.asString(), context.symbolProvider)
is JKParenthesizedExpression -> expression.type(context)
is JKTypeCastExpression -> type.type
else -> TODO(this::class.java.toString()) else -> TODO(this::class.java.toString())
} }
@@ -153,6 +155,7 @@ fun JKType.updateNullability(newNullability: Nullability): JKType =
is JKNoType -> this is JKNoType -> this
is JKJavaVoidType -> this is JKJavaVoidType -> this
is JKJavaPrimitiveType -> this is JKJavaPrimitiveType -> this
is JKJavaArrayType -> JKJavaArrayTypeImpl(type, newNullability)
else -> TODO(this::class.toString()) else -> TODO(this::class.toString())
} }