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

CLI: add an extra MessageRenderer parameter to compiler exec

Browse Source 
Is supposed to be used instead of the "-tags" CLI argument
This commit is contained in:
Alexander Udalov
2014-07-23 16:18:10 +04:00
parent 6258e08011
commit 4a7dc25406
4 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java
+12 -3
View File
@@ -52,7 +52,17 @@ public abstract class CLICompiler<A extends CommonCompilerArguments> {
if (!parseArguments(errStream, arguments, args)) {
return INTERNAL_ERROR;
}
return exec(errStream, arguments);
return exec(errStream, getMessageRenderer(arguments), arguments);
}
@SuppressWarnings("UnusedDeclaration") // Used via reflection in CompilerRunnerUtil#invokeExecMethod
@NotNull
public ExitCode execAndOutputHtml(@NotNull PrintStream errStream, @NotNull String... args) {
A arguments = createArguments();
if (!parseArguments(errStream, arguments, args)) {
return INTERNAL_ERROR;
}
return exec(errStream, MessageRenderer.TAGS, arguments);
}
/**
@@ -100,13 +110,12 @@ public abstract class CLICompiler<A extends CommonCompilerArguments> {
* Executes the compiler on the parsed arguments
*/
@NotNull
public ExitCode exec(@NotNull PrintStream errStream, @NotNull A arguments) {
public ExitCode exec(@NotNull PrintStream errStream, @NotNull MessageRenderer messageRenderer, @NotNull A arguments) {
if (arguments.help || arguments.extraHelp) {
usage(errStream, arguments.extraHelp);
return OK;
}
MessageRenderer messageRenderer = getMessageRenderer(arguments);
errStream.print(messageRenderer.renderPreamble());
printVersionIfNeeded(errStream, arguments, messageRenderer);