From 49814c438c1f38258c1a700e172ee2c2a5717ba1 Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Fri, 6 Mar 2020 10:53:21 +0300
Subject: [PATCH] [Gradle, JS] Fix naming

---
 .../org/jetbrains/kotlin/gradle/targets/js/npm/NpmApi.kt    | 2 +-
 .../org/jetbrains/kotlin/gradle/targets/js/yarn/Yarn.kt     | 6 +++---
 .../jetbrains/kotlin/gradle/targets/js/yarn/YarnBasics.kt   | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmApi.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmApi.kt
index cc754e3113e..09289ae6e62 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmApi.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmApi.kt
@@ -24,7 +24,7 @@ interface NpmApi {
     )
 
     fun resolveDependency(
-        resolvedNpmProject: KotlinCompilationNpmResolution,
+        npmResolution: KotlinCompilationNpmResolution,
         dependency: NpmDependency,
         transitive: Boolean
     ): Set<File>
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/Yarn.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/Yarn.kt
index 5dc2292898b..e0270cb4f4e 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/Yarn.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/Yarn.kt
@@ -22,12 +22,12 @@ object Yarn : NpmApi {
         getDelegate(resolvedNpmProject.project).resolveProject(resolvedNpmProject)
 
     override fun resolveDependency(
-        resolvedNpmProject: KotlinCompilationNpmResolution,
+        npmResolution: KotlinCompilationNpmResolution,
         dependency: NpmDependency,
         transitive: Boolean
-    ) = getDelegate(resolvedNpmProject.project)
+    ) = getDelegate(npmResolution.project)
         .resolveDependency(
-            resolvedNpmProject,
+            npmResolution,
             dependency,
             transitive
         )
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnBasics.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnBasics.kt
index 6a8b2e44267..0d021a83d21 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnBasics.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnBasics.kt
@@ -41,7 +41,7 @@ abstract class YarnBasics : NpmApi {
     }
 
     override fun resolveDependency(
-        resolvedNpmProject: KotlinCompilationNpmResolution,
+        npmResolution: KotlinCompilationNpmResolution,
         dependency: NpmDependency,
         transitive: Boolean
     ): Set<File> {
@@ -51,7 +51,7 @@ abstract class YarnBasics : NpmApi {
             return files
         }
 
-        val npmProject = resolvedNpmProject.npmProject
+        val npmProject = npmResolution.npmProject
 
         val all = mutableSetOf<File>()
 
@@ -73,7 +73,7 @@ abstract class YarnBasics : NpmApi {
         if (transitive) {
             dependency.dependencies.forEach {
                 resolveDependency(
-                    resolvedNpmProject,
+                    npmResolution,
                     it,
                     transitive
                 ).also { files ->