From 6594285693448a776445d665e452c87d3d910c7c Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 27 Jan 2017 16:40:12 +0300 Subject: [PATCH] Introduce CompilerMessageSeverity.STRONG_WARNING This is a severity for mandatory warnings, i.e. those which should be reported in any case, even if there are compilation errors Original commit: 7ac96163acb7bdbb23c4e8d063ab0de497f6157b --- .../jetbrains/kotlin/jps/build/KotlinBuilder.kt | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index f8d8c1c097d..7c64ef1e7b3 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -37,14 +37,20 @@ import org.jetbrains.jps.model.JpsProject import org.jetbrains.jps.model.java.JpsJavaClasspathKind import org.jetbrains.jps.model.java.JpsJavaExtensionService import org.jetbrains.jps.model.module.JpsModule -import org.jetbrains.kotlin.build.* +import org.jetbrains.kotlin.build.GeneratedFile +import org.jetbrains.kotlin.build.GeneratedJvmClass +import org.jetbrains.kotlin.build.JvmBuildMetaInfo +import org.jetbrains.kotlin.build.isModuleMappingFile import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.* import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.cli.common.messages.OutputMessageUtil -import org.jetbrains.kotlin.compilerRunner.* +import org.jetbrains.kotlin.compilerRunner.JpsCompilerEnvironment +import org.jetbrains.kotlin.compilerRunner.JpsKotlinCompilerRunner +import org.jetbrains.kotlin.compilerRunner.OutputItemsCollector +import org.jetbrains.kotlin.compilerRunner.OutputItemsCollectorImpl import org.jetbrains.kotlin.config.* import org.jetbrains.kotlin.config.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX import org.jetbrains.kotlin.daemon.common.isDaemonEnabled @@ -58,8 +64,9 @@ import org.jetbrains.kotlin.modules.TargetId import org.jetbrains.kotlin.preloading.ClassCondition import org.jetbrains.kotlin.progress.CompilationCanceledException import org.jetbrains.kotlin.progress.CompilationCanceledStatus -import org.jetbrains.kotlin.build.JvmBuildMetaInfo -import org.jetbrains.kotlin.utils.* +import org.jetbrains.kotlin.utils.JsLibraryUtils +import org.jetbrains.kotlin.utils.PathUtil +import org.jetbrains.kotlin.utils.keysToMap import org.jetbrains.org.objectweb.asm.ClassReader import java.io.File import java.util.* @@ -766,7 +773,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { return when (severity) { INFO -> BuildMessage.Kind.INFO ERROR, EXCEPTION -> BuildMessage.Kind.ERROR - WARNING -> BuildMessage.Kind.WARNING + WARNING, STRONG_WARNING -> BuildMessage.Kind.WARNING LOGGING -> BuildMessage.Kind.PROGRESS else -> throw IllegalArgumentException("Unsupported severity: " + severity) }