diff --git a/changelog_unreleased/html/14400.md b/changelog_unreleased/html/14400.md new file mode 100644 index 000000000..7d9accfd4 --- /dev/null +++ b/changelog_unreleased/html/14400.md @@ -0,0 +1,38 @@ +#### Format ` + + + + + + + + + + + +``` diff --git a/src/language-html/utils/index.js b/src/language-html/utils/index.js index 943ae6595..abe37f1ba 100644 --- a/src/language-html/utils/index.js +++ b/src/language-html/utils/index.js @@ -109,6 +109,7 @@ function isScriptLikeTag(node) { (node.fullName === "script" || node.fullName === "style" || node.fullName === "svg:style" || + node.fullName === "svg:script" || (isUnknownNamespace(node) && (node.name === "script" || node.name === "style"))) ); diff --git a/tests/config/utils/check-parsers.js b/tests/config/utils/check-parsers.js index 166b37619..a8def844d 100644 --- a/tests/config/utils/check-parsers.js +++ b/tests/config/utils/check-parsers.js @@ -46,7 +46,10 @@ const categoryParsers = new Map([ "handlebars", { parsers: ["glimmer"], verifyParsers: [], extensions: [".hbs"] }, ], - ["html", { parsers: ["html"], verifyParsers: [], extensions: [".html"] }], + [ + "html", + { parsers: ["html"], verifyParsers: [], extensions: [".html", ".svg"] }, + ], ["mjml", { parsers: ["html"], verifyParsers: [], extensions: [".mjml"] }], [ "js", diff --git a/tests/format/html/svg/__snapshots__/jsfmt.spec.js.snap b/tests/format/html/svg/__snapshots__/jsfmt.spec.js.snap index ba70e2d93..4bbcb552c 100644 --- a/tests/format/html/svg/__snapshots__/jsfmt.spec.js.snap +++ b/tests/format/html/svg/__snapshots__/jsfmt.spec.js.snap @@ -19,16 +19,7 @@ printWidth: 80 - + @@ -73,18 +64,6 @@ printWidth: 80 - diff --git a/tests/format/html/svg/embeded/__snapshots__/jsfmt.spec.js.snap b/tests/format/html/svg/embeded/__snapshots__/jsfmt.spec.js.snap new file mode 100644 index 000000000..f8796610d --- /dev/null +++ b/tests/format/html/svg/embeded/__snapshots__/jsfmt.spec.js.snap @@ -0,0 +1,253 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`svg.html - {"embeddedLanguageFormatting":"off"} format 1`] = ` +====================================options===================================== +embeddedLanguageFormatting: "off" +parsers: ["html"] +printWidth: 80 + | printWidth +=====================================input====================================== + + + + SVG + + + + + + + + + +=====================================output===================================== + + + + SVG + + + + + + + + + +================================================================================ +`; + +exports[`svg.html format 1`] = ` +====================================options===================================== +parsers: ["html"] +printWidth: 80 + | printWidth +=====================================input====================================== + + + + SVG + + + + + + + + + +=====================================output===================================== + + + + SVG + + + + + + + + + +================================================================================ +`; + +exports[`svg.svg - {"embeddedLanguageFormatting":"off"} format 1`] = ` +====================================options===================================== +embeddedLanguageFormatting: "off" +parsers: ["html"] +printWidth: 80 + | printWidth +=====================================input====================================== + + + + + +=====================================output===================================== + + + + + +================================================================================ +`; + +exports[`svg.svg format 1`] = ` +====================================options===================================== +parsers: ["html"] +printWidth: 80 + | printWidth +=====================================input====================================== + + + + + +=====================================output===================================== + + + + + +================================================================================ +`; diff --git a/tests/format/html/svg/embeded/jsfmt.spec.js b/tests/format/html/svg/embeded/jsfmt.spec.js new file mode 100644 index 000000000..75e3c2373 --- /dev/null +++ b/tests/format/html/svg/embeded/jsfmt.spec.js @@ -0,0 +1,2 @@ +run_spec(import.meta, ["html"]); +run_spec(import.meta, ["html"], { embeddedLanguageFormatting: "off" }); diff --git a/tests/format/html/svg/embeded/svg.html b/tests/format/html/svg/embeded/svg.html new file mode 100644 index 000000000..6934c58a7 --- /dev/null +++ b/tests/format/html/svg/embeded/svg.html @@ -0,0 +1,29 @@ + + + + SVG + + + + + + + + diff --git a/tests/format/html/svg/embeded/svg.svg b/tests/format/html/svg/embeded/svg.svg new file mode 100644 index 000000000..2a86602fb --- /dev/null +++ b/tests/format/html/svg/embeded/svg.svg @@ -0,0 +1,21 @@ + + + + diff --git a/tests/format/html/svg/svg.html b/tests/format/html/svg/svg.html index 7009b55de..21f7256f3 100644 --- a/tests/format/html/svg/svg.html +++ b/tests/format/html/svg/svg.html @@ -11,16 +11,7 @@ - +