diff --git a/packages/localize/src/tools/src/extract/extraction.ts b/packages/localize/src/tools/src/extract/extraction.ts
index 3067bb7a2e..1d0e03008f 100644
--- a/packages/localize/src/tools/src/extract/extraction.ts
+++ b/packages/localize/src/tools/src/extract/extraction.ts
@@ -123,7 +123,7 @@ export class MessageExtractor {
         sourceFile.sources.find(sf => sf?.sourcePath === originalStart.file)!;
     const startPos = originalSourceFile.startOfLinePositions[start.line] + start.column;
     const endPos = originalSourceFile.startOfLinePositions[end.line] + end.column;
-    const text = originalSourceFile.contents.substring(startPos, endPos);
+    const text = originalSourceFile.contents.substring(startPos, endPos).trim();
     return {file: originalStart.file, start, end, text};
   }
 }
diff --git a/packages/localize/src/tools/test/extract/integration/main_spec.ts b/packages/localize/src/tools/test/extract/integration/main_spec.ts
index 00b84e43a2..bc1c45b60f 100644
--- a/packages/localize/src/tools/test/extract/integration/main_spec.ts
+++ b/packages/localize/src/tools/test/extract/integration/main_spec.ts
@@ -399,7 +399,8 @@ runInNativeFileSystem(() => {
              // These source file paths are due to how Bazel TypeScript compilation source-maps
              // work
              `          <context context-type="sourcefile">../packages/localize/src/tools/test/extract/integration/test_files/src/a.ts</context>`,
-             `          <context context-type="linenumber">3</context>`,
+             `          <context context-type="linenumber">3,${
+                 target === 'es2015' ? 7 : 5}</context>`,
              `        </context-group>`,
              `      </trans-unit>`,
              `      <trans-unit id="7829869508202074508" datatype="html">`,
diff --git a/packages/localize/src/tools/test/extract/integration/test_files/src/a.ts b/packages/localize/src/tools/test/extract/integration/test_files/src/a.ts
index 47da6f3f06..2b3f68bc38 100644
--- a/packages/localize/src/tools/test/extract/integration/test_files/src/a.ts
+++ b/packages/localize/src/tools/test/extract/integration/test_files/src/a.ts
@@ -1,3 +1,7 @@
 declare const $localize: any;
 const file = 'a.ts';
-export const messageA = $localize`Message in ${file}:a-file:!`;
+export const messageA = $localize`Message in ${
+
+    file
+
+}:a-file:!`;