diff options
author | Philippe Charles <philippe.charles@nbb.be> | 2018-07-11 14:38:07 +0200 |
---|---|---|
committer | Philippe Charles <philippe.charles@nbb.be> | 2018-07-11 14:38:07 +0200 |
commit | 0f23383e33bc6756f1ff3777e7dabc465c9c8c02 (patch) | |
tree | aa9af178536161efdc4502a43f6938eaed3b6149 /src/core/lombok | |
parent | 37434ba0cba68ea232efea0824d3f71e5e287dc2 (diff) | |
download | lombok-0f23383e33bc6756f1ff3777e7dabc465c9c8c02.tar.gz lombok-0f23383e33bc6756f1ff3777e7dabc465c9c8c02.tar.bz2 lombok-0f23383e33bc6756f1ff3777e7dabc465c9c8c02.zip |
Fix NetBeans 8.x compile-on-save issue.
Diffstat (limited to 'src/core/lombok')
-rw-r--r-- | src/core/lombok/javac/apt/LombokProcessor.java | 5 | ||||
-rw-r--r-- | src/core/lombok/javac/handlers/JavacHandlerUtil.java | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/core/lombok/javac/apt/LombokProcessor.java b/src/core/lombok/javac/apt/LombokProcessor.java index 04b494bf..0e6880e4 100644 --- a/src/core/lombok/javac/apt/LombokProcessor.java +++ b/src/core/lombok/javac/apt/LombokProcessor.java @@ -173,7 +173,10 @@ public class LombokProcessor extends AbstractProcessor { filerFileManagerField.setAccessible(true); filerFileManagerField.set(javacFiler, newFilerManager); - replaceFileManagerJdk9(context, newFilerManager); + if (lombok.javac.Javac.getJavaCompilerVersion() > 8 + && !lombok.javac.handlers.JavacHandlerUtil.inNetbeansCompileOnSave(context)) { + replaceFileManagerJdk9(context, newFilerManager); + } } } catch (Exception e) { throw Lombok.sneakyThrow(e); diff --git a/src/core/lombok/javac/handlers/JavacHandlerUtil.java b/src/core/lombok/javac/handlers/JavacHandlerUtil.java index f335cf94..570d1a7e 100644 --- a/src/core/lombok/javac/handlers/JavacHandlerUtil.java +++ b/src/core/lombok/javac/handlers/JavacHandlerUtil.java @@ -134,11 +134,16 @@ public class JavacHandlerUtil { return inNetbeansEditor(node.getContext()); } - private static boolean inNetbeansEditor(Context context) { + public static boolean inNetbeansEditor(Context context) { Options options = Options.instance(context); return (options.keySet().contains("ide") && !options.keySet().contains("backgroundCompilation")); } - + + public static boolean inNetbeansCompileOnSave(Context context) { + Options options = Options.instance(context); + return (options.keySet().contains("ide") && options.keySet().contains("backgroundCompilation")); + } + public static JCTree getGeneratedBy(JCTree node) { return JCTree_generatedNode.get(node); } |