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

Add test which checks whether compiler messages are understood correctly by the plugin.

Browse Source
This commit is contained in:
pTalanov
2012-04-28 23:03:55 +04:00
parent 330532661b
commit 3e8624b440
12 changed files with 567 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java
+5 -3
View File
@@ -93,6 +93,7 @@ public abstract class CLICompiler<CLArgs extends CompilerArguments, CEConf exten
System.setProperty("java.awt.headless", "true");
final MessageRenderer messageRenderer = getMessageRenderer(arguments);
errStream.print(messageRenderer.renderPreamble());
printVersionIfNeeded(errStream, arguments, messageRenderer);
try {
return doExecute(errStream, arguments, messageRenderer);
}
@@ -114,9 +115,10 @@ public abstract class CLICompiler<CLArgs extends CompilerArguments, CEConf exten
@NotNull CLArgs arguments,
@NotNull MessageRenderer messageRenderer) {
if (arguments.isVersion()) {
errStream.println(messageRenderer
.render(CompilerMessageSeverity.INFO, "Kotlin Compiler version " + K2JVMCompilerVersion.VERSION,
CompilerMessageLocation.NO_LOCATION));
String versionMessage = messageRenderer.render(CompilerMessageSeverity.INFO,
"Kotlin Compiler version " + K2JVMCompilerVersion.VERSION,
CompilerMessageLocation.NO_LOCATION);
errStream.println(versionMessage);
}
}
compiler/cli/src/org/jetbrains/jet/cli/common/messages/MessageRenderer.java
+1 -1
View File
@@ -42,7 +42,7 @@ public interface MessageRenderer {
out.append(" line=\"").append(location.getLine()).append("\"");
out.append(" column=\"").append(location.getColumn()).append("\"");
}
out.append(">\n");
out.append(">");
out.append(e(message));
compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java
-2
View File
@@ -56,10 +56,8 @@ public class K2JVMCompiler extends CLICompiler<K2JVMCompilerArguments, CompileEn
protected ExitCode doExecute(PrintStream errStream,
K2JVMCompilerArguments arguments,
MessageRenderer messageRenderer) {
printVersionIfNeeded(errStream, arguments, messageRenderer);
CompilerSpecialMode mode = parseCompilerSpecialMode(arguments);
File jdkHeadersJar;
if (mode.includeJdkHeaders()) {
if (arguments.jdkHeaders != null) {