From 1b8fd019690f4e70d71e9c824af5bade1d87ab94 Mon Sep 17 00:00:00 2001 From: Andrei Klunnyi Date: Tue, 9 May 2023 14:54:12 +0200 Subject: [PATCH] [KT-58817] Star-imports are not handled Default imports coming from script configuration can be of "star" type. Prior to this commit they were effectively ignored due to a bug at FQN assembly. Before: org.gradle.dsl.* => org.gradle.dsl. After: org.gradle.dsl.* => org.gradle.dsl --- .../plugin/services/FirScriptConfigurationExtensionImpl.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/services/FirScriptConfigurationExtensionImpl.kt b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/services/FirScriptConfigurationExtensionImpl.kt index fcd53e7b4eb..8dc5e5c8b73 100644 --- a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/services/FirScriptConfigurationExtensionImpl.kt +++ b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/services/FirScriptConfigurationExtensionImpl.kt @@ -58,7 +58,7 @@ class FirScriptConfiguratorExtensionImpl( compilationConfiguration[ScriptCompilationConfiguration.defaultImports]?.forEach { defaultImport -> val trimmed = defaultImport.trim() val endsWithStar = trimmed.endsWith("*") - val stripped = if (endsWithStar) trimmed.substring(0, trimmed.length - 1) else trimmed + val stripped = if (endsWithStar) trimmed.substring(0, trimmed.length - 2) else trimmed val fqName = FqName.fromSegments(stripped.split(".")) fileBuilder.imports += buildImport { importedFqName = fqName