fix: Analysis serialization had incorrect source locations.

linkedin · May 7, 2020 · 9969614 · 9969614
1 parent b498968
commit 9969614
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 49 deletions.
diff --git a/packages/@css-blocks/core/src/Analyzer/ElementAnalysis.ts b/packages/@css-blocks/core/src/Analyzer/ElementAnalysis.ts
@@ -727,7 +727,7 @@ export class ElementAnalysis<BooleanExpression, StringExpression, TernaryExpress
       serialization.sourceLocation = {
         start: { line: this.sourceLocation.start.line },
       };
-      if (this.sourceLocation.start.column) {
+      if (typeof this.sourceLocation.start.column === "number") {
         serialization.sourceLocation.start.column = this.sourceLocation.start.column;
       }
       if (this.sourceLocation.start.filename) {
@@ -737,7 +737,7 @@ export class ElementAnalysis<BooleanExpression, StringExpression, TernaryExpress
         serialization.sourceLocation.end = {
           line: this.sourceLocation.end.line,
         };
-        if (this.sourceLocation.end.column) {
+        if (typeof this.sourceLocation.end.column === "number") {
           serialization.sourceLocation.end.column = this.sourceLocation.end.column;
         }
         if (this.sourceLocation.end.filename) {

diff --git a/packages/@css-blocks/glimmer/src/ElementAnalyzer.ts b/packages/@css-blocks/glimmer/src/ElementAnalyzer.ts
@@ -147,9 +147,9 @@ export class ElementAnalyzer<TemplateType extends keyof TemplateTypes>  {
     }
   }
 
-  private finishElement(element: TemplateElement, forRewrite: boolean): void {
+  private finishElement(node: AnalyzableNode, element: TemplateElement, forRewrite: boolean): void {
     element.seal();
-    if (!forRewrite) { this.analysis.endElement(element); }
+    if (!forRewrite) { this.analysis.endElement(element, node.loc.end); }
   }
 
   isAttributeAnalyzed(attributeName: string): [string, string] | [null, null] {
@@ -269,7 +269,7 @@ export class ElementAnalyzer<TemplateType extends keyof TemplateTypes>  {
       }
     }
 
-    this.finishElement(element, forRewrite);
+    this.finishElement(node, element, forRewrite);
 
     // If this is an Ember Built-In...
     if (!isElementNode(node) && isEmberBuiltInNode(node)) {
@@ -294,7 +294,7 @@ export class ElementAnalyzer<TemplateType extends keyof TemplateTypes>  {
           element.addStaticAttr(style, attr.presenceRule);
         }
         if (element) {
-          this.finishElement(element, forRewrite);
+          this.finishElement(node, element, forRewrite);
         }
       }
     }