github
diff --git a/‎src/logs/model.ts‎
Lines changed: 19 additions & 49 deletions b/‎src/logs/model.ts‎
Lines changed: 19 additions & 49 deletions
@@ -1,6 +1,6 @@
-const ansiColorRE = /\u001b\[((?:\d+;?)+)m(.*)\u001b\[0m/gmu;
 const groupMarker = '##[group]';
-const commandRE = /##\[[a-z]+\]/gm;
+
+import { Parser, IStyle } from './parser'
 
 export enum Type {
   Setup,
@@ -14,23 +14,16 @@ export interface LogSection {
   name?: string;
 }
 
-export interface LogColorInfo {
+export interface LogStyleInfo {
   line: number;
-  start: number;
-  end: number;
-
-  color: CustomColor;
-}
-
-export interface CustomColor {
-  foreground?: string;
-  background?: string;
+  content: string;
+  style?: IStyle;
 }
 
 export interface LogInfo {
-  updatedLog: string;
+  updatedLogLines: string[];
   sections: LogSection[];
-  colorFormats: LogColorInfo[];
+  styleFormats: LogStyleInfo[];
 }
 
 export function parseLog(log: string): LogInfo {
@@ -44,10 +37,12 @@ export function parseLog(log: string): LogInfo {
   // Assume there is always the setup section
   const sections: LogSection[] = [firstSection];
 
-  const colorInfo: LogColorInfo[] = [];
-
   let currentRange: LogSection | null = null;
+
+  const parser = new Parser()
+  const styleInfo: LogStyleInfo[] = [];
   const lines = log.split(/\n|\r/).filter(l => !!l);
+
   let lineIdx = 0;
 
   for (const line of lines) {
@@ -75,24 +70,13 @@ export function parseLog(log: string): LogInfo {
       };
     }
 
-    // Remove commands
-    lines[lineIdx] = line.replace(commandRE, "");
-
-    // Check for custom colors
-    let match: RegExpExecArray | null;
-    if ((match = ansiColorRE.exec(line))) {
-      const colorConfig = match[1];
-      const text = match[2];
-
-      colorInfo.push({
+    const stateFragments = parser.getStates(line)
+    for (const state of stateFragments) {
+      styleInfo.push({
         line: lineIdx,
-        color: parseCustomColor(colorConfig),
-        start: match.index,
-        end: match.index + text.length
+        content: state.output,
+        style: state.style
       });
-
-      // Remove from output
-      lines[lineIdx] = line.replace(ansiColorRE, text);
     }
 
     ++lineIdx;
@@ -104,23 +88,9 @@ export function parseLog(log: string): LogInfo {
   }
 
   return {
-    updatedLog: lines.join("\n"),
-    sections,
-    colorFormats: colorInfo
+    updatedLogLines: lines,
+    sections: sections,
+    styleFormats: styleInfo
   };
 }
 
-function parseCustomColor(str: string): CustomColor {
-  const ret: CustomColor = {};
-
-  const segments = str.split(";");
-  if (segments.length > 0) {
-    ret.foreground = segments[0];
-  }
-
-  if (segments.length > 1) {
-    ret.background = segments[1];
-  }
-
-  return ret;
-}