Skip to content

Commit c2bb8c6

Browse files
Angular: Remove in-repo @error parameter parsing
Stop classifying and formatting `@error` parameters in Prettier. Pretty-printing those params should go through angular-estree-parser and the existing `__ng_directive` / `__ng_binding` printers once that parser understands boundary syntax. Keep `@boundary` / `@error` block recognition and pairing. Snapshots now record the honest un-reflowed parameter text. Co-authored-by: Bennett Payoyo <[email protected]>
1 parent 6621eca commit c2bb8c6

4 files changed

Lines changed: 15 additions & 78 deletions

File tree

‎src/language-html/embed.js‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {
77
} from "../document/index.js";
88
import htmlWhitespace from "../utilities/html-whitespace.js";
99
import printAngularControlFlowBlockParameters from "./embed/angular-control-flow-block-parameters.js";
10-
import printAngularErrorBlockParameter from "./embed/angular-error-block-parameter.js";
1110
import printAttribute from "./embed/attribute.js";
1211
import { formatAttributeValue } from "./embed/utilities.js";
1312
import getNodeContent from "./get-node-content.js";
@@ -150,13 +149,6 @@ function embed(path, options) {
150149

151150
return printAngularControlFlowBlockParameters;
152151

153-
case "angularControlFlowBlockParameter":
154-
if (path.grandparent?.name !== "error") {
155-
return;
156-
}
157-
158-
return printAngularErrorBlockParameter;
159-
160152
case "angularLetDeclarationInitializer":
161153
return (textToDoc) =>
162154
formatAttributeValue(node.value, textToDoc, {

‎src/language-html/embed/angular-error-block-parameter.js‎

Lines changed: 0 additions & 61 deletions
This file was deleted.

‎src/language-html/massage-ast/index.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,7 @@ function massageAstNode(original, cloned, parent) {
7777
original.parameters?.children
7878
) {
7979
for (const parameter of cloned.parameters.children) {
80-
if (
81-
embeddedAngularControlFlowBlocks.has(original.name) ||
82-
original.name === "error"
83-
) {
80+
if (embeddedAngularControlFlowBlocks.has(original.name)) {
8481
delete parameter.expression;
8582
} else {
8683
parameter.expression = parameter.expression.trim();

‎tests/format/angular/control-flow/__snapshots__/format.test.js.snap‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,10 @@ $reset) {
257257
=====================================output=====================================
258258
@boundary {
259259
<app-risky-component />
260-
} @error (let err; retry = $reset; when isNetworkError(err)) {
260+
} @error (let err; retry
261+
262+
= $reset; when
263+
isNetworkError(err)) {
261264
<app-network-error [error]="err" />
262265
<button (click)="retry()">Retry</button>
263266
} @error {
@@ -266,7 +269,11 @@ $reset) {
266269
267270
@boundary {
268271
<app-chart-dashboard />
269-
} @error (let err; reset = $reset; when isRenderError(err)) {
272+
} @error (let
273+
err; reset
274+
=
275+
$reset; when
276+
isRenderError(err)) {
270277
<p>Network issue. Check your connection.</p>
271278
<button (click)="reset()">Retry</button>
272279
} @error {
@@ -275,20 +282,22 @@ $reset) {
275282
276283
@boundary {
277284
<complex-chart [data]="data" />
278-
} @error (let err = $error; let r = $reset) {
285+
} @error (let err=$error; let r=$reset) {
279286
<p>Failed to load chart: {{ err.message }}</p>
280287
<button (click)="r()">Retry</button>
281288
}
282289
283290
@boundary {
284291
Main
285-
} @error (let err; when err.message === "404") {
292+
} @error (let err; when err.message === '404') {
286293
Not Found
287294
}
288295
289296
@boundary {
290297
Main
291-
} @error (err = $error, retry = $reset) {
298+
} @error (err = $error, retry
299+
=
300+
$reset) {
292301
<button (click)="retry()">Retry</button>
293302
}
294303

0 commit comments

Comments
 (0)