[CHERRY PICKED FROM IJ] [kotlin] revert kotlin jps i18n
GitOrigin-RevId: 364e32312675500087616e41bf651b8ed29d3cfd Original commit: https://github.com/JetBrains/intellij-community/commit/ca5307ef2e2254289eed8c94aaa970cb79ddccb2
This commit is contained in:
committed by
Nikita Bobko
parent
cb0955a82d
commit
91f34662e4
@@ -5,11 +5,9 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.compilerRunner
|
package org.jetbrains.kotlin.compilerRunner
|
||||||
|
|
||||||
import org.jetbrains.annotations.Nls
|
|
||||||
import org.jetbrains.jps.ModuleChunk
|
import org.jetbrains.jps.ModuleChunk
|
||||||
import org.jetbrains.jps.incremental.CompileContext
|
import org.jetbrains.jps.incremental.CompileContext
|
||||||
import org.jetbrains.jps.incremental.messages.ProgressMessage
|
import org.jetbrains.jps.incremental.messages.ProgressMessage
|
||||||
import org.jetbrains.kotlin.jps.KotlinJpsBundle
|
|
||||||
|
|
||||||
interface ProgressReporter {
|
interface ProgressReporter {
|
||||||
fun progress(message: String)
|
fun progress(message: String)
|
||||||
@@ -18,13 +16,12 @@ interface ProgressReporter {
|
|||||||
}
|
}
|
||||||
|
|
||||||
class ProgressReporterImpl(private val context: CompileContext, private val chunk: ModuleChunk) : ProgressReporter {
|
class ProgressReporterImpl(private val context: CompileContext, private val chunk: ModuleChunk) : ProgressReporter {
|
||||||
override fun progress(@Nls message: String) {
|
override fun progress(message: String) {
|
||||||
@Suppress("HardCodedStringLiteral")
|
|
||||||
context.processMessage(ProgressMessage("Kotlin: $message"))
|
context.processMessage(ProgressMessage("Kotlin: $message"))
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun compilationStarted() {
|
override fun compilationStarted() {
|
||||||
progress(KotlinJpsBundle.message("progress.text.compiling.0", chunk.presentableShortName))
|
progress("compiling [${chunk.presentableShortName}]")
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun clearProgress() {
|
override fun clearProgress() {
|
||||||
|
|||||||
@@ -17,7 +17,6 @@
|
|||||||
package org.jetbrains.kotlin.jps.build
|
package org.jetbrains.kotlin.jps.build
|
||||||
|
|
||||||
import com.intellij.openapi.diagnostic.Logger
|
import com.intellij.openapi.diagnostic.Logger
|
||||||
import com.intellij.openapi.util.NlsSafe
|
|
||||||
import org.jetbrains.jps.ModuleChunk
|
import org.jetbrains.jps.ModuleChunk
|
||||||
import org.jetbrains.jps.builders.DirtyFilesHolder
|
import org.jetbrains.jps.builders.DirtyFilesHolder
|
||||||
import org.jetbrains.jps.builders.FileProcessor
|
import org.jetbrains.jps.builders.FileProcessor
|
||||||
@@ -33,6 +32,7 @@ import org.jetbrains.kotlin.build.GeneratedFile
|
|||||||
import org.jetbrains.kotlin.build.GeneratedJvmClass
|
import org.jetbrains.kotlin.build.GeneratedJvmClass
|
||||||
import org.jetbrains.kotlin.cli.common.ExitCode
|
import org.jetbrains.kotlin.cli.common.ExitCode
|
||||||
import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
|
import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
|
||||||
|
import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
|
||||||
import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.*
|
import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.*
|
||||||
import org.jetbrains.kotlin.cli.common.messages.MessageCollectorUtil
|
import org.jetbrains.kotlin.cli.common.messages.MessageCollectorUtil
|
||||||
import org.jetbrains.kotlin.compilerRunner.*
|
import org.jetbrains.kotlin.compilerRunner.*
|
||||||
@@ -40,11 +40,11 @@ import org.jetbrains.kotlin.config.IncrementalCompilation
|
|||||||
import org.jetbrains.kotlin.config.KotlinModuleKind
|
import org.jetbrains.kotlin.config.KotlinModuleKind
|
||||||
import org.jetbrains.kotlin.config.Services
|
import org.jetbrains.kotlin.config.Services
|
||||||
import org.jetbrains.kotlin.daemon.common.isDaemonEnabled
|
import org.jetbrains.kotlin.daemon.common.isDaemonEnabled
|
||||||
|
import org.jetbrains.kotlin.idea.artifacts.KotlinArtifacts
|
||||||
import org.jetbrains.kotlin.incremental.*
|
import org.jetbrains.kotlin.incremental.*
|
||||||
import org.jetbrains.kotlin.incremental.components.ExpectActualTracker
|
import org.jetbrains.kotlin.incremental.components.ExpectActualTracker
|
||||||
import org.jetbrains.kotlin.incremental.components.LookupTracker
|
import org.jetbrains.kotlin.incremental.components.LookupTracker
|
||||||
import org.jetbrains.kotlin.build.report.ICReporterBase
|
import org.jetbrains.kotlin.build.report.ICReporterBase
|
||||||
import org.jetbrains.kotlin.jps.KotlinJpsBundle
|
|
||||||
import org.jetbrains.kotlin.jps.incremental.JpsIncrementalCache
|
import org.jetbrains.kotlin.jps.incremental.JpsIncrementalCache
|
||||||
import org.jetbrains.kotlin.jps.incremental.JpsLookupStorageManager
|
import org.jetbrains.kotlin.jps.incremental.JpsLookupStorageManager
|
||||||
import org.jetbrains.kotlin.jps.model.kotlinKind
|
import org.jetbrains.kotlin.jps.model.kotlinKind
|
||||||
@@ -63,7 +63,6 @@ import kotlin.system.measureTimeMillis
|
|||||||
|
|
||||||
class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
|
class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
|
||||||
companion object {
|
companion object {
|
||||||
@NlsSafe
|
|
||||||
const val KOTLIN_BUILDER_NAME: String = "Kotlin Builder"
|
const val KOTLIN_BUILDER_NAME: String = "Kotlin Builder"
|
||||||
|
|
||||||
val LOG = Logger.getInstance("#org.jetbrains.kotlin.jps.build.KotlinBuilder")
|
val LOG = Logger.getInstance("#org.jetbrains.kotlin.jps.build.KotlinBuilder")
|
||||||
@@ -294,7 +293,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
|
|||||||
if (chunk.modules.size > 1) {
|
if (chunk.modules.size > 1) {
|
||||||
messageCollector.report(
|
messageCollector.report(
|
||||||
ERROR,
|
ERROR,
|
||||||
KotlinJpsBundle.message("error.text.cyclically.dependent.modules.are.not.supported.in.multiplatform.projects")
|
"Cyclically dependent modules are not supported in multiplatform projects"
|
||||||
)
|
)
|
||||||
return ABORT
|
return ABORT
|
||||||
}
|
}
|
||||||
@@ -340,7 +339,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
|
|||||||
): ExitCode {
|
): ExitCode {
|
||||||
// Workaround for Android Studio
|
// Workaround for Android Studio
|
||||||
if (representativeTarget is KotlinJvmModuleBuildTarget && !JavaBuilder.IS_ENABLED[context, true]) {
|
if (representativeTarget is KotlinJvmModuleBuildTarget && !JavaBuilder.IS_ENABLED[context, true]) {
|
||||||
messageCollector.report(INFO, KotlinJpsBundle.message("info.text.kotlin.jps.plugin.is.disabled"))
|
messageCollector.report(INFO, "Kotlin JPS plugin is disabled")
|
||||||
return NOTHING_DONE
|
return NOTHING_DONE
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -350,7 +349,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
|
|||||||
if (!kotlinChunk.haveSameCompiler) {
|
if (!kotlinChunk.haveSameCompiler) {
|
||||||
messageCollector.report(
|
messageCollector.report(
|
||||||
ERROR,
|
ERROR,
|
||||||
KotlinJpsBundle.message("error.text.cyclically.dependent.modules.0.should.have.same.compiler", kotlinChunk.presentableModulesToCompilersList)
|
"Cyclically dependent modules ${kotlinChunk.presentableModulesToCompilersList} should have same compiler."
|
||||||
)
|
)
|
||||||
return ABORT
|
return ABORT
|
||||||
}
|
}
|
||||||
@@ -388,9 +387,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
|
|||||||
|
|
||||||
val targetsWithoutOutputDir = targets.filter { it.outputDir == null }
|
val targetsWithoutOutputDir = targets.filter { it.outputDir == null }
|
||||||
if (targetsWithoutOutputDir.isNotEmpty()) {
|
if (targetsWithoutOutputDir.isNotEmpty()) {
|
||||||
messageCollector.report(ERROR,
|
messageCollector.report(ERROR, "Output directory not specified for " + targetsWithoutOutputDir.joinToString())
|
||||||
KotlinJpsBundle.message("error.text.output.directory.not.specified.for.0", targetsWithoutOutputDir.joinToString())
|
|
||||||
)
|
|
||||||
return ABORT
|
return ABORT
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,6 @@ import org.jetbrains.jps.incremental.messages.CompilerMessage
|
|||||||
import org.jetbrains.kotlin.config.CompilerRunnerConstants.KOTLIN_COMPILER_NAME
|
import org.jetbrains.kotlin.config.CompilerRunnerConstants.KOTLIN_COMPILER_NAME
|
||||||
import org.jetbrains.kotlin.incremental.LookupSymbol
|
import org.jetbrains.kotlin.incremental.LookupSymbol
|
||||||
import org.jetbrains.kotlin.incremental.storage.FileToPathConverter
|
import org.jetbrains.kotlin.incremental.storage.FileToPathConverter
|
||||||
import org.jetbrains.kotlin.jps.KotlinJpsBundle
|
|
||||||
import org.jetbrains.kotlin.jps.incremental.*
|
import org.jetbrains.kotlin.jps.incremental.*
|
||||||
import org.jetbrains.kotlin.jps.targets.KotlinTargetsIndex
|
import org.jetbrains.kotlin.jps.targets.KotlinTargetsIndex
|
||||||
import org.jetbrains.kotlin.jps.targets.KotlinTargetsIndexBuilder
|
import org.jetbrains.kotlin.jps.targets.KotlinTargetsIndexBuilder
|
||||||
@@ -71,7 +70,7 @@ class KotlinCompileContext(val jpsContext: CompileContext) {
|
|||||||
val isInstrumentationEnabled: Boolean by lazy {
|
val isInstrumentationEnabled: Boolean by lazy {
|
||||||
val value = System.getProperty("kotlin.jps.instrument.bytecode")?.toBoolean() ?: false
|
val value = System.getProperty("kotlin.jps.instrument.bytecode")?.toBoolean() ?: false
|
||||||
if (value) {
|
if (value) {
|
||||||
val message = KotlinJpsBundle.message("compiler.text.experimental.bytecode.instrumentation.for.kotlin.classes.is.enabled")
|
val message = "Experimental bytecode instrumentation for Kotlin classes is enabled"
|
||||||
jpsContext.processMessage(CompilerMessage(KOTLIN_COMPILER_NAME, BuildMessage.Kind.INFO, message))
|
jpsContext.processMessage(CompilerMessage(KOTLIN_COMPILER_NAME, BuildMessage.Kind.INFO, message))
|
||||||
}
|
}
|
||||||
value
|
value
|
||||||
@@ -127,7 +126,7 @@ class KotlinCompileContext(val jpsContext: CompileContext) {
|
|||||||
jpsContext.processMessage(
|
jpsContext.processMessage(
|
||||||
CompilerMessage(
|
CompilerMessage(
|
||||||
"Kotlin", BuildMessage.Kind.WARNING,
|
"Kotlin", BuildMessage.Kind.WARNING,
|
||||||
KotlinJpsBundle.message("compiler.text.incremental.caches.are.corrupted.all.kotlin.code.will.be.rebuilt")
|
"Incremental caches are corrupted. All Kotlin code will be rebuilt."
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
KotlinBuilder.LOG.info(Error("Lookup storage is corrupted, probe failed: ${e.message}", e))
|
KotlinBuilder.LOG.info(Error("Lookup storage is corrupted, probe failed: ${e.message}", e))
|
||||||
@@ -287,9 +286,11 @@ class KotlinCompileContext(val jpsContext: CompileContext) {
|
|||||||
|
|
||||||
val msg =
|
val msg =
|
||||||
if (kind == null) {
|
if (kind == null) {
|
||||||
KotlinJpsBundle.message("compiler.text.0.is.not.yet.supported.in.idea.internal.build.system.please.use.gradle.to.build.them.enable.delegate.ide.build.run.actions.to.gradle.in.settings", presentableChunksListString)
|
"$presentableChunksListString is not yet supported in IDEA internal build system. " +
|
||||||
|
"Please use Gradle to build them (enable 'Delegate IDE build/run actions to Gradle' in Settings)."
|
||||||
} else {
|
} else {
|
||||||
KotlinJpsBundle.message("compiler.text.0.is.not.yet.supported.in.idea.internal.build.system.please.use.gradle.to.build.1.enable.delegate.ide.build.run.actions.to.gradle.in.settings", kind, presentableChunksListString)
|
"$kind is not yet supported in IDEA internal build system. " +
|
||||||
|
"Please use Gradle to build $presentableChunksListString (enable 'Delegate IDE build/run actions to Gradle' in Settings)."
|
||||||
}
|
}
|
||||||
|
|
||||||
testingLogger?.addCustomMessage(msg)
|
testingLogger?.addCustomMessage(msg)
|
||||||
|
|||||||
@@ -5,7 +5,6 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.jps.build
|
package org.jetbrains.kotlin.jps.build
|
||||||
|
|
||||||
import org.jetbrains.annotations.Nls
|
|
||||||
import org.jetbrains.jps.incremental.CompileContext
|
import org.jetbrains.jps.incremental.CompileContext
|
||||||
import org.jetbrains.jps.incremental.messages.BuildMessage
|
import org.jetbrains.jps.incremental.messages.BuildMessage
|
||||||
import org.jetbrains.jps.incremental.messages.CompilerMessage
|
import org.jetbrains.jps.incremental.messages.CompilerMessage
|
||||||
@@ -22,7 +21,7 @@ class MessageCollectorAdapter(
|
|||||||
) : MessageCollector {
|
) : MessageCollector {
|
||||||
private var hasErrors = false
|
private var hasErrors = false
|
||||||
|
|
||||||
override fun report(severity: CompilerMessageSeverity, @Nls message: String, location: CompilerMessageSourceLocation?) {
|
override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageSourceLocation?) {
|
||||||
hasErrors = hasErrors || severity.isError
|
hasErrors = hasErrors || severity.isError
|
||||||
|
|
||||||
var prefix = ""
|
var prefix = ""
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ import org.jetbrains.jps.incremental.CompileContext
|
|||||||
import org.jetbrains.jps.incremental.messages.CompilerMessage
|
import org.jetbrains.jps.incremental.messages.CompilerMessage
|
||||||
|
|
||||||
fun jpsReportInternalBuilderError(context: CompileContext, error: Throwable) {
|
fun jpsReportInternalBuilderError(context: CompileContext, error: Throwable) {
|
||||||
@Suppress("HardCodedStringLiteral")
|
|
||||||
val builderError = CompilerMessage.createInternalBuilderError("Kotlin", error)
|
val builderError = CompilerMessage.createInternalBuilderError("Kotlin", error)
|
||||||
context.processMessage(builderError)
|
context.processMessage(builderError)
|
||||||
}
|
}
|
||||||
@@ -28,7 +28,6 @@ import org.jetbrains.kotlin.incremental.ChangesCollector
|
|||||||
import org.jetbrains.kotlin.incremental.ExpectActualTrackerImpl
|
import org.jetbrains.kotlin.incremental.ExpectActualTrackerImpl
|
||||||
import org.jetbrains.kotlin.incremental.components.ExpectActualTracker
|
import org.jetbrains.kotlin.incremental.components.ExpectActualTracker
|
||||||
import org.jetbrains.kotlin.incremental.components.LookupTracker
|
import org.jetbrains.kotlin.incremental.components.LookupTracker
|
||||||
import org.jetbrains.kotlin.jps.KotlinJpsBundle
|
|
||||||
import org.jetbrains.kotlin.jps.build.*
|
import org.jetbrains.kotlin.jps.build.*
|
||||||
import org.jetbrains.kotlin.jps.incremental.CacheAttributesDiff
|
import org.jetbrains.kotlin.jps.incremental.CacheAttributesDiff
|
||||||
import org.jetbrains.kotlin.jps.incremental.JpsIncrementalCache
|
import org.jetbrains.kotlin.jps.incremental.JpsIncrementalCache
|
||||||
@@ -103,7 +102,7 @@ abstract class KotlinModuleBuildTarget<BuildMetaInfoType : BuildMetaInfo> intern
|
|||||||
val explicitOutputDir = explicitOutputPath?.let { File(it).absoluteFile.parentFile }
|
val explicitOutputDir = explicitOutputPath?.let { File(it).absoluteFile.parentFile }
|
||||||
return@lazy explicitOutputDir
|
return@lazy explicitOutputDir
|
||||||
?: jpsModuleBuildTarget.outputDir
|
?: jpsModuleBuildTarget.outputDir
|
||||||
?: throw ProjectBuildException(KotlinJpsBundle.message("error.message.no.output.directory.found.for.0", this))
|
?: throw ProjectBuildException("No output directory found for " + this)
|
||||||
}
|
}
|
||||||
|
|
||||||
val friendBuildTargets: List<KotlinModuleBuildTarget<*>>
|
val friendBuildTargets: List<KotlinModuleBuildTarget<*>>
|
||||||
|
|||||||
Reference in New Issue
Block a user