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

Report exceptions from both makes to Exception Analyzer

Browse Source
This commit is contained in:
Andrey Breslav
2012-11-21 19:31:07 +04:00
parent 4ed07cd9ae
commit 3e1a5a7be1
5 changed files with 66 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/compiler/JetCompilerManager.java
+30 -2
View File
@@ -16,20 +16,30 @@
package org.jetbrains.jet.plugin.compiler;
import com.intellij.openapi.compiler.CompilerManager;
import com.intellij.openapi.compiler.*;
import com.intellij.openapi.components.ProjectComponent;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.plugin.JetFileType;
import java.util.Collections;
import static org.jetbrains.jet.compiler.runner.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX;
import static org.jetbrains.jet.compiler.runner.CompilerRunnerConstants.KOTLIN_COMPILER_NAME;
/**
* @author yole
*/
public class JetCompilerManager implements ProjectComponent {
public JetCompilerManager(CompilerManager manager) {
private static final Logger LOG = Logger.getInstance(JetCompilerManager.class);
// Comes from external make
private static final String PREFIX_WITH_COMPILER_NAME = KOTLIN_COMPILER_NAME + ": " + INTERNAL_ERROR_PREFIX;
public JetCompilerManager(Project project, CompilerManager manager) {
manager.addTranslatingCompiler(new JetCompiler(),
Collections.<FileType>singleton(JetFileType.INSTANCE),
Collections.singleton(StdFileTypes.CLASS));
@@ -37,6 +47,24 @@ public class JetCompilerManager implements ProjectComponent {
Collections.<FileType>singleton(JetFileType.INSTANCE),
Collections.<FileType>singleton(StdFileTypes.JS));
manager.addCompilableFileType(JetFileType.INSTANCE);
manager.addCompilationStatusListener(new CompilationStatusListener() {
@Override
public void compilationFinished(
boolean aborted, int errors, int warnings, CompileContext compileContext
) {
for (CompilerMessage error : compileContext.getMessages(CompilerMessageCategory.ERROR)) {
String message = error.getMessage();
if (message.startsWith(INTERNAL_ERROR_PREFIX) || message.startsWith(PREFIX_WITH_COMPILER_NAME)) {
LOG.error(message);
}
}
}
@Override
public void fileGenerated(String outputRoot, String relativePath) {
}
}, project);
}
@Override
idea/src/org/jetbrains/jet/plugin/compiler/MessageCollectorAdapter.java
+6 -5
View File
@@ -18,17 +18,15 @@ package org.jetbrains.jet.plugin.compiler;
import com.intellij.openapi.compiler.CompileContext;
import com.intellij.openapi.compiler.CompilerMessageCategory;
import com.intellij.openapi.diagnostic.Logger;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation;
import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity;
import org.jetbrains.jet.cli.common.messages.MessageCollector;
import org.jetbrains.jet.compiler.runner.CompilerRunnerConstants;
import static com.intellij.openapi.compiler.CompilerMessageCategory.*;
class MessageCollectorAdapter implements MessageCollector {
private static final Logger LOG = Logger.getInstance(MessageCollectorAdapter.class);
private final CompileContext compileContext;
public MessageCollectorAdapter(CompileContext compileContext) {
@@ -42,10 +40,13 @@ class MessageCollectorAdapter implements MessageCollector {
@NotNull CompilerMessageLocation location
) {
CompilerMessageCategory category = category(severity);
compileContext.addMessage(category, message, "file://" + location.getPath(), location.getLine(), location.getColumn());
String prefix = "";
if (severity == CompilerMessageSeverity.EXCEPTION) {
LOG.error(message);
prefix = CompilerRunnerConstants.INTERNAL_ERROR_PREFIX;
}
compileContext.addMessage(category, prefix + message, "file://" + location.getPath(), location.getLine(), location.getColumn());
if (severity == CompilerMessageSeverity.LOGGING) {
compileContext.getProgressIndicator().setText(message);
}