rearrange

Sam Pullara · Sam Pullara · commit 3eb80e81552e · 2012-09-24T14:36:32.000-07:00
diff --git a/compiler/src/main/java/com/github/mustachejava/util/HtmlEscaper.java b/compiler/src/main/java/com/github/mustachejava/util/HtmlEscaper.java
@@ -15,38 +15,39 @@ public static void escape(String value, Writer writer, boolean escapeEscaped) {
       int length = value.length();
       for (int i = 0; i < length; i++) {
         char c = value.charAt(i);
-        switch (c) {
-          case '&':
-            // If we match an entity or char ref then keep it
-            // as is in the text. Otherwise, replace it.
-            if (!escapeEscaped && matchesEntityRef(i + 1, length, value)) {
-              // If we are at the beginning we can just keep going
-              if (position != 0) {
-                position = append(value, writer, position, i, "&");
-              }
-            } else {
-              position = append(value, writer, position, i, "&amp;");
-            }
-            break;
-          case '<':
-            position = append(value, writer, position, i, "&lt;");
-            break;
-          case '>':
-            position = append(value, writer, position, i, "&gt;");
-            break;
-          case '"':
-            position = append(value, writer, position, i, "&quot;");
-            break;
-          case '\'':
-            position = append(value, writer, position, i, "&#39;");
-            break;
-        }
         if (c <= 13) {
           writer.append(value, position, i);
           writer.append("&#");
           writer.append(String.valueOf((int)c));
           writer.append(";");
           position = i + 1;
+        } else {
+          switch (c) {
+            case '&':
+              // If we match an entity or char ref then keep it
+              // as is in the text. Otherwise, replace it.
+              if (!escapeEscaped && matchesEntityRef(i + 1, length, value)) {
+                // If we are at the beginning we can just keep going
+                if (position != 0) {
+                  position = append(value, writer, position, i, "&");
+                }
+              } else {
+                position = append(value, writer, position, i, "&amp;");
+              }
+              break;
+            case '<':
+              position = append(value, writer, position, i, "&lt;");
+              break;
+            case '>':
+              position = append(value, writer, position, i, "&gt;");
+              break;
+            case '"':
+              position = append(value, writer, position, i, "&quot;");
+              break;
+            case '\'':
+              position = append(value, writer, position, i, "&#39;");
+              break;
+          }
         }
       }
       writer.append(value, position, length);
