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

ScriptConfigurationManager: take OutsidersPsiFileSupport into account

Browse Source
This commit is contained in:
Sergey Rostov
2020-05-02 13:47:18 +03:00
parent 316c7ce60f
commit 0e7cf60b04
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/configuration/CompositeScriptConfigurationManager.kt
+5 -1
View File
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.idea.core.script.configuration package org.jetbrains.kotlin.idea.core.script.configuration
import com.intellij.ProjectTopics import com.intellij.ProjectTopics
import com.intellij.codeInsight.daemon.OutsidersPsiFileSupport
import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.diagnostic.logger
import com.intellij.openapi.progress.ProcessCanceledException import com.intellij.openapi.progress.ProcessCanceledException
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
@@ -46,7 +47,10 @@ class CompositeScriptConfigurationManager(val project: Project) : ScriptConfigur
if (scriptConfiguration != null) return scriptConfiguration if (scriptConfiguration != null) return scriptConfiguration
// check that this script should be loaded later in special way (e.g. gradle project import) // 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) return default.getOrLoadConfiguration(virtualFile, preloadedKtFile)
} }
idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/roots/GradleBuildRootsManager.kt
-2
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.codeInsight.daemon.DaemonCodeAnalyzer import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer
import com.intellij.openapi.components.ServiceManager
import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
import com.intellij.openapi.fileEditor.FileEditorManager import com.intellij.openapi.fileEditor.FileEditorManager
import com.intellij.openapi.project.Project 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.core.util.EDT
import org.jetbrains.kotlin.idea.scripting.gradle.* import org.jetbrains.kotlin.idea.scripting.gradle.*
import org.jetbrains.kotlin.idea.scripting.gradle.importing.KotlinDslGradleBuildSync 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.psi.KtFile
import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstance import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstance
import org.jetbrains.plugins.gradle.config.GradleSettingsListenerAdapter import org.jetbrains.plugins.gradle.config.GradleSettingsListenerAdapter