Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Angular: allow self-closing tags on custom elements #14170

Merged
merged 6 commits into from Jan 14, 2023
Merged

Angular: allow self-closing tags on custom elements #14170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5c7ebac
Add tests
fisker Jan 13, 2023
e0f9f60
`recognizeSelfClosing` -> `canSelfClose`
fisker Jan 13, 2023
03d9b90
Allow self-closing in angular
fisker Jan 13, 2023
37ff7db
More tests
fisker Jan 13, 2023
821e74e
Add changelog
fisker Jan 13, 2023
b31fd56
Add link
fisker Jan 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 18 additions & 0 deletions changelog_unreleased/angular/14170.md
View file
Open in desktop
@@ -0,0 +1,18 @@
#### Allow self-closing tags on custom elements (#14170 by @fisker)

See [Angular v15.1.0 release note](https://github.com/angular/angular/releases/tag/15.1.0) for details.

<!-- prettier-ignore -->
```html
// Input
<app-test/>

// Prettier stable
SyntaxError: Only void and foreign elements can be self closed "app-test" (1:1)
> 1 | <app-test/>
| ^^^^^^^^^
2 |

// Prettier main
<app-test />
```
22 changes: 11 additions & 11 deletions src/language-html/parser-html.js
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@ const { locStart, locEnd } = require("./loc.js");
* @typedef {import('angular-html-parser/lib/compiler/src/ml_parser/parser').ParseTreeResult} ParserTreeResult
* @typedef {Omit<import('angular-html-parser').ParseOptions, 'canSelfClose'> & {
* name?: 'html' | 'angular' | 'vue' | 'lwc';
* recognizeSelfClosing?: boolean;
* canSelfClose?: boolean;
* normalizeTagName?: boolean;
* normalizeAttributeName?: boolean;
* }} ParserOptions
Expand All @@ -42,7 +42,7 @@ const { locStart, locEnd } = require("./loc.js");
function ngHtmlParser(
input,
{
recognizeSelfClosing,
canSelfClose,
normalizeTagName,
normalizeAttributeName,
allowHtmComponentClosingTags,
Expand All @@ -64,7 +64,7 @@ function ngHtmlParser(
} = require("angular-html-parser/lib/compiler/src/ml_parser/html_tags");

let { rootNodes, errors } = parser.parse(input, {
canSelfClose: recognizeSelfClosing,
canSelfClose,
allowHtmComponentClosingTags,
isTagNameCaseSensitive,
getTagContentType,
Expand Down Expand Up @@ -97,7 +97,7 @@ function ngHtmlParser(
let secondParseResult;
const doSecondParse = () =>
parser.parse(input, {
canSelfClose: recognizeSelfClosing,
canSelfClose,
allowHtmComponentClosingTags,
isTagNameCaseSensitive,
});
Expand Down Expand Up @@ -135,13 +135,13 @@ function ngHtmlParser(
}
} else {
// If not Vue SFC, treat as html
recognizeSelfClosing = true;
canSelfClose = true;
normalizeTagName = true;
normalizeAttributeName = true;
allowHtmComponentClosingTags = true;
isTagNameCaseSensitive = false;
const htmlParseResult = parser.parse(input, {
canSelfClose: recognizeSelfClosing,
canSelfClose,
allowHtmComponentClosingTags,
isTagNameCaseSensitive,
});
Expand Down Expand Up @@ -373,7 +373,7 @@ function _parse(text, options, parserOptions, shouldParseFrontMatter = true) {
*/
function createParser({
name,
recognizeSelfClosing = false,
canSelfClose = false,
normalizeTagName = false,
normalizeAttributeName = false,
allowHtmComponentClosingTags = false,
Expand All @@ -386,7 +386,7 @@ function createParser({
text,
{ parser: name, ...options },
{
recognizeSelfClosing,
canSelfClose,
normalizeTagName,
normalizeAttributeName,
allowHtmComponentClosingTags,
Expand All @@ -405,15 +405,15 @@ module.exports = {
parsers: {
html: createParser({
name: "html",
recognizeSelfClosing: true,
canSelfClose: true,
normalizeTagName: true,
normalizeAttributeName: true,
allowHtmComponentClosingTags: true,
}),
angular: createParser({ name: "angular" }),
angular: createParser({ name: "angular", canSelfClose: true }),
vue: createParser({
name: "vue",
recognizeSelfClosing: true,
canSelfClose: true,
isTagNameCaseSensitive: true,
getTagContentType: (tagName, prefix, hasParent, attrs) => {
if (
Expand Down
36 changes: 36 additions & 0 deletions tests/format/angular/self-closing/__snapshots__/jsfmt.spec.js.snap
View file
Open in desktop
@@ -0,0 +1,36 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`self-closing.component.html format 1`] = `
====================================options=====================================
parsers: ["angular"]
printWidth: 80
| printWidth
=====================================input======================================
<app-test/>
<app-test />
<app-test
/>
<img>
<img/>
<img />
<img
/>
<div/>
<div />
<div
/>

=====================================output=====================================
<app-test />
<app-test />
<app-test />
<img />
<img />
<img />
<img />
<div />
<div />
<div />

================================================================================
`;
1 change: 1 addition & 0 deletions tests/format/angular/self-closing/jsfmt.spec.js
View file
Open in desktop
@@ -0,0 +1 @@
run_spec(__dirname, ["angular"]);
13 changes: 13 additions & 0 deletions tests/format/angular/self-closing/self-closing.component.html
View file
Open in desktop
@@ -0,0 +1,13 @@
<app-test/>
<app-test />
<app-test
/>
<img>
<img/>
<img />
<img
/>
<div/>
<div />
<div
/>