Restore -style PRETTY as a default for regular superdevmode. Change-Id: I67acff303848e82ddbb2632d86edbf2eb81805a4
diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/Options.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/Options.java index ad623bd..260e8a5 100644 --- a/dev/codeserver/java/com/google/gwt/dev/codeserver/Options.java +++ b/dev/codeserver/java/com/google/gwt/dev/codeserver/Options.java
@@ -91,7 +91,9 @@ private OptionMethodNameDisplayMode.Mode methodNameDisplayMode = OptionMethodNameDisplayMode.Mode.NONE; private boolean closureFormattedOutput = false; - private JsOutputOption output = JsOutputOption.OBFUSCATED; + // Incremental superdevmod has different defaults than devmode and regular superdevmode; we use + // null here means not set by the user (and the right default is computed by getOutput(). + private JsOutputOption output = null; private final ListMultimap<String, String> properties = LinkedListMultimap.create(); @@ -313,6 +315,9 @@ } JsOutputOption getOutput() { + if (output == null) { + return isIncrementalCompileEnabled() ? JsOutputOption.OBFUSCATED : JsOutputOption.PRETTY; + } return output; }