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

#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
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.backend.jvm.JvmGeneratorExtensionsImpl
import org.jetbrains.kotlin.backend.jvm.JvmIrCodegenFactory
import org.jetbrains.kotlin.backend.jvm.serialization.JvmIdSignatureDescriptor
import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
import org.jetbrains.kotlin.cli.common.checkKotlinPackageUsage
import org.jetbrains.kotlin.cli.common.environment.setIdeaIoUseFallback
import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport
import org.jetbrains.kotlin.cli.common.messages.MessageCollector
@@ -94,6 +95,8 @@ open class KJvmReplCompilerBase<AnalyzerT : ReplCodeAnalyzerBase>(
if (firstFailure != null)
return firstFailure
checkKotlinPackageUsage(context.environment.configuration, sourceFiles, messageCollector)
if (messageCollector.hasErrors()) return failure(messageCollector)
// TODO: support case then JvmDependencyFromClassLoader is registered in non-first line
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.scripting.compiler.plugin.impl
import org.jetbrains.kotlin.analyzer.AnalysisResult
import org.jetbrains.kotlin.backend.jvm.JvmIrCodegenFactory
import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
import org.jetbrains.kotlin.cli.common.checkKotlinPackageUsage
import org.jetbrains.kotlin.cli.common.fir.FirDiagnosticsCompilerResultsReporter
import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport
import org.jetbrains.kotlin.cli.common.messages.MessageCollector
@@ -126,6 +127,8 @@ private fun compileImpl(
messageCollector
)
checkKotlinPackageUsage(context.environment.configuration, sourceFiles, messageCollector)
if (messageCollector.hasErrors() || sourceDependencies.any { it.sourceDependencies is ResultWithDiagnostics.Failure }) {
return failure(messageCollector)
}
@@ -1,4 +1,4 @@
package kotlin.scripting.fibonacci
package org.jetbrains.kotlin.scripting.fibonacci
// this script expected parameter num : Int
fun fib(n: Int): Int {