Merge pull request #77 from Codeforces/dev-mikemirzayanov

Dev mikemirzayanov
Codeforces · Dec 7, 2023 · 04329ed · 04329ed
2 parents a26efcf + 790f7a7
commit 04329ed
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/code/src/main/java/com/codeforces/commons/text/StringUtil.java b/code/src/main/java/com/codeforces/commons/text/StringUtil.java
@@ -66,7 +66,7 @@ public final class StringUtil {
     private static final Logger logger = Logger.getLogger(StringUtil.class);
 
     private static final Pattern FORMAT_COMMENTS_COMMENT_SPLIT_PATTERN = Pattern.compile("\\[pre]|\\[/pre]");
-    private static final Pattern FORMAT_COMMENTS_LINE_BREAK_REPLACE_PATTERN = Pattern.compile("[\n\r][\n\r]+");
+    private static final Pattern FORMAT_COMMENTS_LINE_BREAK_REPLACE_PATTERN = Pattern.compile("[\n\r][\\s\\u200B]*[\n\r]+");
 
     private static final Map<Class, ToStringConverter> toStringConverterByClass = new HashMap<>();
     private static final ReadWriteLock toStringConverterByClassMapLock = new ReentrantReadWriteLock();

diff --git a/code/src/test/java/com/codeforces/commons/text/StringUtilTest.java b/code/src/test/java/com/codeforces/commons/text/StringUtilTest.java
@@ -383,4 +383,11 @@ private static void internalTestLooksLikeUtilDifferent(String... strings) {
     private static void internalTestSplit(String s, char c, String[] parts) {
         assertArrayEquals("Illegal split of '" + s + "' by '" + c + "'.", parts, StringUtil.split(s, c));
     }
+
+    @Test
+    public void testWellformForWindows() {
+        assertEquals("1\r\n", StringUtil.wellformForWindows("\r\n\r\n  1   \r\n  \r\n  "));
+        assertEquals("a b c\r\nd e\r\n", StringUtil.wellformForWindows("\r\n\r\n  a  b     c     \r\n  d      e"));
+        assertEquals("a b c\r\n\r\nd e\r\n", StringUtil.wellformForWindows("a b c\r\n\r\nd e\r\n"));
+    }
 }