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

[FIR] KT-57803: Report the error message for light tree

Browse Source 
The renaming prevents the JVM clash.

^KT-57803 Fixed
This commit is contained in:
Nikolay Lunyak
2023-05-26 13:12:44 +03:00
committed by Space Team
parent 7f74950993
commit 23f87eda1f
16 changed files with 114 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/KJvmReplCompilerBase.kt
+2 -2
View File
@@ -11,7 +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.checkKotlinPackageUsageForPsi
import org.jetbrains.kotlin.cli.common.environment.setIdeaIoUseFallback
import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport
import org.jetbrains.kotlin.cli.common.messages.MessageCollector
@@ -95,7 +95,7 @@ open class KJvmReplCompilerBase<AnalyzerT : ReplCodeAnalyzerBase>(
if (firstFailure != null)
return firstFailure
checkKotlinPackageUsage(context.environment.configuration, sourceFiles, messageCollector)
checkKotlinPackageUsageForPsi(context.environment.configuration, sourceFiles, messageCollector)
if (messageCollector.hasErrors()) return failure(messageCollector)
plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/ScriptJvmCompilerImpls.kt
+1 -1
View File
@@ -139,7 +139,7 @@ private fun compileImpl(
messageCollector
)
checkKotlinPackageUsage(context.environment.configuration, sourceFiles, messageCollector)
checkKotlinPackageUsageForPsi(context.environment.configuration, sourceFiles, messageCollector)
if (messageCollector.hasErrors() || sourceDependencies.any { it.sourceDependencies is ResultWithDiagnostics.Failure }) {
return failure(messageCollector)