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

Scripting: add check for 'kotlin' package similar to the regular sources

Browse Source 
#KT-52598 fixed
This commit is contained in:
Ilya Chernikov
2022-05-31 15:55:47 +02:00
committed by teamcity
parent f5950ac8f3
commit a8c4ea04c8
6 changed files with 53 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/common/utils.kt
+4 -2
View File
@@ -42,11 +42,10 @@ fun incrementalCompilationIsEnabledForJs(arguments: CommonCompilerArguments): Bo
return arguments.incrementalCompilation ?: IncrementalCompilation.isEnabledForJs()
}
fun checkKotlinPackageUsage(configuration: CompilerConfiguration, files: Collection<KtFile>): Boolean {
fun checkKotlinPackageUsage(configuration: CompilerConfiguration, files: Collection<KtFile>, messageCollector: MessageCollector): Boolean {
if (configuration.getBoolean(CLIConfigurationKeys.ALLOW_KOTLIN_PACKAGE)) {
return true
}
val messageCollector = configuration.get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, MessageCollector.NONE)
val kotlinPackage = FqName("kotlin")
for (file in files) {
if (file.packageFqName.isSubpackageOf(kotlinPackage)) {
@@ -61,6 +60,9 @@ fun checkKotlinPackageUsage(configuration: CompilerConfiguration, files: Collect
return true
}
fun checkKotlinPackageUsage(configuration: CompilerConfiguration, files: Collection<KtFile>): Boolean =
checkKotlinPackageUsage(configuration, files, configuration.get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, MessageCollector.NONE))
fun getLibraryFromHome(
paths: KotlinPaths?,
getLibrary: (KotlinPaths) -> File,