fix: get text

softvisio-node · Nov 7, 2023 · d4dd8d1 · d4dd8d1
1 parent 19d7bc1
commit d4dd8d1
Showing 1 changed file with 15 additions and 10 deletions.
diff --git a/lib/get-text.js b/lib/get-text.js
@@ -162,7 +162,6 @@ export default class GetText {
         yaml.parse( content, { "all": true, locale, ejs } );
     }
 
-    // XXX node / location
     #parseEjs ( content, { start } = {} ) {
         const template = new Template( content );
 
@@ -223,7 +222,10 @@ export default class GetText {
 
             if ( template ) {
                 this.#parseEjs( template, {
-                    "start": arg.loc.start,
+                    "start": {
+                        ...arg.loc.start,
+                        "force": true,
+                    },
                 } );
             }
 
@@ -349,17 +351,20 @@ export default class GetText {
     }
 
     #getNodeLocation ( node, { start } = {} ) {
-        const nodeStart = node.loc.start;
-
-        var line = nodeStart.line,
-            column = nodeStart.column;
+        var { line, column } = node.loc.start;
 
         if ( start ) {
-            if ( line === 1 ) column += start.column;
-            line += start.line - 1;
-        }
+            if ( start.force ) {
+                ( { line, column } = start );
+            }
+            else {
+                if ( line === 1 ) {
+                    column += start.column;
+                }
 
-        // message = `Error at ${loc.line}:${loc.column} in the file: ${this.#relativePath}\n` + message;
+                line += start.line - 1;
+            }
+        }
 
         return { line, column };
     }