MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 03:21:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin] K2: skip loading definitions if there is no gradle.kts

Browse Source 
#KTIJ-33119 Fixed


(cherry picked from commit 6eacff1938c508c055d59b74571b893c466be260)

IJ-CR-156007

GitOrigin-RevId: e783c2bef2236b5d4512a64f304205c9d035ce3f
This commit is contained in:
Vlad Koshkin
2025-02-25 16:10:40 +01:00
committed by intellij-monorepo-bot
parent 45d46461b3
commit dc03e780c0
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/scripting/ProjectGradleSettingsListener.kt
View File

@@ -69,9 +69,12 @@ class ProjectGradleSettingsListener(
root: Imported,
settings: GradleProjectSettings
) {
val models = root.data.models
if (models.isEmpty()) return
val definitions = loadGradleDefinitions(settings.externalProjectPath, root.data.gradleHome, root.data.javaHome, project)
val gradleScripts = root.data.models.mapNotNull {
val gradleScripts = models.mapNotNull {
val path = Paths.get(it.file)
VirtualFileManager.getInstance().findFileByNioPath(path)?.let { virtualFile ->
GradleScriptModel(

2
plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/scripting/importing/KotlinDslScriptModelResolver.kt
View File

@@ -70,7 +70,7 @@ class KotlinDslScriptSyncContributor : GradleSyncContributor {
}
}
if (sync != null && KotlinPluginModeProvider.isK2Mode()) {
if (sync != null && sync.models.isNotEmpty() && KotlinPluginModeProvider.isK2Mode()) {
val definitions = loadGradleDefinitions(sync.workingDir, sync.gradleHome, sync.javaHome, project)
GradleScriptDefinitionsSource.getInstance(project)?.updateDefinitions(definitions)