azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed loading Gradle script templates located on WSL2

Browse Source 
#KT-45042 Fixed
This commit is contained in:
Andrey Uskov
2021-03-07 11:40:55 +03:00
parent 63925ee018
commit b7e13d677d
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslScriptModelProcessor.kt
+5 -5
View File
@@ -26,14 +26,14 @@ fun saveGradleBuildEnvironment(resolverCtx: ProjectResolverContext) {
val tasks = KotlinDslSyncListener.instance.tasks val tasks = KotlinDslSyncListener.instance.tasks
val sync = synchronized(tasks) { tasks[task] } val sync = synchronized(tasks) { tasks[task] }
if (sync != null) { if (sync != null) {
val gradleHome = resolverCtx.getExtraProject(BuildScriptClasspathModel::class.java)?.gradleHomeDir?.canonicalPath val gradleHome = resolverCtx.getExtraProject(BuildScriptClasspathModel::class.java)?.gradleHomeDir?.path
?: resolverCtx.settings?.gradleHome ?: resolverCtx.settings?.gradleHome
synchronized(sync) { synchronized(sync) {
sync.gradleVersion = resolverCtx.projectGradleVersion sync.gradleVersion = resolverCtx.projectGradleVersion
sync.javaHome = (resolverCtx as? DefaultProjectResolverContext) sync.javaHome = (resolverCtx as? DefaultProjectResolverContext)
?.buildEnvironment ?.buildEnvironment
?.java?.javaHome?.canonicalPath ?.java?.javaHome?.path
?.let { toSystemIndependentName(it) } ?.let { toSystemIndependentName(it) }
if (gradleHome != null) { if (gradleHome != null) {
@@ -125,10 +125,10 @@ private fun KotlinDslScriptsModel.toListOfScriptModels(project: Project): List<K
// todo(KT-34440): take inputs snapshot before starting import // todo(KT-34440): take inputs snapshot before starting import
val gradleScriptInputsStamp = getGradleScriptInputsStamp(project, virtualFile) ?: return@mapNotNull null val gradleScriptInputsStamp = getGradleScriptInputsStamp(project, virtualFile) ?: return@mapNotNull null
KotlinDslScriptModel( KotlinDslScriptModel(
toSystemIndependentName(file.absolutePath), toSystemIndependentName(file.path),
gradleScriptInputsStamp, gradleScriptInputsStamp,
model.classPath.map { toSystemIndependentName(it.absolutePath) }, model.classPath.map { toSystemIndependentName(it.path) },
model.sourcePath.map { toSystemIndependentName(it.absolutePath) }, model.sourcePath.map { toSystemIndependentName(it.path) },
model.implicitImports, model.implicitImports,
messages messages
) )
idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/importing/KotlinDslSyncListener.kt
+1 -1
View File
@@ -58,7 +58,7 @@ class KotlinDslSyncListener : ExternalSystemTaskNotificationListenerAdapter() {
sync.gradleHome = ServiceManager sync.gradleHome = ServiceManager
.getService(GradleInstallationManager::class.java) .getService(GradleInstallationManager::class.java)
.getGradleHome(project, sync.workingDir) .getGradleHome(project, sync.workingDir)
?.canonicalPath ?.path
} }
if (sync.javaHome == null) { if (sync.javaHome == null) {