From f2484b780b8825ff40fe7b0be3ffd6a4ab17ecc4 Mon Sep 17 00:00:00 2001 From: Vlad Koshkin Date: Wed, 18 Sep 2024 00:10:34 +0200 Subject: [PATCH] [kotlin] remove deprecated script api usage GitOrigin-RevId: f1b1c04af066810ec1e702fa5139f9fe6230a1fe --- .../core/script/ScriptConfigurationManager.kt | 4 ++-- .../core/script/ScriptDefinitionsManager.kt | 6 ------ .../idea/core/script/ScriptDependencyAware.kt | 4 ++-- .../ScriptTrafficLightRendererContributor.kt | 5 ++--- .../KotlinScriptResolveScopeProvider.kt | 4 ++-- ...kt => ScriptConfigurationsProviderImpl.kt} | 12 ++++++------ .../script/k2/ScriptDependenciesSource.kt | 2 +- .../core/script/scriptDefinitionLoading.kt | 19 +++++++++++++++---- .../script/ScriptDefinitionsManagerTest.kt | 3 --- .../imports/KotlinIdeDefaultImportProvider.kt | 4 ++-- .../roots/GradleBuildRootsLocator.kt | 4 ++-- .../highlighting/KotlinHighlightingUtils.kt | 4 ++-- ...tlinDefaultHighlightingSettingsProvider.kt | 4 ++-- .../resources/META-INF/scripting-base.xml | 2 +- .../k2/resources/META-INF/scripting-k2.xml | 4 ++-- 15 files changed, 41 insertions(+), 40 deletions(-) rename plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/k2/{ScriptConfigurationDataProvider.kt => ScriptConfigurationsProviderImpl.kt} (91%) diff --git a/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationManager.kt b/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationManager.kt index 1b45dec9cf02..8e39bae293ec 100644 --- a/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationManager.kt +++ b/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationManager.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.idea.core.script.configuration.CompositeScriptConfig import org.jetbrains.kotlin.idea.core.script.configuration.DefaultScriptingSupport import org.jetbrains.kotlin.idea.util.application.isUnitTestMode import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.scripting.definitions.ScriptDependenciesProvider +import org.jetbrains.kotlin.scripting.definitions.ScriptConfigurationsProvider import org.jetbrains.kotlin.scripting.resolve.ScriptCompilationConfigurationResult import org.jetbrains.kotlin.scripting.resolve.ScriptCompilationConfigurationWrapper import org.jetbrains.kotlin.utils.addToStdlib.cast @@ -37,7 +37,7 @@ import kotlin.script.experimental.api.makeFailureResult // NOTE: this service exists exclusively because ScriptDependencyManager // cannot be registered as implementing two services (state would be duplicated) -internal class IdeScriptDependenciesProvider(project: Project) : ScriptDependenciesProvider(project) { +internal class IdeScriptDependenciesProvider(project: Project) : ScriptConfigurationsProvider(project) { override fun getScriptConfigurationResult(file: KtFile): ScriptCompilationConfigurationResult? { val configuration = getScriptConfiguration(file) val reports = IdeScriptReportSink.getReports(file) diff --git a/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt b/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt index 4569f607a119..400490ec54db 100644 --- a/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt +++ b/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt @@ -114,12 +114,6 @@ open class ScriptDefinitionsManager(private val project: Project) : LazyScriptDe return definition } - @Deprecated("Migrating to configuration refinement", level = DeprecationLevel.ERROR) - override fun findScriptDefinition(fileName: String): KotlinScriptDefinition? { - @Suppress("DEPRECATION") - return findDefinition(File(fileName).toScriptSource())?.legacyDefinition - } - /** * Goes through the list of registered [ScriptDefinitionsSource]s and triggers definitions reload. * Result of previous reloads is invalidated including those launched via [reloadDefinitionsBy]. diff --git a/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/ScriptDependencyAware.kt b/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/ScriptDependencyAware.kt index 7c61e83ef6f6..5d8508ff2a8c 100644 --- a/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/ScriptDependencyAware.kt +++ b/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/ScriptDependencyAware.kt @@ -7,7 +7,7 @@ import com.intellij.openapi.projectRoots.Sdk import com.intellij.openapi.vfs.VirtualFile import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginModeProvider -import org.jetbrains.kotlin.scripting.definitions.ScriptDependenciesProvider +import org.jetbrains.kotlin.scripting.definitions.ScriptConfigurationsProvider interface ScriptDependencyAware { fun getAllScriptDependenciesSources(): Collection @@ -25,7 +25,7 @@ interface ScriptDependencyAware { companion object { fun getInstance(project: Project): ScriptDependencyAware { return if (KotlinPluginModeProvider.isK2Mode()) { - project.serviceIfCreated() as? ScriptDependencyAware ?: EMPTY + project.serviceIfCreated() as? ScriptDependencyAware ?: EMPTY } else { ScriptConfigurationManager.getInstance(project) } diff --git a/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/ScriptTrafficLightRendererContributor.kt b/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/ScriptTrafficLightRendererContributor.kt index 5f12318ab452..0ea6c092b0a0 100644 --- a/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/ScriptTrafficLightRendererContributor.kt +++ b/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/ScriptTrafficLightRendererContributor.kt @@ -4,7 +4,6 @@ package org.jetbrains.kotlin.idea.core.script import com.intellij.codeInsight.daemon.impl.SeverityRegistrar import com.intellij.codeInsight.daemon.impl.TrafficLightRenderer -import com.intellij.codeInsight.daemon.impl.TrafficLightRenderer.DaemonCodeAnalyzerStatus import com.intellij.codeInsight.daemon.impl.TrafficLightRendererContributor import com.intellij.openapi.application.runReadAction import com.intellij.openapi.editor.Document @@ -14,7 +13,7 @@ import com.intellij.psi.PsiFile import com.intellij.util.concurrency.annotations.RequiresBackgroundThread import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginModeProvider import org.jetbrains.kotlin.idea.base.scripting.KotlinBaseScriptingBundle -import org.jetbrains.kotlin.idea.core.script.k2.ScriptConfigurationDataProvider +import org.jetbrains.kotlin.idea.core.script.k2.ScriptConfigurationsProviderImpl import org.jetbrains.kotlin.psi.KtFile internal class ScriptTrafficLightRendererContributor : TrafficLightRendererContributor { @@ -30,7 +29,7 @@ internal class ScriptTrafficLightRendererContributor : TrafficLightRendererContr val status = super.getDaemonCodeAnalyzerStatus(severityRegistrar) if (KotlinPluginModeProvider.isK2Mode()) { - if (ScriptConfigurationDataProvider.getInstanceIfCreated(project)?.getScriptConfiguration(file) == null) { + if (ScriptConfigurationsProviderImpl.getInstanceIfCreated(project)?.getScriptConfiguration(file) == null) { status.reasonWhySuspended = KotlinBaseScriptingBundle.message("text.loading.kotlin.script.configuration") status.errorAnalyzingFinished = false } diff --git a/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/dependencies/KotlinScriptResolveScopeProvider.kt b/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/dependencies/KotlinScriptResolveScopeProvider.kt index 38de3f963c38..300d447099f1 100644 --- a/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/dependencies/KotlinScriptResolveScopeProvider.kt +++ b/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/dependencies/KotlinScriptResolveScopeProvider.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.idea.isEnabled import org.jetbrains.kotlin.idea.util.isKotlinFileType import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition -import org.jetbrains.kotlin.scripting.definitions.ScriptDependenciesProvider +import org.jetbrains.kotlin.scripting.definitions.ScriptConfigurationsProvider import org.jetbrains.kotlin.scripting.definitions.findScriptDefinition import kotlin.script.experimental.api.ScriptCompilationConfiguration import kotlin.script.experimental.api.isStandalone @@ -110,7 +110,7 @@ class KotlinScriptResolveScopeProvider : ResolveScopeProvider() { } private fun KtFile.isStandaloneScriptByDesign(project: Project, definition: ScriptDefinition): Boolean { - val configuration = ScriptDependenciesProvider.getInstance(project)?.getScriptConfiguration(this)?.configuration + val configuration = ScriptConfigurationsProvider.getInstance(project)?.getScriptConfiguration(this)?.configuration ?: definition.compilationConfiguration val isStandalone = configuration[ScriptCompilationConfiguration.isStandalone] == true debugLog { "standalone-by-design: $isStandalone" } diff --git a/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/k2/ScriptConfigurationDataProvider.kt b/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/k2/ScriptConfigurationsProviderImpl.kt similarity index 91% rename from plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/k2/ScriptConfigurationDataProvider.kt rename to plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/k2/ScriptConfigurationsProviderImpl.kt index 170d5df06a23..7d2fabb0b4aa 100644 --- a/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/k2/ScriptConfigurationDataProvider.kt +++ b/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/k2/ScriptConfigurationsProviderImpl.kt @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.idea.core.script.SCRIPT_DEPENDENCIES_SOURCES import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager.Companion.toVfsRoots import org.jetbrains.kotlin.idea.core.script.ScriptDependencyAware import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.scripting.definitions.ScriptDependenciesProvider +import org.jetbrains.kotlin.scripting.definitions.ScriptConfigurationsProvider import org.jetbrains.kotlin.scripting.resolve.ScriptCompilationConfigurationResult import org.jetbrains.kotlin.scripting.resolve.ScriptCompilationConfigurationWrapper import java.nio.file.Path @@ -38,7 +38,7 @@ class ScriptDependenciesData( ) } -class ScriptConfigurationDataProvider(project: Project) : ScriptDependenciesProvider(project), ScriptDependencyAware { +class ScriptConfigurationsProviderImpl(project: Project) : ScriptConfigurationsProvider(project), ScriptDependencyAware { private val scriptDependenciesData = AtomicReference(ScriptDependenciesData()) fun notifySourceUpdated() { @@ -121,11 +121,11 @@ class ScriptConfigurationDataProvider(project: Project) : ScriptDependenciesProv private val KtFile.alwaysVirtualFile: VirtualFile get() = originalFile.virtualFile ?: viewProvider.virtualFile companion object { - fun getInstance(project: Project): ScriptConfigurationDataProvider = - project.service() as ScriptConfigurationDataProvider + fun getInstance(project: Project): ScriptConfigurationsProviderImpl = + project.service() as ScriptConfigurationsProviderImpl - fun getInstanceIfCreated(project: Project): ScriptConfigurationDataProvider? = - project.serviceIfCreated() as? ScriptConfigurationDataProvider + fun getInstanceIfCreated(project: Project): ScriptConfigurationsProviderImpl? = + project.serviceIfCreated() as? ScriptConfigurationsProviderImpl } } diff --git a/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/k2/ScriptDependenciesSource.kt b/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/k2/ScriptDependenciesSource.kt index e075eaa5da40..7a9d3322e11e 100644 --- a/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/k2/ScriptDependenciesSource.kt +++ b/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/k2/ScriptDependenciesSource.kt @@ -35,7 +35,7 @@ abstract class ScriptDependenciesSource(open val project: P updateModules(dependencies, storage) currentConfigurationsData.set(dependencies) - ScriptConfigurationDataProvider.getInstance(project).notifySourceUpdated() + ScriptConfigurationsProviderImpl.getInstance(project).notifySourceUpdated() writeAction { project.analysisMessageBus.syncPublisher(KotlinModificationTopics.GLOBAL_MODULE_STATE_MODIFICATION).onModification() diff --git a/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/scriptDefinitionLoading.kt b/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/scriptDefinitionLoading.kt index aad731221786..0a8f3ceb34e9 100644 --- a/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/scriptDefinitionLoading.kt +++ b/plugins/kotlin/base/scripting/src/org/jetbrains/kotlin/idea/core/script/scriptDefinitionLoading.kt @@ -14,6 +14,9 @@ import com.intellij.util.PathUtil import com.intellij.util.lang.UrlClassLoader import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition import org.jetbrains.kotlin.scripting.definitions.ScriptDefinitionsSource +import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition.FromLegacy +import org.jetbrains.kotlin.scripting.definitions.getEnvironment +import org.jetbrains.kotlin.scripting.resolve.KotlinScriptDefinitionFromAnnotatedTemplate import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull import java.io.File import java.nio.file.Files @@ -81,14 +84,22 @@ fun loadDefinitionsFromTemplatesByPaths( } when { - template.annotations.firstIsInstanceOrNull() != null -> { - ScriptDefinition.FromLegacyTemplate(hostConfiguration, template, templateClasspathAsFiles, defaultCompilerOptions) - } - template.annotations.firstIsInstanceOrNull() != null -> { ScriptDefinition.FromTemplate(hostConfiguration, template, ScriptDefinition::class, defaultCompilerOptions) } + template.annotations.firstIsInstanceOrNull() != null -> { + FromLegacy( + hostConfiguration, + KotlinScriptDefinitionFromAnnotatedTemplate( + template, + hostConfiguration[ScriptingHostConfiguration.getEnvironment]?.invoke(), + templateClasspathAsFiles + ), + defaultCompilerOptions + ) + } + else -> { scriptingWarnLog("Cannot find a valid script definition annotation on the class $template") null diff --git a/plugins/kotlin/base/scripting/test/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManagerTest.kt b/plugins/kotlin/base/scripting/test/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManagerTest.kt index 2326a6b6f5c6..1b82f051e6e5 100644 --- a/plugins/kotlin/base/scripting/test/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManagerTest.kt +++ b/plugins/kotlin/base/scripting/test/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManagerTest.kt @@ -256,10 +256,7 @@ class ScriptDefinitionsManagerTest { @Test fun `Default definition is available via both new and legacy API`() { val defaultDefinition = manager.getDefaultDefinition() - val defaultScriptDefinition = manager.getDefaultScriptDefinition() - assertNotNull(defaultDefinition.asLegacyOrNull()) - assertInstanceOf(LegacyBundledIdeScriptDefinition::class.java, defaultScriptDefinition) } diff --git a/plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/imports/KotlinIdeDefaultImportProvider.kt b/plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/imports/KotlinIdeDefaultImportProvider.kt index 00e0c6d9a70a..1271f6f39169 100644 --- a/plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/imports/KotlinIdeDefaultImportProvider.kt +++ b/plugins/kotlin/code-insight/impl-base/src/org/jetbrains/kotlin/idea/imports/KotlinIdeDefaultImportProvider.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.idea.base.projectStructure.languageVersionSettings import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.resolve.ImportPath -import org.jetbrains.kotlin.scripting.definitions.ScriptDependenciesProvider +import org.jetbrains.kotlin.scripting.definitions.ScriptConfigurationsProvider @Service @ApiStatus.Experimental @@ -34,7 +34,7 @@ class KotlinIdeDefaultImportProvider { val allDefaultImports = analyzerServices.getDefaultImports(languageVersionSettings, includeLowPriorityImports = true) val scriptExtraImports = contextFile.takeIf { it.isScript() }?.let { ktFile -> - val scriptDependencies = ScriptDependenciesProvider.getInstance(ktFile.project) + val scriptDependencies = ScriptConfigurationsProvider.getInstance(ktFile.project) ?.getScriptConfiguration(ktFile.originalFile as KtFile) scriptDependencies?.defaultImports?.map { ImportPath.fromString(it) } scriptDependencies?.defaultImports?.map { ImportPath.fromString(it) } diff --git a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/scripting/roots/GradleBuildRootsLocator.kt b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/scripting/roots/GradleBuildRootsLocator.kt index 864fbc516160..da8b46e895cc 100644 --- a/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/scripting/roots/GradleBuildRootsLocator.kt +++ b/plugins/kotlin/gradle/gradle-java/src/org/jetbrains/kotlin/idea/gradleJava/scripting/roots/GradleBuildRootsLocator.kt @@ -6,7 +6,7 @@ import com.intellij.openapi.project.Project import com.intellij.openapi.vfs.StandardFileSystems import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginModeProvider -import org.jetbrains.kotlin.idea.core.script.k2.ScriptConfigurationDataProvider +import org.jetbrains.kotlin.idea.core.script.k2.ScriptConfigurationsProviderImpl import kotlin.script.experimental.api.valueOrNull /** @@ -116,7 +116,7 @@ abstract class GradleBuildRootsLocator(private val project: Project) { get() { if (KotlinPluginModeProvider.isK2Mode()) { val virtualFile = StandardFileSystems.local()?.refreshAndFindFileByPath(filePath) ?: return false - return ScriptConfigurationDataProvider.getInstanceIfCreated(project)?.getConfiguration(virtualFile)?.valueOrNull() != null + return ScriptConfigurationsProviderImpl.getInstanceIfCreated(project)?.getConfiguration(virtualFile)?.valueOrNull() != null } return script != null } diff --git a/plugins/kotlin/highlighting/highlighting-shared/src/org/jetbrains/kotlin/idea/base/highlighting/KotlinHighlightingUtils.kt b/plugins/kotlin/highlighting/highlighting-shared/src/org/jetbrains/kotlin/idea/base/highlighting/KotlinHighlightingUtils.kt index 0f429805fb9b..30eb31a54557 100644 --- a/plugins/kotlin/highlighting/highlighting-shared/src/org/jetbrains/kotlin/idea/base/highlighting/KotlinHighlightingUtils.kt +++ b/plugins/kotlin/highlighting/highlighting-shared/src/org/jetbrains/kotlin/idea/base/highlighting/KotlinHighlightingUtils.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.idea.core.script.IdeScriptReportSink import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesModificationTracker import org.jetbrains.kotlin.psi.KtCodeFragment import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.scripting.definitions.ScriptDependenciesProvider +import org.jetbrains.kotlin.scripting.definitions.ScriptConfigurationsProvider import kotlin.script.experimental.api.ScriptDiagnostic @ApiStatus.Internal @@ -86,4 +86,4 @@ private fun KtFile.calculateShouldHighlightScript(): Boolean { } private fun KtFile.isConfigurationLoaded(): Boolean = - ScriptDependenciesProvider.getInstance(project)?.getScriptConfiguration(this) != null \ No newline at end of file + ScriptConfigurationsProvider.getInstance(project)?.getScriptConfiguration(this) != null \ No newline at end of file diff --git a/plugins/kotlin/highlighting/highlighting-shared/src/org/jetbrains/kotlin/idea/highlighter/KotlinDefaultHighlightingSettingsProvider.kt b/plugins/kotlin/highlighting/highlighting-shared/src/org/jetbrains/kotlin/idea/highlighter/KotlinDefaultHighlightingSettingsProvider.kt index b945dfca359a..4c47c44d5140 100644 --- a/plugins/kotlin/highlighting/highlighting-shared/src/org/jetbrains/kotlin/idea/highlighter/KotlinDefaultHighlightingSettingsProvider.kt +++ b/plugins/kotlin/highlighting/highlighting-shared/src/org/jetbrains/kotlin/idea/highlighter/KotlinDefaultHighlightingSettingsProvider.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.idea.codeinsight.utils.KotlinSupportAvailability import org.jetbrains.kotlin.idea.core.util.toPsiFile import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.NotNullableUserDataProperty -import org.jetbrains.kotlin.scripting.definitions.ScriptDependenciesProvider +import org.jetbrains.kotlin.scripting.definitions.ScriptConfigurationsProvider var VirtualFile.isKotlinDecompiledFile: Boolean by NotNullableUserDataProperty(Key.create("IS_KOTLIN_DECOMPILED_FILE"), false) @@ -28,7 +28,7 @@ class KotlinDefaultHighlightingSettingsProvider : DefaultHighlightingSettingProv return when { psiFile is KtFile -> when { - psiFile.isScript() && ScriptDependenciesProvider.getInstance(project)?.getScriptConfiguration(psiFile) == null -> + psiFile.isScript() && ScriptConfigurationsProvider.getInstance(project)?.getScriptConfiguration(psiFile) == null -> FileHighlightingSetting.SKIP_HIGHLIGHTING psiFile.isCompiled -> FileHighlightingSetting.SKIP_INSPECTION diff --git a/plugins/kotlin/plugin/common/resources/META-INF/scripting-base.xml b/plugins/kotlin/plugin/common/resources/META-INF/scripting-base.xml index 4ab81ce19b02..720a4ba5a9ac 100644 --- a/plugins/kotlin/plugin/common/resources/META-INF/scripting-base.xml +++ b/plugins/kotlin/plugin/common/resources/META-INF/scripting-base.xml @@ -45,7 +45,7 @@ - - +