From 6826d2f193434f4adf6124e03636837e89fb2633 Mon Sep 17 00:00:00 2001
From: Dmitry Gridin <dmitry.gridin@jetbrains.com>
Date: Tue, 23 Apr 2019 16:16:31 +0700
Subject: [PATCH] Replace provideByFqNameMulti with provideByFqName

---
 .../nj2k/conversions/BuiltinMembersConversion.kt       | 10 +++++-----
 .../conversions/SynchronizedStatementConversion.kt     |  2 +-
 nj2k/src/org/jetbrains/kotlin/nj2k/expressions.kt      |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/BuiltinMembersConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/BuiltinMembersConversion.kt
index eaea8408d5a..bf99fdae874 100644
--- a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/BuiltinMembersConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/BuiltinMembersConversion.kt
@@ -70,13 +70,13 @@ class BuiltinMembersConversion(private val context: NewJ2kConverterContext) : Re
             when (from) {
                 is JKMethodCallExpression ->
                     JKKtCallExpressionImpl(
-                        context.symbolProvider.provideByFqNameMulti(fqName),
+                        context.symbolProvider.provideByFqName(fqName, true),
                         argumentsProvider(from::arguments.detached()),
                         from::typeArgumentList.detached()
                     ).withNonCodeElementsFrom(from)
                 is JKFieldAccessExpression ->
                     JKKtCallExpressionImpl(
-                        context.symbolProvider.provideByFqNameMulti(fqName),
+                        context.symbolProvider.provideByFqName(fqName, true),
                         JKArgumentListImpl(),
                         JKTypeArgumentListImpl()
                     ).withNonCodeElementsFrom(from)
@@ -91,11 +91,11 @@ class BuiltinMembersConversion(private val context: NewJ2kConverterContext) : Re
             when (from) {
                 is JKMethodCallExpression ->
                     JKFieldAccessExpressionImpl(
-                        context.symbolProvider.provideByFqNameMulti(fqName)
+                        context.symbolProvider.provideByFqName(fqName, true)
                     ).withNonCodeElementsFrom(from)
                 is JKFieldAccessExpression ->
                     JKFieldAccessExpressionImpl(
-                        context.symbolProvider.provideByFqNameMulti(fqName)
+                        context.symbolProvider.provideByFqName(fqName, true)
                     ).withNonCodeElementsFrom(from)
                 else -> error("Bad conversion")
             }
@@ -112,7 +112,7 @@ class BuiltinMembersConversion(private val context: NewJ2kConverterContext) : Re
                         arguments.first()::value.detached().parenthesizeIfBinaryExpression(),
                         JKKtQualifierImpl.DOT,
                         JKKtCallExpressionImpl(
-                            context.symbolProvider.provideByFqNameMulti(fqName),
+                            context.symbolProvider.provideByFqName(fqName, true),
                             JKArgumentListImpl(arguments.drop(1)),
                             from::typeArgumentList.detached()
                         )
diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/SynchronizedStatementConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/SynchronizedStatementConversion.kt
index a91b3f7bc32..d0ea7bd0117 100644
--- a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/SynchronizedStatementConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/SynchronizedStatementConversion.kt
@@ -22,7 +22,7 @@ class SynchronizedStatementConversion(private val context: NewJ2kConverterContex
         )
         val synchronizedCall =
             JKKtCallExpressionImpl(
-                context.symbolProvider.provideByFqNameMulti("kotlin.synchronized"),
+                context.symbolProvider.provideByFqName("kotlin.synchronized", true),
                 JKArgumentListImpl(
                     element.lockExpression,
                     lambdaBody
diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/expressions.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/expressions.kt
index 99ceff35ff9..cca1f09a84d 100644
--- a/nj2k/src/org/jetbrains/kotlin/nj2k/expressions.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/expressions.kt
@@ -517,7 +517,7 @@ fun runExpression(body: JKStatement, symbolProvider: JKSymbolProvider): JKExpres
         emptyList()
     )
     return JKKtCallExpressionImpl(
-        symbolProvider.provideByFqNameMulti("kotlin.run"),
+        symbolProvider.provideByFqName("kotlin.run", true),
         (listOf(lambda)).toArgumentList()
     )
 }