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

[KT-58817] Star-imports are not handled

Browse Source 
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
This commit is contained in:
Andrei Klunnyi
2023-05-09 14:54:12 +02:00
committed by Space Team
parent 6255efa7f7
commit 1b8fd01969
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/services/FirScriptConfigurationExtensionImpl.kt
+1 -1
View File
@@ -58,7 +58,7 @@ class FirScriptConfiguratorExtensionImpl(
compilationConfiguration[ScriptCompilationConfiguration.defaultImports]?.forEach { defaultImport -> compilationConfiguration[ScriptCompilationConfiguration.defaultImports]?.forEach { defaultImport ->
val trimmed = defaultImport.trim() val trimmed = defaultImport.trim()
val endsWithStar = trimmed.endsWith("*") 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(".")) val fqName = FqName.fromSegments(stripped.split("."))
fileBuilder.imports += buildImport { fileBuilder.imports += buildImport {
importedFqName = fqName importedFqName = fqName