refactor: rearrange the code to reduce cognitive complexity

alvis · Aug 2, 2022 · 6c9cad7 · 6c9cad7
1 parent 5123609
commit 6c9cad7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/source/render.ts b/source/render.ts
@@ -195,17 +195,17 @@ export function renderStack(
   for (let i = 0; i < blocks.length; i++) {
     const block = blocks[i];
 
-    if (block.type === 'location' && filter(block.path)) {
+    if (block.type === 'description') {
+      renderedBlocks.push(renderDescription(block, currentError));
+      currentError = error['cause'];
+    } else if (filter(block.path)) {
       renderedBlocks.push(
         renderLocation(block, {
           showSource:
             // NOTE a location block must follow a description block
             showSource && blocks[i - 1].type === 'description',
         }),
       );
-    } else if (block.type === 'description') {
-      renderedBlocks.push(renderDescription(block, currentError));
-      currentError = error['cause'];
     }
   }
 

diff --git a/source/stack.ts b/source/stack.ts
@@ -29,7 +29,8 @@ export interface StackLocationBlock {
 
 export type StackBlock = StackDescriptionBlock | StackLocationBlock;
 
-const stackLineExpression = /(\s*at (.+) \((.+):([0-9]+):([0-9]+)\))|(^(\w+):\s*([\w\W]*?)(\s*\n\s+))/gm;
+const stackLineExpression =
+  /(\s*at (.+) \((.+):([0-9]+):([0-9]+)\))|(^(\w+):\s*([\w\W]*?)(\s*\n\s+))/gm;
 
 /**
  * parse a stack into its components