From 234ffb46449e5aab88cfcc401d7514bda80b670e Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Wed, 15 Feb 2023 13:36:17 +0100
Subject: [PATCH] [Gradle, JS] Fix naming

---
 .../js/npm/resolver/KotlinCompilationNpmResolution.kt     | 8 ++++----
 .../gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolution.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolution.kt
index 8038ebc745b..0d55b6c24e0 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolution.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolution.kt
@@ -44,14 +44,14 @@ class KotlinCompilationNpmResolution(
     private var resolution: PreparedKotlinCompilationNpmResolution? = null
 
     @Synchronized
-    fun resolve(
+    fun prepareWithDependencies(
         skipWriting: Boolean = false,
         npmResolutionManager: KotlinNpmResolutionManager,
         logger: Logger
     ): PreparedKotlinCompilationNpmResolution {
         check(resolution == null) { "$this already resolved" }
 
-        return createPackageJson(
+        return createPreparedResolution(
             skipWriting,
             npmResolutionManager,
             logger
@@ -66,7 +66,7 @@ class KotlinCompilationNpmResolution(
         logger: Logger,
     ): PreparedKotlinCompilationNpmResolution {
 
-        return resolution ?: resolve(
+        return resolution ?: prepareWithDependencies(
             skipWriting = true,
             npmResolutionManager,
             logger
@@ -83,7 +83,7 @@ class KotlinCompilationNpmResolution(
         return getResolutionOrResolve(npmResolutionManager, logger)
     }
 
-    fun createPackageJson(
+    fun createPreparedResolution(
         skipWriting: Boolean,
         npmResolutionManager: KotlinNpmResolutionManager,
         logger: Logger
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt
index 72d6cd8f456..1b4b1a0dc08 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinPackageJsonTask.kt
@@ -87,7 +87,7 @@ abstract class KotlinPackageJsonTask :
     @TaskAction
     fun resolve() {
         npmResolutionManager.get().resolution.get()[projectPath][compilationDisambiguatedName.get()]
-            .resolve(
+            .prepareWithDependencies(
                 npmResolutionManager = npmResolutionManager.get(),
                 logger = logger
             )