From 320fbfee4dbf17b0e2c467311e0fd062448321c4 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Tue, 26 Mar 2019 01:24:16 +0100 Subject: [fixes #2049] Delombok now figures out usages of ‘var’ and delomboks them as just ‘var’ instead of their actual type. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/delombok/lombok/delombok/Delombok.java | 1 + src/delombok/lombok/delombok/PrettyPrinter.java | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'src/delombok/lombok') diff --git a/src/delombok/lombok/delombok/Delombok.java b/src/delombok/lombok/delombok/Delombok.java index 9582c3b8..8f4f99e5 100755 --- a/src/delombok/lombok/delombok/Delombok.java +++ b/src/delombok/lombok/delombok/Delombok.java @@ -753,6 +753,7 @@ public class Delombok { Object care = callAttributeMethodOnJavaCompiler(delegate, delegate.todo); callFlowMethodOnJavaCompiler(delegate, care); + FormatPreferences fps = new FormatPreferences(formatPrefs); for (JCCompilationUnit unit : roots) { DelombokResult result = new DelombokResult(catcher.getComments(unit), unit, force || options.isChanged(unit), fps); diff --git a/src/delombok/lombok/delombok/PrettyPrinter.java b/src/delombok/lombok/delombok/PrettyPrinter.java index 353bd753..832dbe0a 100644 --- a/src/delombok/lombok/delombok/PrettyPrinter.java +++ b/src/delombok/lombok/delombok/PrettyPrinter.java @@ -648,7 +648,11 @@ public class PrettyPrinter extends JCTree.Visitor { */ try { innermostArrayBracketsAreVarargs = varargs; - print(tree.vartype); + if (tree.vartype == null || tree.vartype.pos == -1) { + print("var"); + } else { + print(tree.vartype); + } } finally { innermostArrayBracketsAreVarargs = false; } -- cgit