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

Fix minor compile warnings

Browse Source
This commit is contained in:
Dmitry Gridin
2019-04-17 17:48:26 +07:00
parent 79793a4bda
commit 37c856290f
226 changed files with 618 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/src/org/jetbrains/kotlin/j2k/AnnotationConverter.kt
+1 -1
View File
@@ -189,7 +189,7 @@ class AnnotationConverter(private val converter: Converter) {
val returnType = method.returnType
if (returnType is PsiArrayType && value !is PsiArrayInitializerMemberValue) {
return converter.deferredElement { codeConverter ->
val convertedType = converter.typeConverter.convertType(returnType) as ArrayType
converter.typeConverter.convertType(returnType) as ArrayType
val convertAttributeValue = convertAttributeValue(value, returnType.componentType, false, false)
createArrayLiteralExpression(codeConverter, convertAttributeValue.toList())
}
j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt
+18 -15
View File
@@ -37,7 +37,6 @@ import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
import org.jetbrains.kotlin.psi.psiUtil.isExtensionDeclaration
import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType
import java.lang.AssertionError
import java.math.BigInteger
interface ExpressionConverter {
@@ -399,13 +398,15 @@ class DefaultExpressionConverter : JavaElementVisitor(), ExpressionConverter {
}
is KtFunction -> if (isTopLevel) {
result = if (origin.isExtensionDeclaration()) {
val qualifier = codeConverter.convertExpression(arguments.firstOrNull(), shouldParenthesize = true)
MethodCallExpression.build(qualifier,
origin.name!!,
convertArguments(expression, isExtension = true),
typeArguments,
isNullable,
dot)
val receiver = codeConverter.convertExpression(arguments.firstOrNull(), shouldParenthesize = true)
MethodCallExpression.build(
receiver,
origin.name!!,
convertArguments(expression, isExtension = true),
typeArguments,
isNullable,
dot
)
}
else {
MethodCallExpression.build(null,
@@ -420,13 +421,15 @@ class DefaultExpressionConverter : JavaElementVisitor(), ExpressionConverter {
val resolvedQualifier = (methodExpr.qualifier as? PsiReferenceExpression)?.resolve()
if (isFacadeClassFromLibrary(resolvedQualifier)) {
result = if (target.isKotlinExtensionFunction()) {
val qualifier = codeConverter.convertExpression(arguments.firstOrNull(), shouldParenthesize = true)
MethodCallExpression.build(qualifier,
methodExpr.referenceName!!,
convertArguments(expression, isExtension = true),
typeArguments,
isNullable,
dot)
val receiver = codeConverter.convertExpression(arguments.firstOrNull(), shouldParenthesize = true)
MethodCallExpression.build(
receiver,
methodExpr.referenceName!!,
convertArguments(expression, isExtension = true),
typeArguments,
isNullable,
dot
)
}
else {
MethodCallExpression.build(null,