Update ANSI escape code regex (#530)

Author: cronik

src/main/java/io/jenkins/plugins/pipelinegraphview/utils/PipelineStepApi.java

@@ -67,9 +67,9 @@ private List<PipelineStep> parseSteps(List<FlowNodeWrapper> stepNodes, String st
         return steps;
     }
 
-    private static String cleanTextContent(String text) {
+    static String cleanTextContent(String text) {
         // strips off all ANSI color codes
-        text = text.replaceAll("\\[\\d+m", "");
+        text = text.replaceAll("\\e\\[(\\d+[;:]?)+m", "");
         return text.trim();
     }
 

src/test/java/io/jenkins/plugins/pipelinegraphview/utils/PipelineStepApiTest.java

@@ -33,6 +33,7 @@
 import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.LoggerRule;
+import org.jvnet.hudson.test.WithoutJenkins;
 
 public class PipelineStepApiTest {
 
@@ -553,4 +554,20 @@ public void gh362_stepsBeforeStepBlockGetValidStatus() throws Exception {
             TestUtils.assertTimesInRange(n, checks.get(n.getName()));
         }
     }
+
+    @Test
+    @WithoutJenkins
+    public void clearTextContents() {
+        assertThat(PipelineStepApi.cleanTextContent("Hello World"), equalTo("Hello World"));
+        assertThat(PipelineStepApi.cleanTextContent("abc[10m]def"), equalTo("abc[10m]def"));
+        // 3-4 bit
+        assertThat(PipelineStepApi.cleanTextContent("\033[32mHello World\033[0m"), equalTo("Hello World"));
+        assertThat(PipelineStepApi.cleanTextContent("\033[1;32mHello World\033[0m"), equalTo("Hello World"));
+        // 8-bit
+        assertThat(PipelineStepApi.cleanTextContent("\033[38;5;6mHello World\033[0m"), equalTo("Hello World"));
+        // with colon as separator character
+        assertThat(PipelineStepApi.cleanTextContent("\033[38:5:6mHello World\033[0m"), equalTo("Hello World"));
+        // 24-bit rgb
+        assertThat(PipelineStepApi.cleanTextContent("\033[38;2;0;255;128mHello World\033[0m"), equalTo("Hello World"));
+    }
 }

src/test/resources/io/jenkins/plugins/pipelinegraphview/utils/unstableSmokes.jenkinsfile

@@ -3,7 +3,7 @@ stage('unstable-one') {
     timeout(1) {
         unstable('oops-one')
     }
-    echo('bar')
+    echo('\033[1;32mbar\033[0m')
 }
 stage('success') {
     echo('baz')