Revert "fix(compiler): include leading whitespace in source-spans of i18n messages (#42062)" (#43033)

This reverts commit f08516db09.

PR Close #43033

packages/compiler-cli/test/compliance/test_cases/source_mapping/external_templates/escaped_chars_partial.js

@@ -1,6 +1,6 @@
 .ɵɵelementStart(0, "div") // SOURCE: "/escaped_chars.html" "<div>\r\n  "
 …
 // NOTE: the `\\r\\n` at the end of the next line will be unescaped to `\r\n`. If it was just `\r\n` it would get unescaped to the actual characters.
-.ɵɵtext(1, " Some Message Encoded character: \uD83D\uDE80\\n") // SOURCE: "/escaped_chars.html" "Some Message\r\n  Encoded character: 🚀\r\n"
+.ɵɵtext(1, " Some Message Encoded character: \uD83D\uDE80\\n") // SOURCE: "/escaped_chars.html" "Some Message\r\n  Encoded character: 🚀\\r\\n"
 …
 .ɵɵelementEnd() // SOURCE: "/escaped_chars.html" "</div>"

packages/compiler-cli/test/compliance/test_cases/source_mapping/inline_templates/GOLDEN_PARTIAL.js

@@ -1652,78 +1652,6 @@ export declare class TestCmp {
     static ɵcmp: i0.ɵɵComponentDeclaration<TestCmp, "test-cmp", never, {}, {}, never, never>;
 }
 
-/****************************************************************************************************
- * PARTIAL FILE: i18n_message_placeholder_entities.js
- ****************************************************************************************************/
-import { Component } from '@angular/core';
-import * as i0 from "@angular/core";
-export class TestCmp {
-    constructor() {
-        this.one = 1;
-        this.two = 2;
-    }
-}
-TestCmp.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "0.0.0-PLACEHOLDER", ngImport: i0, type: TestCmp, deps: [], target: i0.ɵɵFactoryTarget.Component });
-TestCmp.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "0.0.0-PLACEHOLDER", type: TestCmp, selector: "test-cmp", ngImport: i0, template: '<div i18n>Interpolation: {{ one }}&nbsp;Interpolation: {{ two }}</div>', isInline: true });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "0.0.0-PLACEHOLDER", ngImport: i0, type: TestCmp, decorators: [{
-            type: Component,
-            args: [{
-                    selector: 'test-cmp',
-                    template: '<div i18n>Interpolation: {{ one }}&nbsp;Interpolation: {{ two }}</div>',
-                }]
-        }] });
-//# sourceMappingURL=i18n_message_placeholder_entities.js.map
-/****************************************************************************************************
- * PARTIAL FILE: i18n_message_placeholder_entities.js.map
- ****************************************************************************************************/
-{"version":3,"file":"i18n_message_placeholder_entities.js","sourceRoot":"","sources":["../i18n_message_placeholder_entities.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,eAAe,CAAC;;AAMxC,MAAM,OAAO,OAAO;IAJpB;QAKE,QAAG,GAAG,CAAC,CAAC;QACR,QAAG,GAAG,CAAC,CAAC;KACT;;+GAHY,OAAO;mGAAP,OAAO,gDAFR,wEAAwE;sGAEvE,OAAO;kBAJnB,SAAS;mBAAC;oBACT,QAAQ,EAAE,UAAU;oBACpB,QAAQ,EAAE,wEAAwE;iBACnF"}
-/****************************************************************************************************
- * PARTIAL FILE: i18n_message_placeholder_entities.d.ts
- ****************************************************************************************************/
-import * as i0 from "@angular/core";
-export declare class TestCmp {
-    one: number;
-    two: number;
-    static ɵfac: i0.ɵɵFactoryDeclaration<TestCmp, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<TestCmp, "test-cmp", never, {}, {}, never, never>;
-}
-
-/****************************************************************************************************
- * PARTIAL FILE: i18n_message_placeholder_entities.js
- ****************************************************************************************************/
-import { Component } from '@angular/core';
-import * as i0 from "@angular/core";
-export class TestCmp {
-    constructor() {
-        this.one = 1;
-        this.two = 2;
-    }
-}
-TestCmp.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "0.0.0-PLACEHOLDER", ngImport: i0, type: TestCmp, deps: [], target: i0.ɵɵFactoryTarget.Component });
-TestCmp.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "0.0.0-PLACEHOLDER", type: TestCmp, selector: "test-cmp", ngImport: i0, template: '<div i18n>Interpolation: {{ one }}&nbsp;Interpolation: {{ two }}</div>', isInline: true });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "0.0.0-PLACEHOLDER", ngImport: i0, type: TestCmp, decorators: [{
-            type: Component,
-            args: [{
-                    selector: 'test-cmp',
-                    template: '<div i18n>Interpolation: {{ one }}&nbsp;Interpolation: {{ two }}</div>',
-                }]
-        }] });
-//# sourceMappingURL=i18n_message_placeholder_entities.js.map
-/****************************************************************************************************
- * PARTIAL FILE: i18n_message_placeholder_entities.js.map
- ****************************************************************************************************/
-{"version":3,"file":"i18n_message_placeholder_entities.js","sourceRoot":"","sources":["../i18n_message_placeholder_entities.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,eAAe,CAAC;;AAMxC,MAAM,OAAO,OAAO;IAJpB;QAKE,QAAG,GAAG,CAAC,CAAC;QACR,QAAG,GAAG,CAAC,CAAC;KACT;;+GAHY,OAAO;mGAAP,OAAO,gDAFR,wEAAwE;sGAEvE,OAAO;kBAJnB,SAAS;mBAAC;oBACT,QAAQ,EAAE,UAAU;oBACpB,QAAQ,EAAE,wEAAwE;iBACnF"}
-/****************************************************************************************************
- * PARTIAL FILE: i18n_message_placeholder_entities.d.ts
- ****************************************************************************************************/
-import * as i0 from "@angular/core";
-export declare class TestCmp {
-    one: number;
-    two: number;
-    static ɵfac: i0.ɵɵFactoryDeclaration<TestCmp, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<TestCmp, "test-cmp", never, {}, {}, never, never>;
-}
-
 /****************************************************************************************************
  * PARTIAL FILE: i18n_message_interpolation_whitespace.js
  ****************************************************************************************************/

packages/compiler-cli/test/compliance/test_cases/source_mapping/inline_templates/TEST_CASES.json

@@ -749,40 +749,6 @@
         "sourceMap": true
       }
     },
-    {
-      "description": "should handle encoded entities in i18n message source-mappings (full compile)",
-      "inputFiles": [
-        "i18n_message_placeholder_entities.ts"
-      ],
-      "compilationModeFilter": [
-        "full compile"
-      ],
-      "compilerOptions": {
-        "sourceMap": true
-      }
-    },
-    {
-      "description": "should handle encoded entities in i18n message source-mappings (partial compile)",
-      "inputFiles": [
-        "i18n_message_placeholder_entities.ts"
-      ],
-      "expectations": [
-        {
-          "files": [
-            {
-              "generated": "i18n_message_placeholder_entities.js",
-              "expected": "i18n_message_placeholder_entities_partial.js"
-            }
-          ]
-        }
-      ],
-      "compilationModeFilter": [
-        "linked compile"
-      ],
-      "compilerOptions": {
-        "sourceMap": true
-      }
-    },
     {
       "description": "should correctly handle collapsed whitespace in interpolation placeholder i18n message source-mappings (full compile)",
       "inputFiles": [

packages/compiler-cli/test/compliance/test_cases/source_mapping/inline_templates/i18n_message_element_whitespace.js

@@ -1,19 +1,19 @@
-` pre-p ${ // SOURCE: "/i18n_message_element_whitespace.ts" "\\n  pre-p\\n  "
+` pre-p ${ // SOURCE: "/i18n_message_element_whitespace.ts" "pre-p\\n  "
 …
-"\uFFFD#2\uFFFD" // SOURCE: "/i18n_message_element_whitespace.ts" "<p>"
+"\uFFFD#2\uFFFD" // SOURCE: "/i18n_message_element_whitespace.ts" "<p>\\n    "
 …
-}:START_PARAGRAPH: in-p ${ // SOURCE: "/i18n_message_element_whitespace.ts" "\\n    in-p\\n  "
+}:START_PARAGRAPH: in-p ${ // SOURCE: "/i18n_message_element_whitespace.ts" "in-p\\n  "
 …
 "\uFFFD/#2\uFFFD" // SOURCE: "/i18n_message_element_whitespace.ts" "</p>"
 …
-}:CLOSE_PARAGRAPH: post-p\n` // SOURCE: "/i18n_message_element_whitespace.ts" "\\n  post-p\\n"
+}:CLOSE_PARAGRAPH: post-p\n` // SOURCE: "/i18n_message_element_whitespace.ts" "post-p\\n"
 …
 
 i0.ɵɵelementStart(0, "div") // SOURCE: "/i18n_message_element_whitespace.ts" "<div i18n>"
 …
 i0.ɵɵi18nStart(1, 0) // SOURCE: "/i18n_message_element_whitespace.ts" "<div i18n>"
 …
-i0.ɵɵelement(2, "p") // SOURCE: "/i18n_message_element_whitespace.ts" "<p>"
+i0.ɵɵelement(2, "p") // SOURCE: "/i18n_message_element_whitespace.ts" "<p>\\n    "
 …
 i0.ɵɵi18nEnd() // SOURCE: "/i18n_message_element_whitespace.ts" "</div>"
 …

packages/compiler-cli/test/compliance/test_cases/source_mapping/inline_templates/i18n_message_element_whitespace_partial.js

@@ -1,19 +1,19 @@
-$localize` pre-p ${ // SOURCE: "/i18n_message_element_whitespace.ts" "\\n  pre-p\\n  "
+$localize` pre-p ${ // SOURCE: "/i18n_message_element_whitespace.ts" "pre-p\\n  "
 …
-"\uFFFD#2\uFFFD" // SOURCE: "/i18n_message_element_whitespace.ts" "<p>"
+"\uFFFD#2\uFFFD" // SOURCE: "/i18n_message_element_whitespace.ts" "<p>\\n    "
 …
-}:START_PARAGRAPH: in-p ${ // SOURCE: "/i18n_message_element_whitespace.ts" "\\n    in-p\\n  "
+}:START_PARAGRAPH: in-p ${ // SOURCE: "/i18n_message_element_whitespace.ts" "in-p\\n  "
 …
-"\uFFFD/#2\uFFFD" // SOURCE: "/i18n_message_element_whitespace.ts" "</p>"
+"\uFFFD/#2\uFFFD" // SOURCE: "/i18n_message_element_whitespace.ts" "</p>\\n  "
 …
-}:CLOSE_PARAGRAPH: post-p\n` // SOURCE: "/i18n_message_element_whitespace.ts" "\\n  post-p\\n"
+}:CLOSE_PARAGRAPH: post-p\n` // SOURCE: "/i18n_message_element_whitespace.ts" "post-p\\n"
 …
 
-.ɵɵelementStart(0, "div") // SOURCE: "/i18n_message_element_whitespace.ts" "<div i18n>"
+.ɵɵelementStart(0, "div") // SOURCE: "/i18n_message_element_whitespace.ts" "<div i18n>\\n  "
 …
-.ɵɵi18nStart(1, 0) // SOURCE: "/i18n_message_element_whitespace.ts" "<div i18n>"
+.ɵɵi18nStart(1, 0) // SOURCE: "/i18n_message_element_whitespace.ts" "<div i18n>\\n  "
 …
-.ɵɵelement(2, "p") // SOURCE: "/i18n_message_element_whitespace.ts" "<p>"
+.ɵɵelement(2, "p") // SOURCE: "/i18n_message_element_whitespace.ts" "<p>\\n    "
 …
 .ɵɵi18nEnd() // SOURCE: "/i18n_message_element_whitespace.ts" "</div>'"
 …

packages/compiler-cli/test/compliance/test_cases/source_mapping/inline_templates/i18n_message_placeholder_entities.js

@@ -1,9 +0,0 @@
-`Interpolation: ${ // SOURCE: "/i18n_message_placeholder_entities.ts" "Interpolation: "
-…
-"\uFFFD0\uFFFD" // SOURCE: "/i18n_message_placeholder_entities.ts" "{{ one }}"
-…
-}:INTERPOLATION: Interpolation: ${ // SOURCE: "/i18n_message_placeholder_entities.ts" " Interpolation: "
-…
-"\uFFFD1\uFFFD" // SOURCE: "/i18n_message_placeholder_entities.ts" "{{ two }}"
-…
-}:INTERPOLATION_1:` // SOURCE: "/i18n_message_placeholder_entities.ts" "</div>"

packages/compiler-cli/test/compliance/test_cases/source_mapping/inline_templates/i18n_message_placeholder_entities.ts

@@ -1,10 +0,0 @@
-import {Component} from '@angular/core';
-
-@Component({
-  selector: 'test-cmp',
-  template: '<div i18n>Interpolation: {{ one }}&nbsp;Interpolation: {{ two }}</div>',
-})
-export class TestCmp {
-  one = 1;
-  two = 2;
-}

packages/compiler-cli/test/compliance/test_cases/source_mapping/inline_templates/i18n_message_placeholder_entities_partial.js

@@ -1,9 +0,0 @@
-$localize`Interpolation: ${ // SOURCE: "/i18n_message_placeholder_entities.ts" "Interpolation: "
-…
-"\uFFFD0\uFFFD" // SOURCE: "/i18n_message_placeholder_entities.ts" "{{ one }}"
-…
-}:INTERPOLATION: Interpolation: ${ // SOURCE: "/i18n_message_placeholder_entities.ts" " Interpolation: "
-…
-"\uFFFD1\uFFFD" // SOURCE: "/i18n_message_placeholder_entities.ts" "{{ two }}"
-…
-}:INTERPOLATION_1:` // SOURCE: "/i18n_message_placeholder_entities.ts" "</div>'"

packages/compiler-cli/test/compliance/test_cases/source_mapping/inline_templates/update_mode_partial.js

@@ -10,7 +10,7 @@
 .ɵɵtext(3) // SOURCE: "/update_mode.ts" "{{ 1 + 2 }}"
 …
 // TODO: Work out how to fix the broken segment for the last item in a template
-.ɵɵelem // SOURCE: "/update_mode.ts" "</div>'"
+.ɵɵelem // SOURCE: "/update_mode.ts" "</div>"'
 …
 // NOTE: Update mode
 .ɵɵtextInterpolate(1 + 2) // SOURCE: "/update_mode.ts" "{{ 1 + 2 }}"

packages/compiler-cli/test/ngtsc/template_mapping_spec.ts

@@ -464,27 +464,27 @@ runInEachFileSystem((os) => {
              // $localize expressions
              expectMapping(mappings, {
                sourceUrl: '../test.ts',
-               source: '\n  pre-p\n  ',
+               source: 'pre-p\n  ',
                generated: '` pre-p ${',
              });
              expectMapping(mappings, {
                sourceUrl: '../test.ts',
-               source: '<p>',
+               source: '<p>\n    ',
                generated: '"\\uFFFD#2\\uFFFD"',
              });
              expectMapping(mappings, {
                sourceUrl: '../test.ts',
-               source: '\n    in-p\n  ',
+               source: 'in-p\n  ',
                generated: '}:START_PARAGRAPH: in-p ${',
              });
              expectMapping(mappings, {
                sourceUrl: '../test.ts',
-               source: '</p>',
+               source: '</p>\n  ',
                generated: '"\\uFFFD/#2\\uFFFD"',
              });
              expectMapping(mappings, {
                sourceUrl: '../test.ts',
-               source: '\n  post-p\n',
+               source: 'post-p\n',
                generated: '}:CLOSE_PARAGRAPH: post-p\n`',
              });
              // ivy instructions