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

Fix ScriptDefinition subtyping after earlier refactorings

Browse Source 
#KT-41905 fixed
(may also fix other yet undetected or not analyzed problems with script
definitions)
This commit is contained in:
Ilya Chernikov
2020-09-30 17:56:58 +02:00
parent adcfca3f98
commit d88e87aaac
3 changed files with 3 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/dependencies/KotlinScriptResolveScopeProvider.kt
+1 -1
View File
@@ -48,7 +48,7 @@ class KotlinScriptResolveScopeProvider : ResolveScopeProvider() {
// This is a workaround for completion in REPL to provide module dependencies // This is a workaround for completion in REPL to provide module dependencies
if (scriptDefinition.baseClassType.fromClass == Any::class) return null if (scriptDefinition.baseClassType.fromClass == Any::class) return null
if (scriptDefinition is ScriptDefinition.FromConfigurations || if (scriptDefinition is ScriptDefinition.FromConfigurationsBase ||
scriptDefinition.asLegacyOrNull<KotlinScriptDefinitionFromAnnotatedTemplate>() != null scriptDefinition.asLegacyOrNull<KotlinScriptDefinitionFromAnnotatedTemplate>() != null
) { ) {
return GlobalSearchScope.fileScope(project, file).union( return GlobalSearchScope.fileScope(project, file).union(
idea/src/org/jetbrains/kotlin/idea/script/configuration/KotlinScriptDefinitionsModel.kt
+1 -1
View File
@@ -59,7 +59,7 @@ class KotlinScriptDefinitionsModel private constructor(definitions: MutableList<
override fun valueOf(item: ModelDescriptor): String { override fun valueOf(item: ModelDescriptor): String {
val definition = item.definition val definition = item.definition
return definition.asLegacyOrNull<KotlinScriptDefinitionFromAnnotatedTemplate>()?.scriptFilePattern?.pattern return definition.asLegacyOrNull<KotlinScriptDefinitionFromAnnotatedTemplate>()?.scriptFilePattern?.pattern
?: (definition as? ScriptDefinition.FromConfigurations)?.filePathPattern ?: (definition as? ScriptDefinition.FromConfigurationsBase)?.filePathPattern
?: "." + definition.fileExtension ?: "." + definition.fileExtension
} }
} }
plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/ScriptDefinition.kt
+1 -1
View File
@@ -175,7 +175,7 @@ abstract class ScriptDefinition : UserDataHolderBase() {
get() = compilationConfiguration[ScriptCompilationConfiguration.annotationsForSamWithReceivers].orEmpty().map { it.typeName } get() = compilationConfiguration[ScriptCompilationConfiguration.annotationsForSamWithReceivers].orEmpty().map { it.typeName }
override fun equals(other: Any?): Boolean = this === other || override fun equals(other: Any?): Boolean = this === other ||
(other as? FromConfigurations)?.let { (other as? FromConfigurationsBase)?.let {
compilationConfiguration == it.compilationConfiguration && evaluationConfiguration == it.evaluationConfiguration compilationConfiguration == it.compilationConfiguration && evaluationConfiguration == it.evaluationConfiguration
} == true } == true