From b7e13d677d5f1c4ecabfd95a422c820329e031e2 Mon Sep 17 00:00:00 2001
From: Andrey Uskov <Andrey.Uskov@jetbrains.com>
Date: Sun, 7 Mar 2021 11:40:55 +0300
Subject: [PATCH] Fixed loading Gradle script templates located on WSL2

#KT-45042 Fixed
---
 .../gradle/importing/KotlinDslScriptModelProcessor.kt  | 10 +++++-----
 .../gradle/importing/KotlinDslSyncListener.kt          |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProcessor.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProcessor.kt
index d0638edeb62..860d69558d6 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProcessor.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProcessor.kt
@@ -26,14 +26,14 @@ fun saveGradleBuildEnvironment(resolverCtx: ProjectResolverContext) {
     val tasks = KotlinDslSyncListener.instance.tasks
     val sync = synchronized(tasks) { tasks[task] }
     if (sync != null) {
-        val gradleHome = resolverCtx.getExtraProject(BuildScriptClasspathModel::class.java)?.gradleHomeDir?.canonicalPath
+        val gradleHome = resolverCtx.getExtraProject(BuildScriptClasspathModel::class.java)?.gradleHomeDir?.path
             ?: resolverCtx.settings?.gradleHome
         synchronized(sync) {
             sync.gradleVersion = resolverCtx.projectGradleVersion
 
             sync.javaHome = (resolverCtx as? DefaultProjectResolverContext)
                 ?.buildEnvironment
-                ?.java?.javaHome?.canonicalPath
+                ?.java?.javaHome?.path
                 ?.let { toSystemIndependentName(it) }
 
             if (gradleHome != null) {
@@ -125,10 +125,10 @@ private fun KotlinDslScriptsModel.toListOfScriptModels(project: Project): List<K
         // todo(KT-34440): take inputs snapshot before starting import
         val gradleScriptInputsStamp = getGradleScriptInputsStamp(project, virtualFile) ?: return@mapNotNull null
         KotlinDslScriptModel(
-            toSystemIndependentName(file.absolutePath),
+            toSystemIndependentName(file.path),
             gradleScriptInputsStamp,
-            model.classPath.map { toSystemIndependentName(it.absolutePath) },
-            model.sourcePath.map { toSystemIndependentName(it.absolutePath) },
+            model.classPath.map { toSystemIndependentName(it.path) },
+            model.sourcePath.map { toSystemIndependentName(it.path) },
             model.implicitImports,
             messages
         )
diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslSyncListener.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslSyncListener.kt
index 334f7792c69..268e2947b9d 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslSyncListener.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslSyncListener.kt
@@ -58,7 +58,7 @@ class KotlinDslSyncListener : ExternalSystemTaskNotificationListenerAdapter() {
             sync.gradleHome = ServiceManager
                 .getService(GradleInstallationManager::class.java)
                 .getGradleHome(project, sync.workingDir)
-                ?.canonicalPath
+                ?.path
         }
 
         if (sync.javaHome == null) {