TypeScriptToLua
diff --git a/‎src/LuaPrinter.ts‎
Lines changed: 3 additions & 1 deletion b/‎src/LuaPrinter.ts‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎test/unit/printer/sourcemaps.spec.ts‎
Lines changed: 9 additions & 7 deletions b/‎test/unit/printer/sourcemaps.spec.ts‎
Lines changed: 9 additions & 7 deletions
@@ -175,9 +175,11 @@ export class LuaPrinter {
             header += "{#SourceMapTraceback}\n";
         }
 
+        // Hack: __TS__Resolve macro resolution destroys mappings of macro's node grand-parent
+        const headerNode = new SourceNode(null, null, null, new SourceNode(null, null, null, header));
         const fileBlockNode = this.printBlock(block);
 
-        return this.concatNodes(header, fileBlockNode);
+        return this.concatNodes(headerNode, fileBlockNode);
     }
 
     protected pushIndent(): void {
 
@@ -51,25 +51,23 @@ test.each([
     },
     {
         code: `
-            // @ts-ignore
-            import { Foo } from "foo";
+            import { Foo } from "./module";
             Foo;
         `,
 
         assertPatterns: [
-            { luaPattern: 'require("foo")', typeScriptPattern: '"foo"' },
+            { luaPattern: 'require("module")', typeScriptPattern: '"./module"' },
             { luaPattern: "Foo", typeScriptPattern: "Foo" },
         ],
     },
     {
         code: `
-            // @ts-ignore
-            import * as Foo from "foo";
+            import * as Foo from "./module";
             Foo;
         `,
 
         assertPatterns: [
-            { luaPattern: 'require("foo")', typeScriptPattern: '"foo"' },
+            { luaPattern: 'require("module")', typeScriptPattern: '"./module"' },
             { luaPattern: "Foo", typeScriptPattern: "Foo" },
         ],
     },
@@ -144,7 +142,11 @@ test.each([
         ],
     },
 ])("Source map has correct mapping (%p)", async ({ code, assertPatterns }) => {
-    const file = util.testModule(code).expectToHaveNoDiagnostics().getMainLuaFileResult();
+    const file = util
+        .testModule(code)
+        .addExtraFile("module.ts", "export const Foo = true;")
+        .expectToHaveNoDiagnostics()
+        .getMainLuaFileResult();
 
     const consumer = await new SourceMapConsumer(file.luaSourceMap);
     for (const { luaPattern, typeScriptPattern } of assertPatterns) {
Original file line number	Diff line number	Diff line change
`@@ -175,9 +175,11 @@ export class LuaPrinter {`
`175`	`175`	`header += "{#SourceMapTraceback}\n";`
`176`	`176`	`}`
`177`	`177`
	`178`	`+ // Hack: __TS__Resolve macro resolution destroys mappings of macro's node grand-parent`
	`179`	`+ const headerNode = new SourceNode(null, null, null, new SourceNode(null, null, null, header));`
`178`	`180`	`const fileBlockNode = this.printBlock(block);`
`179`	`181`
`180`		`- return this.concatNodes(header, fileBlockNode);`
	`182`	`+ return this.concatNodes(headerNode, fileBlockNode);`
`181`	`183`	`}`
`182`	`184`
`183`	`185`	`protected pushIndent(): void {`