Merge pull request #6228 from headius/strftime_space_padding

headius · web-flow · commit af1f4e1ed130 · 2020-05-22T17:27:16.000-05:00
Default to space padding for "special" formats
diff --git a/core/src/main/java/org/jruby/util/RubyDateFormatter.java b/core/src/main/java/org/jruby/util/RubyDateFormatter.java
@@ -275,12 +275,37 @@ public List<Token> compilePattern(ByteList pattern, boolean dateLibrary) {
         lexer.yyreset(reader);
 
         Token token;
+        RubyTimeOutputFormatter formatter = null;
         try {
             while ((token = lexer.yylex()) != null) {
-                if (token.format != Format.FORMAT_SPECIAL) {
+                if (token.format == Format.FORMAT_OUTPUT) {
+                    formatter = (RubyTimeOutputFormatter) token.data;
+                } else if (token.format != Format.FORMAT_SPECIAL) {
+                    if (formatter != null) {
+                        compiledPattern.add(new Token(Format.FORMAT_OUTPUT, formatter));
+                        formatter = null;
+                    }
                     compiledPattern.add(token);
                 } else {
                     char c = (Character) token.data;
+
+                    // prepare padding if necessary
+                    if (formatter != null) {
+                        switch (c) {
+                            default:
+                                // force most formats to use spaces for padding unless otherwise specified
+                                if (formatter.flags == "" || formatter.flags == null) {
+                                    compiledPattern.add(new Token(Format.FORMAT_OUTPUT, new RubyTimeOutputFormatter("_", formatter.width)));
+                                    break;
+                                }
+                                // fall through
+                            case 'Q':
+                            case '+':
+                                compiledPattern.add(new Token(Format.FORMAT_OUTPUT, formatter));
+                        }
+                        formatter = null;
+                    }
+
                     switch (c) {
                     case 'c':
                         addToPattern(compiledPattern, "a b e H:M:S Y");
@@ -344,6 +369,11 @@ public List<Token> compilePattern(ByteList pattern, boolean dateLibrary) {
                     }
                 }
             }
+
+            // if formatter is still set we didn't use it, add it as is
+            if (formatter != null) {
+                compiledPattern.add(new Token(Format.FORMAT_OUTPUT, formatter));
+            }
         } catch (IOException e) {
             throw new AssertionError(e); // IOException never happens
         }
