Merge pull request #30 from DigitalPrimates/master

Possible Fix for Issue# 29
RokuRoad · Aug 11, 2018 · a01125c · a01125c
2 parents af66c77 + 5fccd29
commit a01125c
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/src/BaseVisitor.ts b/src/BaseVisitor.ts
@@ -39,18 +39,16 @@ export class BaseVisitor extends Visitor {
   }
 
   protected mergeTrailing(elements: ASTNode[] = [], trailing: ASTNode[] = []): ASTNode[] {
-    const linedElements = this.byLine(elements)
     const linedTrailing = this.byLine(trailing)
-
-    const merger = (el: ASTNode, line: number): ASTNode => {
+    const merger = (el: ASTNode): ASTNode => {
+      const line = el.loc && el.loc.start.line
       if (linedTrailing[line]) {
         el.trailing = linedTrailing[line]
       }
-
       return el
     }
 
-    return map<ASTNode>(linedElements, merger) as any
+    return map<ASTNode>(elements, merger) as any
   }
 
   protected Location(head: ASTNode, tail: ASTNode): Location {