Merge pull request #1799 from NationalSecurityAgency/t#1797/newline_bug

#1797 - need to make regex for replacing linebreaks and separators wi…
NationalSecurityAgency · Nov 9, 2022 · 8054e8a · 8054e8a
2 parents b6cd07e + 56bb1c6
commit 8054e8a
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 2 deletions.
diff --git a/service/src/main/java/skills/services/CustomValidator.groovy b/service/src/main/java/skills/services/CustomValidator.groovy
@@ -117,7 +117,11 @@ class CustomValidator {
         // split if
         // - there is at least 2 new lines
         // - markdown separator (3 underscores, 3 dashes, 3 stars)
-        String[] paragraphs = preProcessForMarkdownSupport(description).split("([\n]{2,})|(\n[\\s]*[-_*]{3,})")
+        description = preProcessForMarkdownSupport(description)
+        if (StringUtils.isBlank(description)) {
+            return new CustomValidationResult(valid: true)
+        }
+        String[] paragraphs = description.split("([\n]{2,})|(\n[\\s]*[-_*]{3,})")
 
         CustomValidationResult validationResult = null
         for (String s : paragraphs) {
@@ -139,7 +143,7 @@ class CustomValidator {
 //        String toValidate = s.trim()
 
         // treat all linebreaks and separators as newlines
-        toValidate = toValidate.replaceAll(/(\n\s*[-_*]{3,}^)|(\n<br>)/, '\n')
+        toValidate = toValidate.replaceAll(/(?m)(^\s*[-_*]{3,}\s*$)|(^\s*<br>\s*$)/, '\n')
 
         // remove a single new line above a table and/or codeblock
         toValidate = TABLE_FIX.matcher(toValidate).replaceAll('$2')

diff --git a/service/src/test/java/skills/services/CustomValidatorSpec.groovy b/service/src/test/java/skills/services/CustomValidatorSpec.groovy
@@ -397,6 +397,45 @@ A new sentence after a few new lines
         A Separate me
         ***
         no go""").valid
+
+        validator.validateDescription("""A Separate me
+___
+        A Separate me
+---
+        A Separate me
+***
+        
+        
+        ___
+        
+        A Separate me
+        
+        
+---
+        
+        
+        A Separate me
+        
+        
+        ***
+A
+
+```
+if (a == true) {
+  println 'Hello <br> <br /> World'
+}
+```
+
+
+<br>
+<br>
+<br>
+<br>
+A new sentence after a few new lines
+```""").valid
+
+        validator.validateDescription("""A this is text\n\nA\n\n***\n\n<br>\n""").valid
+        validator.validateDescription("""***""").valid
     }
 
     def "markdown Blockquotes should be considered during validation"() {