From a85a62bb5cdc18b1a76be0b606e21a695cd29000 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Wed, 8 Apr 2009 15:36:56 +0400 Subject: [PATCH] new Compiler API based compiler (java6 only) --- compiler/compiler-impl.iml | 9 + .../compiler/CompilerConfigurationImpl.java | 40 +- .../com/intellij/compiler/OutputParser.java | 3 +- .../intellij/compiler/impl/CompileDriver.java | 699 +++++++++--------- .../impl/TranslatingCompilerFilesMonitor.java | 4 +- .../impl/javaCompiler/BackendCompiler.java | 13 +- .../javaCompiler/BackendCompilerWrapper.java | 128 ++-- .../javaCompiler/CompilerParsingThread.java | 19 +- .../impl/javaCompiler/ExternalCompiler.java | 2 +- .../impl/javaCompiler/FileObject.java | 46 ++ .../impl/javaCompiler/JavaCompiler.java | 21 +- .../impl/javaCompiler/api/CompAPIDriver.java | 110 +++ .../javaCompiler/api/CompilationEvent.java | 70 ++ .../javaCompiler/api/CompilerAPICompiler.java | 182 +++++ .../impl/javaCompiler/api/MyFileManager.java | 126 ++++ .../eclipse/EclipseCompilerDriver.java | 17 +- .../eclipse/EclipseCompilerOutputParser.java | 4 +- .../eclipse/EclipseEmbeddedCompiler.java | 20 +- .../javac/FilePathActionJavac.java | 5 +- .../javaCompiler/javac/JavacCompiler.java | 215 +++--- .../javaCompiler/jikes/JikesCompiler.java | 4 +- .../javaCompiler/jikes/ParserActionJikes.java | 3 +- .../resourceCompiler/ResourceCompiler.java | 11 +- .../impl/rmiCompiler/RmicCompiler.java | 14 +- lib/dev/compilerapi.jar | Bin 0 -> 72275 bytes .../ant/config/execution/OutputParser.java | 3 +- .../src/messages/CompilerBundle.properties | 2 +- .../make/Form2ByteCodeCompiler.java | 6 +- 28 files changed, 1183 insertions(+), 593 deletions(-) create mode 100644 compiler/impl/com/intellij/compiler/impl/javaCompiler/FileObject.java create mode 100644 compiler/impl/com/intellij/compiler/impl/javaCompiler/api/CompAPIDriver.java create mode 100644 compiler/impl/com/intellij/compiler/impl/javaCompiler/api/CompilationEvent.java create mode 100644 compiler/impl/com/intellij/compiler/impl/javaCompiler/api/CompilerAPICompiler.java create mode 100644 compiler/impl/com/intellij/compiler/impl/javaCompiler/api/MyFileManager.java create mode 100644 lib/dev/compilerapi.jar diff --git a/compiler/compiler-impl.iml b/compiler/compiler-impl.iml index 4223c594a53d..72515d9328d5 100644 --- a/compiler/compiler-impl.iml +++ b/compiler/compiler-impl.iml @@ -24,6 +24,15 @@ + + + + + + + + + diff --git a/compiler/impl/com/intellij/compiler/CompilerConfigurationImpl.java b/compiler/impl/com/intellij/compiler/CompilerConfigurationImpl.java index 17fa63f63de5..ec871d96948e 100644 --- a/compiler/impl/com/intellij/compiler/CompilerConfigurationImpl.java +++ b/compiler/impl/com/intellij/compiler/CompilerConfigurationImpl.java @@ -10,13 +10,15 @@ package com.intellij.compiler; import com.intellij.CommonBundle; import com.intellij.compiler.impl.javaCompiler.BackendCompiler; +import com.intellij.compiler.impl.javaCompiler.api.CompilerAPICompiler; import com.intellij.compiler.impl.javaCompiler.eclipse.EclipseCompiler; +import com.intellij.compiler.impl.javaCompiler.eclipse.EclipseEmbeddedCompiler; import com.intellij.compiler.impl.javaCompiler.javac.JavacCompiler; -import com.intellij.compiler.impl.javaCompiler.javac.JavacEmbeddedCompiler; import com.intellij.compiler.impl.javaCompiler.javac.JavacSettings; import com.intellij.compiler.impl.javaCompiler.jikes.JikesCompiler; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ApplicationNamesInfo; +import com.intellij.openapi.application.ex.ApplicationManagerEx; import com.intellij.openapi.compiler.CompilerBundle; import com.intellij.openapi.compiler.options.ExcludedEntriesConfiguration; import com.intellij.openapi.components.*; @@ -65,7 +67,6 @@ public class CompilerConfigurationImpl extends CompilerConfiguration implements private final Collection myRegisteredCompilers = new ArrayList(); private BackendCompiler JAVAC_EXTERNAL_BACKEND; - private BackendCompiler JAVAC_EMBEDDED_BACKEND; private final Perl5Matcher myPatternMatcher = new Perl5Matcher(); { @@ -178,8 +179,6 @@ public class CompilerConfigurationImpl extends CompilerConfiguration implements private void createCompilers() { JAVAC_EXTERNAL_BACKEND = new JavacCompiler(myProject); myRegisteredCompilers.add(JAVAC_EXTERNAL_BACKEND); - JAVAC_EMBEDDED_BACKEND = new JavacEmbeddedCompiler(myProject); - //myRegisteredCompilers.add(JAVAC_EMBEDDED_BACKEND); if (!ApplicationManager.getApplication().isUnitTestMode()) { final BackendCompiler JIKES_BACKEND = new JikesCompiler(myProject); @@ -189,13 +188,26 @@ public class CompilerConfigurationImpl extends CompilerConfiguration implements final EclipseCompiler eclipse = new EclipseCompiler(myProject); myRegisteredCompilers.add(eclipse); } - //try { - // final EclipseEmbeddedCompiler eclipseEmbedded = new EclipseEmbeddedCompiler(myProject); - // myRegisteredCompilers.add(eclipseEmbedded); - //} - //catch (NoClassDefFoundError e) { - // // eclipse jar must be not in the classpath - //} + + if (ApplicationManagerEx.getApplicationEx().isInternal()) { + try { + final EclipseEmbeddedCompiler eclipseEmbedded = new EclipseEmbeddedCompiler(myProject); + myRegisteredCompilers.add(eclipseEmbedded); + } + catch (NoClassDefFoundError e) { + // eclipse jar must be not in the classpath + } + } + + if (ApplicationManagerEx.getApplicationEx().isInternal()) { + try { + CompilerAPICompiler compiler = new CompilerAPICompiler(myProject); + myRegisteredCompilers.add(compiler); + } + catch (NoClassDefFoundError e) { + // wrong JDK + } + } } myDefaultJavaCompiler = JAVAC_EXTERNAL_BACKEND; @@ -394,11 +406,7 @@ public class CompilerConfigurationImpl extends CompilerConfiguration implements if (JAVAC_EXTERNAL_BACKEND == null) { createCompilers(); } - if (myDefaultJavaCompiler != JAVAC_EXTERNAL_BACKEND) return myDefaultJavaCompiler; - boolean runEmbedded = ApplicationManager.getApplication().isUnitTestMode() - ? !JavacSettings.getInstance(myProject).isTestsUseExternalCompiler() - : Boolean.parseBoolean(System.getProperty(PROPERTY_IDEA_USE_EMBEDDED_JAVAC)); - return runEmbedded ? JAVAC_EMBEDDED_BACKEND : JAVAC_EXTERNAL_BACKEND; + return myDefaultJavaCompiler; } public void setDefaultCompiler(BackendCompiler defaultCompiler) { diff --git a/compiler/impl/com/intellij/compiler/OutputParser.java b/compiler/impl/com/intellij/compiler/OutputParser.java index 4608e90fecaf..6977a5f4f2bc 100644 --- a/compiler/impl/com/intellij/compiler/OutputParser.java +++ b/compiler/impl/com/intellij/compiler/OutputParser.java @@ -2,6 +2,7 @@ package com.intellij.compiler; import com.intellij.openapi.compiler.CompilerMessageCategory; import com.intellij.openapi.util.text.StringUtil; +import com.intellij.compiler.impl.javaCompiler.FileObject; import org.jetbrains.annotations.NonNls; import java.util.ArrayList; @@ -15,7 +16,7 @@ public abstract class OutputParser { @NonNls String getCurrentLine(); void setProgressText(String text); void fileProcessed(@NonNls String path); - void fileGenerated(@NonNls String path); + void fileGenerated(@NonNls FileObject path); void message(CompilerMessageCategory category, String message, @NonNls String url, int lineNum, int columnNum); } diff --git a/compiler/impl/com/intellij/compiler/impl/CompileDriver.java b/compiler/impl/com/intellij/compiler/impl/CompileDriver.java index 50e54d8c1045..62b80a410061 100644 --- a/compiler/impl/com/intellij/compiler/impl/CompileDriver.java +++ b/compiler/impl/com/intellij/compiler/impl/CompileDriver.java @@ -58,10 +58,7 @@ import com.intellij.psi.PsiCompiledElement; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiManager; -import com.intellij.util.Chunk; -import com.intellij.util.LocalTimeCounter; -import com.intellij.util.ProfilingUtil; -import com.intellij.util.StringBuilderSpinAllocator; +import com.intellij.util.*; import com.intellij.util.containers.HashMap; import gnu.trove.THashSet; import org.jetbrains.annotations.NonNls; @@ -85,8 +82,16 @@ public class CompileDriver { @NonNls private static final boolean GENERATE_CLASSPATH_INDEX = "true".equals(System.getProperty("generate.classpath.index")); - private final FileProcessingCompilerAdapterFactory myProcessingCompilerAdapterFactory; - private final FileProcessingCompilerAdapterFactory myPackagingCompilerAdapterFactory; + private static final FileProcessingCompilerAdapterFactory FILE_PROCESSING_COMPILER_ADAPTER_FACTORY = new FileProcessingCompilerAdapterFactory() { + public FileProcessingCompilerAdapter create(CompileContext context, FileProcessingCompiler compiler) { + return new FileProcessingCompilerAdapter(context, compiler); + } + }; + private static final FileProcessingCompilerAdapterFactory FILE_PACKAGING_COMPILER_ADAPTER_FACTORY = new FileProcessingCompilerAdapterFactory() { + public FileProcessingCompilerAdapter create(CompileContext context, FileProcessingCompiler compiler) { + return new PackagingCompilerAdapter(context, (PackagingCompiler)compiler); + } + }; public CompileDriver(Project project) { myProject = project; @@ -109,16 +114,6 @@ public class CompileDriver { } } - myProcessingCompilerAdapterFactory = new FileProcessingCompilerAdapterFactory() { - public FileProcessingCompilerAdapter create(CompileContext context, FileProcessingCompiler compiler) { - return new FileProcessingCompilerAdapter(context, compiler); - } - }; - myPackagingCompilerAdapterFactory = new FileProcessingCompilerAdapterFactory() { - public FileProcessingCompilerAdapter create(CompileContext context, FileProcessingCompiler compiler) { - return new PackagingCompilerAdapter(context, (PackagingCompiler)compiler); - } - }; } public void rebuild(CompileStatusNotification callback) { @@ -150,10 +145,11 @@ public class CompileDriver { return false; } - for (Pair pair : myGenerationCompilerModuleToOutputDirMap.keySet()) { - final Pair outputs = myGenerationCompilerModuleToOutputDirMap.get(pair); - compileContext.assignModule(outputs.getFirst(), pair.getSecond(), false); - compileContext.assignModule(outputs.getSecond(), pair.getSecond(), true); + for (Map.Entry, Pair> entry : myGenerationCompilerModuleToOutputDirMap.entrySet()) { + final Pair outputs = entry.getValue(); + Module module = entry.getKey().getSecond(); + compileContext.assignModule(outputs.getFirst(), module, false); + compileContext.assignModule(outputs.getSecond(), module, true); } final Ref status = new Ref(); @@ -188,7 +184,7 @@ public class CompileDriver { final int CACHE_FORMAT_VERSION; final boolean COMPILATION_IN_PROGRESS; - public CompileStatus(int cacheVersion, boolean isCompilationInProgress) { + private CompileStatus(int cacheVersion, boolean isCompilationInProgress) { CACHE_FORMAT_VERSION = cacheVersion; COMPILATION_IN_PROGRESS = isCompilationInProgress; } @@ -260,10 +256,11 @@ public class CompileDriver { private CompileScope addAdditionalRoots(CompileScope originalScope) { CompileScope scope = originalScope; final Set affected = new HashSet(Arrays.asList(originalScope.getAffectedModules())); - for (final Pair pair : myGenerationCompilerModuleToOutputDirMap.keySet()) { - if (affected.contains(pair.getSecond())) { - final Pair outputs = myGenerationCompilerModuleToOutputDirMap.get(pair); - scope = new CompositeScope(scope, new FileSetCompileScope(new VirtualFile[]{outputs.getFirst(), outputs.getSecond()}, new Module[]{pair.getSecond()})); + for (Map.Entry, Pair> entry : myGenerationCompilerModuleToOutputDirMap.entrySet()) { + Module module = entry.getKey().getSecond(); + if (affected.contains(module)) { + final Pair outputs = entry.getValue(); + scope = new CompositeScope(scope, new FileSetCompileScope(new VirtualFile[]{outputs.getFirst(), outputs.getSecond()}, new Module[]{module})); } } @@ -303,10 +300,11 @@ public class CompileDriver { final CompileContextImpl compileContext = new CompileContextImpl(myProject, compileTask, scope, dependencyCache, !isRebuild && !forceCompile, isRebuild); compileContext.putUserData(COMPILATION_START_TIMESTAMP, LocalTimeCounter.currentTime()); - for (Pair pair : myGenerationCompilerModuleToOutputDirMap.keySet()) { - final Pair outputs = myGenerationCompilerModuleToOutputDirMap.get(pair); - compileContext.assignModule(outputs.getFirst(), pair.getSecond(), false); - compileContext.assignModule(outputs.getSecond(), pair.getSecond(), true); + for (Map.Entry, Pair> entry : myGenerationCompilerModuleToOutputDirMap.entrySet()) { + final Pair outputs = entry.getValue(); + Module module = entry.getKey().getSecond(); + compileContext.assignModule(outputs.getFirst(), module, false); + compileContext.assignModule(outputs.getSecond(), module, true); } compileTask.start(new Runnable() { @@ -355,7 +353,6 @@ public class CompileDriver { ExitStatus status = ExitStatus.ERRORS; boolean wereExceptions = false; try { - compileContext.getProgressIndicator().pushState(); if (checkCachesVersion) { checkCachesVersion(compileContext); if (compileContext.isRebuildRequested()) { @@ -379,7 +376,6 @@ public class CompileDriver { } finally { dropDependencyCache(compileContext); - compileContext.getProgressIndicator().popState(); final ExitStatus _status = status; if (compileContext.isRebuildRequested()) { ApplicationManager.getApplication().invokeLater(new Runnable() { @@ -464,7 +460,7 @@ public class CompileDriver { private static class ExitException extends Exception { private final ExitStatus myStatus; - public ExitException(ExitStatus status) { + private ExitException(ExitStatus status) { myStatus = status; } @@ -473,7 +469,7 @@ public class CompileDriver { } } - private ExitStatus doCompile(CompileContextEx context, + private ExitStatus doCompile(final CompileContextEx context, boolean isRebuild, final boolean forceCompile, final boolean trackDependencies, @@ -491,17 +487,11 @@ public class CompileDriver { } if (!onlyCheckStatus) { - try { - context.getProgressIndicator().pushState(); - if (!executeCompileTasks(context, true)) { - if (LOG.isDebugEnabled()) { - LOG.debug("Compilation cancelled"); - } - return ExitStatus.CANCELLED; + if (!executeCompileTasks(context, true)) { + if (LOG.isDebugEnabled()) { + LOG.debug("Compilation cancelled"); } - } - finally { - context.getProgressIndicator().popState(); + return ExitStatus.CANCELLED; } } @@ -512,42 +502,8 @@ public class CompileDriver { return ExitStatus.ERRORS; } - // need this to make sure the VFS is built - boolean needRecalcOutputDirs = false; - final List outputsToRefresh = new ArrayList(); - for (VirtualFile output : context.getAllOutputDirectories()) { - if (output.isValid()) { - walkChildren(output, context); - } - else { - needRecalcOutputDirs = true; - final File file = new File(output.getPath()); - if (!file.exists()) { - final boolean created = file.mkdirs(); - if (!created) { - context.addMessage(CompilerMessageCategory.ERROR, "Failed to create output directory " + file.getPath(), null, 0, 0); - return ExitStatus.ERRORS; - } - } - output = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(file); - if (output == null) { - context.addMessage(CompilerMessageCategory.ERROR, "Failed to locate output directory " + file.getPath(), null, 0, 0); - return ExitStatus.ERRORS; - } - } - outputsToRefresh.add(output); - } - for (Pair pair : myGenerationCompilerModuleToOutputDirMap.keySet()) { - final Pair generated = myGenerationCompilerModuleToOutputDirMap.get(pair); - walkChildren(generated.getFirst(), context); - outputsToRefresh.add(generated.getFirst()); - walkChildren(generated.getSecond(), context); - outputsToRefresh.add(generated.getSecond()); - } - RefreshQueue.getInstance().refresh(false, true, null, outputsToRefresh.toArray(new VirtualFile[outputsToRefresh.size()])); - if (needRecalcOutputDirs) { - context.recalculateOutputDirs(); - } + final ExitStatus status = refreshFiles(context); + if (status != null) return status; boolean didSomething = false; @@ -557,23 +513,24 @@ public class CompileDriver { didSomething |= generateSources(compilerManager, context, forceCompile, onlyCheckStatus); didSomething |= invokeFileProcessingCompilers(compilerManager, context, SourceInstrumentingCompiler.class, - myProcessingCompilerAdapterFactory, forceCompile, true, onlyCheckStatus); + FILE_PROCESSING_COMPILER_ADAPTER_FACTORY, forceCompile, true, onlyCheckStatus); didSomething |= translate(context, compilerManager, forceCompile, isRebuild, trackDependencies, outputDirectories, onlyCheckStatus); didSomething |= invokeFileProcessingCompilers(compilerManager, context, ClassInstrumentingCompiler.class, - myProcessingCompilerAdapterFactory, isRebuild, false, onlyCheckStatus); + FILE_PROCESSING_COMPILER_ADAPTER_FACTORY, isRebuild, false, onlyCheckStatus); // explicitly passing forceCompile = false because in scopes that is narrower than ProjectScope it is impossible // to understand whether the class to be processed is in scope or not. Otherwise compiler may process its items even if // there were changes in completely independent files. didSomething |= invokeFileProcessingCompilers(compilerManager, context, ClassPostProcessingCompiler.class, - myProcessingCompilerAdapterFactory, isRebuild, false, onlyCheckStatus); + FILE_PROCESSING_COMPILER_ADAPTER_FACTORY, isRebuild, false, onlyCheckStatus); - didSomething |= invokeFileProcessingCompilers(compilerManager, context, PackagingCompiler.class, myPackagingCompilerAdapterFactory, + didSomething |= invokeFileProcessingCompilers(compilerManager, context, PackagingCompiler.class, + FILE_PACKAGING_COMPILER_ADAPTER_FACTORY, isRebuild, false, onlyCheckStatus); - didSomething |= invokeFileProcessingCompilers(compilerManager, context, Validator.class, myProcessingCompilerAdapterFactory, + didSomething |= invokeFileProcessingCompilers(compilerManager, context, Validator.class, FILE_PROCESSING_COMPILER_ADAPTER_FACTORY, forceCompile, true, onlyCheckStatus); } catch (ExitException e) { @@ -590,14 +547,15 @@ public class CompileDriver { final VirtualFile[] allOutputDirs = context.getAllOutputDirectories(); if (didSomething && GENERATE_CLASSPATH_INDEX) { - context.getProgressIndicator().pushState(); - context.getProgressIndicator().setText("Generating classpath index..."); - int count = 0; - for (VirtualFile file : allOutputDirs) { - context.getProgressIndicator().setFraction(((double)++count) / allOutputDirs.length); - createClasspathIndex(file); - } - context.getProgressIndicator().popState(); + runInContext(context, "Generating classpath index...", new ThrowableRunnable(){ + public void run() { + int count = 0; + for (VirtualFile file : allOutputDirs) { + context.getProgressIndicator().setFraction((double)++count / allOutputDirs.length); + createClasspathIndex(file); + } + } + }); } if (!context.getProgressIndicator().isCanceled() && context.getMessageCount(CompilerMessageCategory.ERROR) == 0) { @@ -610,14 +568,8 @@ public class CompileDriver { } if (!onlyCheckStatus) { - try { - context.getProgressIndicator().pushState(); - if (!executeCompileTasks(context, false)) { - return ExitStatus.CANCELLED; - } - } - finally { - context.getProgressIndicator().popState(); + if (!executeCompileTasks(context, false)) { + return ExitStatus.CANCELLED; } } @@ -637,6 +589,53 @@ public class CompileDriver { } } + private ExitStatus refreshFiles(final CompileContextEx context) { + final ExitStatus[] status = {null}; + runInContext(context, "Refreshing files...",new ThrowableRunnable(){ + public void run() { + // need this to make sure the VFS is built + boolean needRecalcOutputDirs = false; + final List outputsToRefresh = new ArrayList(); + for (VirtualFile output : context.getAllOutputDirectories()) { + if (output.isValid()) { + walkChildren(output, context); + } + else { + needRecalcOutputDirs = true; + final File file = new File(output.getPath()); + if (!file.exists()) { + final boolean created = file.mkdirs(); + if (!created) { + context.addMessage(CompilerMessageCategory.ERROR, "Failed to create output directory " + file.getPath(), null, 0, 0); + status[0] = ExitStatus.ERRORS; + return; + } + } + output = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(file); + if (output == null) { + context.addMessage(CompilerMessageCategory.ERROR, "Failed to locate output directory " + file.getPath(), null, 0, 0); + status[0] = ExitStatus.ERRORS; + return; + } + } + outputsToRefresh.add(output); + } + for (Map.Entry, Pair> entry : myGenerationCompilerModuleToOutputDirMap.entrySet()) { + final Pair generated = entry.getValue(); + walkChildren(generated.getFirst(), context); + outputsToRefresh.add(generated.getFirst()); + walkChildren(generated.getSecond(), context); + outputsToRefresh.add(generated.getSecond()); + } + RefreshQueue.getInstance().refresh(false, true, null, outputsToRefresh.toArray(new VirtualFile[outputsToRefresh.size()])); + if (needRecalcOutputDirs) { + context.recalculateOutputDirs(); + } + } + }); + return status[0]; + } + private static void logErrorMessages(final CompileContext context) { final CompilerMessage[] errors = context.getMessages(CompilerMessageCategory.ERROR); if (errors.length > 0) { @@ -700,14 +699,11 @@ public class CompileDriver { } private static void dropDependencyCache(final CompileContextEx context) { - context.getProgressIndicator().pushState(); - try { - context.getProgressIndicator().setText(CompilerBundle.message("progress.saving.caches")); - context.getDependencyCache().dispose(); - } - finally { - context.getProgressIndicator().popState(); - } + runInContext(context, CompilerBundle.message("progress.saving.caches"), new ThrowableRunnable(){ + public void run() { + context.getDependencyCache().dispose(); + } + }); } private boolean generateSources(final CompilerManager compilerManager, @@ -867,70 +863,78 @@ public class CompileDriver { return map; } - private void deleteAll(final CompileContextEx context, Set outputDirectories) { + private static void runInContext(CompileContext context, String title, ThrowableRunnable action) throws T { context.getProgressIndicator().pushState(); + context.getProgressIndicator().setText(title); try { - final boolean isTestMode = ApplicationManager.getApplication().isUnitTestMode(); - final VirtualFile[] allSources = context.getProjectCompileScope().getFiles(null, true); - context.getProgressIndicator().setText(CompilerBundle.message("progress.clearing.output")); - if (myShouldClearOutputDirectory) { - clearOutputDirectories(outputDirectories); - } - else { // refresh is still required - try { - for (final Compiler compiler : CompilerManager.getInstance(myProject).getCompilers(Compiler.class)) { - try { - if (compiler instanceof GeneratingCompiler) { - final StateCache cache = getGeneratingCompilerCache((GeneratingCompiler)compiler); - final Iterator urlIterator = cache.getUrlsIterator(); - while (urlIterator.hasNext()) { - context.getProgressIndicator().checkCanceled(); - deleteFile(new File(VirtualFileManager.extractPath(urlIterator.next()))); - } - } - else if (compiler instanceof TranslatingCompiler) { - final ArrayList> toDelete = new ArrayList>(); - ApplicationManager.getApplication().runReadAction(new Runnable() { - public void run() { - TranslatingCompilerFilesMonitor.getInstance().collectFiles( - context, - (TranslatingCompiler)compiler, Arrays.asList(allSources).iterator(), - true /*pass true to make sure that every source in scope file is processed*/, - false /*important! should pass false to enable collection of files to delete*/, - new ArrayList(), - toDelete - ); - } - }); - for (Trinity trinity : toDelete) { - context.getProgressIndicator().checkCanceled(); - final File file = trinity.getFirst(); - final boolean deleted = deleteFile(file); - if (isTestMode && deleted) { - CompilerManagerImpl.addDeletedPath(FileUtil.toSystemIndependentName(file.getPath())); - } - } - } - } - catch (IOException e) { - LOG.info(e); - } - } - pruneEmptyDirectories(context.getProgressIndicator(), outputDirectories); // to avoid too much files deleted events - } - finally { - CompilerUtil.refreshIODirectories(outputDirectories); - } - } - dropScopesCaches(); - - clearCompilerSystemDirectory(context); + action.run(); } finally { context.getProgressIndicator().popState(); } } + private void deleteAll(final CompileContextEx context, final Set outputDirectories) { + runInContext(context, CompilerBundle.message("progress.clearing.output"), new ThrowableRunnable(){ + public void run() { + final boolean isTestMode = ApplicationManager.getApplication().isUnitTestMode(); + final VirtualFile[] allSources = context.getProjectCompileScope().getFiles(null, true); + if (myShouldClearOutputDirectory) { + clearOutputDirectories(outputDirectories); + } + else { // refresh is still required + try { + for (final Compiler compiler : CompilerManager.getInstance(myProject).getCompilers(Compiler.class)) { + try { + if (compiler instanceof GeneratingCompiler) { + final StateCache cache = getGeneratingCompilerCache((GeneratingCompiler)compiler); + final Iterator urlIterator = cache.getUrlsIterator(); + while (urlIterator.hasNext()) { + context.getProgressIndicator().checkCanceled(); + deleteFile(new File(VirtualFileManager.extractPath(urlIterator.next()))); + } + } + else if (compiler instanceof TranslatingCompiler) { + final ArrayList> toDelete = new ArrayList>(); + ApplicationManager.getApplication().runReadAction(new Runnable() { + public void run() { + TranslatingCompilerFilesMonitor.getInstance().collectFiles( + context, + (TranslatingCompiler)compiler, Arrays.asList(allSources).iterator(), + true /*pass true to make sure that every source in scope file is processed*/, + false /*important! should pass false to enable collection of files to delete*/, + new ArrayList(), + toDelete + ); + } + }); + for (Trinity trinity : toDelete) { + context.getProgressIndicator().checkCanceled(); + final File file = trinity.getFirst(); + final boolean deleted = deleteFile(file); + if (isTestMode && deleted) { + CompilerManagerImpl.addDeletedPath(FileUtil.toSystemIndependentName(file.getPath())); + } + } + } + } + catch (IOException e) { + LOG.info(e); + } + } + pruneEmptyDirectories(context.getProgressIndicator(), outputDirectories); // to avoid too much files deleted events + } + finally { + CompilerUtil.refreshIODirectories(outputDirectories); + } + } + dropScopesCaches(); + + clearCompilerSystemDirectory(context); + } + }); + } + private void dropScopesCaches() { // hack to be sure the classpath will include the output directories ApplicationManager.getApplication().runReadAction(new Runnable() { @@ -946,23 +950,26 @@ public class CompileDriver { } } - private static boolean doPrune(ProgressIndicator progress, final File directory, final Set outPutDirectories) { + private static boolean doPrune(ProgressIndicator progress, final File directory, final Set outputDirectories) { progress.checkCanceled(); final File[] files = directory.listFiles(); boolean isEmpty = true; - if (files != null) { + if (files == null) { + isEmpty = false; + } + else { for (File file : files) { - if (file.isDirectory() && !outPutDirectories.contains(file)) { - if (doPrune(progress, file, outPutDirectories)) { + if (outputDirectories.contains(file)) { + isEmpty = false; + } + else { + if (doPrune(progress, file, outputDirectories)) { deleteFile(file); } else { isEmpty = false; } } - else { - isEmpty = false; - } } } @@ -1074,13 +1081,13 @@ public class CompileDriver { final List toGenerate = new ArrayList(); final List filesToRefresh = new ArrayList(); final List generatedFiles = new ArrayList(); - final List affectedModules = new ArrayList(); + final Set affectedModules = new THashSet(); try { final StateCache cache = getGeneratingCompilerCache(compiler); final Set pathsToRemove = new HashSet(cache.getUrls()); final Map itemToOutputPathMap = new HashMap(); - final IOException[] ex = new IOException[] {null}; + final IOException[] ex = {null}; ApplicationManager.getApplication().runReadAction(new Runnable() { public void run() { for (final GeneratingCompiler.GenerationItem item : allItems) { @@ -1091,7 +1098,7 @@ public class CompileDriver { try { final ValidityState savedState = cache.getState(outputPath); - + if (forceGenerate || savedState == null || !savedState.equalsTo(item.getValidityState())) { final String outputPathUrl = VirtualFileManager.constructUrl(LocalFileSystem.PROTOCOL, outputPath); if (context.getCompileScope().belongs(outputPathUrl)) { @@ -1131,20 +1138,21 @@ public class CompileDriver { } if (!pathsToRemove.isEmpty()) { - context.getProgressIndicator().pushState(); - context.getProgressIndicator().setText(CompilerBundle.message("progress.synchronizing.output.directory")); - for (final String path : pathsToRemove) { - final File file = new File(path); - final boolean deleted = deleteFile(file); - if (deleted) { - cache.remove(path); - filesToRefresh.add(file); + runInContext(context, CompilerBundle.message("progress.synchronizing.output.directory"), new ThrowableRunnable(){ + public void run() throws IOException { + for (final String path : pathsToRemove) { + final File file = new File(path); + final boolean deleted = deleteFile(file); + if (deleted) { + cache.remove(path); + filesToRefresh.add(file); + } + } } - } - context.getProgressIndicator().popState(); + }); } - Map> moduleToItemMap = + final Map> moduleToItemMap = buildModuleToGenerationItemMap(toGenerate.toArray(new GeneratingCompiler.GenerationItem[toGenerate.size()])); List modules = new ArrayList(moduleToItemMap.size()); for (final Module module : moduleToItemMap.keySet()) { @@ -1153,38 +1161,36 @@ public class CompileDriver { ModuleCompilerUtil.sortModules(myProject, modules); for (final Module module : modules) { - context.getProgressIndicator().pushState(); - try { - final Set items = moduleToItemMap.get(module); - if (items != null && !items.isEmpty()) { - final GeneratingCompiler.GenerationItem[][] productionAndTestItems = splitGenerationItems(items); - boolean moduleAffected = false; - for (GeneratingCompiler.GenerationItem[] _items : productionAndTestItems) { - if (_items.length > 0) { - final VirtualFile outputDir = getGenerationOutputDir(compiler, module, _items[0].isTestSource()); - final GeneratingCompiler.GenerationItem[] successfullyGenerated = compiler.generate(context, _items, outputDir); - context.getProgressIndicator().setText(CompilerBundle.message("progress.updating.caches")); - if (successfullyGenerated.length > 0) { - moduleAffected = true; - } - for (final GeneratingCompiler.GenerationItem item : successfullyGenerated) { - final String fullOutputPath = itemToOutputPathMap.get(item); - cache.update(fullOutputPath, item.getValidityState()); - final File file = new File(fullOutputPath); - filesToRefresh.add(file); - generatedFiles.add(file); + runInContext(context, "Generating output from "+compiler.getDescription(),new ThrowableRunnable(){ + public void run() throws IOException { + final Set items = moduleToItemMap.get(module); + if (items != null && !items.isEmpty()) { + final GeneratingCompiler.GenerationItem[][] productionAndTestItems = splitGenerationItems(items); + for (GeneratingCompiler.GenerationItem[] _items : productionAndTestItems) { + if (_items.length > 0) { + final VirtualFile outputDir = getGenerationOutputDir(compiler, module, _items[0].isTestSource()); + final GeneratingCompiler.GenerationItem[] successfullyGenerated = compiler.generate(context, _items, outputDir); + + context.getProgressIndicator().setText(CompilerBundle.message("progress.updating.caches")); + runInContext(context, CompilerBundle.message("progress.updating.caches"), new ThrowableRunnable() { + public void run() throws IOException { + if (successfullyGenerated.length > 0) { + affectedModules.add(module); + } + for (final GeneratingCompiler.GenerationItem item : successfullyGenerated) { + final String fullOutputPath = itemToOutputPathMap.get(item); + cache.update(fullOutputPath, item.getValidityState()); + final File file = new File(fullOutputPath); + filesToRefresh.add(file); + generatedFiles.add(file); + } + } + }); } } } - - if (moduleAffected) { - affectedModules.add(module); - } } - } - finally { - context.getProgressIndicator().popState(); - } + }); } } catch (IOException e) { @@ -1193,7 +1199,6 @@ public class CompileDriver { throw new ExitException(ExitStatus.ERRORS); } finally { - context.getProgressIndicator().pushState(); CompilerUtil.refreshIOFiles(filesToRefresh); if (!generatedFiles.isEmpty()) { List vFiles = ApplicationManager.getApplication().runReadAction(new Computable>() { @@ -1244,116 +1249,118 @@ public class CompileDriver { final boolean trackDependencies, final Set outputDirectories, final boolean onlyCheckStatus) throws ExitException { - - final Set toCompile = new HashSet(); final List> toDelete = new ArrayList>(); - context.getProgressIndicator().pushState(); - final boolean[] wereFilesDeleted = new boolean[]{false}; - try { - final TranslatingCompilerFilesMonitor monitor = TranslatingCompilerFilesMonitor.getInstance(); - ApplicationManager.getApplication().runReadAction(new Runnable() { - public void run() { - - TranslatingCompilerFilesMonitor.getInstance().collectFiles( - context, compiler, Arrays.asList(snapshot).iterator(), forceCompile, isRebuild, toCompile, toDelete - ); - if (trackDependencies && !toCompile.isEmpty()) { // should add dependent files - final FileTypeManager fileTypeManager = FileTypeManager.getInstance(); - final PsiManager psiManager = PsiManager.getInstance(myProject); - final VirtualFile[] filesToCompile = toCompile.toArray(new VirtualFile[toCompile.size()]); - for (final VirtualFile file : filesToCompile) { - if (fileTypeManager.getFileTypeByFile(file) == StdFileTypes.JAVA) { - final PsiFile psiFile = psiManager.findFile(file); - if (psiFile != null) { - addDependentFiles(psiFile, toCompile, compiler, context); + final boolean[] wereFilesDeleted = {false}; + runInContext(context, "Compiling using "+compiler.getDescription(), new ThrowableRunnable(){ + public void run() throws ExitException { + try { + final TranslatingCompilerFilesMonitor monitor = TranslatingCompilerFilesMonitor.getInstance(); + ApplicationManager.getApplication().runReadAction(new Runnable() { + public void run() { + TranslatingCompilerFilesMonitor.getInstance().collectFiles( + context, compiler, Arrays.asList(snapshot).iterator(), forceCompile, isRebuild, toCompile, toDelete + ); + if (trackDependencies && !toCompile.isEmpty()) { // should add dependent files + final FileTypeManager fileTypeManager = FileTypeManager.getInstance(); + final PsiManager psiManager = PsiManager.getInstance(myProject); + final VirtualFile[] filesToCompile = toCompile.toArray(new VirtualFile[toCompile.size()]); + for (final VirtualFile file : filesToCompile) { + if (fileTypeManager.getFileTypeByFile(file) == StdFileTypes.JAVA) { + final PsiFile psiFile = psiManager.findFile(file); + if (psiFile != null) { + addDependentFiles(psiFile, toCompile, compiler, context); + } + } } } } + }); + + if (onlyCheckStatus) { + if (toDelete.isEmpty() && toCompile.isEmpty()) { + return; + } + if (LOG.isDebugEnabled()) { + if (!toDelete.isEmpty()) { + LOG.debug("Found items to delete, compiler " + compiler.getDescription()); + } + if (!toCompile.isEmpty()) { + LOG.debug("Found items to compile, compiler " + compiler.getDescription()); + } + } + throw new ExitException(ExitStatus.CANCELLED); } - } - }); - if (onlyCheckStatus) { - if (toDelete.isEmpty() && toCompile.isEmpty()) { - return false; - } - if (LOG.isDebugEnabled()) { if (!toDelete.isEmpty()) { - LOG.debug("Found items to delete, compiler " + compiler.getDescription()); + try { + wereFilesDeleted[0] = syncOutputDir(context, toDelete, outputDirectories); + } + catch (CacheCorruptedException e) { + LOG.info(e); + context.requestRebuildNextTime(e.getMessage()); + } } - if (!toCompile.isEmpty()) { - LOG.debug("Found items to compile, compiler " + compiler.getDescription()); - } - } - throw new ExitException(ExitStatus.CANCELLED); - } - if (!toDelete.isEmpty()) { - try { - wereFilesDeleted[0] = syncOutputDir(context, toDelete, outputDirectories); + if ((wereFilesDeleted[0] || !toCompile.isEmpty()) && context.getMessageCount(CompilerMessageCategory.ERROR) == 0) { + final TranslatingCompiler.ExitStatus exitStatus = compiler.compile(context, toCompile.toArray(new VirtualFile[toCompile.size()])); + monitor.update(context, exitStatus.getSuccessfullyCompiled(), exitStatus.getFilesToRecompile()); + } } - catch (CacheCorruptedException e) { + catch (IOException e) { LOG.info(e); context.requestRebuildNextTime(e.getMessage()); + throw new ExitException(ExitStatus.ERRORS); } } - - if ((wereFilesDeleted[0] || !toCompile.isEmpty()) && context.getMessageCount(CompilerMessageCategory.ERROR) == 0) { - final TranslatingCompiler.ExitStatus exitStatus = compiler.compile(context, toCompile.toArray(new VirtualFile[toCompile.size()])); - monitor.update(context, exitStatus.getSuccessfullyCompiled(), exitStatus.getFilesToRecompile()); - } - } - catch (IOException e) { - LOG.info(e); - context.requestRebuildNextTime(e.getMessage()); - throw new ExitException(ExitStatus.ERRORS); - } - finally { - context.getProgressIndicator().popState(); - } + }); return !toCompile.isEmpty() || wereFilesDeleted[0]; } private static boolean syncOutputDir(final CompileContextEx context, final Collection> toDelete, final Set outputDirectories) throws CacheCorruptedException { - int total = toDelete.size(); + final int total = toDelete.size(); final DependencyCache dependencyCache = context.getDependencyCache(); final boolean isTestMode = ApplicationManager.getApplication().isUnitTestMode(); - context.getProgressIndicator().pushState(); final List filesToRefresh = new ArrayList(); try { - context.getProgressIndicator().setText(CompilerBundle.message("progress.synchronizing.output.directory")); - int current = 0; - boolean wereFilesDeleted = false; - for (final Trinity trinity : toDelete) { - context.getProgressIndicator().setFraction(((double)(++current)) / total); - context.getProgressIndicator().checkCanceled(); - final File outputPath = trinity.getFirst(); - filesToRefresh.add(outputPath); - if (deleteFile(outputPath)) { - wereFilesDeleted = true; - final String className = trinity.getSecond(); - if (className != null) { - final int id = dependencyCache.getSymbolTable().getId(className); - dependencyCache.addTraverseRoot(id); - final boolean sourcePresent = trinity.getThird().booleanValue(); - if (!sourcePresent) { - dependencyCache.markSourceRemoved(id); + final boolean[] wereFilesDeleted = {false}; + runInContext(context, CompilerBundle.message("progress.synchronizing.output.directory"), new ThrowableRunnable(){ + public void run() throws CacheCorruptedException { + int current = 0; + for (final Trinity trinity : toDelete) { + context.getProgressIndicator().setFraction((double)++current / total); + context.getProgressIndicator().checkCanceled(); + final File outputPath = trinity.getFirst(); + filesToRefresh.add(outputPath); + if (deleteFile(outputPath)) { + wereFilesDeleted[0] = true; + final String className = trinity.getSecond(); + if (className != null) { + final int id = dependencyCache.getSymbolTable().getId(className); + dependencyCache.addTraverseRoot(id); + final boolean sourcePresent = trinity.getThird().booleanValue(); + if (!sourcePresent) { + dependencyCache.markSourceRemoved(id); + } + } + if (isTestMode) { + CompilerManagerImpl.addDeletedPath(outputPath.getPath()); + } } } - if (isTestMode) { - CompilerManagerImpl.addDeletedPath(outputPath.getPath()); - } + runInContext(context, "Pruning empty directories...", new ThrowableRunnable() { + public void run() throws RuntimeException { + pruneEmptyDirectories(context.getProgressIndicator(), outputDirectories); + } + }); } - } - pruneEmptyDirectories(context.getProgressIndicator(), outputDirectories); - return wereFilesDeleted; + }); + return wereFilesDeleted[0]; } finally { CompilerUtil.refreshIOFiles(filesToRefresh); - context.getProgressIndicator().popState(); } } @@ -1409,14 +1416,14 @@ public class CompileDriver { final CompileScope scope = context.getCompileScope(); final List toProcess = new ArrayList(); final Set allUrls = new HashSet(); - final IOException[] ex = new IOException[] {null}; + final IOException[] ex = {null}; ApplicationManager.getApplication().runReadAction(new Runnable() { public void run() { try { for (FileProcessingCompiler.ProcessingItem item : items) { final VirtualFile file = item.getFile(); if (file == null) { - LOG.assertTrue(false, "FileProcessingCompiler.ProcessingItem.getFile() must not return null: compiler " + adapter.getCompiler().getDescription()); + LOG.error("FileProcessingCompiler.ProcessingItem.getFile() must not return null: compiler " + adapter.getCompiler().getDescription()); } final String url = file.getUrl(); allUrls.add(url); @@ -1446,26 +1453,27 @@ public class CompileDriver { final Collection urls = cache.getUrls(); final List urlsToRemove = new ArrayList(); if (!urls.isEmpty()) { - context.getProgressIndicator().pushState(); - context.getProgressIndicator().setText(CompilerBundle.message("progress.processing.outdated.files")); - ApplicationManager.getApplication().runReadAction(new Runnable() { - public void run() { - for (final String url : urls) { - if (!allUrls.contains(url)) { - if (!checkScope || scope.belongs(url)) { - urlsToRemove.add(url); + runInContext(context, CompilerBundle.message("progress.processing.outdated.files"), new ThrowableRunnable(){ + public void run() throws IOException { + ApplicationManager.getApplication().runReadAction(new Runnable() { + public void run() { + for (final String url : urls) { + if (!allUrls.contains(url)) { + if (!checkScope || scope.belongs(url)) { + urlsToRemove.add(url); + } + } } } + }); + if (!onlyCheckStatus && !urlsToRemove.isEmpty()) { + for (final String url : urlsToRemove) { + adapter.processOutdatedItem(context, url, cache.getExtState(url)); + cache.remove(url); + } } } }); - if (!onlyCheckStatus && !urlsToRemove.isEmpty()) { - for (final String url : urlsToRemove) { - adapter.processOutdatedItem(context, url, cache.getExtState(url)); - cache.remove(url); - } - } - context.getProgressIndicator().popState(); } if (onlyCheckStatus) { @@ -1493,33 +1501,33 @@ public class CompileDriver { return false; } - context.getProgressIndicator().pushState(); final FileProcessingCompiler.ProcessingItem[] processed = adapter.process(toProcess.toArray(new FileProcessingCompiler.ProcessingItem[toProcess.size()])); - context.getProgressIndicator().popState(); if (processed.length > 0) { - context.getProgressIndicator().pushState(); - context.getProgressIndicator().setText(CompilerBundle.message("progress.updating.caches")); - List vFiles = new ArrayList(processed.length); - for (FileProcessingCompiler.ProcessingItem aProcessed : processed) { - final VirtualFile file = aProcessed.getFile(); - vFiles.add(file); - if (LOG.isDebugEnabled()) { - LOG.debug("File processed by " + adapter.getCompiler().getDescription()); - LOG.debug("\tFile processed " + file.getPresentableUrl() + "; ts=" + file.getTimeStamp()); + runInContext(context, CompilerBundle.message("progress.updating.caches"), new ThrowableRunnable(){ + public void run() { + List vFiles = new ArrayList(processed.length); + for (FileProcessingCompiler.ProcessingItem aProcessed : processed) { + final VirtualFile file = aProcessed.getFile(); + vFiles.add(file); + if (LOG.isDebugEnabled()) { + LOG.debug("File processed by " + adapter.getCompiler().getDescription()); + LOG.debug("\tFile processed " + file.getPresentableUrl() + "; ts=" + file.getTimeStamp()); + } + } + LocalFileSystem.getInstance().refreshFiles(vFiles); + if (LOG.isDebugEnabled()) { + LOG.debug("Files after VFS refresh:"); + for (VirtualFile file : vFiles) { + LOG.debug("\t" + file.getPresentableUrl() + "; ts=" + file.getTimeStamp()); + } + } + for (FileProcessingCompiler.ProcessingItem item : processed) { + cacheUpdater.addFileForUpdate(item, cache); + } } - } - LocalFileSystem.getInstance().refreshFiles(vFiles); - if (LOG.isDebugEnabled()) { - LOG.debug("Files after VFS refresh:"); - for (VirtualFile file : vFiles) { - LOG.debug("\t" + file.getPresentableUrl() + "; ts=" + file.getTimeStamp()); - } - } - for (FileProcessingCompiler.ProcessingItem item : processed) { - cacheUpdater.addFileForUpdate(item, cache); - } + }); } return true; } @@ -1556,21 +1564,25 @@ public class CompileDriver { }, null); } - private boolean executeCompileTasks(CompileContext context, boolean beforeTasks) { + private boolean executeCompileTasks(final CompileContext context, final boolean beforeTasks) { final CompilerManager manager = CompilerManager.getInstance(myProject); final ProgressIndicator progressIndicator = context.getProgressIndicator(); try { - CompileTask[] tasks = beforeTasks ? manager.getBeforeTasks() : manager.getAfterTasks(); - if (tasks.length > 0) { - progressIndicator.setText(beforeTasks - ? CompilerBundle.message("progress.executing.precompile.tasks") - : CompilerBundle.message("progress.executing.postcompile.tasks")); - for (CompileTask task : tasks) { - if (!task.execute(context)) { - return false; + final boolean[] result = {true}; + runInContext(context, beforeTasks + ? CompilerBundle.message("progress.executing.precompile.tasks") + : CompilerBundle.message("progress.executing.postcompile.tasks"),new ThrowableRunnable(){ + public void run() { + CompileTask[] tasks = beforeTasks ? manager.getBeforeTasks() : manager.getAfterTasks(); + for (CompileTask task : tasks) { + if (!task.execute(context)) { + result[0] = false; + return; + } } } - } + }); + return result[0]; } finally { WindowManager.getInstance().getStatusBar(myProject).setInfo(""); @@ -1582,7 +1594,6 @@ public class CompileDriver { }); } } - return true; } // todo: add validation for module chunks: all modules that form a chunk must have the same JDK @@ -1877,7 +1888,7 @@ public class CompileDriver { } public void doUpdate() throws IOException{ - final IOException[] ex = new IOException[] {null}; + final IOException[] ex = {null}; ApplicationManager.getApplication().runReadAction(new Runnable() { public void run() { try { diff --git a/compiler/impl/com/intellij/compiler/impl/TranslatingCompilerFilesMonitor.java b/compiler/impl/com/intellij/compiler/impl/TranslatingCompilerFilesMonitor.java index c02f07acf67d..4627ee5efce0 100644 --- a/compiler/impl/com/intellij/compiler/impl/TranslatingCompilerFilesMonitor.java +++ b/compiler/impl/com/intellij/compiler/impl/TranslatingCompilerFilesMonitor.java @@ -172,7 +172,7 @@ public class TranslatingCompilerFilesMonitor implements ApplicationComponent { final Project project = context.getProject(); final int projectId = getProjectId(project); final LocalFileSystem lfs = LocalFileSystem.getInstance(); - final IOException[] _ex = new IOException[] {null}; + final IOException[] _ex = {null}; // need read action here to ensure that no modifications were made to VFS while updating file attributes ApplicationManager.getApplication().runReadAction(new Runnable() { @@ -1032,7 +1032,7 @@ public class TranslatingCompilerFilesMonitor implements ApplicationComponent { private final String mySrcUrl; private final LocalFileSystem myFileSystem; - public ScheduleOutputsForDeletionProc(final String srcUrl) { + private ScheduleOutputsForDeletionProc(final String srcUrl) { mySrcUrl = srcUrl; myFileSystem = LocalFileSystem.getInstance(); } diff --git a/compiler/impl/com/intellij/compiler/impl/javaCompiler/BackendCompiler.java b/compiler/impl/com/intellij/compiler/impl/javaCompiler/BackendCompiler.java index cde55a4f0d32..022c495b58aa 100644 --- a/compiler/impl/com/intellij/compiler/impl/javaCompiler/BackendCompiler.java +++ b/compiler/impl/com/intellij/compiler/impl/javaCompiler/BackendCompiler.java @@ -16,17 +16,16 @@ public interface BackendCompiler { @NotNull @NonNls String getId(); // used for externalization @NotNull String getPresentableName(); @NotNull Configurable createConfigurable(); - @NotNull - Set getCompilableFileTypes(); - @Nullable OutputParser createErrorParser(final String outputDir); - @Nullable OutputParser createOutputParser(final String outputDir); + @NotNull Set getCompilableFileTypes(); + @Nullable OutputParser createErrorParser(@NotNull String outputDir); + @Nullable OutputParser createOutputParser(@NotNull String outputDir); boolean checkCompiler(final CompileScope scope); @NotNull Process launchProcess( - final ModuleChunk chunk, - final String outputDir, - final CompileContext compileContext) throws IOException; + @NotNull ModuleChunk chunk, + @NotNull String outputDir, + @NotNull CompileContext compileContext) throws IOException; void compileFinished(); diff --git a/compiler/impl/com/intellij/compiler/impl/javaCompiler/BackendCompilerWrapper.java b/compiler/impl/com/intellij/compiler/impl/javaCompiler/BackendCompilerWrapper.java index 5a6209ac99a9..c76a6bc0dc9b 100644 --- a/compiler/impl/com/intellij/compiler/impl/javaCompiler/BackendCompilerWrapper.java +++ b/compiler/impl/com/intellij/compiler/impl/javaCompiler/BackendCompilerWrapper.java @@ -35,17 +35,17 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.util.ArrayUtil; import com.intellij.util.Chunk; import com.intellij.util.StringBuilderSpinAllocator; import com.intellij.util.cls.ClsFormatException; import gnu.trove.TIntHashSet; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; import java.io.File; -import java.io.FileOutputStream; +import java.io.FileNotFoundException; import java.io.IOException; import java.util.*; import java.util.concurrent.ArrayBlockingQueue; @@ -64,35 +64,36 @@ public class BackendCompilerWrapper { private final List myOutputItems; private final CompileContextEx myCompileContext; - private final VirtualFile[] myFilesToCompile; + private final List myFilesToCompile; private final Project myProject; private final Set myFilesToRecompile; private final Map myModuleToTempDirMap = new HashMap(); private final ProjectFileIndex myProjectFileIndex; @NonNls private static final String PACKAGE_ANNOTATION_FILE_NAME = "package-info.java"; + private static final FileObject myStopThreadToken = new FileObject(null,null); - public BackendCompilerWrapper(final Project project, - VirtualFile[] filesToCompile, - CompileContextEx compileContext, - BackendCompiler compiler) { + public BackendCompilerWrapper(@NotNull final Project project, + @NotNull List filesToCompile, + @NotNull CompileContextEx compileContext, + @NotNull BackendCompiler compiler) { myProject = project; myCompiler = compiler; myCompileContext = compileContext; myFilesToCompile = filesToCompile; - myFilesToRecompile = new HashSet(Arrays.asList(filesToCompile)); + myFilesToRecompile = new HashSet(filesToCompile); myProjectFileIndex = ProjectRootManager.getInstance(myProject).getFileIndex(); - mySuccesfullyCompiledJavaFiles = new HashSet(filesToCompile.length); - myOutputItems = new ArrayList(filesToCompile.length); - myFileNameToSourceMap = new HashMap>(filesToCompile.length); - myFilesToRefresh = new ArrayList(filesToCompile.length); + mySuccesfullyCompiledJavaFiles = new HashSet(filesToCompile.size()); + myOutputItems = new ArrayList(filesToCompile.size()); + myFileNameToSourceMap = new HashMap>(filesToCompile.size()); + myFilesToRefresh = new ArrayList(filesToCompile.size()); } - public TranslatingCompiler.OutputItem[] compile() throws CompilerException, CacheCorruptedException { + public List compile() throws CompilerException, CacheCorruptedException { Application application = ApplicationManager.getApplication(); final Set allDependent = new HashSet(); COMPILE: try { - if (myFilesToCompile.length > 0) { + if (!myFilesToCompile.isEmpty()) { if (application.isUnitTestMode()) { saveTestData(); } @@ -101,20 +102,18 @@ public class BackendCompilerWrapper { compileModules(moduleToFilesMap); } - - VirtualFile[] dependentFiles; + Collection dependentFiles; do { dependentFiles = findDependentFiles(); - if (dependentFiles.length > 0) { - final List deps = Arrays.asList(dependentFiles); - myFilesToRecompile.addAll(deps); - allDependent.addAll(deps); + if (!dependentFiles.isEmpty()) { + myFilesToRecompile.addAll(dependentFiles); + allDependent.addAll(dependentFiles); if (myCompileContext.getProgressIndicator().isCanceled() || myCompileContext.getMessageCount(CompilerMessageCategory.ERROR) > 0) { break COMPILE; } - final VirtualFile[] filesInScope = getFilesInScope(dependentFiles); - if (filesInScope.length == 0) { + final List filesInScope = getFilesInScope(dependentFiles); + if (filesInScope.isEmpty()) { break; } final Map> moduleToFilesMap = buildModuleToFilesMap(myCompileContext, filesInScope); @@ -122,7 +121,7 @@ public class BackendCompilerWrapper { compileModules(moduleToFilesMap); } } - while (dependentFiles.length > 0 && myCompileContext.getMessageCount(CompilerMessageCategory.ERROR) == 0); + while (!dependentFiles.isEmpty() && myCompileContext.getMessageCount(CompilerMessageCategory.ERROR) == 0); } catch (IOException e) { throw new CompilerException(CompilerBundle.message("error.compiler.process.not.started", e.getMessage()), e); @@ -151,7 +150,7 @@ public class BackendCompilerWrapper { if (myCompileContext.getProgressIndicator().isCanceled()) { myFilesToRecompile.clear(); // when cancelled pretend nothing was compiled and next compile will compile everything from the scratch - return TranslatingCompiler.EMPTY_OUTPUT_ITEM_ARRAY; + return Collections.emptyList(); } // do not update caches if cancelled because there is a chance that they will be incomplete @@ -163,7 +162,7 @@ public class BackendCompilerWrapper { myFilesToRecompile.addAll(allDependent); } processPackageInfoFiles(); - return myOutputItems.toArray(new TranslatingCompiler.OutputItem[myOutputItems.size()]); + return myOutputItems; } // package-info.java hack @@ -192,8 +191,8 @@ public class BackendCompilerWrapper { }); } - private VirtualFile[] getFilesInScope(final VirtualFile[] dependentFiles) { - final List filesInScope = new ArrayList(dependentFiles.length); + private List getFilesInScope(final Collection dependentFiles) { + final List filesInScope = new ArrayList(dependentFiles.size()); ApplicationManager.getApplication().runReadAction(new Runnable() { public void run() { for (VirtualFile dependentFile : dependentFiles) { @@ -203,7 +202,7 @@ public class BackendCompilerWrapper { } } }); - return filesInScope.toArray(new VirtualFile[filesInScope.size()]); + return filesInScope; } private void compileModules(final Map> moduleToFilesMap) throws IOException { @@ -328,7 +327,7 @@ public class BackendCompilerWrapper { private final TIntHashSet myProcessedNames = new TIntHashSet(); private final Set myProcessedFiles = new HashSet(); - private VirtualFile[] findDependentFiles() throws CacheCorruptedException { + private Collection findDependentFiles() throws CacheCorruptedException { myCompileContext.getProgressIndicator().setText(CompilerBundle.message("progress.checking.dependencies")); final DependencyCache dependencyCache = myCompileContext.getDependencyCache(); @@ -388,7 +387,7 @@ public class BackendCompilerWrapper { } myCompileContext.getProgressIndicator().setText(CompilerBundle.message("progress.found.dependent.files", dependentFiles.size())); - return dependentFiles.toArray(new VirtualFile[dependentFiles.size()]); + return dependentFiles; } private final Object lock = new Object(); @@ -424,14 +423,14 @@ public class BackendCompilerWrapper { } } - protected void processCompiledClass(final String classFileToProcess) throws CacheCorruptedException { + protected void processCompiledClass(final FileObject classFileToProcess) throws CacheCorruptedException { synchronized (lock) { myClassParsingThread.addPath(classFileToProcess); } } } - private void doCompile(final ModuleChunk chunk, String outputDir, int sourcesFilter) throws IOException { + private void doCompile(@NotNull final ModuleChunk chunk, @NotNull String outputDir, int sourcesFilter) throws IOException { myCompileContext.getProgressIndicator().checkCanceled(); chunk.setSourcesFilter(sourcesFilter); @@ -866,7 +865,7 @@ public class BackendCompilerWrapper { myCompileContext.getProgressIndicator().setText2(msg); } - private static Map> buildModuleToFilesMap(final CompileContext context, final VirtualFile[] files) { + private static Map> buildModuleToFilesMap(final CompileContext context, final List files) { final Map> map = new HashMap>(); ApplicationManager.getApplication().runReadAction(new Runnable() { public void run() { @@ -890,9 +889,8 @@ public class BackendCompilerWrapper { } private class ClassParsingThread implements Runnable { - private final BlockingQueue myPaths = new ArrayBlockingQueue(50000); + private final BlockingQueue myPaths = new ArrayBlockingQueue(50000); private CacheCorruptedException myError = null; - private final String myStopThreadToken = new String(); private final boolean myAddNotNullAssertions; private final boolean myIsJdk16; @@ -903,10 +901,11 @@ public class BackendCompilerWrapper { public void run() { try { - //noinspection StringEquality - String path; - while ((path = getNextPath()) != myStopThreadToken) { - processPath(path.replace('/', File.separatorChar)); + while (true) { + FileObject path = myPaths.take(); + + if (path == myStopThreadToken) break; + processPath(path); } } catch (InterruptedException e) { @@ -917,30 +916,23 @@ public class BackendCompilerWrapper { } } - public void addPath(String path) throws CacheCorruptedException { + public void addPath(FileObject path) throws CacheCorruptedException { if (myError != null) { throw myError; } myPaths.offer(path); } - private String getNextPath() throws InterruptedException { - return myPaths.take(); - } - public void stopParsing() { myPaths.offer(myStopThreadToken); } - private void processPath(final String path) throws CacheCorruptedException { + private void processPath(FileObject fileObject) throws CacheCorruptedException { + File file = fileObject.getFile(); + byte[] fileContent = fileObject.getContent(); + String path = file.getPath(); try { - final File file = new File(path); // the file is assumed to exist! - byte[] fileContent = ArrayUtil.EMPTY_BYTE_ARRAY; - try{ - fileContent = FileUtil.loadFileBytes(file); - } - catch(IOException ignored){ - } + // the file is assumed to exist! final DependencyCache dependencyCache = myCompileContext.getDependencyCache(); final int newClassQName = dependencyCache.reparseClassFile(file, fileContent); @@ -949,7 +941,8 @@ public class BackendCompilerWrapper { final String qName = dependencyCache.resolve(newClassQName); String relativePathToSource = "/" + MakeUtil.createRelativePathToSource(qName, sourceFileName); putName(sourceFileName, newClassQName, relativePathToSource, path); - + + boolean fileContentChanged = false; if (myAddNotNullAssertions && hasNotNullAnnotations(newClassesCache, dependencyCache.getSymbolTable(), newClassQName)) { try { ClassReader reader = new ClassReader(fileContent, 0, fileContent.length); @@ -958,19 +951,18 @@ public class BackendCompilerWrapper { final NotNullVerifyingInstrumenter instrumenter = new NotNullVerifyingInstrumenter(writer); reader.accept(instrumenter, 0); if (instrumenter.isModification()) { - final FileOutputStream output = new FileOutputStream(file); - try { - output.write(writer.toByteArray()); - } - finally { - output.close(); - } + fileContent = writer.toByteArray(); + fileContentChanged = true; } } catch (Exception ignored) { LOG.info(ignored); } } + + if (fileContentChanged || !fileObject.isSaved()) { + writeFile(file, fileContent); + } } catch (ClsFormatException e) { String message; @@ -983,11 +975,24 @@ public class BackendCompilerWrapper { } myCompileContext.addMessage(CompilerMessageCategory.ERROR, message, null, -1, -1); } + catch (IOException e) { + myCompileContext.addMessage(CompilerMessageCategory.ERROR, e.getMessage(), null, -1, -1); + } finally { myClassesCount += 1; updateStatistics(); } } + + private void writeFile(File file, byte[] fileContent) throws IOException { + try { + FileUtil.writeToFile(file, fileContent); + } + catch (FileNotFoundException e) { + FileUtil.createParentDirs(file); + FileUtil.writeToFile(file, fileContent); + } + } } private static boolean hasNotNullAnnotations(final Cache cache, final SymbolTable symbolTable, final int className) throws CacheCorruptedException { @@ -1025,11 +1030,12 @@ public class BackendCompilerWrapper { private final String myPath; private final int myKind; - private OutputDir(String path, int kind) { + private OutputDir(@NotNull String path, int kind) { myPath = path; myKind = kind; } + @NotNull public String getPath() { return myPath; } diff --git a/compiler/impl/com/intellij/compiler/impl/javaCompiler/CompilerParsingThread.java b/compiler/impl/com/intellij/compiler/impl/javaCompiler/CompilerParsingThread.java index 71d08533026c..7557fa39694d 100644 --- a/compiler/impl/com/intellij/compiler/impl/javaCompiler/CompilerParsingThread.java +++ b/compiler/impl/com/intellij/compiler/impl/javaCompiler/CompilerParsingThread.java @@ -24,10 +24,9 @@ public abstract class CompilerParsingThread implements Runnable, OutputParser.Ca private boolean mySkipLF = false; private Throwable myError = null; private final boolean myIsUnitTestMode; - private String myClassFileToProcess = null; + private FileObject myClassFileToProcess = null; private String myLastReadLine = null; - private boolean myProcessExited = false; - + private volatile boolean myProcessExited = false; public CompilerParsingThread(Process process, OutputParser outputParser, final boolean readErrorStream, boolean trimLines) { myProcess = process; @@ -44,7 +43,7 @@ public abstract class CompilerParsingThread implements Runnable, OutputParser.Ca if (!myIsUnitTestMode && myProcess == null) { break; } - if (isCanceled()) { + if (myProcessExited || isCanceled()) { break; } if (!myOutputParser.processMessageLine(this)) { @@ -57,6 +56,7 @@ public abstract class CompilerParsingThread implements Runnable, OutputParser.Ca } } catch (Throwable e) { + e.printStackTrace(); myError = e; LOG.info(e); } @@ -92,8 +92,8 @@ public abstract class CompilerParsingThread implements Runnable, OutputParser.Ca return myLastReadLine; } - public final void fileGenerated(String path) { - String previousPath = myClassFileToProcess; + public final void fileGenerated(FileObject path) { + FileObject previousPath = myClassFileToProcess; myClassFileToProcess = path; if (previousPath != null) { try { @@ -108,8 +108,7 @@ public abstract class CompilerParsingThread implements Runnable, OutputParser.Ca protected abstract boolean isCanceled(); - protected abstract void processCompiledClass(final String classFileToProcess) throws CacheCorruptedException; - + protected abstract void processCompiledClass(final FileObject classFileToProcess) throws CacheCorruptedException; private String readLine(final Reader reader) { StringBuilder buffer; @@ -176,11 +175,11 @@ public abstract class CompilerParsingThread implements Runnable, OutputParser.Ca } } - private synchronized boolean isProcessTerminated() { + private boolean isProcessTerminated() { return myProcessExited; } - public synchronized void setProcessTerminated(final boolean procesExited) { + public void setProcessTerminated(final boolean procesExited) { myProcessExited = procesExited; } } diff --git a/compiler/impl/com/intellij/compiler/impl/javaCompiler/ExternalCompiler.java b/compiler/impl/com/intellij/compiler/impl/javaCompiler/ExternalCompiler.java index f08abfd9f602..562861cbdb67 100644 --- a/compiler/impl/com/intellij/compiler/impl/javaCompiler/ExternalCompiler.java +++ b/compiler/impl/com/intellij/compiler/impl/javaCompiler/ExternalCompiler.java @@ -31,7 +31,7 @@ public abstract class ExternalCompiler implements BackendCompiler { } @NotNull - public Process launchProcess(final ModuleChunk chunk, final String outputDir, final CompileContext compileContext) throws IOException { + public Process launchProcess(@NotNull final ModuleChunk chunk, @NotNull final String outputDir, @NotNull final CompileContext compileContext) throws IOException { final String[] commands = createStartupCommand(chunk, compileContext, outputDir); if (LOG.isDebugEnabled()) { diff --git a/compiler/impl/com/intellij/compiler/impl/javaCompiler/FileObject.java b/compiler/impl/com/intellij/compiler/impl/javaCompiler/FileObject.java new file mode 100644 index 000000000000..919c724d1640 --- /dev/null +++ b/compiler/impl/com/intellij/compiler/impl/javaCompiler/FileObject.java @@ -0,0 +1,46 @@ +package com.intellij.compiler.impl.javaCompiler; + +import com.intellij.util.ArrayUtil; +import com.intellij.openapi.util.io.FileUtil; + +import java.io.File; +import java.io.IOException; + +/** + * @author cdr + */ +public class FileObject { + private final File myFile; + private final byte[] myContent; + private final boolean mySaved; + + public FileObject(File file, byte[] content) { + myFile = file; + myContent = content; + mySaved = false; + } + + public FileObject(File file) { + myFile = file; + byte[] fileContent = ArrayUtil.EMPTY_BYTE_ARRAY; + try{ + fileContent = FileUtil.loadFileBytes(file); + } + catch(IOException ignored){ + } + myContent = fileContent; + mySaved = true; + } + + public File getFile() { + return myFile; + } + + public byte[] getContent() { + return myContent; + } + + public boolean isSaved() { + return mySaved; + } +} diff --git a/compiler/impl/com/intellij/compiler/impl/javaCompiler/JavaCompiler.java b/compiler/impl/com/intellij/compiler/impl/javaCompiler/JavaCompiler.java index 782b1554aa37..13fc95e0cd8b 100644 --- a/compiler/impl/com/intellij/compiler/impl/javaCompiler/JavaCompiler.java +++ b/compiler/impl/com/intellij/compiler/impl/javaCompiler/JavaCompiler.java @@ -18,6 +18,10 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + public class JavaCompiler implements TranslatingCompiler { private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.impl.javaCompiler.JavaCompiler"); private final Project myProject; @@ -38,19 +42,19 @@ public class JavaCompiler implements TranslatingCompiler { public ExitStatus compile(CompileContext context, VirtualFile[] files) { final BackendCompiler backEndCompiler = getBackEndCompiler(); - final BackendCompilerWrapper wrapper = new BackendCompilerWrapper(myProject, files, (CompileContextEx)context, backEndCompiler); - OutputItem[] outputItems; + final BackendCompilerWrapper wrapper = new BackendCompilerWrapper(myProject, Arrays.asList(files), (CompileContextEx)context, backEndCompiler); + List outputItems; try { outputItems = wrapper.compile(); } catch (CompilerException e) { - outputItems = EMPTY_OUTPUT_ITEM_ARRAY; + outputItems = Collections.emptyList(); context.addMessage(CompilerMessageCategory.ERROR, e.getMessage(), null, -1, -1); } catch (CacheCorruptedException e) { LOG.info(e); context.requestRebuildNextTime(e.getMessage()); - outputItems = EMPTY_OUTPUT_ITEM_ARRAY; + outputItems = Collections.emptyList(); } return new ExitStatusImpl(outputItems, wrapper.getFilesToRecompile()); @@ -66,17 +70,16 @@ public class JavaCompiler implements TranslatingCompiler { } private static class ExitStatusImpl implements ExitStatus { - - private final OutputItem[] myOuitputItems; + private final List myOutputItems; private final VirtualFile[] myMyFilesToRecompile; - public ExitStatusImpl(OutputItem[] ouitputItems, VirtualFile[] myFilesToRecompile) { - myOuitputItems = ouitputItems; + private ExitStatusImpl(List outputItems, VirtualFile[] myFilesToRecompile) { + myOutputItems = outputItems; myMyFilesToRecompile = myFilesToRecompile; } public OutputItem[] getSuccessfullyCompiled() { - return myOuitputItems; + return myOutputItems.toArray(new OutputItem[myOutputItems.size()]); } public VirtualFile[] getFilesToRecompile() { diff --git a/compiler/impl/com/intellij/compiler/impl/javaCompiler/api/CompAPIDriver.java b/compiler/impl/com/intellij/compiler/impl/javaCompiler/api/CompAPIDriver.java new file mode 100644 index 000000000000..4a2b644ca426 --- /dev/null +++ b/compiler/impl/com/intellij/compiler/impl/javaCompiler/api/CompAPIDriver.java @@ -0,0 +1,110 @@ +package com.intellij.compiler.impl.javaCompiler.api; + +import com.intellij.compiler.OutputParser; +import com.sun.source.util.JavacTask; +import com.sun.source.util.TaskEvent; +import com.sun.source.util.TaskListener; +import org.jetbrains.annotations.NotNull; + +import javax.tools.*; +import java.io.OutputStream; +import java.io.PrintWriter; +import java.io.File; +import java.util.List; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.LinkedBlockingQueue; + +/** + * @author cdr + */ +@SuppressWarnings({"Since15"}) +public class CompAPIDriver { + private final BlockingQueue myCompilationResults = new LinkedBlockingQueue(); + private static final CompilationEvent GUARD = new CompilationEvent() { + @Override + protected void process(OutputParser.Callback callback) { + } + }; + + public void compile(List commandLine, List paths, final String outputDir) { + JavaCompiler compiler = new com.sun.tools.javac.api.JavacTool(); //use current classloader + StandardJavaFileManager manager = new MyFileManager(this, outputDir); + + Iterable input = manager.getJavaFileObjectsFromFiles(paths); + + DiagnosticListener listener = new DiagnosticListener() { + public void report(Diagnostic diagnostic) { + CompilationEvent event = CompilationEvent.diagnostic(diagnostic); + myCompilationResults.offer(event); + } + }; + try { + PrintWriter silent = new PrintWriter(new OutputStream(){ + public void write(int b) {} + }); + + JavaCompiler.CompilationTask task = compiler.getTask(silent, manager, listener, commandLine, null, input); + ((JavacTask)task).setTaskListener(new TaskListener() { + public void started(TaskEvent taskEvent) { + JavaFileObject sourceFile = taskEvent.getSourceFile(); + CompilationEvent event; + switch (taskEvent.getKind()) { + case ANALYZE: + event = CompilationEvent.progress("Analyzing ",sourceFile); + break; + case PARSE: + event = CompilationEvent.progress("Parsing ", sourceFile); + break; + default: + event = null; + } + if (event != null) { + myCompilationResults.offer(event); + } + } + public void finished(TaskEvent taskEvent) { + CompilationEvent event; + switch (taskEvent.getKind()) { + case ENTER: + event = CompilationEvent.fileProcessed(); + break; + default: + event = null; + } + if (event != null) { + myCompilationResults.offer(event); + } + } + }); + task.call(); + } + finally { + myCompilationResults.offer(GUARD); + } + } + + public boolean processAll(@NotNull OutputParser.Callback callback) { + try { + while (true) { + CompilationEvent event = myCompilationResults.take(); + if (event == GUARD) break; + event.process(callback); + } + } + catch (InterruptedException ignored) { + System.out.println("ignored " + ignored); + } + return false; + } + + public void finish() { + myCompilationResults.clear(); + } + + + public void offer(CompilationEvent compilationEvent) { + myCompilationResults.offer(compilationEvent); + } +} + + diff --git a/compiler/impl/com/intellij/compiler/impl/javaCompiler/api/CompilationEvent.java b/compiler/impl/com/intellij/compiler/impl/javaCompiler/api/CompilationEvent.java new file mode 100644 index 000000000000..4835d32929f8 --- /dev/null +++ b/compiler/impl/com/intellij/compiler/impl/javaCompiler/api/CompilationEvent.java @@ -0,0 +1,70 @@ +package com.intellij.compiler.impl.javaCompiler.api; + +import com.intellij.compiler.OutputParser; +import com.intellij.openapi.util.text.StringUtil; +import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.vfs.VfsUtil; +import com.intellij.openapi.compiler.CompilerMessageCategory; + +import javax.tools.JavaFileObject; +import javax.tools.Diagnostic; +import java.net.URI; +import java.io.File; + +/** + * @author cdr + */ +@SuppressWarnings({"Since15"}) +abstract class CompilationEvent { + protected abstract void process(OutputParser.Callback callback); + static CompilationEvent progress(final String title, final JavaFileObject fileObject) { + return new CompilationEvent() { + @Override + protected void process(OutputParser.Callback callback) { + showProgressFor(title, fileObject.toUri(), callback); + } + }; + } + + private static void showProgressFor(String title, URI uri, OutputParser.Callback callback) { + callback.setProgressText(title + StringUtil.last(uri.toString(), 70, true)); + } + + static CompilationEvent generateClass(final URI uri, final byte[] bytes) { + return new CompilationEvent() { + @Override + protected void process(OutputParser.Callback callback) { + showProgressFor("Writing ", uri, callback); + File file = new File(uri); + callback.fileGenerated(new com.intellij.compiler.impl.javaCompiler.FileObject(file,bytes)); + } + }; + } + static CompilationEvent diagnostic(final Diagnostic diagnostic) { + return new CompilationEvent() { + @Override + protected void process(OutputParser.Callback callback) { + JavaFileObject fileObject = diagnostic.getSource(); + String message = diagnostic.getMessage(null); + String url = fileObject == null ? null : VfsUtil.pathToUrl(FileUtil.toSystemIndependentName(new File(fileObject.toUri()).getPath())); + + CompilerMessageCategory category = diagnostic.getKind() == Diagnostic.Kind.ERROR + ? CompilerMessageCategory.ERROR + : diagnostic.getKind() == Diagnostic.Kind.WARNING || + diagnostic.getKind() == Diagnostic.Kind.MANDATORY_WARNING + ? CompilerMessageCategory.WARNING + : CompilerMessageCategory.INFORMATION; + callback.message(category, message, url, (int)diagnostic.getLineNumber(), (int)diagnostic.getColumnNumber()); + } + }; + } + + public static CompilationEvent fileProcessed() { + return new CompilationEvent() { + @Override + protected void process(OutputParser.Callback callback) { + callback.fileProcessed(null); + } + }; + } +} diff --git a/compiler/impl/com/intellij/compiler/impl/javaCompiler/api/CompilerAPICompiler.java b/compiler/impl/com/intellij/compiler/impl/javaCompiler/api/CompilerAPICompiler.java new file mode 100644 index 000000000000..26f815531939 --- /dev/null +++ b/compiler/impl/com/intellij/compiler/impl/javaCompiler/api/CompilerAPICompiler.java @@ -0,0 +1,182 @@ +package com.intellij.compiler.impl.javaCompiler.api; + +import com.intellij.compiler.OutputParser; +import com.intellij.compiler.impl.CompilerUtil; +import com.intellij.compiler.impl.javaCompiler.BackendCompiler; +import com.intellij.compiler.impl.javaCompiler.DependencyProcessor; +import com.intellij.compiler.impl.javaCompiler.ModuleChunk; +import com.intellij.compiler.impl.javaCompiler.javac.JavacCompiler; +import com.intellij.compiler.impl.javaCompiler.javac.JavacConfigurable; +import com.intellij.compiler.impl.javaCompiler.javac.JavacSettings; +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.fileTypes.FileType; +import com.intellij.openapi.fileTypes.StdFileTypes; +import com.intellij.openapi.module.Module; +import com.intellij.openapi.options.Configurable; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.projectRoots.Sdk; +import com.intellij.openapi.roots.ModuleRootManager; +import com.intellij.openapi.roots.ProjectRootManager; +import com.intellij.openapi.ui.Messages; +import com.intellij.openapi.util.Computable; +import com.intellij.openapi.vfs.VirtualFile; +import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.*; + + +public class CompilerAPICompiler implements BackendCompiler { + private final Project myProject; + private int myExitCode; + private static final Set COMPILABLE_TYPES = Collections.singleton(StdFileTypes.JAVA); + private final CompAPIDriver myCompAPIDriver = new CompAPIDriver(); + + public CompilerAPICompiler(Project project) { + myProject = project; + } + + public DependencyProcessor getDependencyProcessor() { + return null; + } + + public boolean checkCompiler(final CompileScope scope) { + final Module[] modules = scope.getAffectedModules(); + final Set checkedJdks = new HashSet(); + for (final Module module : modules) { + final Sdk jdk = ModuleRootManager.getInstance(module).getSdk(); + if (jdk == null) { + continue; + } + checkedJdks.add(jdk); + } + Sdk projectJdk = ProjectRootManager.getInstance(myProject).getProjectJdk(); + if (projectJdk != null) checkedJdks.add(projectJdk); + + for (Sdk sdk : checkedJdks) { + if (!CompilerUtil.isOfVersion(sdk.getVersionString(), "1.6")) { + Messages.showErrorDialog(myProject, "Compiler API supports JDK of version 6 only: "+sdk.getVersionString(), "Incompatible JDK"); + return false; + } + } + return true; + } + + @NotNull + @NonNls + // used for externalization + public String getId() { + return "compAPI"; + } + + @NotNull + public String getPresentableName() { + return "Javac in-process (Java6 only)"; + } + + @NotNull + public Configurable createConfigurable() { + return new JavacConfigurable(JavacSettings.getInstance(myProject)); + } + + @NotNull + public Set getCompilableFileTypes() { + return COMPILABLE_TYPES; + } + + @Nullable + public OutputParser createErrorParser(@NotNull final String outputDir) { + return new OutputParser() { + public boolean processMessageLine(Callback callback) { + return myCompAPIDriver.processAll(callback); + } + }; + } + + @Nullable + public OutputParser createOutputParser(@NotNull final String outputDir) { + return null; + } + + public void compileFinished() { + myCompAPIDriver.finish(); + } + + @NotNull + public Process launchProcess(@NotNull final ModuleChunk chunk, @NotNull final String outputDir, @NotNull final CompileContext compileContext) throws IOException { + final IOException[] ex = {null}; + @NonNls final List commandLine = ApplicationManager.getApplication().runReadAction(new Computable>() { + public List compute() { + try { + List commandLine = new ArrayList(); + JavacSettings javacSettings = JavacSettings.getInstance(myProject); + final List additionalOptions = + JavacCompiler.addAdditionalSettings(commandLine, javacSettings, false, false, false, false, false); + + JavacCompiler.addCommandLineOptions(chunk, commandLine, outputDir, chunk.getJdk(), false,false, null, false, false); + commandLine.addAll(additionalOptions); + return commandLine; + } + catch (IOException e) { + ex[0] = e; + } + return null; + } + }); + if (ex[0] != null) { + throw ex[0]; + } + + return new Process() { + public OutputStream getOutputStream() { + throw new UnsupportedOperationException(); + } + + public InputStream getInputStream() { + return null; + } + + public InputStream getErrorStream() { + return null; + } + + public void destroy() { + } + + public int waitFor() { + try { + //commandLine.remove("-verbose"); + compile(commandLine, chunk, outputDir); + myExitCode = 0; + return myExitCode; + } + catch (Exception e) { + compileContext.addMessage(CompilerMessageCategory.ERROR, e.getMessage(), null, -1, -1); + myExitCode = -1; + return -1; + } + } + + public int exitValue() { + return myExitCode; + } + }; + } + + private void compile(List commandLine, ModuleChunk chunk, String outputDir) { + VirtualFile[] filesToCompile = chunk.getFilesToCompile(); + List paths = new ArrayList(filesToCompile.length); + for (VirtualFile file : filesToCompile) { + paths.add(new File(file.getPresentableUrl())); + } + myCompAPIDriver.compile(commandLine, paths, outputDir); + } +} \ No newline at end of file diff --git a/compiler/impl/com/intellij/compiler/impl/javaCompiler/api/MyFileManager.java b/compiler/impl/com/intellij/compiler/impl/javaCompiler/api/MyFileManager.java new file mode 100644 index 000000000000..49f221d220e8 --- /dev/null +++ b/compiler/impl/com/intellij/compiler/impl/javaCompiler/api/MyFileManager.java @@ -0,0 +1,126 @@ +package com.intellij.compiler.impl.javaCompiler.api; + +import com.intellij.openapi.fileEditor.impl.LoadTextUtil; +import com.intellij.openapi.vfs.LocalFileSystem; +import com.intellij.openapi.vfs.VirtualFile; +import com.sun.tools.javac.util.Context; +import com.sun.tools.javac.util.DefaultFileManager; +import gnu.trove.THashMap; + +import javax.tools.FileObject; +import javax.tools.JavaFileObject; +import javax.tools.SimpleJavaFileObject; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** +* @author cdr +*/ +class MyFileManager extends DefaultFileManager { + private final String myOutputDir; + private final CompAPIDriver myCompAPIDriver; + private final Map uri2Output = new THashMap(); + private final Map uri2Source = new THashMap(); + + MyFileManager(CompAPIDriver compAPIDriver, String outputDir) { + super(new Context(), false, null); + myCompAPIDriver = compAPIDriver; + myOutputDir = outputDir; + } + + @Override + public Iterable getJavaFileObjectsFromFiles(Iterable files) { + //return super.getJavaFileObjectsFromFiles(files); + int size = ((Collection)files).size(); + List result = new ArrayList(size); + + for (File file : files) { + result.add(getSource(file)); + } + + return result; + } + + private JavaFileObject getSource(File file) { + URI uri = file.toURI(); + JavaFileObject fileObject = uri2Source.get(uri); + if (fileObject == null) { + fileObject = new JavaFile(file); + uri2Source.put(uri, fileObject); + } + return fileObject; + } + private JavaFileObject getOutput(URI uri) { + JavaFileObject fileObject = uri2Output.get(uri); + if (fileObject == null) { + fileObject = new Output(uri) { + protected void offerClassFile(URI uri, byte[] bytes) { + myCompAPIDriver.offer(CompilationEvent.generateClass(uri, bytes)); + } + }; + uri2Output.put(uri, fileObject); + } + return fileObject; + } + + @Override + public JavaFileObject getJavaFileForOutput(Location location, String name, JavaFileObject.Kind kind, FileObject fileObject) { + return getOutput(toURI(myOutputDir,name)); + } + + private static class JavaFile extends SimpleJavaFileObject { + private final File myFile; + + protected JavaFile(File file) { + super(file.toURI(), Kind.SOURCE); + myFile = file; + } + + @Override + public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException { + VirtualFile virtualFile = LocalFileSystem.getInstance().findFileByIoFile(myFile); + if (virtualFile == null) return null; + return LoadTextUtil.loadText(virtualFile); + } + + @Override + public String toString() { + return toUri().toString(); + } + } + + private abstract static class Output extends SimpleJavaFileObject { + private Output(URI uri) { + super(uri, Kind.CLASS); + } + + @Override + public ByteArrayOutputStream openOutputStream() { + return new ByteArrayOutputStream() { + @Override + public void close() throws IOException { + super.close(); + offerClassFile(toUri(), toByteArray()); + } + }; + } + + protected abstract void offerClassFile(URI uri, byte[] bytes); + } + + private static URI toURI(String outputDir, String name) { + try { + return new URI("file:///" + outputDir.replace('\\','/') + "/" + name.replace('.', '/') + JavaFileObject.Kind.CLASS.extension); + } + catch (URISyntaxException exception) { + throw new Error(exception); + } + } +} diff --git a/compiler/impl/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompilerDriver.java b/compiler/impl/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompilerDriver.java index 528bddd55388..e914943852b9 100644 --- a/compiler/impl/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompilerDriver.java +++ b/compiler/impl/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompilerDriver.java @@ -19,6 +19,7 @@ package com.intellij.compiler.impl.javaCompiler.eclipse; import com.intellij.compiler.OutputParser; +import com.intellij.compiler.impl.javaCompiler.FileObject; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.compiler.CompilerBundle; import com.intellij.openapi.compiler.CompilerMessageCategory; @@ -55,7 +56,7 @@ import java.util.Map; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; -public class EclipseCompilerDriver implements IEclipseCompilerDriver { +public class EclipseCompilerDriver { private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.impl.javaCompiler.eclipse.EclipseCompilerDriver"); private String[] sourceFilePaths; @@ -183,17 +184,11 @@ public class EclipseCompilerDriver implements IEclipseCompilerDriver { String filePath = String.valueOf(classFile.fileName()); String relativePath = FileUtil.toSystemDependentName(filePath + ".class"); String path = FileUtil.toSystemDependentName(outputDir) + File.separatorChar + relativePath; - - try { - File out = new File(path); - FileUtil.createParentDirs(out); - FileUtil.writeToFile(out, classFile.getBytes()); - } - catch (IOException e) { - LOG.error(e); - } - callback.fileGenerated(path); + byte[] bytes = classFile.getBytes(); + File out = new File(path); + + callback.fileGenerated(new FileObject(out,bytes)); } IProblem[] problems = result.getProblems(); if (problems != null) { diff --git a/compiler/impl/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompilerOutputParser.java b/compiler/impl/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompilerOutputParser.java index 30ddc51c23d0..a191207cc3eb 100644 --- a/compiler/impl/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompilerOutputParser.java +++ b/compiler/impl/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompilerOutputParser.java @@ -1,11 +1,13 @@ package com.intellij.compiler.impl.javaCompiler.eclipse; import com.intellij.compiler.OutputParser; +import com.intellij.compiler.impl.javaCompiler.FileObject; import com.intellij.openapi.compiler.CompilerBundle; import com.intellij.openapi.compiler.CompilerMessageCategory; import com.intellij.openapi.util.io.FileUtil; import org.jetbrains.annotations.NonNls; +import java.io.File; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -61,7 +63,7 @@ public class EclipseCompilerOutputParser extends OutputParser { String path = matcher.group(1); String absPath = FileUtil.toSystemDependentName(myOutputDir + '/' + path); //callback.setProgressText(CompilerBundle.message("eclipse.compiler.writing", absPath)); - callback.fileGenerated(absPath); + callback.fileGenerated(new FileObject(new File(absPath))); return true; } if (COMPILED_PATTERN.matcher(line).matches() || GENERATED_PATTERN.matcher(line).matches()) { diff --git a/compiler/impl/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseEmbeddedCompiler.java b/compiler/impl/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseEmbeddedCompiler.java index 57fb4efa2ba7..68a69234f783 100644 --- a/compiler/impl/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseEmbeddedCompiler.java +++ b/compiler/impl/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseEmbeddedCompiler.java @@ -30,13 +30,13 @@ public class EclipseEmbeddedCompiler implements BackendCompiler { private final Project myProject; private final EclipseCompiler myEclipseExternalCompiler; private int myExitCode; - private IEclipseCompilerDriver myEclipseCompilerDriver; + private final EclipseCompilerDriver myEclipseCompilerDriver; private static final Set COMPILABLE_TYPES = Collections.singleton(StdFileTypes.JAVA); public EclipseEmbeddedCompiler(Project project) { myProject = project; myEclipseExternalCompiler = new EclipseCompiler(project); - createCompileDriver(); + myEclipseCompilerDriver = new EclipseCompilerDriver(); } public DependencyProcessor getDependencyProcessor() { @@ -49,8 +49,8 @@ public class EclipseEmbeddedCompiler implements BackendCompiler { @NotNull @NonNls - public String getId() // used for externalization - { + public String getId() { + // used for externalization return "EclipseEmbedded"; } @@ -70,7 +70,7 @@ public class EclipseEmbeddedCompiler implements BackendCompiler { } @Nullable - public OutputParser createErrorParser(final String outputDir) { + public OutputParser createErrorParser(@NotNull final String outputDir) { return new OutputParser() { public boolean processMessageLine(Callback callback) { return myEclipseCompilerDriver.processMessageLine(callback, outputDir, myProject); @@ -79,7 +79,7 @@ public class EclipseEmbeddedCompiler implements BackendCompiler { } @Nullable - public OutputParser createOutputParser(final String outputDir) { + public OutputParser createOutputParser(@NotNull final String outputDir) { return null; } @@ -88,9 +88,9 @@ public class EclipseEmbeddedCompiler implements BackendCompiler { @NotNull - public Process launchProcess(final ModuleChunk chunk, final String outputDir, final CompileContext compileContext) throws IOException { + public Process launchProcess(@NotNull final ModuleChunk chunk, @NotNull final String outputDir, @NotNull final CompileContext compileContext) throws IOException { @NonNls final ArrayList commandLine = new ArrayList(); - final IOException[] ex = new IOException[]{null}; + final IOException[] ex = {null}; ApplicationManager.getApplication().runReadAction(new Runnable() { public void run() { try { @@ -141,8 +141,4 @@ public class EclipseEmbeddedCompiler implements BackendCompiler { } }; } - - private void createCompileDriver() { - myEclipseCompilerDriver = new EclipseCompilerDriver(); - } } diff --git a/compiler/impl/com/intellij/compiler/impl/javaCompiler/javac/FilePathActionJavac.java b/compiler/impl/com/intellij/compiler/impl/javaCompiler/javac/FilePathActionJavac.java index 7e9ac583d0a6..bf5971702b46 100644 --- a/compiler/impl/com/intellij/compiler/impl/javaCompiler/javac/FilePathActionJavac.java +++ b/compiler/impl/com/intellij/compiler/impl/javaCompiler/javac/FilePathActionJavac.java @@ -16,12 +16,14 @@ package com.intellij.compiler.impl.javaCompiler.javac; import com.intellij.compiler.OutputParser; +import com.intellij.compiler.impl.javaCompiler.FileObject; import com.intellij.openapi.compiler.CompilerBundle; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.fileTypes.FileTypeManager; import com.intellij.openapi.fileTypes.StdFileTypes; +import java.io.File; import java.util.regex.Matcher; /** @@ -48,8 +50,7 @@ public class FilePathActionJavac extends JavacParserAction { callback.setProgressText(CompilerBundle.message("progress.parsing.file", name)); } else if (StdFileTypes.CLASS.equals(fileType)) { - callback.fileGenerated(filePath); + callback.fileGenerated(new FileObject(new File(filePath))); } } - } diff --git a/compiler/impl/com/intellij/compiler/impl/javaCompiler/javac/JavacCompiler.java b/compiler/impl/com/intellij/compiler/impl/javaCompiler/javac/JavacCompiler.java index 52b26f90f5c7..e5c305140eb8 100644 --- a/compiler/impl/com/intellij/compiler/impl/javaCompiler/javac/JavacCompiler.java +++ b/compiler/impl/com/intellij/compiler/impl/javaCompiler/javac/JavacCompiler.java @@ -21,6 +21,7 @@ import com.intellij.openapi.projectRoots.ex.JavaSdkUtil; import com.intellij.openapi.projectRoots.impl.MockJdkWrapper; import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.openapi.ui.Messages; +import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.pom.java.LanguageLevel; @@ -112,61 +113,54 @@ public class JavacCompiler extends ExternalCompiler { return new JavacConfigurable(JavacSettings.getInstance(myProject)); } - public OutputParser createErrorParser(final String outputDir) { + public OutputParser createErrorParser(@NotNull final String outputDir) { return new JavacOutputParser(myProject); } - public OutputParser createOutputParser(final String outputDir) { + public OutputParser createOutputParser(@NotNull final String outputDir) { return null; } + private static class MyException extends RuntimeException { + private MyException(Throwable cause) { + super(cause); + } + } + @NotNull public String[] createStartupCommand(final ModuleChunk chunk, final CompileContext context, final String outputPath) throws IOException, IllegalArgumentException { - final ArrayList commandLine = new ArrayList(); - - final Exception[] ex = new Exception[]{null}; - ApplicationManager.getApplication().runReadAction(new Runnable() { - public void run() { - try { - createStartupCommand(chunk, commandLine, outputPath); + try { + return ApplicationManager.getApplication().runReadAction(new Computable() { + public String[] compute() { + try { + final List commandLine = new ArrayList(); + createStartupCommand(chunk, commandLine, outputPath, JavacSettings.getInstance(myProject)); + return ArrayUtil.toStringArray(commandLine); + } + catch (IOException e) { + throw new MyException(e); + } } - catch (IllegalArgumentException e) { - ex[0] = e; - } - catch (IOException e) { - ex[0] = e; - } - } - }); - if (ex[0] != null) { - if (ex[0] instanceof IOException) { - throw (IOException)ex[0]; - } - else if (ex[0] instanceof IllegalArgumentException) { - throw (IllegalArgumentException)ex[0]; - } - else { - LOG.error(ex[0]); - } + }); + } + catch (MyException e) { + Throwable cause = e.getCause(); + if (cause instanceof IOException) { + throw (IOException)cause; + } + throw e; } - return ArrayUtil.toStringArray(commandLine); } - private void createStartupCommand(final ModuleChunk chunk, @NonNls final List commandLine, final String outputPath) throws IOException { + private void createStartupCommand(final ModuleChunk chunk, @NonNls final List commandLine, final String outputPath, + JavacSettings javacSettings) throws IOException { final Sdk jdk = getJdkForStartupCommand(chunk); final String versionString = jdk.getVersionString(); if (versionString == null || "".equals(versionString) || !(jdk.getSdkType() instanceof JavaSdkType)) { throw new IllegalArgumentException(CompilerBundle.message("javac.error.unknown.jdk.version", jdk.getName())); } - - final JavaSdkType sdkType = (JavaSdkType)jdk.getSdkType(); - final String toolsJarPath = sdkType.getToolsPath(jdk); - if (toolsJarPath == null) { - throw new IllegalArgumentException(CompilerBundle.message("javac.error.tools.jar.missing", jdk.getName())); - } - final boolean isVersion1_0 = CompilerUtil.isOfVersion(versionString, "1.0"); final boolean isVersion1_1 = CompilerUtil.isOfVersion(versionString, "1.1"); final boolean isVersion1_2 = CompilerUtil.isOfVersion(versionString, "1.2"); @@ -175,11 +169,18 @@ public class JavacCompiler extends ExternalCompiler { final boolean isVersion1_5 = CompilerUtil.isOfVersion(versionString, "1.5") || CompilerUtil.isOfVersion(versionString, "5.0"); final boolean isVersion1_5_or_higher = isVersion1_5 || !(isVersion1_0 || isVersion1_1 || isVersion1_2 || isVersion1_3 || isVersion1_4); - final JavacSettings javacSettings = JavacSettings.getInstance(myProject); + + JavaSdkType sdkType = (JavaSdkType)jdk.getSdkType(); + + final String toolsJarPath = sdkType.getToolsPath(jdk); + if (toolsJarPath == null) { + throw new IllegalArgumentException(CompilerBundle.message("javac.error.tools.jar.missing", jdk.getName())); + } final String vmExePath = sdkType.getVMExecutablePath(jdk); commandLine.add(vmExePath); + if (isVersion1_1 || isVersion1_0) { commandLine.add("-mx" + javacSettings.MAXIMUM_HEAP_SIZE + "m"); } @@ -187,27 +188,8 @@ public class JavacCompiler extends ExternalCompiler { commandLine.add("-Xmx" + javacSettings.MAXIMUM_HEAP_SIZE + "m"); } - final List additionalOptions = new ArrayList(); - StringTokenizer tokenizer = new StringTokenizer(javacSettings.getOptionsString(), " "); - while (tokenizer.hasMoreTokens()) { - @NonNls String token = tokenizer.nextToken(); - if (isVersion1_0) { - if ("-deprecation".equals(token)) { - continue; // not supported for this version - } - } - if (isVersion1_0 || isVersion1_1 || isVersion1_2 || isVersion1_3 || isVersion1_4) { - if ("-Xlint".equals(token)) { - continue; // not supported in these versions - } - } - if (token.startsWith("-J-")) { - commandLine.add(token.substring("-J".length())); - } - else { - additionalOptions.add(token); - } - } + final List additionalOptions = + addAdditionalSettings(commandLine, javacSettings, isVersion1_0, isVersion1_1, isVersion1_2, isVersion1_3, isVersion1_4); CompilerUtil.addLocaleOptions(commandLine, false); @@ -229,40 +211,9 @@ public class JavacCompiler extends ExternalCompiler { commandLine.add(JAVAC_MAIN_CLASS); } - LanguageLevel languageLevel = chunk.getLanguageLevel(); - CompilerUtil.addSourceCommandLineSwitch(jdk, languageLevel, commandLine); + addCommandLineOptions(chunk, commandLine, outputPath, jdk, isVersion1_0, isVersion1_1, myTempFiles, true, true); - commandLine.add("-verbose"); - - final String cp = chunk.getCompilationClasspath(); - final String bootCp = chunk.getCompilationBootClasspath(); - - final String classPath; - if (isVersion1_0 || isVersion1_1) { - classPath = bootCp + File.pathSeparator + cp; - } - else { - classPath = cp; - commandLine.add("-bootclasspath"); - addClassPathValue(jdk, false, commandLine, bootCp, "javac_bootcp"); - } - - commandLine.add("-classpath"); - addClassPathValue(jdk, isVersion1_0, commandLine, classPath, "javac_cp"); - - if (!isVersion1_1 && !isVersion1_0) { - commandLine.add("-sourcepath"); - // this way we tell the compiler that the sourcepath is "empty". However, javac thinks that sourcepath is 'new File("")' - // this may cause problems if we have java code in IDEA working directory - commandLine.add("\"\""); - } - - commandLine.add("-d"); - commandLine.add(outputPath.replace('/', File.separatorChar)); - - for (String option : additionalOptions) { - commandLine.add(option); - } + commandLine.addAll(additionalOptions); final VirtualFile[] files = chunk.getFilesToCompile(); @@ -298,11 +249,80 @@ public class JavacCompiler extends ExternalCompiler { } } - private void addClassPathValue(final Sdk jdk, - final boolean isVersion1_0, - final List commandLine, - final String cpString, - @NonNls final String tempFileName) throws IOException { + public static List addAdditionalSettings(List commandLine, JavacSettings javacSettings, + boolean version1_0, + boolean version1_1, + boolean version1_2, + boolean version1_3, + boolean version1_4) { + final List additionalOptions = new ArrayList(); + StringTokenizer tokenizer = new StringTokenizer(javacSettings.getOptionsString(), " "); + while (tokenizer.hasMoreTokens()) { + @NonNls String token = tokenizer.nextToken(); + if (version1_0) { + if ("-deprecation".equals(token)) { + continue; // not supported for this version + } + } + if (version1_0 || version1_1 || version1_2 || version1_3 || version1_4) { + if ("-Xlint".equals(token)) { + continue; // not supported in these versions + } + } + if (token.startsWith("-J-")) { + commandLine.add(token.substring("-J".length())); + } + else { + additionalOptions.add(token); + } + } + return additionalOptions; + } + + public static void addCommandLineOptions(ModuleChunk chunk, @NonNls List commandLine, String outputPath, Sdk jdk, + boolean version1_0, + boolean version1_1, + List tempFiles, boolean addSourcePath, boolean useTempFile) throws IOException { + + LanguageLevel languageLevel = chunk.getLanguageLevel(); + CompilerUtil.addSourceCommandLineSwitch(jdk, languageLevel, commandLine); + + commandLine.add("-verbose"); + + final String cp = chunk.getCompilationClasspath(); + final String bootCp = chunk.getCompilationBootClasspath(); + + final String classPath; + if (version1_0 || version1_1) { + classPath = bootCp + File.pathSeparator + cp; + } + else { + classPath = cp; + commandLine.add("-bootclasspath"); + addClassPathValue(jdk, false, commandLine, bootCp, "javac_bootcp", tempFiles, useTempFile); + } + + commandLine.add("-classpath"); + addClassPathValue(jdk, version1_0, commandLine, classPath, "javac_cp", tempFiles, useTempFile); + + if (!version1_1 && !version1_0 && addSourcePath) { + commandLine.add("-sourcepath"); + // this way we tell the compiler that the sourcepath is "empty". However, javac thinks that sourcepath is 'new File("")' + // this may cause problems if we have java code in IDEA working directory + commandLine.add("\"\""); + } + + commandLine.add("-d"); + commandLine.add(outputPath.replace('/', File.separatorChar)); + } + + private static void addClassPathValue(final Sdk jdk, final boolean isVersion1_0, final List commandLine, final String cpString, @NonNls final String tempFileName, + List tempFiles, + boolean useTempFile) throws IOException { + if (!useTempFile) { + commandLine.add(cpString); + return; + } // must include output path to classpath, otherwise javac will compile all dependent files no matter were they compiled before or not if (isVersion1_0) { commandLine.add(((JavaSdkType)jdk.getSdkType()).getToolsPath(jdk) + File.pathSeparator + cpString); @@ -310,7 +330,7 @@ public class JavacCompiler extends ExternalCompiler { else { File cpFile = FileUtil.createTempFile(tempFileName, ".tmp"); cpFile.deleteOnExit(); - myTempFiles.add(cpFile); + tempFiles.add(cpFile); final DataOutputStream out = new DataOutputStream(new BufferedOutputStream(new FileOutputStream(cpFile))); try { CompilerIOUtil.writeString(cpString, out); @@ -337,5 +357,6 @@ public class JavacCompiler extends ExternalCompiler { public void compileFinished() { FileUtil.asyncDelete(myTempFiles); + myTempFiles.clear(); } } diff --git a/compiler/impl/com/intellij/compiler/impl/javaCompiler/jikes/JikesCompiler.java b/compiler/impl/com/intellij/compiler/impl/javaCompiler/jikes/JikesCompiler.java index 59db836113e2..d7cf1d4a6e1a 100644 --- a/compiler/impl/com/intellij/compiler/impl/javaCompiler/jikes/JikesCompiler.java +++ b/compiler/impl/com/intellij/compiler/impl/javaCompiler/jikes/JikesCompiler.java @@ -99,12 +99,12 @@ public class JikesCompiler extends ExternalCompiler { return new JikesConfigurable(JikesSettings.getInstance(myProject)); } - public OutputParser createErrorParser(final String outputDir) { + public OutputParser createErrorParser(@NotNull final String outputDir) { return new JikesOutputParser(myProject); } @Nullable - public OutputParser createOutputParser(final String outputDir) { + public OutputParser createOutputParser(@NotNull final String outputDir) { return null; } diff --git a/compiler/impl/com/intellij/compiler/impl/javaCompiler/jikes/ParserActionJikes.java b/compiler/impl/com/intellij/compiler/impl/javaCompiler/jikes/ParserActionJikes.java index 8832fa66f926..4c1a5b24246f 100644 --- a/compiler/impl/com/intellij/compiler/impl/javaCompiler/jikes/ParserActionJikes.java +++ b/compiler/impl/com/intellij/compiler/impl/javaCompiler/jikes/ParserActionJikes.java @@ -22,6 +22,7 @@ import com.intellij.openapi.fileTypes.StdFileTypes; import com.intellij.openapi.util.text.StringUtil; import com.intellij.compiler.ParserAction; import com.intellij.compiler.OutputParser; +import com.intellij.compiler.impl.javaCompiler.FileObject; import org.jetbrains.annotations.NonNls; import java.io.File; @@ -81,7 +82,7 @@ public class ParserActionJikes extends ParserAction { callback.setProgressText(CompilerBundle.message("progress.parsing.file", name)); } else if (StdFileTypes.CLASS.equals(fileType)) { - callback.fileGenerated(filePath); + callback.fileGenerated(new FileObject(new File(filePath))); } } } diff --git a/compiler/impl/com/intellij/compiler/impl/resourceCompiler/ResourceCompiler.java b/compiler/impl/com/intellij/compiler/impl/resourceCompiler/ResourceCompiler.java index 2a8851b55005..28976eeea8b9 100644 --- a/compiler/impl/com/intellij/compiler/impl/resourceCompiler/ResourceCompiler.java +++ b/compiler/impl/com/intellij/compiler/impl/resourceCompiler/ResourceCompiler.java @@ -57,7 +57,7 @@ public class ResourceCompiler implements TranslatingCompiler { return !StdFileTypes.JAVA.equals(FILE_TYPE_MANAGER.getFileTypeByFile(file)) && myConfiguration.isResourceFile(file.getName()); } - public TranslatingCompiler.ExitStatus compile(final CompileContext context, final VirtualFile[] files) { + public ExitStatus compile(final CompileContext context, final VirtualFile[] files) { context.getProgressIndicator().pushState(); context.getProgressIndicator().setText(CompilerBundle.message("progress.copying.resources")); @@ -116,6 +116,7 @@ public class ResourceCompiler implements TranslatingCompiler { break; } context.getProgressIndicator().setFraction(i * 1.0 / copyCommands.size()); + context.getProgressIndicator().setText2("Copying "+command.getToPath()+"..."); try { final MyOutputItem outputItem = command.copy(filesToRefresh); processed.add(outputItem); @@ -128,7 +129,7 @@ public class ResourceCompiler implements TranslatingCompiler { ); } } - if (filesToRefresh.size() > 0) { + if (!filesToRefresh.isEmpty()) { CompilerUtil.refreshIOFiles(filesToRefresh); } @@ -145,7 +146,7 @@ public class ResourceCompiler implements TranslatingCompiler { private final String myToPath; private final VirtualFile mySourceFile; - public CopyCommand(String outputPath, String fromPath, String toPath, VirtualFile sourceFile) { + private CopyCommand(String outputPath, String fromPath, String toPath, VirtualFile sourceFile) { myOutputPath = outputPath; myFromPath = fromPath; myToPath = toPath; @@ -181,7 +182,7 @@ public class ResourceCompiler implements TranslatingCompiler { private final String myTargetPath; private final VirtualFile myFile; - public MyOutputItem(String outputPath, String targetPath, VirtualFile file) { + private MyOutputItem(String outputPath, String targetPath, VirtualFile file) { myOutputPath = outputPath; myTargetPath = targetPath; myFile = file; @@ -202,7 +203,7 @@ public class ResourceCompiler implements TranslatingCompiler { private static class MyExitStatus implements ExitStatus { private final OutputItem[] myItemsArray; - public MyExitStatus(OutputItem[] itemsArray) { + private MyExitStatus(OutputItem[] itemsArray) { myItemsArray = itemsArray; } diff --git a/compiler/impl/com/intellij/compiler/impl/rmiCompiler/RmicCompiler.java b/compiler/impl/com/intellij/compiler/impl/rmiCompiler/RmicCompiler.java index ef76e8ab0b53..7a431baa3094 100644 --- a/compiler/impl/com/intellij/compiler/impl/rmiCompiler/RmicCompiler.java +++ b/compiler/impl/com/intellij/compiler/impl/rmiCompiler/RmicCompiler.java @@ -5,6 +5,7 @@ import com.intellij.compiler.RmicSettings; import com.intellij.compiler.impl.CompilerUtil; import com.intellij.compiler.impl.javaCompiler.CompilerParsingThread; import com.intellij.compiler.impl.javaCompiler.CompilerParsingThreadImpl; +import com.intellij.compiler.impl.javaCompiler.FileObject; import com.intellij.compiler.make.Cache; import com.intellij.compiler.make.CacheCorruptedException; import com.intellij.compiler.make.DependencyCache; @@ -230,8 +231,9 @@ public class RmicCompiler implements ClassPostProcessingCompiler{ final Process process = Runtime.getRuntime().exec(cmdLine); final Set successfullyCompiledItems = new HashSet(); final CompilerParsingThread parsingThread = new CompilerParsingThreadImpl(process, context, outputParser, false, true) { - protected void processCompiledClass(String classFileToProcess) { - final RmicProcessingItem item = pathToItemMap.get(classFileToProcess.replace(File.separatorChar, '/')); + protected void processCompiledClass(FileObject classFileToProcess) { + String key = classFileToProcess.getFile().getPath().replace(File.separatorChar, '/'); + final RmicProcessingItem item = pathToItemMap.get(key); if (item != null) { successfullyCompiledItems.add(item); } @@ -251,9 +253,9 @@ public class RmicCompiler implements ClassPostProcessingCompiler{ try { parsingThreadFuture.get(); } - catch (InterruptedException e) { + catch (InterruptedException ignored) { } - catch (ExecutionException e) { + catch (ExecutionException ignored) { } return successfullyCompiledItems.toArray(new RmicProcessingItem[successfullyCompiledItems.size()]); } @@ -407,7 +409,7 @@ public class RmicCompiler implements ClassPostProcessingCompiler{ private final long mySkelTimestamp; private final long myTieTimestamp; - public RemoteClassValidityState(long remoteClassTimestamp, long stubTimestamp, long skelTimestamp, long tieTimestamp) { + private RemoteClassValidityState(long remoteClassTimestamp, long stubTimestamp, long skelTimestamp, long tieTimestamp) { myRemoteClassTimestamp = remoteClassTimestamp; myStubTimestamp = stubTimestamp; mySkelTimestamp = skelTimestamp; @@ -443,7 +445,7 @@ public class RmicCompiler implements ClassPostProcessingCompiler{ private final File myTie; private boolean myIsRemoteObject = false; - public RmicProcessingItem(Module module, final VirtualFile outputClassFile, File outputDir, String qName) { + private RmicProcessingItem(Module module, final VirtualFile outputClassFile, File outputDir, String qName) { myModule = module; myOutputClassFile = outputClassFile; myOutputDir = outputDir; diff --git a/lib/dev/compilerapi.jar b/lib/dev/compilerapi.jar new file mode 100644 index 0000000000000000000000000000000000000000..b5bf1f3d8ed7ad3e0337c6d0a33081c4d10ad540 GIT binary patch literal 72275 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 z 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%0Dup zXkcS&^kWz3KD|3WU=Mr(h{PfQ<*ry@KXHHMA{ju~imBO&uK;q206?a{(^^E- z|9}dVI&r{R)9)G#geJC?V59&LLLWegyU-?pERKI7=RXbpKWOIPx7s^IHG>%d&G!rR z2IhYY&GLI_g1MH1Lx7$Q0`!FW4ndr7{#$5(CynEeL&e){1XAUq+eSVg(EklC5D?ls z_?>`Z`M;vduMG#9jVxtRJqiFPSAn+Z4sZ|ae*y-K|G(oR5H|O^Y*-&aYF+@T@4||+ z|2MF|;UEx}pll7JilTAChz1qEoU6hN5os-B?Oe*(2P zGIIDG4S=`xwwm)F7aRC{)PxZTwbEQ6ySE@Dgc+^4iT=U{wrKT8(XvA z2^tVwMLeOA955bYGv2os$g=+p`0q)KU-B`?13=ycK*%-QohAqC{25i%UeDGR5H|!= z?qA%@ZX5E%e}QUbgKRNWc&?A(8k)) z$i6q9fj{txM0PMR0F>LskCjP*dH2M?nh285*fTB$SG~@1= zN@)C_aew6)(BLd0#6?d7+W7$>WGp|40C=;p{0pX#k+GhWrQ9nr3K(<+@6_h& z^uN`nU}WNCsb>%5+il08+Y$_98udJ%Ryu%^F;D>0ey75gm;YOZimq1rHkNwFznrWhP?i_$^aRg|5}r$9DLRgpj-NYDX8$RdO$#q{Qu{gfHV}hHZ*ei zYn8WCQv*hsThEh_|Nkog6aQ}K$h^zH=GgzQTK^_2w{J=TrrrGc6s7)8mHn#O!0T3S z-ve^j>S6T$1^&+EE4K%c-`ybcv&nINKm4U`m-*d|B0tO2{$H7&YmXmmK;U=)n(^~C z2jZW_0B@`JO8)k~k=x1%gu8vy05B^0=My#fqw(Jx@)Pb?(gGdDZik+e|AYa&i46Y< z>E1mB_ZxRRn49blx4Z+^?S?QdEEjOM%@=XqC>kSFdT z{V|sLc7K7Gw0;kruBU>KbVUX|Q zU0h%@1^*gbbekAJ?Au`%faS`q2W|P!*uTmq5bJiN!rlH4ul$MyWc}~MHtx6aw!8UV zW!zr(6Iy`!3pVd|q!84=9wk-I(rb(8sTL!T#)LdK(kiz}wz2cbAZchxai5<_>iq_O`Rd zT|=aI{Cn6R4i>+g$pRaC`>2%UCm8{6W~YBg{5@xGA24Fv!MnP+iwE3+{}lsx6nT3` zpY#p}=GCtlKX&nN9ZcRP8xZjJe(_xu{_^0#9cv40)DOTPje~#$wm}H+M;FkeS+ECy G-~JzOo6`dT literal 0 HcmV?d00001 diff --git a/plugins/ant/src/com/intellij/lang/ant/config/execution/OutputParser.java b/plugins/ant/src/com/intellij/lang/ant/config/execution/OutputParser.java index 9ff9652bf248..24cb2c3bc267 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/execution/OutputParser.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/execution/OutputParser.java @@ -2,6 +2,7 @@ package com.intellij.lang.ant.config.execution; import com.intellij.compiler.impl.javaCompiler.javac.JavacOutputParser; import com.intellij.compiler.impl.javaCompiler.jikes.JikesOutputParser; +import com.intellij.compiler.impl.javaCompiler.FileObject; import com.intellij.execution.process.OSProcessHandler; import com.intellij.lang.ant.AntBundle; import com.intellij.openapi.application.ApplicationManager; @@ -263,7 +264,7 @@ public class OutputParser{ public void fileProcessed(String path) { } - public void fileGenerated(String path) { + public void fileGenerated(FileObject path) { } }; try { diff --git a/resources_eng/src/messages/CompilerBundle.properties b/resources_eng/src/messages/CompilerBundle.properties index bcb35b94022c..abef44e30153 100644 --- a/resources_eng/src/messages/CompilerBundle.properties +++ b/resources_eng/src/messages/CompilerBundle.properties @@ -140,7 +140,7 @@ eclipse.options.group.title=Eclipse Options eclipse.compiler.parsing=Parsing {0} eclipse.compiler.reading=Reading classes eclipse.compiler.analyzing=Analyzing {0} -compiler.eclipse.embedded.name=Eclipse embedded (faster, but requires more/leaks memory) +compiler.eclipse.embedded.name=Eclipse in-process generate.ant.build.title=Generate Ant Build generate.ant.build.progress.message=Generating ant build... diff --git a/ui-designer/impl/com/intellij/uiDesigner/make/Form2ByteCodeCompiler.java b/ui-designer/impl/com/intellij/uiDesigner/make/Form2ByteCodeCompiler.java index 579eff891813..3650fea2db34 100644 --- a/ui-designer/impl/com/intellij/uiDesigner/make/Form2ByteCodeCompiler.java +++ b/ui-designer/impl/com/intellij/uiDesigner/make/Form2ByteCodeCompiler.java @@ -153,7 +153,7 @@ public final class Form2ByteCodeCompiler implements ClassInstrumentingCompiler { } }); - return items.toArray(new FileProcessingCompiler.ProcessingItem[items.size()]); + return items.toArray(new ProcessingItem[items.size()]); } private static boolean belongsToCompileScope(final CompileContext context, final VirtualFile formFile, final String classToBind) { @@ -184,7 +184,7 @@ public final class Form2ByteCodeCompiler implements ClassInstrumentingCompiler { return module2formFiles; } - private HashMap> sortByModules(final FileProcessingCompiler.ProcessingItem[] items) { + private HashMap> sortByModules(final ProcessingItem[] items) { final HashMap> module2formFiles = new HashMap>(); for (ProcessingItem item1 : items) { final MyInstrumentationItem item = (MyInstrumentationItem)item1; @@ -282,7 +282,7 @@ public final class Form2ByteCodeCompiler implements ClassInstrumentingCompiler { final ArrayList list = module2itemsList.get(module); for (final MyInstrumentationItem item : list) { - context.getProgressIndicator().setFraction((double)(++formsProcessed) / ((double)items.length)); + context.getProgressIndicator().setFraction((double)++formsProcessed / (double)items.length); final VirtualFile formFile = item.getFormFile();