Compiles a project as a whole
This commit is contained in:
@@ -1,12 +1,14 @@
|
||||
package org.jetbrains.jet.plugin.compiler;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import com.intellij.openapi.application.ApplicationManager;
|
||||
import com.intellij.openapi.compiler.CompileContext;
|
||||
import com.intellij.openapi.compiler.CompileScope;
|
||||
import com.intellij.openapi.compiler.CompilerMessageCategory;
|
||||
import com.intellij.openapi.compiler.TranslatingCompiler;
|
||||
import com.intellij.openapi.editor.Document;
|
||||
import com.intellij.openapi.module.Module;
|
||||
import com.intellij.openapi.util.Computable;
|
||||
import com.intellij.openapi.util.TextRange;
|
||||
import com.intellij.openapi.util.io.FileUtil;
|
||||
import com.intellij.openapi.vfs.VirtualFile;
|
||||
import com.intellij.psi.PsiFile;
|
||||
@@ -15,14 +17,20 @@ import com.intellij.util.Chunk;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.jet.codegen.ClassFileFactory;
|
||||
import org.jetbrains.jet.codegen.GenerationState;
|
||||
import org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory;
|
||||
import org.jetbrains.jet.lang.diagnostics.Diagnostic;
|
||||
import org.jetbrains.jet.lang.psi.JetFile;
|
||||
import org.jetbrains.jet.lang.psi.JetNamespace;
|
||||
import org.jetbrains.jet.lang.resolve.AnalyzingUtils;
|
||||
import org.jetbrains.jet.lang.resolve.BindingContext;
|
||||
import org.jetbrains.jet.lang.resolve.java.JavaDefaultImports;
|
||||
import org.jetbrains.jet.plugin.JetFileType;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import static com.intellij.openapi.compiler.CompilerMessageCategory.ERROR;
|
||||
|
||||
/**
|
||||
* @author yole
|
||||
@@ -45,67 +53,148 @@ public class JetCompiler implements TranslatingCompiler {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void compile(CompileContext compileContext, Chunk<Module> moduleChunk, VirtualFile[] virtualFiles, OutputSink outputSink) {
|
||||
Map<Module, ModuleCompileState> moduleMap = new HashMap<Module, ModuleCompileState>();
|
||||
public void compile(final CompileContext compileContext, Chunk<Module> moduleChunk, final VirtualFile[] virtualFiles, OutputSink outputSink) {
|
||||
if (virtualFiles.length == 0) return;
|
||||
|
||||
for (VirtualFile virtualFile : virtualFiles) {
|
||||
Module module = compileContext.getModuleByFile(virtualFile);
|
||||
ModuleCompileState state = moduleMap.get(module);
|
||||
if (state == null) {
|
||||
state = new ModuleCompileState(compileContext, module, outputSink);
|
||||
moduleMap.put(module, state);
|
||||
}
|
||||
state.compile(virtualFile);
|
||||
Module module = compileContext.getModuleByFile(virtualFiles[0]);
|
||||
final VirtualFile outputDir = compileContext.getModuleOutputDirectory(module);
|
||||
if (outputDir == null) {
|
||||
compileContext.addMessage(ERROR, "[Internal Error] No output directory", "", -1, -1);
|
||||
return;
|
||||
}
|
||||
|
||||
for (ModuleCompileState state : moduleMap.values()) {
|
||||
state.done();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private static class ModuleCompileState {
|
||||
private final GenerationState state;
|
||||
private final CompileContext compileContext;
|
||||
private final Module module;
|
||||
private final OutputSink outputSink;
|
||||
|
||||
public ModuleCompileState(final CompileContext compileContext, Module module, OutputSink outputSink) {
|
||||
this.compileContext = compileContext;
|
||||
this.module = module;
|
||||
this.outputSink = outputSink;
|
||||
state = ApplicationManager.getApplication().runReadAction(new Computable<GenerationState>() {
|
||||
@Override
|
||||
public GenerationState compute() {
|
||||
return new GenerationState(compileContext.getProject(), false);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public void compile(final VirtualFile virtualFile) {
|
||||
ApplicationManager.getApplication().runReadAction(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
PsiFile psiFile = PsiManager.getInstance(module.getProject()).findFile(virtualFile);
|
||||
ApplicationManager.getApplication().runReadAction(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
GenerationState generationState = new GenerationState(compileContext.getProject(), false);
|
||||
List<JetNamespace> namespaces = Lists.newArrayList();
|
||||
for (VirtualFile virtualFile : virtualFiles) {
|
||||
PsiFile psiFile = PsiManager.getInstance(compileContext.getProject()).findFile(virtualFile);
|
||||
if (psiFile instanceof JetFile) {
|
||||
state.compile((JetFile) psiFile);
|
||||
namespaces.add(((JetFile) psiFile).getRootNamespace());
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public void done() {
|
||||
VirtualFile outputDir = compileContext.getModuleOutputDirectory(module);
|
||||
final ClassFileFactory factory = state.getFactory();
|
||||
List<String> files = factory.files();
|
||||
for (String file : files) {
|
||||
File target = new File(outputDir.getPath(), file);
|
||||
try {
|
||||
FileUtil.writeToFile(target, factory.asBytes(file));
|
||||
} catch (IOException e) {
|
||||
compileContext.addMessage(CompilerMessageCategory.ERROR, e.getMessage(), null, 0, 0);
|
||||
BindingContext bindingContext = AnalyzingUtils.getInstance(JavaDefaultImports.JAVA_DEFAULT_IMPORTS).analyzeNamespaces(compileContext.getProject(), namespaces, JetControlFlowDataTraceFactory.EMPTY);
|
||||
|
||||
boolean errors = false;
|
||||
for (Diagnostic diagnostic : bindingContext.getDiagnostics()) {
|
||||
switch (diagnostic.getSeverity()) {
|
||||
case ERROR:
|
||||
errors = true;
|
||||
report(diagnostic, CompilerMessageCategory.ERROR, compileContext);
|
||||
break;
|
||||
case INFO:
|
||||
report(diagnostic, CompilerMessageCategory.INFORMATION, compileContext);
|
||||
break;
|
||||
case WARNING:
|
||||
report(diagnostic, CompilerMessageCategory.WARNING, compileContext);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!errors) {
|
||||
generationState.compileCorrectNamespaces(bindingContext, namespaces);
|
||||
|
||||
final ClassFileFactory factory = generationState.getFactory();
|
||||
List<String> files = factory.files();
|
||||
for (String file : files) {
|
||||
File target = new File(outputDir.getPath(), file);
|
||||
try {
|
||||
FileUtil.writeToFile(target, factory.asBytes(file));
|
||||
} catch (IOException e) {
|
||||
compileContext.addMessage(ERROR, e.getMessage(), null, 0, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// Map<Module, ModuleCompileState> moduleMap = new HashMap<Module, ModuleCompileState>();
|
||||
//
|
||||
// for (VirtualFile virtualFile : virtualFiles) {
|
||||
// Module module = compileContext.getModuleByFile(virtualFile);
|
||||
// ModuleCompileState state = moduleMap.get(module);
|
||||
// if (state == null) {
|
||||
// state = new ModuleCompileState(compileContext, module, outputSink);
|
||||
// moduleMap.put(module, state);
|
||||
// }
|
||||
// state.compile(virtualFile);
|
||||
// }
|
||||
//
|
||||
// for (ModuleCompileState state : moduleMap.values()) {
|
||||
// state.done();
|
||||
// }
|
||||
|
||||
}
|
||||
|
||||
private void report(Diagnostic diagnostic, CompilerMessageCategory severity, CompileContext compileContext) {
|
||||
PsiFile psiFile = diagnostic.getFactory().getPsiFile(diagnostic);
|
||||
TextRange textRange = diagnostic.getFactory().getTextRange(diagnostic);
|
||||
Document document = psiFile.getViewProvider().getDocument();
|
||||
int line;
|
||||
int col;
|
||||
if (document != null) {
|
||||
line = document.getLineNumber(textRange.getStartOffset());
|
||||
col = textRange.getStartOffset() - document.getLineStartOffset(line) + 1;
|
||||
}
|
||||
else {
|
||||
line = -1;
|
||||
col = -1;
|
||||
}
|
||||
VirtualFile virtualFile = psiFile.getVirtualFile();
|
||||
if (virtualFile == null) {
|
||||
compileContext.addMessage(ERROR, "[Internal Error] No virtual file for PsiFile. Diagnostic: " + diagnostic.getMessage(), "", -1, -1);
|
||||
}
|
||||
else {
|
||||
compileContext.addMessage(severity, diagnostic.getMessage(), virtualFile.getUrl(), line + 1, col);
|
||||
}
|
||||
}
|
||||
|
||||
// private static class ModuleCompileState {
|
||||
// private final GenerationState state;
|
||||
// private final CompileContext compileContext;
|
||||
// private final Module module;
|
||||
// private final OutputSink outputSink;
|
||||
//
|
||||
// public ModuleCompileState(final CompileContext compileContext, Module module, OutputSink outputSink) {
|
||||
// this.compileContext = compileContext;
|
||||
// this.module = module;
|
||||
// this.outputSink = outputSink;
|
||||
// state = ApplicationManager.getApplication().runReadAction(new Computable<GenerationState>() {
|
||||
// @Override
|
||||
// public GenerationState compute() {
|
||||
// return new GenerationState(compileContext.getProject(), false);
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
//
|
||||
//
|
||||
//
|
||||
// public void compile(final VirtualFile virtualFile) {
|
||||
// ApplicationManager.getApplication().runReadAction(new Runnable() {
|
||||
// @Override
|
||||
// public void run() {
|
||||
// PsiFile psiFile = PsiManager.getInstance(module.getProject()).findFile(virtualFile);
|
||||
// if (psiFile instanceof JetFile) {
|
||||
// state.compile((JetFile) psiFile);
|
||||
// }
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
//
|
||||
// public void done() {
|
||||
// VirtualFile outputDir = compileContext.getModuleOutputDirectory(module);
|
||||
// final ClassFileFactory factory = state.getFactory();
|
||||
// List<String> files = factory.files();
|
||||
// for (String file : files) {
|
||||
// File target = new File(outputDir.getPath(), file);
|
||||
// try {
|
||||
// FileUtil.writeToFile(target, factory.asBytes(file));
|
||||
// } catch (IOException e) {
|
||||
// compileContext.addMessage(ERROR, e.getMessage(), null, 0, 0);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user