From 0e7cf60b04ff8d09623b19b34e1f3c5e9a4a4f92 Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Sat, 2 May 2020 13:47:18 +0300 Subject: [PATCH] ScriptConfigurationManager: take OutsidersPsiFileSupport into account --- .../configuration/CompositeScriptConfigurationManager.kt | 6 +++++- .../idea/scripting/gradle/roots/GradleBuildRootsManager.kt | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/CompositeScriptConfigurationManager.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/CompositeScriptConfigurationManager.kt index 3e79f95b737..578f19cd9fe 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/CompositeScriptConfigurationManager.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/CompositeScriptConfigurationManager.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.idea.core.script.configuration import com.intellij.ProjectTopics +import com.intellij.codeInsight.daemon.OutsidersPsiFileSupport import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.progress.ProcessCanceledException import com.intellij.openapi.project.Project @@ -46,7 +47,10 @@ class CompositeScriptConfigurationManager(val project: Project) : ScriptConfigur if (scriptConfiguration != null) return scriptConfiguration // check that this script should be loaded later in special way (e.g. gradle project import) - if (plugins.any { it.isApplicable(virtualFile) }) return null + // (and not for syntactic diff files) + if (!OutsidersPsiFileSupport.isOutsiderFile(virtualFile)) { + if (plugins.any { it.isApplicable(virtualFile) }) return null + } return default.getOrLoadConfiguration(virtualFile, preloadedKtFile) } 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 807b68ae35a..d0d6144a50c 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 @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.idea.scripting.gradle.roots import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer -import com.intellij.openapi.components.ServiceManager import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil import com.intellij.openapi.fileEditor.FileEditorManager import com.intellij.openapi.project.Project @@ -24,7 +23,6 @@ import org.jetbrains.kotlin.idea.core.script.configuration.utils.ScriptClassRoot import org.jetbrains.kotlin.idea.core.util.EDT import org.jetbrains.kotlin.idea.scripting.gradle.* import org.jetbrains.kotlin.idea.scripting.gradle.importing.KotlinDslGradleBuildSync -import org.jetbrains.kotlin.idea.scripting.gradle.importing.KotlinDslScriptModel import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstance import org.jetbrains.plugins.gradle.config.GradleSettingsListenerAdapter