fix: adaptions for prettier 3 formatter-changes in html

simschla · simschla · commit bd0918318703 · 2023-07-18T14:50:45.000+02:00
diff --git a/testlib/src/main/resources/npm/prettier/filetypes/html_prettier3/.prettierrc.yml b/testlib/src/main/resources/npm/prettier/filetypes/html_prettier3/.prettierrc.yml
@@ -0,0 +1 @@
+parser: html
diff --git a/testlib/src/main/resources/npm/prettier/filetypes/html_prettier3/html_prettier3.clean b/testlib/src/main/resources/npm/prettier/filetypes/html_prettier3/html_prettier3.clean
@@ -0,0 +1,13 @@
+<!doctype html>
+<html dir="ltr" lang="en">
+  <head>
+    <meta charset="viewport" content="with=device-width" />
+    <title>Test</title>
+    <script type="module" src="module.js"></script>
+    <script type="module2" src="module2.js"></script>
+
+    <link rel="stylesheet" type="text/css" href="style.css" />
+  </head>
+
+  <body></body>
+</html>
diff --git a/testlib/src/main/resources/npm/prettier/filetypes/html_prettier3/html_prettier3.dirty b/testlib/src/main/resources/npm/prettier/filetypes/html_prettier3/html_prettier3.dirty
@@ -0,0 +1,17 @@
+<!doctype html>
+<html dir="ltr" lang="en">
+
+	<head>
+	<meta
+	charset="viewport"
+	 content="with=device-width">
+	 <title>Test</title><script type="module" src="module.js"></script>
+	 <script type="module2" src="module2.js"></script>
+
+	 <link rel="stylesheet" type ="text/css" href="style.css">
+	 </head>
+
+	 <body>
+
+	 </body></html>
+
diff --git a/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java b/testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java
@@ -46,7 +46,7 @@ void formattingUsingPrettier2WithConfigFile(String fileType) throws Exception {
 		}
 
 		@ParameterizedTest(name = "{index}: prettier 3.x can be applied to {0}")
-		@ValueSource(strings = {"html", "typescript", "json", "javascript-es5", "javascript-es6", "css", "scss", "markdown", "yaml"})
+		@ValueSource(strings = {"html_prettier3", "typescript", "json", "javascript-es5", "javascript-es6", "css", "scss", "markdown", "yaml"})
 		void formattingUsingPrettier3WithConfigFile(String fileType) throws Exception {
 			runTestUsingPrettier(fileType, ImmutableMap.of("prettier", "3.0.0"));
 		}

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ void formattingUsingPrettier2WithConfigFile(String fileType) throws Exception {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`@ParameterizedTest(name = "{index}: prettier 3.x can be applied to {0}")`
`49`		`- @ValueSource(strings = {"html", "typescript", "json", "javascript-es5", "javascript-es6", "css", "scss", "markdown", "yaml"})`
	`49`	`+ @ValueSource(strings = {"html_prettier3", "typescript", "json", "javascript-es5", "javascript-es6", "css", "scss", "markdown", "yaml"})`
`50`	`50`	`void formattingUsingPrettier3WithConfigFile(String fileType) throws Exception {`
`51`	`51`	`runTestUsingPrettier(fileType, ImmutableMap.of("prettier", "3.0.0"));`
`52`	`52`	`}`