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

Rename warningsAsErrors -> allWarningsAsErrors in args

Browse Source 
(cherry picked from commit 377acf5)
This commit is contained in:
Sergey Igushkin
2017-10-11 17:48:09 +03:00
parent 71e97e32e0
commit 5edf8664fb
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonToolArguments.kt
+1 -1
View File
@@ -47,5 +47,5 @@ abstract class CommonToolArguments : Freezable(), Serializable {
@GradleOption(DefaultValues.BooleanFalseDefault::class) @GradleOption(DefaultValues.BooleanFalseDefault::class)
@Argument(value = "-Werror", description = "Report an error if there are any warnings") @Argument(value = "-Werror", description = "Report an error if there are any warnings")
var warningsAsErrors: Boolean by FreezableVar(false) var allWarningsAsErrors: Boolean by FreezableVar(false)
} }
compiler/cli/src/org/jetbrains/kotlin/cli/common/CLICompiler.java
+1 -1
View File
@@ -69,7 +69,7 @@ public abstract class CLICompiler<A extends CommonCompilerArguments> extends CLI
@NotNull @NotNull
@Override @Override
public ExitCode execImpl(@NotNull MessageCollector messageCollector, @NotNull Services services, @NotNull A arguments) { public ExitCode execImpl(@NotNull MessageCollector messageCollector, @NotNull Services services, @NotNull A arguments) {
GroupingMessageCollector groupingCollector = new GroupingMessageCollector(messageCollector, arguments.getWarningsAsErrors()); GroupingMessageCollector groupingCollector = new GroupingMessageCollector(messageCollector, arguments.getAllWarningsAsErrors());
CompilerConfiguration configuration = new CompilerConfiguration(); CompilerConfiguration configuration = new CompilerConfiguration();
configuration.put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, groupingCollector); configuration.put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, groupingCollector);
compiler/cli/src/org/jetbrains/kotlin/cli/common/CLITool.kt
+1 -1
View File
@@ -81,7 +81,7 @@ abstract class CLITool<A : CommonToolArguments> {
fun exec(messageCollector: MessageCollector, services: Services, arguments: A): ExitCode { fun exec(messageCollector: MessageCollector, services: Services, arguments: A): ExitCode {
printVersionIfNeeded(messageCollector, arguments) printVersionIfNeeded(messageCollector, arguments)
val fixedMessageCollector = if (arguments.suppressWarnings && !arguments.warningsAsErrors) { val fixedMessageCollector = if (arguments.suppressWarnings && !arguments.allWarningsAsErrors) {
FilteringMessageCollector(messageCollector, Predicate.isEqual(CompilerMessageSeverity.WARNING)) FilteringMessageCollector(messageCollector, Predicate.isEqual(CompilerMessageSeverity.WARNING))
} }
else { else {