File tree Expand file tree Collapse file tree 1 file changed +12
-12
lines changed
lib/src/jackson/java/com/diffplug/spotless/glue/json Expand file tree Collapse file tree 1 file changed +12
-12
lines changed Original file line number Diff line number Diff line change @@ -88,23 +88,23 @@ protected static class SpotlessJsonPrettyPrinter extends DefaultPrettyPrinter {
8888
8989 public SpotlessJsonPrettyPrinter (boolean spaceBeforeSeparator ) {
9090 this .spaceBeforeSeparator = spaceBeforeSeparator ;
91+
92+ if (_objectFieldValueSeparatorWithSpaces == null || _objectFieldValueSeparatorWithSpaces .isEmpty ()) {
93+ return ;
94+ }
95+
96+ // Keep the behavior consistent even if Jackson changes default behavior
97+ boolean startsWithSpace = Character .isWhitespace (_objectFieldValueSeparatorWithSpaces .charAt (0 ));
98+ if (spaceBeforeSeparator && !startsWithSpace ) {
99+ _objectFieldValueSeparatorWithSpaces = String .format (" %s" , _objectFieldValueSeparatorWithSpaces );
100+ } else if (!spaceBeforeSeparator && startsWithSpace ) {
101+ _objectFieldValueSeparatorWithSpaces = _objectFieldValueSeparatorWithSpaces .substring (1 );
102+ }
91103 }
92104
93105 @ Override
94106 public DefaultPrettyPrinter createInstance () {
95107 return new SpotlessJsonPrettyPrinter (spaceBeforeSeparator );
96108 }
97-
98- @ Override
99- public DefaultPrettyPrinter withSeparators (Separators separators ) {
100- this ._separators = separators ;
101- if (spaceBeforeSeparator ) {
102- // This is Jackson default behavior
103- this ._objectFieldValueSeparatorWithSpaces = " " + separators .getObjectFieldValueSeparator () + " " ;
104- } else {
105- this ._objectFieldValueSeparatorWithSpaces = separators .getObjectFieldValueSeparator () + " " ;
106- }
107- return this ;
108- }
109109 }
110110}
You can’t perform that action at this time.
0 commit comments