diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRoot.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRoot.kt index fdbe8575da5..10e03a1c86e 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRoot.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRoot.kt @@ -46,7 +46,7 @@ sealed class GradleBuildRoot { abstract val projectRoots: Collection - private val dir: VirtualFile? + val dir: VirtualFile? get() = LocalFileSystem.getInstance().findFileByPath(pathPrefix) private lateinit var lastModifiedFiles: LastModifiedFiles @@ -107,15 +107,13 @@ sealed class GradleBuildRoot { */ class Imported( override val manager: GradleBuildRootsManager, - val dir: VirtualFile, + override val pathPrefix: String, val javaHome: File?, val data: GradleBuildRootData ) : Linked() { val project: Project get() = manager.project - override val pathPrefix: String = dir.path - override val projectRoots: Collection get() = data.projectRoots diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRootsManager.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRootsManager.kt index e01d6e6de3d..262b3f40ade 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRootsManager.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRootsManager.kt @@ -202,7 +202,7 @@ class GradleBuildRootsManager(val project: Project) : ScriptingSupport() { val mergedData = if (build.failed && root is GradleBuildRoot.Imported) merge(root.data, newData) else newData val newSupport = tryCreateImportedRoot(build.workingDir) { mergedData } ?: return - GradleBuildRootDataSerializer.write(newSupport.dir, mergedData) + GradleBuildRootDataSerializer.write(newSupport.dir ?: return, mergedData) add(newSupport) @@ -335,7 +335,7 @@ class GradleBuildRootsManager(val project: Project) : ScriptingSupport() { .getExecutionSettings(project, externalProjectPath, GradleConstants.SYSTEM_ID) .javaHome?.let { File(it) } - return GradleBuildRoot.Imported(this, buildRoot, javaHome, data) + return GradleBuildRoot.Imported(this, externalProjectPath, javaHome, data) } private fun add(newRoot: GradleBuildRoot.Linked) { diff --git a/idea/resources/META-INF/gradle.xml.201 b/idea/resources/META-INF/gradle.xml.201 index b6e93cff310..f9a603cdf30 100644 --- a/idea/resources/META-INF/gradle.xml.201 +++ b/idea/resources/META-INF/gradle.xml.201 @@ -14,7 +14,6 @@ -