spotlessApply

Author: nedtwigg

lib/src/main/java/com/diffplug/spotless/npm/PrettierConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,17 +40,15 @@ public PrettierConfig(@Nullable File prettierConfigPath, @Nullable Map<String, O
 		this.editorconfig = editorconfig;
 	}
 
-	@Nullable
-	public File getPrettierConfigPath() {
+	@Nullable public File getPrettierConfigPath() {
 		return prettierConfigPathSignature == null ? null : prettierConfigPathSignature.get().getOnlyFile();
 	}
 
 	public Map<String, Object> getOptions() {
 		return new TreeMap<>(this.options);
 	}
 
-	@Nullable
-	public Boolean getEditorconfig() {
+	@Nullable public Boolean getEditorconfig() {
 		return editorconfig;
 	}
 }

lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

lib/src/main/java/com/diffplug/spotless/npm/PrettierRestService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java

@@ -769,8 +769,7 @@ public class PrettierConfig extends NpmStepConfig<PrettierConfig> {
 
 		@Nullable Map<String, Object> prettierConfig;
 
-		@Nullable
-		Boolean editorconfig;
+		@Nullable Boolean editorconfig;
 
 		final Map<String, String> devDependencies;
 

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PrettierIntegrationTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -121,26 +121,26 @@ void useEditorconfig(String prettierVersion) throws IOException {
 		setFile(".prettierrc.yml").toResource("npm/prettier/config/.prettierrc_noop.yml");
 		setFile(".editorconfig").toResource("npm/prettier/config/.editorconfig_20");
 		setFile("build.gradle").toLines(
-			"plugins {",
-			"    id 'com.diffplug.spotless'",
-			"}",
-			"repositories { mavenCentral() }",
-			"spotless {",
-			"    format 'mytypescript', {",
-			"        target 'test.ts'",
-			"        prettier('" + prettierVersion + "').configFile('.prettierrc.yml').editorconfig(true)",
-			"    }",
-			"}");
+				"plugins {",
+				"    id 'com.diffplug.spotless'",
+				"}",
+				"repositories { mavenCentral() }",
+				"spotless {",
+				"    format 'mytypescript', {",
+				"        target 'test.ts'",
+				"        prettier('" + prettierVersion + "').configFile('.prettierrc.yml').editorconfig(true)",
+				"    }",
+				"}");
 		setFile("test.ts").toResource("npm/prettier/config/typescript.dirty");
 		final BuildResult spotlessApply = gradleRunner().withArguments("--stacktrace", "spotlessApply").build();
 		Assertions.assertThat(spotlessApply.getOutput()).contains("BUILD SUCCESSFUL");
 		switch (prettierVersion) {
-			case PRETTIER_VERSION_2:
-				assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile_prettier_2.clean");
-				break;
-			case PRETTIER_VERSION_3:
-				assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile_prettier_3.clean");
-				break;
+		case PRETTIER_VERSION_2:
+			assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile_prettier_2.clean");
+			break;
+		case PRETTIER_VERSION_3:
+			assertFile("test.ts").sameAsResource("npm/prettier/config/typescript.configfile_prettier_3.clean");
+			break;
 		}
 	}
 

plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Prettier.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

plugin-maven/src/test/java/com/diffplug/spotless/maven/prettier/PrettierFormatStepTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -162,11 +162,11 @@ void multiple_prettier_configs() throws Exception {
 	void prettier_editorconfig() throws Exception {
 		String suffix = "ts";
 		writePomWithPrettierSteps("**/*." + suffix,
-			"<prettier>",
-			"  <prettierVersion>1.16.4</prettierVersion>",
-			"  <configFile>.prettierrc.yml</configFile>",
-			"  <editorconfig>true</editorconfig>",
-			"</prettier>");
+				"<prettier>",
+				"  <prettierVersion>1.16.4</prettierVersion>",
+				"  <configFile>.prettierrc.yml</configFile>",
+				"  <editorconfig>true</editorconfig>",
+				"</prettier>");
 
 		String kind = "typescript";
 		setFile(".prettierrc.yml").toResource("npm/prettier/config/.prettierrc_noop.yml");

testlib/src/test/java/com/diffplug/spotless/npm/PrettierFormatterStepTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2024 DiffPlug
+ * Copyright 2016-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.