Replace provideByFqNameMulti with provideByFqName
This commit is contained in:
@@ -70,13 +70,13 @@ class BuiltinMembersConversion(private val context: NewJ2kConverterContext) : Re
|
|||||||
when (from) {
|
when (from) {
|
||||||
is JKMethodCallExpression ->
|
is JKMethodCallExpression ->
|
||||||
JKKtCallExpressionImpl(
|
JKKtCallExpressionImpl(
|
||||||
context.symbolProvider.provideByFqNameMulti(fqName),
|
context.symbolProvider.provideByFqName(fqName, true),
|
||||||
argumentsProvider(from::arguments.detached()),
|
argumentsProvider(from::arguments.detached()),
|
||||||
from::typeArgumentList.detached()
|
from::typeArgumentList.detached()
|
||||||
).withNonCodeElementsFrom(from)
|
).withNonCodeElementsFrom(from)
|
||||||
is JKFieldAccessExpression ->
|
is JKFieldAccessExpression ->
|
||||||
JKKtCallExpressionImpl(
|
JKKtCallExpressionImpl(
|
||||||
context.symbolProvider.provideByFqNameMulti(fqName),
|
context.symbolProvider.provideByFqName(fqName, true),
|
||||||
JKArgumentListImpl(),
|
JKArgumentListImpl(),
|
||||||
JKTypeArgumentListImpl()
|
JKTypeArgumentListImpl()
|
||||||
).withNonCodeElementsFrom(from)
|
).withNonCodeElementsFrom(from)
|
||||||
@@ -91,11 +91,11 @@ class BuiltinMembersConversion(private val context: NewJ2kConverterContext) : Re
|
|||||||
when (from) {
|
when (from) {
|
||||||
is JKMethodCallExpression ->
|
is JKMethodCallExpression ->
|
||||||
JKFieldAccessExpressionImpl(
|
JKFieldAccessExpressionImpl(
|
||||||
context.symbolProvider.provideByFqNameMulti(fqName)
|
context.symbolProvider.provideByFqName(fqName, true)
|
||||||
).withNonCodeElementsFrom(from)
|
).withNonCodeElementsFrom(from)
|
||||||
is JKFieldAccessExpression ->
|
is JKFieldAccessExpression ->
|
||||||
JKFieldAccessExpressionImpl(
|
JKFieldAccessExpressionImpl(
|
||||||
context.symbolProvider.provideByFqNameMulti(fqName)
|
context.symbolProvider.provideByFqName(fqName, true)
|
||||||
).withNonCodeElementsFrom(from)
|
).withNonCodeElementsFrom(from)
|
||||||
else -> error("Bad conversion")
|
else -> error("Bad conversion")
|
||||||
}
|
}
|
||||||
@@ -112,7 +112,7 @@ class BuiltinMembersConversion(private val context: NewJ2kConverterContext) : Re
|
|||||||
arguments.first()::value.detached().parenthesizeIfBinaryExpression(),
|
arguments.first()::value.detached().parenthesizeIfBinaryExpression(),
|
||||||
JKKtQualifierImpl.DOT,
|
JKKtQualifierImpl.DOT,
|
||||||
JKKtCallExpressionImpl(
|
JKKtCallExpressionImpl(
|
||||||
context.symbolProvider.provideByFqNameMulti(fqName),
|
context.symbolProvider.provideByFqName(fqName, true),
|
||||||
JKArgumentListImpl(arguments.drop(1)),
|
JKArgumentListImpl(arguments.drop(1)),
|
||||||
from::typeArgumentList.detached()
|
from::typeArgumentList.detached()
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ class SynchronizedStatementConversion(private val context: NewJ2kConverterContex
|
|||||||
)
|
)
|
||||||
val synchronizedCall =
|
val synchronizedCall =
|
||||||
JKKtCallExpressionImpl(
|
JKKtCallExpressionImpl(
|
||||||
context.symbolProvider.provideByFqNameMulti("kotlin.synchronized"),
|
context.symbolProvider.provideByFqName("kotlin.synchronized", true),
|
||||||
JKArgumentListImpl(
|
JKArgumentListImpl(
|
||||||
element.lockExpression,
|
element.lockExpression,
|
||||||
lambdaBody
|
lambdaBody
|
||||||
|
|||||||
@@ -517,7 +517,7 @@ fun runExpression(body: JKStatement, symbolProvider: JKSymbolProvider): JKExpres
|
|||||||
emptyList()
|
emptyList()
|
||||||
)
|
)
|
||||||
return JKKtCallExpressionImpl(
|
return JKKtCallExpressionImpl(
|
||||||
symbolProvider.provideByFqNameMulti("kotlin.run"),
|
symbolProvider.provideByFqName("kotlin.run", true),
|
||||||
(listOf(lambda)).toArgumentList()
|
(listOf(lambda)).toArgumentList()
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user