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

Handle standalone gradle scripts before (build|settnings|init).gradle.kts

Browse Source 
#KT-39916 Fixed
This commit is contained in:
Vladimir Dolzhenko
2020-07-17 05:36:02 +00:00
parent a6e58edfb9
commit a1ffc0b25a
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRootsLocator.kt
+14 -15
View File
@@ -6,7 +6,6 @@
package org.jetbrains.kotlin.idea.scripting.gradle.roots package org.jetbrains.kotlin.idea.scripting.gradle.roots
import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFile
import org.jetbrains.kotlin.utils.addToStdlib.lastIndexOfOrNull
/** /**
* Internal logic about finding script root for [GradleBuildRootsManager]. * Internal logic about finding script root for [GradleBuildRootsManager].
@@ -96,8 +95,8 @@ abstract class GradleBuildRootsLocator {
nearest == null -> NotificationKind.outsideAnything nearest == null -> NotificationKind.outsideAnything
importing -> NotificationKind.dontCare importing -> NotificationKind.dontCare
else -> when (nearest) { else -> when (nearest) {
is Legacy -> when { is Legacy -> when (root) {
root == null -> NotificationKind.legacyOutside null -> NotificationKind.legacyOutside
else -> NotificationKind.legacy else -> NotificationKind.legacy
} }
is New -> NotificationKind.wasNotImportedAfterCreation is New -> NotificationKind.wasNotImportedAfterCreation
@@ -130,24 +129,24 @@ abstract class GradleBuildRootsLocator {
if (!filePath.endsWith(".gradle.kts")) return null if (!filePath.endsWith(".gradle.kts")) return null
val scriptInfo = getScriptInfo(filePath) val scriptInfo = getScriptInfo(filePath)
val imported = scriptInfo?.buildRoot scriptInfo?.buildRoot?.let {
if (imported != null) return ScriptUnderRoot(filePath, imported, scriptInfo) return ScriptUnderRoot(filePath, it, scriptInfo)
}
// stand-alone scripts: "included", "precompiled" scripts, scripts in unlinked projects,
// or just random files with ".gradle.kts" ending OR scripts those Gradle has not provided
roots.getStandaloneScriptRoot(filePath)?.let {
return ScriptUnderRoot(filePath, it, standalone = true)
}
if (filePath.endsWith("/build.gradle.kts") || if (filePath.endsWith("/build.gradle.kts") ||
filePath.endsWith("/settings.gradle.kts") || filePath.endsWith("/settings.gradle.kts") ||
filePath.endsWith("/init.gradle.kts") filePath.endsWith("/init.gradle.kts")
) { ) {
// build|settings|init.gradle.kts scripts should be located near gradle project root only // build|settings|init.gradle.kts scripts should be located near gradle project root only
val gradleBuild = roots.getBuildByProjectDir(filePath.substringBeforeLast("/")) roots.getBuildByProjectDir(filePath.substringBeforeLast("/"))?.let {
if (gradleBuild != null) return ScriptUnderRoot(filePath, gradleBuild) return ScriptUnderRoot(filePath, it)
} }
// other scripts: "included", "precompiled" scripts, scripts in unlinked projects,
// or just random files with ".gradle.kts" ending
val standaloneScriptRoot = roots.getStandaloneScriptRoot(filePath)
if (standaloneScriptRoot != null) {
return ScriptUnderRoot(filePath, standaloneScriptRoot, standalone = true)
} }
val nearest = val nearest =