From ae4a1e3cca2db96c8f01a267515dd937ab111e82 Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Mon, 2 Dec 2019 11:51:45 +0300
Subject: [PATCH] [Gradle, JS] Fix check on Kotlin/JS modules from NPM in DCE

#KT-35198 fixed
---
 .../kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinJsDce.kt  | 3 ++-
 .../kotlin/org/jetbrains/kotlin/gradle/utils/fileUtils.kt    | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinJsDce.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinJsDce.kt
index a56292a6e03..09496b5dd60 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinJsDce.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinJsDce.kt
@@ -30,6 +30,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJsDce
 import org.jetbrains.kotlin.gradle.dsl.KotlinJsDceOptions
 import org.jetbrains.kotlin.gradle.dsl.KotlinJsDceOptionsImpl
 import org.jetbrains.kotlin.gradle.logging.GradleKotlinLogger
+import org.jetbrains.kotlin.gradle.utils.canonicalPathWithoutExtension
 import java.io.File
 
 @CacheableTask
@@ -97,6 +98,6 @@ open class KotlinJsDce : AbstractKotlinCompileTool<K2JSDceArguments>(), KotlinJs
             return false
         }
 
-        return File("${file.nameWithoutExtension}.meta.js").exists()
+        return File("${file.canonicalPathWithoutExtension()}.meta.js").exists()
     }
 }
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/fileUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/fileUtils.kt
index c778c47c80e..bdeabfad53e 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/fileUtils.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/fileUtils.kt
@@ -42,4 +42,7 @@ internal fun File.isParentOf(childCandidate: File, strict: Boolean = false): Boo
     } else {
         childCandidatePath.startsWith(parentPath)
     }
-}
\ No newline at end of file
+}
+
+internal fun File.canonicalPathWithoutExtension(): String =
+    canonicalPath.substringBeforeLast(".")
\ No newline at end of file