From 3f1689f700f8d6295c1915ab02ba280e7c17b87e Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Mon, 9 May 2011 22:19:58 +0200 Subject: [PATCH] correctly implement exclusions from annotation processing (IDEA-69349) --- .../impl/javaCompiler/AnnotationProcessingCompiler.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/AnnotationProcessingCompiler.java b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/AnnotationProcessingCompiler.java index 77d2a7653f80..36cf64ae998c 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/AnnotationProcessingCompiler.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/AnnotationProcessingCompiler.java @@ -115,9 +115,12 @@ public class AnnotationProcessingCompiler implements TranslatingCompiler{ } private boolean isExcludedFromAnnotationProcessing(VirtualFile file, CompileContext context) { + if (!context.isAnnotationProcessorsEnabled()) { + return true; + } final Module module = context.getModuleByFile(file); if (module != null) { - if (!context.isAnnotationProcessorsEnabled()) { + if (!myConfig.isAnnotationProcessingEnabled(module)) { return true; } final String path = CompilerPaths.getAnnotationProcessorsGenerationPath(module); @@ -141,7 +144,7 @@ public class AnnotationProcessingCompiler implements TranslatingCompiler{ } private JavacCompiler getBackEndCompiler() { - CompilerConfigurationImpl configuration = (CompilerConfigurationImpl)CompilerConfiguration.getInstance(myProject); + CompilerConfigurationImpl configuration = (CompilerConfigurationImpl)myConfig; return configuration.getJavacCompiler(); }