From aacef939396f13760246f3520652380b9c6ed4ee Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Mon, 18 Aug 2025 05:59:26 +0200
Subject: [PATCH 1/6] feat: add eclipse wtp formatter

eclipse wtp does initialize static variables based on the formatter type
used. so in order to leverage the graal agent, we need to run each type
of eclipse wtp formatter in a separate jvm - hence introducing the
`SeparateJvm` test tag.

The current version is working but needs cleaning up.
---
 .idea/compiler.xml                            |   4 +-
 app/build.gradle                              |  20 ++-
 .../diffplug/spotless/cli/SpotlessCLI.java    |   3 +
 .../spotless/cli/steps/EclipseWtp.java        | 123 ++++++++++++++++++
 app/src/nativecompile/reflectconfig.json      |  39 ++++++
 .../cli/steps/EclipseWtpSecondTest.java       |  97 ++++++++++++++
 .../spotless/cli/steps/EclipseWtpTest.java    |  99 ++++++++++++++
 .../cli/steps/EclipseWtpSecondTest.ss         |   9 ++
 .../spotless/cli/steps/EclipseWtpTest.ss      |   6 +
 ...buildlogic.java-graalvm-conventions.gradle |  10 +-
 ...ogic.java-special-tests-conventions.gradle |  27 ++--
 .../buildlogic.picocli-conventions.gradle     |   2 +-
 gradle/libs.versions.toml                     |   5 +
 .../spotless/tag/SeparateJvmTest.java         |  30 +++++
 14 files changed, 460 insertions(+), 14 deletions(-)
 create mode 100644 app/src/main/java/com/diffplug/spotless/cli/steps/EclipseWtp.java
 create mode 100644 app/src/nativecompile/reflectconfig.json
 create mode 100644 app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpSecondTest.java
 create mode 100644 app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpTest.java
 create mode 100644 app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpSecondTest.ss
 create mode 100644 app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpTest.ss
 create mode 100644 testlib/src/main/java/com/diffplug/spotless/tag/SeparateJvmTest.java

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 465c268..2639a7b 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -5,7 +5,7 @@
       <profile name="Gradle Imported" enabled="true">
         <outputRelativeToContentRoot value="true" />
         <option name="other.resource.bundles" value="application" />
-        <option name="other.resource.patterns" value=".*\\.properties,.*\\.json,.*\\.js" />
+        <option name="other.resource.patterns" value=".*\\.properties,.*\\.json,.*\\.js,.*\\.MF" />
         <option name="project" value="spotless-cli/app" />
         <processorPath useClasspath="false">
           <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/info.picocli/picocli-codegen/4.7.6/c36d09aee9ded3685ceac45de8c1e02623158920/picocli-codegen-4.7.6.jar" />
@@ -18,7 +18,7 @@
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
-      <module name="spotless-cli.app.main" options="-Aproject=spotless-cli/app -Aother.resource.bundles=application -Aother.resource.patterns=.*\\.properties,.*\\.json,.*\\.js" />
+      <module name="spotless-cli.app.main" options="-Aproject=spotless-cli/app -Aother.resource.bundles=application -Aother.resource.patterns=.*\\.properties,.*\\.json,.*\\.js,.*\\.MF" />
     </option>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index f8a0924..768cf72 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,4 +1,12 @@
 import com.diffplug.spotless.cli.picocli.usage.GenerateUsagePropertiesTask
+import com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep
+import org.gradle.plugins.ide.eclipse.model.EclipseWtp
+
+//buildscript {
+//	dependencies {
+//		classpath libs.spotless.lib.extra
+//	}
+//}
 
 plugins {
 	id 'buildlogic.picocli-conventions'
@@ -9,6 +17,7 @@ plugins {
 
 version = rootProject.version
 
+
 dependencies {
 	testImplementation project(':testlib')
 	implementation libs.bundles.spotless.libs
@@ -17,6 +26,15 @@ dependencies {
 	// these are fixed versions of the otherwise dynamic dependencies for spotless
 	// this is necessary to allow for native compilation where reflective access to dynamic jars is not possible
 	implementation libs.bundles.native.includes
+
+	def resourceName = "/com/diffplug/spotless/extra/eclipse_wtp_formatter/v4.21.0.lockfile"
+	println("resource: " + resourceName)
+    EclipseWtpFormatterStep.getResource(resourceName)
+			.readLines()
+	        .findAll { !it.startsWith('#')} // filter out comments
+	        .each { implementation("${it}") {
+				transitive=false
+			} }
 }
 
 application {
@@ -35,7 +53,7 @@ gradle.taskGraph.whenReady { TaskExecutionGraph graph ->
 }
 
 tasks.withType(Test).configureEach {
-	if (it.name == 'test' || it.name == 'testNpm') {
+	if (it.name == 'test' || it.name == 'testNpm' || it.name == 'testSeparateJvm') {
 		it.outputs.dir(nativeCompileMetaDir)
 		if (project.hasProperty('agent')) {
 			it.inputs.property('agent', project.property('agent')) // make sure to re-run tests if agent changes
diff --git a/app/src/main/java/com/diffplug/spotless/cli/SpotlessCLI.java b/app/src/main/java/com/diffplug/spotless/cli/SpotlessCLI.java
index 965598f..8752ad2 100644
--- a/app/src/main/java/com/diffplug/spotless/cli/SpotlessCLI.java
+++ b/app/src/main/java/com/diffplug/spotless/cli/SpotlessCLI.java
@@ -24,6 +24,7 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
+import com.diffplug.spotless.cli.steps.EclipseWtp;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -45,6 +46,7 @@
 import com.diffplug.spotless.cli.logging.output.Output;
 import com.diffplug.spotless.cli.steps.ClangFormat;
 import com.diffplug.spotless.cli.steps.CleanThat;
+import com.diffplug.spotless.cli.steps.EclipseWtp;
 import com.diffplug.spotless.cli.steps.FormatAnnotations;
 import com.diffplug.spotless.cli.steps.GoogleJavaFormat;
 import com.diffplug.spotless.cli.steps.LicenseHeader;
@@ -97,6 +99,7 @@
         subcommands = {
             ClangFormat.class,
             CleanThat.class,
+            EclipseWtp.class,
             FormatAnnotations.class,
             GoogleJavaFormat.class,
             LicenseHeader.class,
diff --git a/app/src/main/java/com/diffplug/spotless/cli/steps/EclipseWtp.java b/app/src/main/java/com/diffplug/spotless/cli/steps/EclipseWtp.java
new file mode 100644
index 0000000..48ec803
--- /dev/null
+++ b/app/src/main/java/com/diffplug/spotless/cli/steps/EclipseWtp.java
@@ -0,0 +1,123 @@
+package com.diffplug.spotless.cli.steps;
+
+
+import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.ThrowingEx;
+import com.diffplug.spotless.cli.core.SpotlessActionContext;
+import com.diffplug.spotless.cli.help.OptionConstants;
+import com.diffplug.spotless.extra.EclipseBasedStepBuilder;
+import com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep;
+import org.jetbrains.annotations.NotNull;
+import picocli.CommandLine;
+
+import java.lang.reflect.Constructor;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Properties;
+
+@CommandLine.Command(name = "eclipse-wtp", description = "Runs Eclipse WTP formatter (" + EclipseWtp.ECLIPSE_WTP_VERSION+")")
+public class EclipseWtp extends SpotlessFormatterStep {
+
+    public static final String ECLIPSE_WTP_VERSION = "4.21.0"; // TODO we need to slurp in the lock file also
+
+    @CommandLine.Option(
+            names = {"-f", "--config-file"},
+            arity = "0",
+            description = "The path to the Eclipse WTP configuration file.\n" +
+                    "For supported config file options see <https://github.com/diffplug/spotless/tree/main/plugin-gradle#eclipse-web-tools-platform>"
+    )
+    List<Path> configFiles;
+
+    @CommandLine.Option(
+            names = { "-t", "--type" },
+            description = "The type of the Eclipse WTP formatter." + OptionConstants.VALID_VALUES_SUFFIX,
+            required = true
+    )
+    Type type;
+
+    public enum Type {
+        CSS,
+        HTML,
+        JS,
+        JSON,
+        XML,
+        XHTML;
+
+        public void initCorrespondingEclipseWtpCorePlugin() {
+            // due to internals of eclipse wtp, invoking various variants of the formatter in the same java process
+            // requires some static initialization to take place
+
+        }
+
+        public @NotNull EclipseWtpFormatterStep toEclipseWtpType() {
+            EclipseWtpFormatterStep step = switch (this) {
+                case CSS -> EclipseWtpFormatterStep.CSS;
+                case HTML, XHTML -> EclipseWtpFormatterStep.HTML; // XHTML is treated as HTML in Eclipse WTP
+                case JS -> EclipseWtpFormatterStep.JS;
+                case JSON -> EclipseWtpFormatterStep.JSON;
+                case XML -> EclipseWtpFormatterStep.XML;
+            };
+
+            @SuppressWarnings("unused") Class<?> reverseLookup = lookupClass(step);
+            return step;
+        }
+
+        static Class<?> lookupClass(EclipseWtpFormatterStep step) {
+                        /* this statement is only here to
+               1) get compile errors in case a new type is added in EclipseWtpFormatterStep
+               2) allow graal to collect reflective Metadata*/
+            @SuppressWarnings("unused") Class<?> reverseLookup = switch(step) {
+                case CSS -> EclipseWtpMetadata.cssClass();
+                case HTML -> EclipseWtpMetadata.htmlClass();
+                case JS -> EclipseWtpMetadata.jsClass();
+                case JSON -> EclipseWtpMetadata.jsonClass();
+                case XML -> EclipseWtpMetadata.xmlClass();
+            };
+            return reverseLookup;
+        }
+    }
+
+
+    @Override
+    public @NotNull List<FormatterStep> prepareFormatterSteps(SpotlessActionContext context) {
+        EclipseWtpFormatterStep wtpType = type.toEclipseWtpType();
+        EclipseBasedStepBuilder builder = wtpType.createBuilder(context.provisioner());
+        builder.setVersion(ECLIPSE_WTP_VERSION);
+        if (configFiles != null && !configFiles.isEmpty()) {
+            builder.setPreferences(
+                    configFiles.stream()
+                            .map(context::resolvePath)
+                            .map(Path::toFile)
+                            .toList());
+        }
+        return List.of(builder.build());
+    }
+
+
+    static class EclipseWtpMetadata {
+
+        private static Class<?> cssClass() {
+            return ThrowingEx.get(() -> Class.forName("com.diffplug.spotless.extra.eclipse.wtp.EclipseCssFormatterStepImpl"));
+        }
+
+        private static Class<?> htmlClass() {
+            return ThrowingEx.get(() -> {
+                Class<?> result = Class.forName("com.diffplug.spotless.extra.eclipse.wtp.EclipseHtmlFormatterStepImpl");
+                Constructor<?> declaredConstructor = result.getDeclaredConstructor(Properties.class);
+                return result;
+            });
+        }
+
+        private static Class<?> jsClass() {
+            return ThrowingEx.get(() -> Class.forName("com.diffplug.spotless.extra.eclipse.wtp.EclipseJsFormatterStepImpl"));
+        }
+
+        private static Class<?> jsonClass() {
+            return ThrowingEx.get(() -> Class.forName("com.diffplug.spotless.extra.eclipse.wtp.EclipseJsonFormatterStepImpl"));
+        }
+
+        private static Class<?> xmlClass() {
+            return ThrowingEx.get(() -> Class.forName("com.diffplug.spotless.extra.eclipse.wtp.EclipseXmlFormatterStepImpl"));
+        }
+    }
+}
diff --git a/app/src/nativecompile/reflectconfig.json b/app/src/nativecompile/reflectconfig.json
new file mode 100644
index 0000000..bea721c
--- /dev/null
+++ b/app/src/nativecompile/reflectconfig.json
@@ -0,0 +1,39 @@
+[
+  {
+    "name" : "java.lang.Class",
+    "queryAllDeclaredConstructors" : true,
+    "queryAllPublicConstructors" : true,
+    "queryAllDeclaredMethods" : true,
+    "queryAllPublicMethods" : true,
+    "allDeclaredClasses" : true,
+    "allPublicClasses" : true
+  },
+  {
+    "name" : "java.lang.String",
+    "fields" : [
+      { "name" : "value" },
+      { "name" : "hash" }
+    ],
+    "methods" : [
+      { "name" : "<init>", "parameterTypes" : [] },
+      { "name" : "<init>", "parameterTypes" : ["char[]"] },
+      { "name" : "charAt" },
+      { "name" : "format", "parameterTypes" : ["java.lang.String", "java.lang.Object[]"] }
+    ]
+  },
+  {
+    "name" : "java.lang.String$CaseInsensitiveComparator",
+    "queriedMethods" : [
+      { "name" : "compare" }
+    ]
+  },
+  {
+    "name": "com.diffplug.spotless.extra.eclipse.wtp.EclipseHtmlFormatterStepImpl",
+    "queryAllDeclaredConstructors" : true,
+    "queryAllPublicConstructors" : true,
+    "queryAllDeclaredMethods" : true,
+    "queryAllPublicMethods" : true,
+    "allDeclaredClasses" : true,
+    "allPublicClasses" : true
+  }
+]
\ No newline at end of file
diff --git a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpSecondTest.java b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpSecondTest.java
new file mode 100644
index 0000000..99831f7
--- /dev/null
+++ b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpSecondTest.java
@@ -0,0 +1,97 @@
+package com.diffplug.spotless.cli.steps;
+
+import com.diffplug.spotless.cli.CLIIntegrationHarness;
+import com.diffplug.spotless.cli.SpotlessCLIRunner;
+import com.diffplug.spotless.tag.CliNativeTest;
+import com.diffplug.spotless.tag.CliProcessTest;
+import com.diffplug.spotless.tag.SeparateJvmTest;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@Isolated
+@SeparateJvmTest
+@CliNativeTest
+@CliProcessTest
+public class EclipseWtpSecondTest extends CLIIntegrationHarness {
+
+//    @BeforeEach
+//    void resetEclipseFramework() throws ClassNotFoundException, NoSuchFieldException, IllegalAccessException {
+//        Class<?> frameworkClass = Class.forName("com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseFramework");
+//        Field instanceField = frameworkClass.getDeclaredField("INSTANCE");
+//        instanceField.setAccessible(true);
+//        instanceField.set(null, null);
+//
+//        Class<?> bundleRegistryClass = Class.forName("com.diffplug.spotless.extra.eclipse.base.osgi.FrameworkBundleRegistry");
+//        Field registryInstanceField = bundleRegistryClass.getDeclaredField("INSTANCE");
+//        registryInstanceField.setAccessible(true);
+//        registryInstanceField.set(null, null);
+//
+//        Class<?> registryProviderFactoryClass = Class.forName("org.eclipse.core.internal.registry.RegistryProviderFactory");
+//        Field registryProviderField = registryProviderFactoryClass.getDeclaredField("defaultRegistryProvider");
+//        registryProviderField.setAccessible(true);
+//        registryProviderField.set(null, null);
+//    }
+
+    @ParameterizedTest(name = "itSupportsFormattingFileType {0}")
+    @MethodSource
+    void itSupportsFormattingFileType(EclipseWtp.Type type, String unformatted) {
+        String fileName = "test." + type.name().toLowerCase();
+        setFile(fileName).toContent(unformatted);
+
+        SpotlessCLIRunner.Result result = cliRunner()
+                .withTargets(fileName)
+                .withStep(EclipseWtp.class)
+                .withOption("--type", type.name())
+                .run();
+
+        selfie().expectResource(fileName).toMatchDisk(type.name());
+    }
+
+//    @Test
+//    void itSupportsFormattingXmlFileType() {
+//        String unformatted = "<a><b>   c</b></a>";
+//        String fileName = "test.xml";
+//        setFile(fileName).toContent(unformatted);
+//
+//        SpotlessCLIRunner.Result result = cliRunner()
+//                .withTargets(fileName)
+//                .withStep(EclipseWtp.class)
+//                .withOption("--type", "XML")
+//                .run();
+//
+//        selfie().expectResource(fileName).toBe_TODO();
+//    }
+
+    static Stream<Arguments> itSupportsFormattingFileType() {
+        return Stream.of(
+//                Arguments.of(EclipseWtp.Type.CSS, "body {\n" + "a: v;   b:   \n" + "v;\n" + "}  \n"),
+                Arguments.of(
+                        EclipseWtp.Type.HTML,
+                        "<!DOCTYPE html> <html>\t<head> <meta   charset=\"UTF-8\"></head>\n" + "</html>  "));
+//                Arguments.of(EclipseWtp.Type.JSON, "{\"a\": \"b\",\t\"c\":   { \"d\": \"e\",\"f\": \"g\"}}"),
+//                Arguments.of(EclipseWtp.Type.JS, "function f(  )   {\n" + "a.b(1,\n" + "2);}"),
+//                Arguments.of(EclipseWtp.Type.XML, "<a><b>   c</b></a>"),
+//                Arguments.of(
+//                        EclipseWtp.Type.XHTML,
+//                        "<!DOCTYPE html> <html>\t<head> <meta   charset=\"UTF-8\"></head>\n" + "</html>  "));
+    }
+
+
+    @Test
+    void readMetadata() {
+        Set<Class<?>> set = Stream.of(EclipseWtp.Type.values())
+                .map(t -> EclipseWtp.Type.lookupClass(t.toEclipseWtpType()))
+                .collect(Collectors.toSet());
+
+        assertThat(set).isNotEmpty();
+    }
+}
diff --git a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpTest.java b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpTest.java
new file mode 100644
index 0000000..d778671
--- /dev/null
+++ b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpTest.java
@@ -0,0 +1,99 @@
+package com.diffplug.spotless.cli.steps;
+
+import com.diffplug.spotless.cli.CLIIntegrationHarness;
+import com.diffplug.spotless.cli.SpotlessCLIRunner;
+import com.diffplug.spotless.tag.CliNativeTest;
+import com.diffplug.spotless.tag.CliProcessTest;
+import com.diffplug.spotless.tag.SeparateJvmTest;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.lang.reflect.Field;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@Isolated
+@SeparateJvmTest
+@CliNativeTest
+@CliProcessTest
+public class EclipseWtpTest extends CLIIntegrationHarness {
+
+//    @BeforeEach
+//    void resetEclipseFramework() throws ClassNotFoundException, NoSuchFieldException, IllegalAccessException {
+//        Class<?> frameworkClass = Class.forName("com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseFramework");
+//        Field instanceField = frameworkClass.getDeclaredField("INSTANCE");
+//        instanceField.setAccessible(true);
+//        instanceField.set(null, null);
+//
+//        Class<?> bundleRegistryClass = Class.forName("com.diffplug.spotless.extra.eclipse.base.osgi.FrameworkBundleRegistry");
+//        Field registryInstanceField = bundleRegistryClass.getDeclaredField("INSTANCE");
+//        registryInstanceField.setAccessible(true);
+//        registryInstanceField.set(null, null);
+//
+//        Class<?> registryProviderFactoryClass = Class.forName("org.eclipse.core.internal.registry.RegistryProviderFactory");
+//        Field registryProviderField = registryProviderFactoryClass.getDeclaredField("defaultRegistryProvider");
+//        registryProviderField.setAccessible(true);
+//        registryProviderField.set(null, null);
+//    }
+
+    @ParameterizedTest(name = "itSupportsFormattingFileType {0}")
+    @MethodSource
+    void itSupportsFormattingFileType(EclipseWtp.Type type, String unformatted) {
+        String fileName = "test." + type.name().toLowerCase();
+        setFile(fileName).toContent(unformatted);
+
+        SpotlessCLIRunner.Result result = cliRunner()
+                .withTargets(fileName)
+                .withStep(EclipseWtp.class)
+                .withOption("--type", type.name())
+                .run();
+
+        selfie().expectResource(fileName).toMatchDisk(type.name());
+    }
+
+//    @Test
+//    void itSupportsFormattingXmlFileType() {
+//        String unformatted = "<a><b>   c</b></a>";
+//        String fileName = "test.xml";
+//        setFile(fileName).toContent(unformatted);
+//
+//        SpotlessCLIRunner.Result result = cliRunner()
+//                .withTargets(fileName)
+//                .withStep(EclipseWtp.class)
+//                .withOption("--type", "XML")
+//                .run();
+//
+//        selfie().expectResource(fileName).toBe_TODO();
+//    }
+
+    static Stream<Arguments> itSupportsFormattingFileType() {
+        return Stream.of(
+                Arguments.of(EclipseWtp.Type.CSS, "body {\n" + "a: v;   b:   \n" + "v;\n" + "}  \n"));
+//                Arguments.of(
+//                        EclipseWtp.Type.HTML,
+//                        "<!DOCTYPE html> <html>\t<head> <meta   charset=\"UTF-8\"></head>\n" + "</html>  "),
+//                Arguments.of(EclipseWtp.Type.JSON, "{\"a\": \"b\",\t\"c\":   { \"d\": \"e\",\"f\": \"g\"}}"),
+//                Arguments.of(EclipseWtp.Type.JS, "function f(  )   {\n" + "a.b(1,\n" + "2);}"),
+//                Arguments.of(EclipseWtp.Type.XML, "<a><b>   c</b></a>"),
+//                Arguments.of(
+//                        EclipseWtp.Type.XHTML,
+//                        "<!DOCTYPE html> <html>\t<head> <meta   charset=\"UTF-8\"></head>\n" + "</html>  "));
+    }
+
+
+    @Test
+    void readMetadata() {
+        Set<Class<?>> set = Stream.of(EclipseWtp.Type.values())
+                .map(t -> EclipseWtp.Type.lookupClass(t.toEclipseWtpType()))
+                .collect(Collectors.toSet());
+
+        assertThat(set).isNotEmpty();
+    }
+}
diff --git a/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpSecondTest.ss b/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpSecondTest.ss
new file mode 100644
index 0000000..275dc27
--- /dev/null
+++ b/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpSecondTest.ss
@@ -0,0 +1,9 @@
+╔═ itSupportsFormattingFileType/HTML ═╗
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+</head>
+</html>
+
+╔═ [end of file] ═╗
diff --git a/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpTest.ss b/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpTest.ss
new file mode 100644
index 0000000..cf0524f
--- /dev/null
+++ b/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpTest.ss
@@ -0,0 +1,6 @@
+╔═ itSupportsFormattingFileType/CSS ═╗
+body {
+	a: v;
+	b: v;
+}
+╔═ [end of file] ═╗
diff --git a/build-logic/src/main/groovy/buildlogic.java-graalvm-conventions.gradle b/build-logic/src/main/groovy/buildlogic.java-graalvm-conventions.gradle
index 04dfd4a..e477bb0 100644
--- a/build-logic/src/main/groovy/buildlogic.java-graalvm-conventions.gradle
+++ b/build-logic/src/main/groovy/buildlogic.java-graalvm-conventions.gradle
@@ -27,13 +27,14 @@ graalvmNative {
 		metadataCopy {
 			inputTaskNames.add('test')
 			inputTaskNames.add('testNpm')
+            inputTaskNames.add('testSeparateJvm')
 			mergeWithExisting = false
 			outputDirectories.add(nativeCompileMetaDir.get().asFile.path)
 		}
 		tasksToInstrumentPredicate = new java.util.function.Predicate<Task>() {
 					@Override
 					boolean test(Task task) {
-						def instrument = task.name == 'test' || task.name == 'testNpm'
+						def instrument = task.name == 'test' || task.name == 'testNpm' || task.name == 'testSeparateJvm'
 						logger.debug("Instrumenting task ${task.name} = $instrument")
 						return instrument
 					}
@@ -46,6 +47,11 @@ graalvmNative {
 			sharedLibrary = false
 			useFatJar = true // use shadowJar as input to have same classpath
 
+//			configurationFileDirectories.from(file('src/nativecompile/reflectconfig.json'))
+
+			buildArgs.add('-H:+UnlockExperimentalVMOptions')
+			buildArgs.add("-H:ReflectionConfigurationFiles=${project.file('src/nativecompile/reflectconfig.json').path}")
+
 			// allow calling prettier (using local http server)
 			buildArgs.add('--enable-url-protocols=http')
 
@@ -66,7 +72,7 @@ graalvmNative {
 
 			buildArgs.add('--initialize-at-build-time=com.sun.tools.javac.file.Locations')
 
-			buildArgs.add('-H:+UnlockExperimentalVMOptions') // to enable the following options
+//			buildArgs.add('-H:+UnlockExperimentalVMOptions') // to enable the following options
 			buildArgs.add('-H:IncludeResourceBundles=com.sun.tools.javac.resources.compiler')
 			buildArgs.add('-H:IncludeResourceBundles=com.sun.tools.javac.resources.javac')
 
diff --git a/build-logic/src/main/groovy/buildlogic.java-special-tests-conventions.gradle b/build-logic/src/main/groovy/buildlogic.java-special-tests-conventions.gradle
index 8f03f2f..87eba68 100644
--- a/build-logic/src/main/groovy/buildlogic.java-special-tests-conventions.gradle
+++ b/build-logic/src/main/groovy/buildlogic.java-special-tests-conventions.gradle
@@ -9,7 +9,8 @@ def special = [
 	'cliProcess',
 	'cliProcessNpm',
 	'cliNative',
-	'cliNativeNpm'
+	'cliNativeNpm',
+    'separateJvm'
 ]
 
 tasks.named('test').configure {
@@ -26,14 +27,24 @@ special.forEach { tag ->
 	}
 }
 
-// any test task that does not end with Npm should exclude all the npm tests
+tasks.named('testSeparateJvm', Test) {
+    it.forkEvery = 1 // ensure that each test task runs in a separate JVM
+}
+
 tasks.withType(Test).configureEach { Test task ->
-	if (!task.name.toLowerCase().endsWith('npm')) {
-		def toExclude = special.findAll { it.toLowerCase().endsWith('npm') }.join('|')
-		task.useJUnitPlatform {
-			excludeTags toExclude
-		}
-	}
+    // any test task that does not end with Npm should exclude all the npm tests
+    if (!task.name.toLowerCase().endsWith('npm')) {
+        def toExclude = special.findAll { it.toLowerCase().endsWith('npm') }.join('|')
+        task.useJUnitPlatform {
+            excludeTags toExclude
+        }
+    }
+    // any test task that does not end with separateJvm should exclude all the separateJvm tests
+    if (!task.name.toLowerCase().endsWith('separatejvm')) {
+        task.useJUnitPlatform {
+            excludeTags 'separateJvm'
+        }
+    }
 }
 
 tasks.register('testAll') {
diff --git a/build-logic/src/main/groovy/buildlogic.picocli-conventions.gradle b/build-logic/src/main/groovy/buildlogic.picocli-conventions.gradle
index 59827e9..4db88f6 100644
--- a/build-logic/src/main/groovy/buildlogic.picocli-conventions.gradle
+++ b/build-logic/src/main/groovy/buildlogic.picocli-conventions.gradle
@@ -14,7 +14,7 @@ compileJava {
 		"-Aproject=${project.group}/${project.name}",
 		"-Aother.resource.bundles=application",
 		// patterns require double-escaping (one escape is removed by groovy, the other one is needed in the resulting json file)
-		"-Aother.resource.patterns=.*\\\\.properties,.*\\\\.json,.*\\\\.js"
+		"-Aother.resource.patterns=.*\\\\.properties,.*\\\\.json,.*\\\\.js,.*\\\\.MF"
 	]
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index beb12c1..4741fcc 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -9,6 +9,9 @@ mockito = "5.17.0"
 native-include-cleanThat = "2.23"
 native-include-googleJavaFormat = "1.27.0"
 native-include-palantirJavaFormat = "2.67.0"
+# to find required version here check eclipse_wtp_formatter/v4.21.0.lockfile
+# where <4.21.0> is the default version of com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep#defaultVersion
+native-include-spotlessEclipseWtp = "3.23.0"
 picocli = "4.7.6"
 selfie = "2.5.1"
 slf4j = "2.0.17"
@@ -28,6 +31,7 @@ mockito = { module = "org.mockito:mockito-core", version.ref = "mockito" }
 native-include-cleanThat = { module = "io.github.solven-eu.cleanthat:java", version.ref = "native-include-cleanThat" }
 native-include-googleJavaFormat = { module = "com.google.googlejavaformat:google-java-format", version.ref = "native-include-googleJavaFormat" }
 native-include-palantirJavaFormat = { module = "com.palantir.javaformat:palantir-java-format", version.ref = "native-include-palantirJavaFormat" }
+native-include-spotlessEclipseWtp = { module = "com.diffplug.spotless:spotless-eclipse-wtp", version.ref = "native-include-spotlessEclipseWtp" }
 picocli = { module = "info.picocli:picocli", version.ref = "picocli" }
 picocli-codegen = { module = "info.picocli:picocli-codegen", version.ref = "picocli" }
 selfie = { module = "com.diffplug.selfie:selfie-runner-junit5", version.ref = "selfie" }
@@ -43,6 +47,7 @@ native-includes = [
     "native-include-cleanThat",
     "native-include-googleJavaFormat",
     "native-include-palantirJavaFormat",
+    "native-include-spotlessEclipseWtp",
 ]
 spotless-libs = ["spotless-lib", "spotless-lib-extra"]
 test-libs = ["assertj-core", "junit-jupiter-api", "selfie", "mockito"]
diff --git a/testlib/src/main/java/com/diffplug/spotless/tag/SeparateJvmTest.java b/testlib/src/main/java/com/diffplug/spotless/tag/SeparateJvmTest.java
new file mode 100644
index 0000000..b3e491e
--- /dev/null
+++ b/testlib/src/main/java/com/diffplug/spotless/tag/SeparateJvmTest.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2021-2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.tag;
+
+import org.junit.jupiter.api.Tag;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Target({TYPE, METHOD})
+@Retention(RUNTIME)
+@Tag("separateJvm")
+public @interface SeparateJvmTest {}

From dbf5ca85b026379bd81226183f78b14f456f85e5 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Mon, 18 Aug 2025 06:47:58 +0200
Subject: [PATCH 2/6] chore: cleaning up eclipse-wtp

---
 README.md                                     |   1 +
 app/build.gradle                              |  22 ++-
 .../diffplug/spotless/cli/SpotlessCLI.java    |   1 -
 .../spotless/cli/steps/EclipseWtp.java        | 125 ++++++-----------
 app/src/nativecompile/reflectconfig.json      |  39 ------
 .../cli/steps/EclipseWtpSecondTest.java       | 122 ++++++++--------
 .../spotless/cli/steps/EclipseWtpTest.java    | 131 +++++++++---------
 ...buildlogic.java-graalvm-conventions.gradle |  10 +-
 ...ogic.java-special-tests-conventions.gradle |  35 +++--
 .../spotless/tag/SeparateJvmTest.java         |   4 +-
 10 files changed, 206 insertions(+), 284 deletions(-)
 delete mode 100644 app/src/nativecompile/reflectconfig.json

diff --git a/README.md b/README.md
index 9093656..06e558e 100644
--- a/README.md
+++ b/README.md
@@ -154,6 +154,7 @@ or apply the formatting to the files.
 Available formatting steps:
   clang-format           Runs clang-format
   clean-that             CleanThat enables automatic refactoring of Java code.
+  eclipse-wtp            Runs Eclipse WTP formatter (4.21.0)
   format-annotations     Corrects line break formatting of type annotations in
                            java files.
   google-java-format     Runs google java format
diff --git a/app/build.gradle b/app/build.gradle
index 768cf72..7cf0d73 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,12 +2,6 @@ import com.diffplug.spotless.cli.picocli.usage.GenerateUsagePropertiesTask
 import com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep
 import org.gradle.plugins.ide.eclipse.model.EclipseWtp
 
-//buildscript {
-//	dependencies {
-//		classpath libs.spotless.lib.extra
-//	}
-//}
-
 plugins {
 	id 'buildlogic.picocli-conventions'
 	id 'buildlogic.java-special-tests-conventions'
@@ -27,14 +21,18 @@ dependencies {
 	// this is necessary to allow for native compilation where reflective access to dynamic jars is not possible
 	implementation libs.bundles.native.includes
 
+	// Eclipse WTP formatter used a custom lockfile to ensure the formatter has the
+	// correct version of all its libraries
 	def resourceName = "/com/diffplug/spotless/extra/eclipse_wtp_formatter/v4.21.0.lockfile"
-	println("resource: " + resourceName)
-    EclipseWtpFormatterStep.getResource(resourceName)
+	logger.debug("reading eclipse wtp resource: " + resourceName)
+	EclipseWtpFormatterStep.getResource(resourceName)
 			.readLines()
-	        .findAll { !it.startsWith('#')} // filter out comments
-	        .each { implementation("${it}") {
-				transitive=false
-			} }
+			.findAll { !it.startsWith('#')} // filter out comments
+			.each {
+				implementation("${it}") {
+					transitive=false
+				}
+			}
 }
 
 application {
diff --git a/app/src/main/java/com/diffplug/spotless/cli/SpotlessCLI.java b/app/src/main/java/com/diffplug/spotless/cli/SpotlessCLI.java
index 8752ad2..e861c3e 100644
--- a/app/src/main/java/com/diffplug/spotless/cli/SpotlessCLI.java
+++ b/app/src/main/java/com/diffplug/spotless/cli/SpotlessCLI.java
@@ -24,7 +24,6 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
-import com.diffplug.spotless.cli.steps.EclipseWtp;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/app/src/main/java/com/diffplug/spotless/cli/steps/EclipseWtp.java b/app/src/main/java/com/diffplug/spotless/cli/steps/EclipseWtp.java
index 48ec803..215407b 100644
--- a/app/src/main/java/com/diffplug/spotless/cli/steps/EclipseWtp.java
+++ b/app/src/main/java/com/diffplug/spotless/cli/steps/EclipseWtp.java
@@ -1,21 +1,36 @@
+/*
+ * Copyright 2025 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.cli.steps;
 
+import java.nio.file.Path;
+import java.util.List;
+
+import org.jetbrains.annotations.NotNull;
 
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.ThrowingEx;
 import com.diffplug.spotless.cli.core.SpotlessActionContext;
 import com.diffplug.spotless.cli.help.OptionConstants;
 import com.diffplug.spotless.extra.EclipseBasedStepBuilder;
 import com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep;
-import org.jetbrains.annotations.NotNull;
-import picocli.CommandLine;
 
-import java.lang.reflect.Constructor;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Properties;
+import picocli.CommandLine;
 
-@CommandLine.Command(name = "eclipse-wtp", description = "Runs Eclipse WTP formatter (" + EclipseWtp.ECLIPSE_WTP_VERSION+")")
+@CommandLine.Command(
+        name = "eclipse-wtp",
+        description = "Runs Eclipse WTP formatter (" + EclipseWtp.ECLIPSE_WTP_VERSION + ")")
 public class EclipseWtp extends SpotlessFormatterStep {
 
     public static final String ECLIPSE_WTP_VERSION = "4.21.0"; // TODO we need to slurp in the lock file also
@@ -23,101 +38,47 @@ public class EclipseWtp extends SpotlessFormatterStep {
     @CommandLine.Option(
             names = {"-f", "--config-file"},
             arity = "0",
-            description = "The path to the Eclipse WTP configuration file.\n" +
-                    "For supported config file options see <https://github.com/diffplug/spotless/tree/main/plugin-gradle#eclipse-web-tools-platform>"
-    )
+            description =
+                    "The path to the Eclipse WTP configuration file.\n"
+                            + "For supported config file options see <https://github.com/diffplug/spotless/tree/main/plugin-gradle#eclipse-web-tools-platform>")
     List<Path> configFiles;
 
     @CommandLine.Option(
-            names = { "-t", "--type" },
+            names = {"-t", "--type"},
             description = "The type of the Eclipse WTP formatter." + OptionConstants.VALID_VALUES_SUFFIX,
-            required = true
-    )
-    Type type;
+            required = true)
+    Type type; // TODO: might trying inferring type
 
     public enum Type {
-        CSS,
-        HTML,
-        JS,
-        JSON,
-        XML,
-        XHTML;
+        CSS(EclipseWtpFormatterStep.CSS),
+        HTML(EclipseWtpFormatterStep.HTML),
+        JS(EclipseWtpFormatterStep.JS),
+        JSON(EclipseWtpFormatterStep.JSON),
+        XML(EclipseWtpFormatterStep.XML),
+        XHTML(EclipseWtpFormatterStep.HTML); // XHTML is treated as HTML in Eclipse WTP
 
-        public void initCorrespondingEclipseWtpCorePlugin() {
-            // due to internals of eclipse wtp, invoking various variants of the formatter in the same java process
-            // requires some static initialization to take place
+        private final EclipseWtpFormatterStep backendEclipseWtpType;
 
+        Type(EclipseWtpFormatterStep backendEclipseWtpType) {
+            this.backendEclipseWtpType = backendEclipseWtpType;
         }
 
         public @NotNull EclipseWtpFormatterStep toEclipseWtpType() {
-            EclipseWtpFormatterStep step = switch (this) {
-                case CSS -> EclipseWtpFormatterStep.CSS;
-                case HTML, XHTML -> EclipseWtpFormatterStep.HTML; // XHTML is treated as HTML in Eclipse WTP
-                case JS -> EclipseWtpFormatterStep.JS;
-                case JSON -> EclipseWtpFormatterStep.JSON;
-                case XML -> EclipseWtpFormatterStep.XML;
-            };
-
-            @SuppressWarnings("unused") Class<?> reverseLookup = lookupClass(step);
-            return step;
-        }
-
-        static Class<?> lookupClass(EclipseWtpFormatterStep step) {
-                        /* this statement is only here to
-               1) get compile errors in case a new type is added in EclipseWtpFormatterStep
-               2) allow graal to collect reflective Metadata*/
-            @SuppressWarnings("unused") Class<?> reverseLookup = switch(step) {
-                case CSS -> EclipseWtpMetadata.cssClass();
-                case HTML -> EclipseWtpMetadata.htmlClass();
-                case JS -> EclipseWtpMetadata.jsClass();
-                case JSON -> EclipseWtpMetadata.jsonClass();
-                case XML -> EclipseWtpMetadata.xmlClass();
-            };
-            return reverseLookup;
+            return this.backendEclipseWtpType;
         }
     }
 
-
     @Override
     public @NotNull List<FormatterStep> prepareFormatterSteps(SpotlessActionContext context) {
         EclipseWtpFormatterStep wtpType = type.toEclipseWtpType();
         EclipseBasedStepBuilder builder = wtpType.createBuilder(context.provisioner());
         builder.setVersion(ECLIPSE_WTP_VERSION);
         if (configFiles != null && !configFiles.isEmpty()) {
-            builder.setPreferences(
-                    configFiles.stream()
-                            .map(context::resolvePath)
-                            .map(Path::toFile)
-                            .toList());
+            builder.setPreferences(configFiles.stream()
+                    .map(context::resolvePath)
+                    .map(Path::toFile)
+                    .toList());
         }
         return List.of(builder.build());
     }
-
-
-    static class EclipseWtpMetadata {
-
-        private static Class<?> cssClass() {
-            return ThrowingEx.get(() -> Class.forName("com.diffplug.spotless.extra.eclipse.wtp.EclipseCssFormatterStepImpl"));
-        }
-
-        private static Class<?> htmlClass() {
-            return ThrowingEx.get(() -> {
-                Class<?> result = Class.forName("com.diffplug.spotless.extra.eclipse.wtp.EclipseHtmlFormatterStepImpl");
-                Constructor<?> declaredConstructor = result.getDeclaredConstructor(Properties.class);
-                return result;
-            });
-        }
-
-        private static Class<?> jsClass() {
-            return ThrowingEx.get(() -> Class.forName("com.diffplug.spotless.extra.eclipse.wtp.EclipseJsFormatterStepImpl"));
-        }
-
-        private static Class<?> jsonClass() {
-            return ThrowingEx.get(() -> Class.forName("com.diffplug.spotless.extra.eclipse.wtp.EclipseJsonFormatterStepImpl"));
-        }
-
-        private static Class<?> xmlClass() {
-            return ThrowingEx.get(() -> Class.forName("com.diffplug.spotless.extra.eclipse.wtp.EclipseXmlFormatterStepImpl"));
-        }
-    }
 }
diff --git a/app/src/nativecompile/reflectconfig.json b/app/src/nativecompile/reflectconfig.json
deleted file mode 100644
index bea721c..0000000
--- a/app/src/nativecompile/reflectconfig.json
+++ /dev/null
@@ -1,39 +0,0 @@
-[
-  {
-    "name" : "java.lang.Class",
-    "queryAllDeclaredConstructors" : true,
-    "queryAllPublicConstructors" : true,
-    "queryAllDeclaredMethods" : true,
-    "queryAllPublicMethods" : true,
-    "allDeclaredClasses" : true,
-    "allPublicClasses" : true
-  },
-  {
-    "name" : "java.lang.String",
-    "fields" : [
-      { "name" : "value" },
-      { "name" : "hash" }
-    ],
-    "methods" : [
-      { "name" : "<init>", "parameterTypes" : [] },
-      { "name" : "<init>", "parameterTypes" : ["char[]"] },
-      { "name" : "charAt" },
-      { "name" : "format", "parameterTypes" : ["java.lang.String", "java.lang.Object[]"] }
-    ]
-  },
-  {
-    "name" : "java.lang.String$CaseInsensitiveComparator",
-    "queriedMethods" : [
-      { "name" : "compare" }
-    ]
-  },
-  {
-    "name": "com.diffplug.spotless.extra.eclipse.wtp.EclipseHtmlFormatterStepImpl",
-    "queryAllDeclaredConstructors" : true,
-    "queryAllPublicConstructors" : true,
-    "queryAllDeclaredMethods" : true,
-    "queryAllPublicMethods" : true,
-    "allDeclaredClasses" : true,
-    "allPublicClasses" : true
-  }
-]
\ No newline at end of file
diff --git a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpSecondTest.java b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpSecondTest.java
index 99831f7..67d11e1 100644
--- a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpSecondTest.java
+++ b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpSecondTest.java
@@ -1,21 +1,32 @@
+/*
+ * Copyright 2025 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.cli.steps;
 
-import com.diffplug.spotless.cli.CLIIntegrationHarness;
-import com.diffplug.spotless.cli.SpotlessCLIRunner;
-import com.diffplug.spotless.tag.CliNativeTest;
-import com.diffplug.spotless.tag.CliProcessTest;
-import com.diffplug.spotless.tag.SeparateJvmTest;
-import org.junit.jupiter.api.Test;
+import java.util.stream.Stream;
+
 import org.junit.jupiter.api.parallel.Isolated;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static org.assertj.core.api.Assertions.assertThat;
+import com.diffplug.spotless.cli.CLIIntegrationHarness;
+import com.diffplug.spotless.cli.SpotlessCLIRunner;
+import com.diffplug.spotless.tag.CliNativeTest;
+import com.diffplug.spotless.tag.CliProcessTest;
+import com.diffplug.spotless.tag.SeparateJvmTest;
 
 @Isolated
 @SeparateJvmTest
@@ -23,23 +34,26 @@
 @CliProcessTest
 public class EclipseWtpSecondTest extends CLIIntegrationHarness {
 
-//    @BeforeEach
-//    void resetEclipseFramework() throws ClassNotFoundException, NoSuchFieldException, IllegalAccessException {
-//        Class<?> frameworkClass = Class.forName("com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseFramework");
-//        Field instanceField = frameworkClass.getDeclaredField("INSTANCE");
-//        instanceField.setAccessible(true);
-//        instanceField.set(null, null);
-//
-//        Class<?> bundleRegistryClass = Class.forName("com.diffplug.spotless.extra.eclipse.base.osgi.FrameworkBundleRegistry");
-//        Field registryInstanceField = bundleRegistryClass.getDeclaredField("INSTANCE");
-//        registryInstanceField.setAccessible(true);
-//        registryInstanceField.set(null, null);
-//
-//        Class<?> registryProviderFactoryClass = Class.forName("org.eclipse.core.internal.registry.RegistryProviderFactory");
-//        Field registryProviderField = registryProviderFactoryClass.getDeclaredField("defaultRegistryProvider");
-//        registryProviderField.setAccessible(true);
-//        registryProviderField.set(null, null);
-//    }
+    //    @BeforeEach
+    //    void resetEclipseFramework() throws ClassNotFoundException, NoSuchFieldException, IllegalAccessException {
+    //        Class<?> frameworkClass =
+    // Class.forName("com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseFramework");
+    //        Field instanceField = frameworkClass.getDeclaredField("INSTANCE");
+    //        instanceField.setAccessible(true);
+    //        instanceField.set(null, null);
+    //
+    //        Class<?> bundleRegistryClass =
+    // Class.forName("com.diffplug.spotless.extra.eclipse.base.osgi.FrameworkBundleRegistry");
+    //        Field registryInstanceField = bundleRegistryClass.getDeclaredField("INSTANCE");
+    //        registryInstanceField.setAccessible(true);
+    //        registryInstanceField.set(null, null);
+    //
+    //        Class<?> registryProviderFactoryClass =
+    // Class.forName("org.eclipse.core.internal.registry.RegistryProviderFactory");
+    //        Field registryProviderField = registryProviderFactoryClass.getDeclaredField("defaultRegistryProvider");
+    //        registryProviderField.setAccessible(true);
+    //        registryProviderField.set(null, null);
+    //    }
 
     @ParameterizedTest(name = "itSupportsFormattingFileType {0}")
     @MethodSource
@@ -56,42 +70,32 @@ void itSupportsFormattingFileType(EclipseWtp.Type type, String unformatted) {
         selfie().expectResource(fileName).toMatchDisk(type.name());
     }
 
-//    @Test
-//    void itSupportsFormattingXmlFileType() {
-//        String unformatted = "<a><b>   c</b></a>";
-//        String fileName = "test.xml";
-//        setFile(fileName).toContent(unformatted);
-//
-//        SpotlessCLIRunner.Result result = cliRunner()
-//                .withTargets(fileName)
-//                .withStep(EclipseWtp.class)
-//                .withOption("--type", "XML")
-//                .run();
-//
-//        selfie().expectResource(fileName).toBe_TODO();
-//    }
+    //    @Test
+    //    void itSupportsFormattingXmlFileType() {
+    //        String unformatted = "<a><b>   c</b></a>";
+    //        String fileName = "test.xml";
+    //        setFile(fileName).toContent(unformatted);
+    //
+    //        SpotlessCLIRunner.Result result = cliRunner()
+    //                .withTargets(fileName)
+    //                .withStep(EclipseWtp.class)
+    //                .withOption("--type", "XML")
+    //                .run();
+    //
+    //        selfie().expectResource(fileName).toBe_TODO();
+    //    }
 
     static Stream<Arguments> itSupportsFormattingFileType() {
         return Stream.of(
-//                Arguments.of(EclipseWtp.Type.CSS, "body {\n" + "a: v;   b:   \n" + "v;\n" + "}  \n"),
+                //                Arguments.of(EclipseWtp.Type.CSS, "body {\n" + "a: v;   b:   \n" + "v;\n" + "}  \n"),
                 Arguments.of(
                         EclipseWtp.Type.HTML,
                         "<!DOCTYPE html> <html>\t<head> <meta   charset=\"UTF-8\"></head>\n" + "</html>  "));
-//                Arguments.of(EclipseWtp.Type.JSON, "{\"a\": \"b\",\t\"c\":   { \"d\": \"e\",\"f\": \"g\"}}"),
-//                Arguments.of(EclipseWtp.Type.JS, "function f(  )   {\n" + "a.b(1,\n" + "2);}"),
-//                Arguments.of(EclipseWtp.Type.XML, "<a><b>   c</b></a>"),
-//                Arguments.of(
-//                        EclipseWtp.Type.XHTML,
-//                        "<!DOCTYPE html> <html>\t<head> <meta   charset=\"UTF-8\"></head>\n" + "</html>  "));
-    }
-
-
-    @Test
-    void readMetadata() {
-        Set<Class<?>> set = Stream.of(EclipseWtp.Type.values())
-                .map(t -> EclipseWtp.Type.lookupClass(t.toEclipseWtpType()))
-                .collect(Collectors.toSet());
-
-        assertThat(set).isNotEmpty();
+        //                Arguments.of(EclipseWtp.Type.JSON, "{\"a\": \"b\",\t\"c\":   { \"d\": \"e\",\"f\": \"g\"}}"),
+        //                Arguments.of(EclipseWtp.Type.JS, "function f(  )   {\n" + "a.b(1,\n" + "2);}"),
+        //                Arguments.of(EclipseWtp.Type.XML, "<a><b>   c</b></a>"),
+        //                Arguments.of(
+        //                        EclipseWtp.Type.XHTML,
+        //                        "<!DOCTYPE html> <html>\t<head> <meta   charset=\"UTF-8\"></head>\n" + "</html>  "));
     }
 }
diff --git a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpTest.java b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpTest.java
index d778671..fbd0be7 100644
--- a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpTest.java
+++ b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpTest.java
@@ -1,23 +1,32 @@
+/*
+ * Copyright 2025 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.diffplug.spotless.cli.steps;
 
-import com.diffplug.spotless.cli.CLIIntegrationHarness;
-import com.diffplug.spotless.cli.SpotlessCLIRunner;
-import com.diffplug.spotless.tag.CliNativeTest;
-import com.diffplug.spotless.tag.CliProcessTest;
-import com.diffplug.spotless.tag.SeparateJvmTest;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
+import java.util.stream.Stream;
+
 import org.junit.jupiter.api.parallel.Isolated;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import java.lang.reflect.Field;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static org.assertj.core.api.Assertions.assertThat;
+import com.diffplug.spotless.cli.CLIIntegrationHarness;
+import com.diffplug.spotless.cli.SpotlessCLIRunner;
+import com.diffplug.spotless.tag.CliNativeTest;
+import com.diffplug.spotless.tag.CliProcessTest;
+import com.diffplug.spotless.tag.SeparateJvmTest;
 
 @Isolated
 @SeparateJvmTest
@@ -25,23 +34,26 @@
 @CliProcessTest
 public class EclipseWtpTest extends CLIIntegrationHarness {
 
-//    @BeforeEach
-//    void resetEclipseFramework() throws ClassNotFoundException, NoSuchFieldException, IllegalAccessException {
-//        Class<?> frameworkClass = Class.forName("com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseFramework");
-//        Field instanceField = frameworkClass.getDeclaredField("INSTANCE");
-//        instanceField.setAccessible(true);
-//        instanceField.set(null, null);
-//
-//        Class<?> bundleRegistryClass = Class.forName("com.diffplug.spotless.extra.eclipse.base.osgi.FrameworkBundleRegistry");
-//        Field registryInstanceField = bundleRegistryClass.getDeclaredField("INSTANCE");
-//        registryInstanceField.setAccessible(true);
-//        registryInstanceField.set(null, null);
-//
-//        Class<?> registryProviderFactoryClass = Class.forName("org.eclipse.core.internal.registry.RegistryProviderFactory");
-//        Field registryProviderField = registryProviderFactoryClass.getDeclaredField("defaultRegistryProvider");
-//        registryProviderField.setAccessible(true);
-//        registryProviderField.set(null, null);
-//    }
+    //    @BeforeEach
+    //    void resetEclipseFramework() throws ClassNotFoundException, NoSuchFieldException, IllegalAccessException {
+    //        Class<?> frameworkClass =
+    // Class.forName("com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseFramework");
+    //        Field instanceField = frameworkClass.getDeclaredField("INSTANCE");
+    //        instanceField.setAccessible(true);
+    //        instanceField.set(null, null);
+    //
+    //        Class<?> bundleRegistryClass =
+    // Class.forName("com.diffplug.spotless.extra.eclipse.base.osgi.FrameworkBundleRegistry");
+    //        Field registryInstanceField = bundleRegistryClass.getDeclaredField("INSTANCE");
+    //        registryInstanceField.setAccessible(true);
+    //        registryInstanceField.set(null, null);
+    //
+    //        Class<?> registryProviderFactoryClass =
+    // Class.forName("org.eclipse.core.internal.registry.RegistryProviderFactory");
+    //        Field registryProviderField = registryProviderFactoryClass.getDeclaredField("defaultRegistryProvider");
+    //        registryProviderField.setAccessible(true);
+    //        registryProviderField.set(null, null);
+    //    }
 
     @ParameterizedTest(name = "itSupportsFormattingFileType {0}")
     @MethodSource
@@ -58,42 +70,31 @@ void itSupportsFormattingFileType(EclipseWtp.Type type, String unformatted) {
         selfie().expectResource(fileName).toMatchDisk(type.name());
     }
 
-//    @Test
-//    void itSupportsFormattingXmlFileType() {
-//        String unformatted = "<a><b>   c</b></a>";
-//        String fileName = "test.xml";
-//        setFile(fileName).toContent(unformatted);
-//
-//        SpotlessCLIRunner.Result result = cliRunner()
-//                .withTargets(fileName)
-//                .withStep(EclipseWtp.class)
-//                .withOption("--type", "XML")
-//                .run();
-//
-//        selfie().expectResource(fileName).toBe_TODO();
-//    }
+    //    @Test
+    //    void itSupportsFormattingXmlFileType() {
+    //        String unformatted = "<a><b>   c</b></a>";
+    //        String fileName = "test.xml";
+    //        setFile(fileName).toContent(unformatted);
+    //
+    //        SpotlessCLIRunner.Result result = cliRunner()
+    //                .withTargets(fileName)
+    //                .withStep(EclipseWtp.class)
+    //                .withOption("--type", "XML")
+    //                .run();
+    //
+    //        selfie().expectResource(fileName).toBe_TODO();
+    //    }
 
     static Stream<Arguments> itSupportsFormattingFileType() {
-        return Stream.of(
-                Arguments.of(EclipseWtp.Type.CSS, "body {\n" + "a: v;   b:   \n" + "v;\n" + "}  \n"));
-//                Arguments.of(
-//                        EclipseWtp.Type.HTML,
-//                        "<!DOCTYPE html> <html>\t<head> <meta   charset=\"UTF-8\"></head>\n" + "</html>  "),
-//                Arguments.of(EclipseWtp.Type.JSON, "{\"a\": \"b\",\t\"c\":   { \"d\": \"e\",\"f\": \"g\"}}"),
-//                Arguments.of(EclipseWtp.Type.JS, "function f(  )   {\n" + "a.b(1,\n" + "2);}"),
-//                Arguments.of(EclipseWtp.Type.XML, "<a><b>   c</b></a>"),
-//                Arguments.of(
-//                        EclipseWtp.Type.XHTML,
-//                        "<!DOCTYPE html> <html>\t<head> <meta   charset=\"UTF-8\"></head>\n" + "</html>  "));
-    }
-
-
-    @Test
-    void readMetadata() {
-        Set<Class<?>> set = Stream.of(EclipseWtp.Type.values())
-                .map(t -> EclipseWtp.Type.lookupClass(t.toEclipseWtpType()))
-                .collect(Collectors.toSet());
-
-        assertThat(set).isNotEmpty();
+        return Stream.of(Arguments.of(EclipseWtp.Type.CSS, "body {\n" + "a: v;   b:   \n" + "v;\n" + "}  \n"));
+        //                Arguments.of(
+        //                        EclipseWtp.Type.HTML,
+        //                        "<!DOCTYPE html> <html>\t<head> <meta   charset=\"UTF-8\"></head>\n" + "</html>  "),
+        //                Arguments.of(EclipseWtp.Type.JSON, "{\"a\": \"b\",\t\"c\":   { \"d\": \"e\",\"f\": \"g\"}}"),
+        //                Arguments.of(EclipseWtp.Type.JS, "function f(  )   {\n" + "a.b(1,\n" + "2);}"),
+        //                Arguments.of(EclipseWtp.Type.XML, "<a><b>   c</b></a>"),
+        //                Arguments.of(
+        //                        EclipseWtp.Type.XHTML,
+        //                        "<!DOCTYPE html> <html>\t<head> <meta   charset=\"UTF-8\"></head>\n" + "</html>  "));
     }
 }
diff --git a/build-logic/src/main/groovy/buildlogic.java-graalvm-conventions.gradle b/build-logic/src/main/groovy/buildlogic.java-graalvm-conventions.gradle
index e477bb0..0465ab6 100644
--- a/build-logic/src/main/groovy/buildlogic.java-graalvm-conventions.gradle
+++ b/build-logic/src/main/groovy/buildlogic.java-graalvm-conventions.gradle
@@ -27,7 +27,7 @@ graalvmNative {
 		metadataCopy {
 			inputTaskNames.add('test')
 			inputTaskNames.add('testNpm')
-            inputTaskNames.add('testSeparateJvm')
+			inputTaskNames.add('testSeparateJvm')
 			mergeWithExisting = false
 			outputDirectories.add(nativeCompileMetaDir.get().asFile.path)
 		}
@@ -47,10 +47,9 @@ graalvmNative {
 			sharedLibrary = false
 			useFatJar = true // use shadowJar as input to have same classpath
 
-//			configurationFileDirectories.from(file('src/nativecompile/reflectconfig.json'))
-
+			// to enable some of the options below, we need to enable experimental options
+			// examples: IncludeResourceBundles, ReflectionConfigurationFiles
 			buildArgs.add('-H:+UnlockExperimentalVMOptions')
-			buildArgs.add("-H:ReflectionConfigurationFiles=${project.file('src/nativecompile/reflectconfig.json').path}")
 
 			// allow calling prettier (using local http server)
 			buildArgs.add('--enable-url-protocols=http')
@@ -72,7 +71,6 @@ graalvmNative {
 
 			buildArgs.add('--initialize-at-build-time=com.sun.tools.javac.file.Locations')
 
-//			buildArgs.add('-H:+UnlockExperimentalVMOptions') // to enable the following options
 			buildArgs.add('-H:IncludeResourceBundles=com.sun.tools.javac.resources.compiler')
 			buildArgs.add('-H:IncludeResourceBundles=com.sun.tools.javac.resources.javac')
 
@@ -84,7 +82,7 @@ graalvmNative {
 
 if (!project.hasProperty('skipGraalAgent')) {
 	tasks.named('metadataCopy') {
-		dependsOn('test', 'testNpm')
+		dependsOn('test', 'testNpm', 'testSeparateJvm')
 	}
 } else {
 	tasks.named('metadataCopy') {
diff --git a/build-logic/src/main/groovy/buildlogic.java-special-tests-conventions.gradle b/build-logic/src/main/groovy/buildlogic.java-special-tests-conventions.gradle
index 87eba68..03257f4 100644
--- a/build-logic/src/main/groovy/buildlogic.java-special-tests-conventions.gradle
+++ b/build-logic/src/main/groovy/buildlogic.java-special-tests-conventions.gradle
@@ -10,12 +10,11 @@ def special = [
 	'cliProcessNpm',
 	'cliNative',
 	'cliNativeNpm',
-    'separateJvm'
+	'separateJvm'
 ]
 
-tasks.named('test').configure {
-	useJUnitPlatform {
-	}
+tasks.named('test', Test).configure {
+	useJUnitPlatform()
 }
 
 special.forEach { tag ->
@@ -28,23 +27,23 @@ special.forEach { tag ->
 }
 
 tasks.named('testSeparateJvm', Test) {
-    it.forkEvery = 1 // ensure that each test task runs in a separate JVM
+	it.forkEvery = 1 // ensure that each test task runs in a separate JVM
 }
 
 tasks.withType(Test).configureEach { Test task ->
-    // any test task that does not end with Npm should exclude all the npm tests
-    if (!task.name.toLowerCase().endsWith('npm')) {
-        def toExclude = special.findAll { it.toLowerCase().endsWith('npm') }.join('|')
-        task.useJUnitPlatform {
-            excludeTags toExclude
-        }
-    }
-    // any test task that does not end with separateJvm should exclude all the separateJvm tests
-    if (!task.name.toLowerCase().endsWith('separatejvm')) {
-        task.useJUnitPlatform {
-            excludeTags 'separateJvm'
-        }
-    }
+	// any test task that does not end with Npm should exclude all the npm tests
+	if (!task.name.toLowerCase().endsWith('npm')) {
+		def toExclude = special.findAll { it.toLowerCase().endsWith('npm') }.join('|')
+		task.useJUnitPlatform {
+			excludeTags toExclude
+		}
+	}
+	// any test task that does not end with separateJvm should exclude all the separateJvm tests
+	if (!task.name.toLowerCase().endsWith('separatejvm')) {
+		task.useJUnitPlatform {
+			excludeTags 'separateJvm'
+		}
+	}
 }
 
 tasks.register('testAll') {
diff --git a/testlib/src/main/java/com/diffplug/spotless/tag/SeparateJvmTest.java b/testlib/src/main/java/com/diffplug/spotless/tag/SeparateJvmTest.java
index b3e491e..19be550 100644
--- a/testlib/src/main/java/com/diffplug/spotless/tag/SeparateJvmTest.java
+++ b/testlib/src/main/java/com/diffplug/spotless/tag/SeparateJvmTest.java
@@ -15,11 +15,11 @@
  */
 package com.diffplug.spotless.tag;
 
-import org.junit.jupiter.api.Tag;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
+import org.junit.jupiter.api.Tag;
+
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

From f2eac77453acaccdca71da853e95d8f67cf82854 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Mon, 18 Aug 2025 21:03:13 +0200
Subject: [PATCH 3/6] refactor: move each eclipse wtp file type into its own
 test

(for using gradles fork-every-test to have completely separate jvms for
each of these tests, because they store static values in the jvm)
---
 .../spotless/cli/steps/EclipseWtpCssTest.java |  36 +++++++
 .../cli/steps/EclipseWtpHtmlTest.java         |  38 +++++++
 .../spotless/cli/steps/EclipseWtpJsTest.java  |  36 +++++++
 .../cli/steps/EclipseWtpJsonTest.java         |  37 +++++++
 .../cli/steps/EclipseWtpSecondTest.java       | 101 ------------------
 .../spotless/cli/steps/EclipseWtpTest.java    | 100 -----------------
 .../cli/steps/EclipseWtpTestBase.java         |  35 ++++++
 .../cli/steps/EclipseWtpXhtmlTest.java        |  38 +++++++
 .../spotless/cli/steps/EclipseWtpXmlTest.java |  36 +++++++
 ...EclipseWtpTest.ss => EclipseWtpCssTest.ss} |   2 +-
 ...WtpSecondTest.ss => EclipseWtpHtmlTest.ss} |   2 +-
 .../spotless/cli/steps/EclipseWtpJsTest.ss    |   5 +
 .../spotless/cli/steps/EclipseWtpJsonTest.ss  |   9 ++
 .../spotless/cli/steps/EclipseWtpXhtmlTest.ss |   9 ++
 .../spotless/cli/steps/EclipseWtpXmlTest.ss   |   5 +
 15 files changed, 286 insertions(+), 203 deletions(-)
 create mode 100644 app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpCssTest.java
 create mode 100644 app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpHtmlTest.java
 create mode 100644 app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpJsTest.java
 create mode 100644 app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpJsonTest.java
 delete mode 100644 app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpSecondTest.java
 delete mode 100644 app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpTest.java
 create mode 100644 app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpTestBase.java
 create mode 100644 app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpXhtmlTest.java
 create mode 100644 app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpXmlTest.java
 rename app/src/test/resources/com/diffplug/spotless/cli/steps/{EclipseWtpTest.ss => EclipseWtpCssTest.ss} (52%)
 rename app/src/test/resources/com/diffplug/spotless/cli/steps/{EclipseWtpSecondTest.ss => EclipseWtpHtmlTest.ss} (67%)
 create mode 100644 app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpJsTest.ss
 create mode 100644 app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpJsonTest.ss
 create mode 100644 app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpXhtmlTest.ss
 create mode 100644 app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpXmlTest.ss

diff --git a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpCssTest.java b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpCssTest.java
new file mode 100644
index 0000000..a2f5a08
--- /dev/null
+++ b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpCssTest.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2025 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.cli.steps;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
+
+import com.diffplug.spotless.tag.CliNativeTest;
+import com.diffplug.spotless.tag.CliProcessTest;
+import com.diffplug.spotless.tag.SeparateJvmTest;
+
+@Isolated
+@SeparateJvmTest
+@CliNativeTest
+@CliProcessTest
+public class EclipseWtpCssTest extends EclipseWtpTestBase {
+
+    @Test
+    void itSupportsFormattingCssFileType() {
+        String fileName = runEclipseWtpWithType(EclipseWtp.Type.CSS, "body {\n" + "a: v;   b:   \n" + "v;\n" + "}  \n");
+        selfie().expectResource(fileName).toMatchDisk();
+    }
+}
diff --git a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpHtmlTest.java b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpHtmlTest.java
new file mode 100644
index 0000000..df2cfa1
--- /dev/null
+++ b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpHtmlTest.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2025 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.cli.steps;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
+
+import com.diffplug.spotless.tag.CliNativeTest;
+import com.diffplug.spotless.tag.CliProcessTest;
+import com.diffplug.spotless.tag.SeparateJvmTest;
+
+@Isolated
+@SeparateJvmTest
+@CliNativeTest
+@CliProcessTest
+public class EclipseWtpHtmlTest extends EclipseWtpTestBase {
+
+    @Test
+    void itSupportsFormattingHtmlFileType() {
+        String fileName = runEclipseWtpWithType(
+                EclipseWtp.Type.HTML,
+                "<!DOCTYPE html> <html>\t<head> <meta   charset=\"UTF-8\"></head>\n" + "</html>  ");
+        selfie().expectResource(fileName).toMatchDisk();
+    }
+}
diff --git a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpJsTest.java b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpJsTest.java
new file mode 100644
index 0000000..7277e7d
--- /dev/null
+++ b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpJsTest.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2025 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.cli.steps;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
+
+import com.diffplug.spotless.tag.CliNativeTest;
+import com.diffplug.spotless.tag.CliProcessTest;
+import com.diffplug.spotless.tag.SeparateJvmTest;
+
+@Isolated
+@SeparateJvmTest
+@CliNativeTest
+@CliProcessTest
+public class EclipseWtpJsTest extends EclipseWtpTestBase {
+
+    @Test
+    void itSupportsFormattingJsFileType() {
+        String fileName = runEclipseWtpWithType(EclipseWtp.Type.JS, "function f(  )   {\n" + "a.b(1,\n" + "2);}");
+        selfie().expectResource(fileName).toMatchDisk();
+    }
+}
diff --git a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpJsonTest.java b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpJsonTest.java
new file mode 100644
index 0000000..4bdf2a3
--- /dev/null
+++ b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpJsonTest.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2025 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.cli.steps;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
+
+import com.diffplug.spotless.tag.CliNativeTest;
+import com.diffplug.spotless.tag.CliProcessTest;
+import com.diffplug.spotless.tag.SeparateJvmTest;
+
+@Isolated
+@SeparateJvmTest
+@CliNativeTest
+@CliProcessTest
+public class EclipseWtpJsonTest extends EclipseWtpTestBase {
+
+    @Test
+    void itSupportsFormattingJsonFileType() {
+        String fileName =
+                runEclipseWtpWithType(EclipseWtp.Type.JSON, "{\"a\": \"b\",\t\"c\":   { \"d\": \"e\",\"f\": \"g\"}}");
+        selfie().expectResource(fileName).toMatchDisk();
+    }
+}
diff --git a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpSecondTest.java b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpSecondTest.java
deleted file mode 100644
index 67d11e1..0000000
--- a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpSecondTest.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright 2025 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.cli.steps;
-
-import java.util.stream.Stream;
-
-import org.junit.jupiter.api.parallel.Isolated;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
-
-import com.diffplug.spotless.cli.CLIIntegrationHarness;
-import com.diffplug.spotless.cli.SpotlessCLIRunner;
-import com.diffplug.spotless.tag.CliNativeTest;
-import com.diffplug.spotless.tag.CliProcessTest;
-import com.diffplug.spotless.tag.SeparateJvmTest;
-
-@Isolated
-@SeparateJvmTest
-@CliNativeTest
-@CliProcessTest
-public class EclipseWtpSecondTest extends CLIIntegrationHarness {
-
-    //    @BeforeEach
-    //    void resetEclipseFramework() throws ClassNotFoundException, NoSuchFieldException, IllegalAccessException {
-    //        Class<?> frameworkClass =
-    // Class.forName("com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseFramework");
-    //        Field instanceField = frameworkClass.getDeclaredField("INSTANCE");
-    //        instanceField.setAccessible(true);
-    //        instanceField.set(null, null);
-    //
-    //        Class<?> bundleRegistryClass =
-    // Class.forName("com.diffplug.spotless.extra.eclipse.base.osgi.FrameworkBundleRegistry");
-    //        Field registryInstanceField = bundleRegistryClass.getDeclaredField("INSTANCE");
-    //        registryInstanceField.setAccessible(true);
-    //        registryInstanceField.set(null, null);
-    //
-    //        Class<?> registryProviderFactoryClass =
-    // Class.forName("org.eclipse.core.internal.registry.RegistryProviderFactory");
-    //        Field registryProviderField = registryProviderFactoryClass.getDeclaredField("defaultRegistryProvider");
-    //        registryProviderField.setAccessible(true);
-    //        registryProviderField.set(null, null);
-    //    }
-
-    @ParameterizedTest(name = "itSupportsFormattingFileType {0}")
-    @MethodSource
-    void itSupportsFormattingFileType(EclipseWtp.Type type, String unformatted) {
-        String fileName = "test." + type.name().toLowerCase();
-        setFile(fileName).toContent(unformatted);
-
-        SpotlessCLIRunner.Result result = cliRunner()
-                .withTargets(fileName)
-                .withStep(EclipseWtp.class)
-                .withOption("--type", type.name())
-                .run();
-
-        selfie().expectResource(fileName).toMatchDisk(type.name());
-    }
-
-    //    @Test
-    //    void itSupportsFormattingXmlFileType() {
-    //        String unformatted = "<a><b>   c</b></a>";
-    //        String fileName = "test.xml";
-    //        setFile(fileName).toContent(unformatted);
-    //
-    //        SpotlessCLIRunner.Result result = cliRunner()
-    //                .withTargets(fileName)
-    //                .withStep(EclipseWtp.class)
-    //                .withOption("--type", "XML")
-    //                .run();
-    //
-    //        selfie().expectResource(fileName).toBe_TODO();
-    //    }
-
-    static Stream<Arguments> itSupportsFormattingFileType() {
-        return Stream.of(
-                //                Arguments.of(EclipseWtp.Type.CSS, "body {\n" + "a: v;   b:   \n" + "v;\n" + "}  \n"),
-                Arguments.of(
-                        EclipseWtp.Type.HTML,
-                        "<!DOCTYPE html> <html>\t<head> <meta   charset=\"UTF-8\"></head>\n" + "</html>  "));
-        //                Arguments.of(EclipseWtp.Type.JSON, "{\"a\": \"b\",\t\"c\":   { \"d\": \"e\",\"f\": \"g\"}}"),
-        //                Arguments.of(EclipseWtp.Type.JS, "function f(  )   {\n" + "a.b(1,\n" + "2);}"),
-        //                Arguments.of(EclipseWtp.Type.XML, "<a><b>   c</b></a>"),
-        //                Arguments.of(
-        //                        EclipseWtp.Type.XHTML,
-        //                        "<!DOCTYPE html> <html>\t<head> <meta   charset=\"UTF-8\"></head>\n" + "</html>  "));
-    }
-}
diff --git a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpTest.java b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpTest.java
deleted file mode 100644
index fbd0be7..0000000
--- a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright 2025 DiffPlug
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.diffplug.spotless.cli.steps;
-
-import java.util.stream.Stream;
-
-import org.junit.jupiter.api.parallel.Isolated;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
-
-import com.diffplug.spotless.cli.CLIIntegrationHarness;
-import com.diffplug.spotless.cli.SpotlessCLIRunner;
-import com.diffplug.spotless.tag.CliNativeTest;
-import com.diffplug.spotless.tag.CliProcessTest;
-import com.diffplug.spotless.tag.SeparateJvmTest;
-
-@Isolated
-@SeparateJvmTest
-@CliNativeTest
-@CliProcessTest
-public class EclipseWtpTest extends CLIIntegrationHarness {
-
-    //    @BeforeEach
-    //    void resetEclipseFramework() throws ClassNotFoundException, NoSuchFieldException, IllegalAccessException {
-    //        Class<?> frameworkClass =
-    // Class.forName("com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseFramework");
-    //        Field instanceField = frameworkClass.getDeclaredField("INSTANCE");
-    //        instanceField.setAccessible(true);
-    //        instanceField.set(null, null);
-    //
-    //        Class<?> bundleRegistryClass =
-    // Class.forName("com.diffplug.spotless.extra.eclipse.base.osgi.FrameworkBundleRegistry");
-    //        Field registryInstanceField = bundleRegistryClass.getDeclaredField("INSTANCE");
-    //        registryInstanceField.setAccessible(true);
-    //        registryInstanceField.set(null, null);
-    //
-    //        Class<?> registryProviderFactoryClass =
-    // Class.forName("org.eclipse.core.internal.registry.RegistryProviderFactory");
-    //        Field registryProviderField = registryProviderFactoryClass.getDeclaredField("defaultRegistryProvider");
-    //        registryProviderField.setAccessible(true);
-    //        registryProviderField.set(null, null);
-    //    }
-
-    @ParameterizedTest(name = "itSupportsFormattingFileType {0}")
-    @MethodSource
-    void itSupportsFormattingFileType(EclipseWtp.Type type, String unformatted) {
-        String fileName = "test." + type.name().toLowerCase();
-        setFile(fileName).toContent(unformatted);
-
-        SpotlessCLIRunner.Result result = cliRunner()
-                .withTargets(fileName)
-                .withStep(EclipseWtp.class)
-                .withOption("--type", type.name())
-                .run();
-
-        selfie().expectResource(fileName).toMatchDisk(type.name());
-    }
-
-    //    @Test
-    //    void itSupportsFormattingXmlFileType() {
-    //        String unformatted = "<a><b>   c</b></a>";
-    //        String fileName = "test.xml";
-    //        setFile(fileName).toContent(unformatted);
-    //
-    //        SpotlessCLIRunner.Result result = cliRunner()
-    //                .withTargets(fileName)
-    //                .withStep(EclipseWtp.class)
-    //                .withOption("--type", "XML")
-    //                .run();
-    //
-    //        selfie().expectResource(fileName).toBe_TODO();
-    //    }
-
-    static Stream<Arguments> itSupportsFormattingFileType() {
-        return Stream.of(Arguments.of(EclipseWtp.Type.CSS, "body {\n" + "a: v;   b:   \n" + "v;\n" + "}  \n"));
-        //                Arguments.of(
-        //                        EclipseWtp.Type.HTML,
-        //                        "<!DOCTYPE html> <html>\t<head> <meta   charset=\"UTF-8\"></head>\n" + "</html>  "),
-        //                Arguments.of(EclipseWtp.Type.JSON, "{\"a\": \"b\",\t\"c\":   { \"d\": \"e\",\"f\": \"g\"}}"),
-        //                Arguments.of(EclipseWtp.Type.JS, "function f(  )   {\n" + "a.b(1,\n" + "2);}"),
-        //                Arguments.of(EclipseWtp.Type.XML, "<a><b>   c</b></a>"),
-        //                Arguments.of(
-        //                        EclipseWtp.Type.XHTML,
-        //                        "<!DOCTYPE html> <html>\t<head> <meta   charset=\"UTF-8\"></head>\n" + "</html>  "));
-    }
-}
diff --git a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpTestBase.java b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpTestBase.java
new file mode 100644
index 0000000..6562acc
--- /dev/null
+++ b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpTestBase.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2025 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.cli.steps;
+
+import com.diffplug.spotless.cli.CLIIntegrationHarness;
+import com.diffplug.spotless.cli.SpotlessCLIRunner;
+
+public abstract class EclipseWtpTestBase extends CLIIntegrationHarness {
+
+    protected String runEclipseWtpWithType(EclipseWtp.Type type, String unformatted) {
+        String fileName = "test." + type.name().toLowerCase();
+        setFile(fileName).toContent(unformatted);
+
+        SpotlessCLIRunner.Result result = cliRunner()
+                .withTargets(fileName)
+                .withStep(EclipseWtp.class)
+                .withOption("--type", type.name())
+                .run();
+
+        return fileName;
+    }
+}
diff --git a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpXhtmlTest.java b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpXhtmlTest.java
new file mode 100644
index 0000000..cf4e3b7
--- /dev/null
+++ b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpXhtmlTest.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2025 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.cli.steps;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
+
+import com.diffplug.spotless.tag.CliNativeTest;
+import com.diffplug.spotless.tag.CliProcessTest;
+import com.diffplug.spotless.tag.SeparateJvmTest;
+
+@Isolated
+@SeparateJvmTest
+@CliNativeTest
+@CliProcessTest
+public class EclipseWtpXhtmlTest extends EclipseWtpTestBase {
+
+    @Test
+    void itSupportsFormattingXhtmlFileType() {
+        String fileName = runEclipseWtpWithType(
+                EclipseWtp.Type.XHTML,
+                "<!DOCTYPE html> <html>\t<head> <meta   charset=\"UTF-8\"></head>\n" + "</html>  ");
+        selfie().expectResource(fileName).toMatchDisk();
+    }
+}
diff --git a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpXmlTest.java b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpXmlTest.java
new file mode 100644
index 0000000..2c45169
--- /dev/null
+++ b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpXmlTest.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2025 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.cli.steps;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
+
+import com.diffplug.spotless.tag.CliNativeTest;
+import com.diffplug.spotless.tag.CliProcessTest;
+import com.diffplug.spotless.tag.SeparateJvmTest;
+
+@Isolated
+@SeparateJvmTest
+@CliNativeTest
+@CliProcessTest
+public class EclipseWtpXmlTest extends EclipseWtpTestBase {
+
+    @Test
+    void itSupportsFormattingXmlFileType() {
+        String fileName = runEclipseWtpWithType(EclipseWtp.Type.XML, "<a><b>   c</b></a>");
+        selfie().expectResource(fileName).toMatchDisk();
+    }
+}
diff --git a/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpTest.ss b/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpCssTest.ss
similarity index 52%
rename from app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpTest.ss
rename to app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpCssTest.ss
index cf0524f..f32d054 100644
--- a/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpTest.ss
+++ b/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpCssTest.ss
@@ -1,4 +1,4 @@
-╔═ itSupportsFormattingFileType/CSS ═╗
+╔═ itSupportsFormattingCssFileType ═╗
 body {
 	a: v;
 	b: v;
diff --git a/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpSecondTest.ss b/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpHtmlTest.ss
similarity index 67%
rename from app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpSecondTest.ss
rename to app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpHtmlTest.ss
index 275dc27..01396e9 100644
--- a/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpSecondTest.ss
+++ b/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpHtmlTest.ss
@@ -1,4 +1,4 @@
-╔═ itSupportsFormattingFileType/HTML ═╗
+╔═ itSupportsFormattingHtmlFileType ═╗
 <!DOCTYPE html>
 <html>
 <head>
diff --git a/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpJsTest.ss b/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpJsTest.ss
new file mode 100644
index 0000000..9fa8a3c
--- /dev/null
+++ b/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpJsTest.ss
@@ -0,0 +1,5 @@
+╔═ itSupportsFormattingJsFileType ═╗
+function f() {
+    a.b(1, 2);
+}
+╔═ [end of file] ═╗
diff --git a/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpJsonTest.ss b/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpJsonTest.ss
new file mode 100644
index 0000000..312ab2b
--- /dev/null
+++ b/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpJsonTest.ss
@@ -0,0 +1,9 @@
+╔═ itSupportsFormattingJsonFileType ═╗
+{
+	"a": "b",
+	"c": {
+		"d": "e",
+		"f": "g"
+	}
+}
+╔═ [end of file] ═╗
diff --git a/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpXhtmlTest.ss b/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpXhtmlTest.ss
new file mode 100644
index 0000000..65c88c9
--- /dev/null
+++ b/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpXhtmlTest.ss
@@ -0,0 +1,9 @@
+╔═ itSupportsFormattingXhtmlFileType ═╗
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+</head>
+</html>
+
+╔═ [end of file] ═╗
diff --git a/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpXmlTest.ss b/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpXmlTest.ss
new file mode 100644
index 0000000..6237639
--- /dev/null
+++ b/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpXmlTest.ss
@@ -0,0 +1,5 @@
+╔═ itSupportsFormattingXmlFileType ═╗
+<a>
+	<b> c</b>
+</a>
+╔═ [end of file] ═╗

From cc3b05155e352a3fc1c405eb1308e5a5f4f39f5a Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Mon, 18 Aug 2025 21:24:37 +0200
Subject: [PATCH 4/6] feat: introduce file type inferring to eclipse wtp

---
 .../spotless/cli/steps/EclipseWtp.java        | 40 +++++++++++++++++--
 .../spotless/cli/steps/EclipseWtpCssTest.java |  6 +++
 .../cli/steps/EclipseWtpHtmlTest.java         | 14 +++++++
 .../spotless/cli/steps/EclipseWtpJsTest.java  |  6 +++
 .../cli/steps/EclipseWtpJsonTest.java         |  7 ++++
 .../cli/steps/EclipseWtpTestBase.java         | 10 +++++
 .../cli/steps/EclipseWtpXhtmlTest.java        |  7 ++++
 .../spotless/cli/steps/EclipseWtpXmlTest.java |  6 +++
 .../spotless/cli/steps/EclipseWtpCssTest.ss   |  5 +++
 .../spotless/cli/steps/EclipseWtpHtmlTest.ss  | 16 ++++++++
 .../spotless/cli/steps/EclipseWtpJsTest.ss    |  4 ++
 .../spotless/cli/steps/EclipseWtpJsonTest.ss  |  8 ++++
 .../spotless/cli/steps/EclipseWtpXhtmlTest.ss |  8 ++++
 .../spotless/cli/steps/EclipseWtpXmlTest.ss   |  4 ++
 14 files changed, 137 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/diffplug/spotless/cli/steps/EclipseWtp.java b/app/src/main/java/com/diffplug/spotless/cli/steps/EclipseWtp.java
index 215407b..2607557 100644
--- a/app/src/main/java/com/diffplug/spotless/cli/steps/EclipseWtp.java
+++ b/app/src/main/java/com/diffplug/spotless/cli/steps/EclipseWtp.java
@@ -17,11 +17,15 @@
 
 import java.nio.file.Path;
 import java.util.List;
+import java.util.Locale;
+import java.util.function.Supplier;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.cli.core.SpotlessActionContext;
+import com.diffplug.spotless.cli.core.TargetFileTypeInferer;
 import com.diffplug.spotless.cli.help.OptionConstants;
 import com.diffplug.spotless.extra.EclipseBasedStepBuilder;
 import com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep;
@@ -45,9 +49,10 @@ public class EclipseWtp extends SpotlessFormatterStep {
 
     @CommandLine.Option(
             names = {"-t", "--type"},
-            description = "The type of the Eclipse WTP formatter." + OptionConstants.VALID_VALUES_SUFFIX,
-            required = true)
-    Type type; // TODO: might trying inferring type
+            description =
+                    "The type of the Eclipse WTP formatter. If not provided, the type will be guessed based on the first few files we find. If that does not work, we fail the formatting run."
+                            + OptionConstants.VALID_VALUES_SUFFIX)
+    Type type;
 
     public enum Type {
         CSS(EclipseWtpFormatterStep.CSS),
@@ -66,11 +71,23 @@ public enum Type {
         public @NotNull EclipseWtpFormatterStep toEclipseWtpType() {
             return this.backendEclipseWtpType;
         }
+
+        public static @Nullable Type fromTargetFileType(@NotNull TargetFileTypeInferer.TargetFileType targetFileType) {
+            return switch (targetFileType.fileExtension().toLowerCase(Locale.getDefault())) {
+                case "css" -> CSS;
+                case "html", "htm" -> HTML;
+                case "js" -> JS;
+                case "json" -> JSON;
+                case "xml" -> XML;
+                case "xhtml" -> XHTML;
+                default -> null;
+            };
+        }
     }
 
     @Override
     public @NotNull List<FormatterStep> prepareFormatterSteps(SpotlessActionContext context) {
-        EclipseWtpFormatterStep wtpType = type.toEclipseWtpType();
+        EclipseWtpFormatterStep wtpType = type(context::targetFileType).toEclipseWtpType();
         EclipseBasedStepBuilder builder = wtpType.createBuilder(context.provisioner());
         builder.setVersion(ECLIPSE_WTP_VERSION);
         if (configFiles != null && !configFiles.isEmpty()) {
@@ -81,4 +98,19 @@ public enum Type {
         }
         return List.of(builder.build());
     }
+
+    private Type type(Supplier<TargetFileTypeInferer.TargetFileType> targetFileTypeSupplier) {
+        if (type != null) {
+            return type;
+        }
+        // try type inferring
+        TargetFileTypeInferer.TargetFileType targetFileType = targetFileTypeSupplier.get();
+        Type inferredType = Type.fromTargetFileType(targetFileType);
+        if (inferredType != null) {
+            return inferredType;
+        } else {
+            throw new IllegalArgumentException("Could not infer Eclipse WTP type from target file type: "
+                    + targetFileType.fileExtension() + " - workaround by specifying the --type option.");
+        }
+    }
 }
diff --git a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpCssTest.java b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpCssTest.java
index a2f5a08..4a8e685 100644
--- a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpCssTest.java
+++ b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpCssTest.java
@@ -33,4 +33,10 @@ void itSupportsFormattingCssFileType() {
         String fileName = runEclipseWtpWithType(EclipseWtp.Type.CSS, "body {\n" + "a: v;   b:   \n" + "v;\n" + "}  \n");
         selfie().expectResource(fileName).toMatchDisk();
     }
+
+    @Test
+    void itInfersCssFileTypeFromFileExtension() {
+        String fileName = runEclipseWtpWithTypeInferred("css", "body {\n" + "a: v;   b:   \n" + "v;\n" + "}  \n");
+        selfie().expectResource(fileName).toMatchDisk();
+    }
 }
diff --git a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpHtmlTest.java b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpHtmlTest.java
index df2cfa1..2261ff4 100644
--- a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpHtmlTest.java
+++ b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpHtmlTest.java
@@ -35,4 +35,18 @@ void itSupportsFormattingHtmlFileType() {
                 "<!DOCTYPE html> <html>\t<head> <meta   charset=\"UTF-8\"></head>\n" + "</html>  ");
         selfie().expectResource(fileName).toMatchDisk();
     }
+
+    @Test
+    void itInfersHtmlFileTypeFromFileExtension() {
+        String fileName = runEclipseWtpWithTypeInferred(
+                "html", "<!DOCTYPE html> <html>\t<head> <meta   charset=\"UTF-8\"></head>\n" + "</html>  ");
+        selfie().expectResource(fileName).toMatchDisk();
+    }
+
+    @Test
+    void itInfersHtmlFileTypeFromShortFileExtension() {
+        String fileName = runEclipseWtpWithTypeInferred(
+                "htm", "<!DOCTYPE html> <html>\t<head> <meta   charset=\"UTF-8\"></head>\n" + "</html>  ");
+        selfie().expectResource(fileName).toMatchDisk();
+    }
 }
diff --git a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpJsTest.java b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpJsTest.java
index 7277e7d..90069e1 100644
--- a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpJsTest.java
+++ b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpJsTest.java
@@ -33,4 +33,10 @@ void itSupportsFormattingJsFileType() {
         String fileName = runEclipseWtpWithType(EclipseWtp.Type.JS, "function f(  )   {\n" + "a.b(1,\n" + "2);}");
         selfie().expectResource(fileName).toMatchDisk();
     }
+
+    @Test
+    void itInfersJsFileTypeFromFileExtension() {
+        String fileName = runEclipseWtpWithTypeInferred("js", "function f(  )   {\n" + "a.b(1,\n" + "2);}");
+        selfie().expectResource(fileName).toMatchDisk();
+    }
 }
diff --git a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpJsonTest.java b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpJsonTest.java
index 4bdf2a3..36e4329 100644
--- a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpJsonTest.java
+++ b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpJsonTest.java
@@ -34,4 +34,11 @@ void itSupportsFormattingJsonFileType() {
                 runEclipseWtpWithType(EclipseWtp.Type.JSON, "{\"a\": \"b\",\t\"c\":   { \"d\": \"e\",\"f\": \"g\"}}");
         selfie().expectResource(fileName).toMatchDisk();
     }
+
+    @Test
+    void itInfersJsonFileTypeFromFileExtension() {
+        String fileName =
+                runEclipseWtpWithTypeInferred("json", "{\"a\": \"b\",\t\"c\":   { \"d\": \"e\",\"f\": \"g\"}}");
+        selfie().expectResource(fileName).toMatchDisk();
+    }
 }
diff --git a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpTestBase.java b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpTestBase.java
index 6562acc..2905510 100644
--- a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpTestBase.java
+++ b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpTestBase.java
@@ -32,4 +32,14 @@ protected String runEclipseWtpWithType(EclipseWtp.Type type, String unformatted)
 
         return fileName;
     }
+
+    protected String runEclipseWtpWithTypeInferred(String fileExtension, String unformatted) {
+        String fileName = "test." + fileExtension;
+        setFile(fileName).toContent(unformatted);
+
+        SpotlessCLIRunner.Result result =
+                cliRunner().withTargets(fileName).withStep(EclipseWtp.class).run();
+
+        return fileName;
+    }
 }
diff --git a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpXhtmlTest.java b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpXhtmlTest.java
index cf4e3b7..7de52e9 100644
--- a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpXhtmlTest.java
+++ b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpXhtmlTest.java
@@ -35,4 +35,11 @@ void itSupportsFormattingXhtmlFileType() {
                 "<!DOCTYPE html> <html>\t<head> <meta   charset=\"UTF-8\"></head>\n" + "</html>  ");
         selfie().expectResource(fileName).toMatchDisk();
     }
+
+    @Test
+    void itInfersXhtmlFileTypeFromFileExtension() {
+        String fileName = runEclipseWtpWithTypeInferred(
+                "xhtml", "<!DOCTYPE html> <html>\t<head> <meta   charset=\"UTF-8\"></head>\n" + "</html>  ");
+        selfie().expectResource(fileName).toMatchDisk();
+    }
 }
diff --git a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpXmlTest.java b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpXmlTest.java
index 2c45169..4eebc1f 100644
--- a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpXmlTest.java
+++ b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpXmlTest.java
@@ -33,4 +33,10 @@ void itSupportsFormattingXmlFileType() {
         String fileName = runEclipseWtpWithType(EclipseWtp.Type.XML, "<a><b>   c</b></a>");
         selfie().expectResource(fileName).toMatchDisk();
     }
+
+    @Test
+    void itInfersXmlFileTypeFromFileExtension() {
+        String fileName = runEclipseWtpWithTypeInferred("xml", "<a><b>   c</b></a>");
+        selfie().expectResource(fileName).toMatchDisk();
+    }
 }
diff --git a/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpCssTest.ss b/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpCssTest.ss
index f32d054..f6ef7a8 100644
--- a/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpCssTest.ss
+++ b/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpCssTest.ss
@@ -1,3 +1,8 @@
+╔═ itInfersCssFileTypeFromFileExtension ═╗
+body {
+	a: v;
+	b: v;
+}
 ╔═ itSupportsFormattingCssFileType ═╗
 body {
 	a: v;
diff --git a/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpHtmlTest.ss b/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpHtmlTest.ss
index 01396e9..822a385 100644
--- a/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpHtmlTest.ss
+++ b/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpHtmlTest.ss
@@ -1,3 +1,19 @@
+╔═ itInfersHtmlFileTypeFromFileExtension ═╗
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+</head>
+</html>
+
+╔═ itInfersHtmlFileTypeFromShortFileExtension ═╗
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+</head>
+</html>
+
 ╔═ itSupportsFormattingHtmlFileType ═╗
 <!DOCTYPE html>
 <html>
diff --git a/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpJsTest.ss b/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpJsTest.ss
index 9fa8a3c..3a706c3 100644
--- a/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpJsTest.ss
+++ b/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpJsTest.ss
@@ -1,3 +1,7 @@
+╔═ itInfersJsFileTypeFromFileExtension ═╗
+function f() {
+    a.b(1, 2);
+}
 ╔═ itSupportsFormattingJsFileType ═╗
 function f() {
     a.b(1, 2);
diff --git a/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpJsonTest.ss b/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpJsonTest.ss
index 312ab2b..7128a0f 100644
--- a/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpJsonTest.ss
+++ b/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpJsonTest.ss
@@ -1,3 +1,11 @@
+╔═ itInfersJsonFileTypeFromFileExtension ═╗
+{
+	"a": "b",
+	"c": {
+		"d": "e",
+		"f": "g"
+	}
+}
 ╔═ itSupportsFormattingJsonFileType ═╗
 {
 	"a": "b",
diff --git a/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpXhtmlTest.ss b/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpXhtmlTest.ss
index 65c88c9..e95a8a7 100644
--- a/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpXhtmlTest.ss
+++ b/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpXhtmlTest.ss
@@ -1,3 +1,11 @@
+╔═ itInfersXhtmlFileTypeFromFileExtension ═╗
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+</head>
+</html>
+
 ╔═ itSupportsFormattingXhtmlFileType ═╗
 <!DOCTYPE html>
 <html>
diff --git a/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpXmlTest.ss b/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpXmlTest.ss
index 6237639..7677a89 100644
--- a/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpXmlTest.ss
+++ b/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpXmlTest.ss
@@ -1,3 +1,7 @@
+╔═ itInfersXmlFileTypeFromFileExtension ═╗
+<a>
+	<b> c</b>
+</a>
 ╔═ itSupportsFormattingXmlFileType ═╗
 <a>
 	<b> c</b>

From a473521318699c615945826e8000b477e920d4cd Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Wed, 20 Aug 2025 06:04:25 +0200
Subject: [PATCH 5/6] chore: add tests for eclipse-wtp using config files

---
 .../steps/EclipseWtpCssWithConfigTest.java    |  39 +++
 .../steps/EclipseWtpHtmlWithConfigTest.java   |  39 +++
 .../cli/steps/EclipseWtpJsWithConfigTest.java |  37 +++
 .../cli/steps/EclipseWtpTestBase.java         |  15 +
 .../steps/EclipseWtpXhtmlWithConfigTest.java  |  39 +++
 .../cli/steps/EclipseWtpCssWithConfigTest.ss  |   6 +
 .../cli/steps/EclipseWtpHtmlWithConfigTest.ss |   9 +
 .../cli/steps/EclipseWtpJsWithConfigTest.ss   |   5 +
 .../steps/EclipseWtpXhtmlWithConfigTest.ss    |   9 +
 .../eclipse-wtp/eclipse-wtp-js-profile.xml    | 268 ++++++++++++++++++
 .../org.eclipse.wst.css.core.prefs            |   2 +
 .../org.eclipse.wst.html.core.prefs           |   4 +
 12 files changed, 472 insertions(+)
 create mode 100644 app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpCssWithConfigTest.java
 create mode 100644 app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpHtmlWithConfigTest.java
 create mode 100644 app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpJsWithConfigTest.java
 create mode 100644 app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpXhtmlWithConfigTest.java
 create mode 100644 app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpCssWithConfigTest.ss
 create mode 100644 app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpHtmlWithConfigTest.ss
 create mode 100644 app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpJsWithConfigTest.ss
 create mode 100644 app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpXhtmlWithConfigTest.ss
 create mode 100644 testlib/src/main/resources/eclipse-wtp/eclipse-wtp-js-profile.xml
 create mode 100644 testlib/src/main/resources/eclipse-wtp/org.eclipse.wst.css.core.prefs
 create mode 100644 testlib/src/main/resources/eclipse-wtp/org.eclipse.wst.html.core.prefs

diff --git a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpCssWithConfigTest.java b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpCssWithConfigTest.java
new file mode 100644
index 0000000..762d0e7
--- /dev/null
+++ b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpCssWithConfigTest.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2025 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.cli.steps;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
+
+import com.diffplug.spotless.tag.CliNativeTest;
+import com.diffplug.spotless.tag.CliProcessTest;
+import com.diffplug.spotless.tag.SeparateJvmTest;
+
+@Isolated
+@SeparateJvmTest
+@CliNativeTest
+@CliProcessTest
+public class EclipseWtpCssWithConfigTest extends EclipseWtpTestBase {
+
+    @Test
+    void itUsesConfigurationFile() {
+        String fileName = runEclipseWtpWithTypeAndConfigFile(
+                EclipseWtp.Type.CSS,
+                "body {\n" + "a: v;   b:   \n" + "v;\n" + "}  \n",
+                "org.eclipse.wst.css.core.prefs");
+        selfie().expectResource(fileName).toMatchDisk();
+    }
+}
diff --git a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpHtmlWithConfigTest.java b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpHtmlWithConfigTest.java
new file mode 100644
index 0000000..0230b59
--- /dev/null
+++ b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpHtmlWithConfigTest.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2025 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.cli.steps;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
+
+import com.diffplug.spotless.tag.CliNativeTest;
+import com.diffplug.spotless.tag.CliProcessTest;
+import com.diffplug.spotless.tag.SeparateJvmTest;
+
+@Isolated
+@SeparateJvmTest
+@CliNativeTest
+@CliProcessTest
+public class EclipseWtpHtmlWithConfigTest extends EclipseWtpTestBase {
+
+    @Test
+    void itUsesConfigurationFile() {
+        String fileName = runEclipseWtpWithTypeAndConfigFile(
+                EclipseWtp.Type.HTML,
+                "<!DOCTYPE html> <html>\t<head> <meta   charset=\"UTF-8\"></head>\n" + "</html>  ",
+                "org.eclipse.wst.html.core.prefs");
+        selfie().expectResource(fileName).toMatchDisk();
+    }
+}
diff --git a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpJsWithConfigTest.java b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpJsWithConfigTest.java
new file mode 100644
index 0000000..141bcc9
--- /dev/null
+++ b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpJsWithConfigTest.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2025 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.cli.steps;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
+
+import com.diffplug.spotless.tag.CliNativeTest;
+import com.diffplug.spotless.tag.CliProcessTest;
+import com.diffplug.spotless.tag.SeparateJvmTest;
+
+@Isolated
+@SeparateJvmTest
+@CliNativeTest
+@CliProcessTest
+public class EclipseWtpJsWithConfigTest extends EclipseWtpTestBase {
+
+    @Test
+    void itUsesConfigurationFile() {
+        String fileName = runEclipseWtpWithTypeAndConfigFile(
+                EclipseWtp.Type.JS, "function f(  )   {\n" + "a.b(1,\n" + "2);}", "eclipse-wtp-js-profile.xml");
+        selfie().expectResource(fileName).toMatchDisk();
+    }
+}
diff --git a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpTestBase.java b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpTestBase.java
index 2905510..3fb4ce2 100644
--- a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpTestBase.java
+++ b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpTestBase.java
@@ -42,4 +42,19 @@ protected String runEclipseWtpWithTypeInferred(String fileExtension, String unfo
 
         return fileName;
     }
+
+    protected String runEclipseWtpWithTypeAndConfigFile(EclipseWtp.Type type, String unformatted, String configFile) {
+        String fileName = "test." + type.name().toLowerCase();
+        setFile(fileName).toContent(unformatted);
+        setFile(configFile).toResource("eclipse-wtp/" + configFile);
+
+        SpotlessCLIRunner.Result result = cliRunner()
+                .withTargets(fileName)
+                .withStep(EclipseWtp.class)
+                .withOption("--type", type.name())
+                .withOption("--config-file", configFile)
+                .run();
+
+        return fileName;
+    }
 }
diff --git a/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpXhtmlWithConfigTest.java b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpXhtmlWithConfigTest.java
new file mode 100644
index 0000000..2fbe802
--- /dev/null
+++ b/app/src/test/java/com/diffplug/spotless/cli/steps/EclipseWtpXhtmlWithConfigTest.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2025 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.cli.steps;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
+
+import com.diffplug.spotless.tag.CliNativeTest;
+import com.diffplug.spotless.tag.CliProcessTest;
+import com.diffplug.spotless.tag.SeparateJvmTest;
+
+@Isolated
+@SeparateJvmTest
+@CliNativeTest
+@CliProcessTest
+public class EclipseWtpXhtmlWithConfigTest extends EclipseWtpTestBase {
+
+    @Test
+    void itUsesConfigurationFile() {
+        String fileName = runEclipseWtpWithTypeAndConfigFile(
+                EclipseWtp.Type.XHTML,
+                "<!DOCTYPE html> <html>\t<head> <meta   charset=\"UTF-8\"></head>\n" + "</html>  ",
+                "org.eclipse.wst.html.core.prefs");
+        selfie().expectResource(fileName).toMatchDisk();
+    }
+}
diff --git a/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpCssWithConfigTest.ss b/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpCssWithConfigTest.ss
new file mode 100644
index 0000000..c51eb51
--- /dev/null
+++ b/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpCssWithConfigTest.ss
@@ -0,0 +1,6 @@
+╔═ itUsesConfigurationFile ═╗
+body {
+ a: v;
+ b: v;
+}
+╔═ [end of file] ═╗
diff --git a/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpHtmlWithConfigTest.ss b/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpHtmlWithConfigTest.ss
new file mode 100644
index 0000000..9996af8
--- /dev/null
+++ b/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpHtmlWithConfigTest.ss
@@ -0,0 +1,9 @@
+╔═ itUsesConfigurationFile ═╗
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+</head>
+</html>
+
+╔═ [end of file] ═╗
diff --git a/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpJsWithConfigTest.ss b/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpJsWithConfigTest.ss
new file mode 100644
index 0000000..b336dc5
--- /dev/null
+++ b/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpJsWithConfigTest.ss
@@ -0,0 +1,5 @@
+╔═ itUsesConfigurationFile ═╗
+function f() {
+                a.b(1, 2);
+}
+╔═ [end of file] ═╗
diff --git a/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpXhtmlWithConfigTest.ss b/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpXhtmlWithConfigTest.ss
new file mode 100644
index 0000000..9996af8
--- /dev/null
+++ b/app/src/test/resources/com/diffplug/spotless/cli/steps/EclipseWtpXhtmlWithConfigTest.ss
@@ -0,0 +1,9 @@
+╔═ itUsesConfigurationFile ═╗
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+</head>
+</html>
+
+╔═ [end of file] ═╗
diff --git a/testlib/src/main/resources/eclipse-wtp/eclipse-wtp-js-profile.xml b/testlib/src/main/resources/eclipse-wtp/eclipse-wtp-js-profile.xml
new file mode 100644
index 0000000..9e48a10
--- /dev/null
+++ b/testlib/src/main/resources/eclipse-wtp/eclipse-wtp-js-profile.xml
@@ -0,0 +1,268 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<profiles version="11">
+    <profile kind="CodeFormatterProfile" name="spotless-cli" version="11">
+        <setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_binary_expression" value="16"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.comment.format_header" value="false"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.compact_else_if" value="true"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.align_type_members_on_columns" value="false"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_colon_in_object_initializer" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_after_comma_in_objlit_initializer" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.wrap_before_binary_operator" value="true"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.indentation.size" value="16"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_assignment" value="0"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.compiler.compliance" value="1.5"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_after_opening_brace_in_objlit_initializer" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.blank_lines_after_package" value="1"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.blank_lines_before_method" value="1"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.compiler.problem.assertIdentifier" value="error"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.tabulation.size" value="16"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.comment.format_source_code" value="true"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.continuation_indentation" value="2"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.blank_lines_after_imports" value="1"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.keep_empty_objlit_initializer_on_one_line" value="false"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.blank_lines_between_import_groups" value="1"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.blank_lines_before_field" value="0"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.compiler.source" value="1.5"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_conditional_expression" value="80"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.comment.format_block_comments" value="true"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.comment.format_html" value="true"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.blank_lines_before_package" value="0"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.brace_position_for_objlit_initializer" value="end_of_line"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_function_keyword" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.brace_position_for_block" value="end_of_line"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.indent_empty_lines" value="false"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.blank_lines_before_member_type" value="1"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.blank_lines_before_imports" value="1"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_colon_in_object_initializer" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.blank_lines_between_type_declarations" value="0"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_before_closing_brace_in_objlit_initializer" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.comment.indent_root_tags" value="true"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.comment.format_javadoc_comments" value="true"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.continuation_indentation_for_objlit_initializer" value="1"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.comment.format_line_comments" value="true"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.compiler.codegen.targetPlatform" value="1.5"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.lineSplit" value="80"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.tabulation.char" value="space"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_new_line_after_annotation" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_enum_constants" value="0"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_compact_if" value="16"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.comment.line_length" value="80"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.comment.indent_parameter_description" value="true"/>
+        <setting id="org.eclipse.wst.jsdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+    </profile>
+</profiles>
diff --git a/testlib/src/main/resources/eclipse-wtp/org.eclipse.wst.css.core.prefs b/testlib/src/main/resources/eclipse-wtp/org.eclipse.wst.css.core.prefs
new file mode 100644
index 0000000..d2ebbea
--- /dev/null
+++ b/testlib/src/main/resources/eclipse-wtp/org.eclipse.wst.css.core.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+indentationChar=space
diff --git a/testlib/src/main/resources/eclipse-wtp/org.eclipse.wst.html.core.prefs b/testlib/src/main/resources/eclipse-wtp/org.eclipse.wst.html.core.prefs
new file mode 100644
index 0000000..78641fb
--- /dev/null
+++ b/testlib/src/main/resources/eclipse-wtp/org.eclipse.wst.html.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+indentationChar=space
+indentationSize=4
+inlineElements=small,big,sub,img,strong,select,basefont,title,sup,br,abbr,a,b,acronym,strike,em,i,label,td,input,q,s,th,u,cite,li,font,span

From ab51763cac4f9a71f34f34ac49edf4b62fc0cbb9 Mon Sep 17 00:00:00 2001
From: Simon Gamma <github@survive.ch>
Date: Wed, 20 Aug 2025 06:09:05 +0200
Subject: [PATCH 6/6] docs: document eclipse wtp formatter

---
 CHANGELOG.md                                  |  4 ++
 README.md                                     | 69 +++++++++++++++++++
 .../spotless/cli/steps/EclipseWtp.java        | 12 +++-
 .../cli/picocli/usage/DocumentedUsages.groovy |  1 +
 gradle/libs.versions.toml                     |  1 +
 5 files changed, 84 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 074386d..5b559ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Added formatter [`eclipse-wtp`](https://github.com/diffplug/spotless/tree/main/plugin-gradle#eclipse-web-tools-platform)
+
 ## [0.2.0] - 2025-07-31
 
 ### Fixed
diff --git a/README.md b/README.md
index 06e558e..ab4df79 100644
--- a/README.md
+++ b/README.md
@@ -187,6 +187,7 @@ Spotless CLI supports the following formatter steps in alphabetical order:
 
 - [clang-format](#clang-format)
 - [clean-that](#clean-that)
+- [eclipse-wtp](#eclipse-wtp)
 - [format-annotations](#format-annotations)
 - [google-java-format](#google-java-format)
 - [license-header](#license-header)
@@ -312,6 +313,74 @@ Example usage:
 spotless --target '**/src/**/*.java' clean-that --exclude-mutator=StreamAnyMatch
 ```
 
+### eclipse-wtp
+
+<!---freshmark eclipsewtpshields
+output = [
+  link(shield('spotless eclipse wtp version', 'spotless-eclipse-wtp', '{{libs.versions.native.include.spotlessEclipseWtp}}', 'blue'), 'https://central.sonatype.com/artifact/com.diffplug.spotless/spotless-eclipse-wtp/{{libs.versions.native.include.spotlessEclipseWtp}}'),
+  link(shield('eclipse wtp version', 'eclipse-wtp-formatter', '{{libs.versions.native.include.spotlessEclipseWtpFormatter}}', 'blue'), 'https://github.com/diffplug/spotless/blob/main/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_wtp_formatter/v{{libs.versions.native.include.spotlessEclipseWtpFormatter}}'),
+  ].join('\n')
+-->
+
+[![spotless eclipse wtp version](https://img.shields.io/badge/spotless--eclipse--wtp-3.23.0-blue.svg)](https://central.sonatype.com/artifact/com.diffplug.spotless/spotless-eclipse-wtp/3.23.0)
+[![eclipse wtp version](https://img.shields.io/badge/eclipse--wtp--formatter-4.21.0-blue.svg)](https://github.com/diffplug/spotless/blob/main/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_wtp_formatter/v4.21.0)
+
+<!---freshmark /eclipsewtpshields -->
+
+The [eclipse web tools platform (WTP)](https://projects.eclipse.org/projects/webtools) formatter is a formatter for web files such as HTML, CSS, JavaScript, JSON, XML and XHTML.
+
+It comes with reasonable defaults but can be configured using configuration files. For details see the [spotless documentation](https://github.com/diffplug/spotless/tree/main/plugin-gradle#eclipse-web-tools-platform).
+
+To see usage instructions for the eclipse-wtp formatter, run: `spotless eclipse-wtp --help`
+
+<!---freshmark usage_eclipse_wtp
+output =
+   '```\n' +
+   {{usage.eclipse-wtp.array}}.join('\n') +
+    '\n```';
+-->
+
+```
+Usage: spotless eclipse-wtp [-hV] [-f]... [-t=<type>]
+Runs Eclipse WTP formatter (4.21.0)
+  -f, --config-file   The path to the Eclipse WTP configuration file. For
+                        supported config file options see spotless
+                        documentation (additional info links).
+  -h, --help          Show this help message and exit.
+  -t, --type=<type>   The type of the Eclipse WTP formatter. If not provided,
+                        the type will be guessed based on the first few files
+                        we find. If that does not work, we fail the formatting
+                        run.
+                      One of: CSS, HTML, JS, JSON, XML, XHTML
+  -V, --version       Print version information and exit.
+
+✅ This step supports the following file types:
+   * css
+   * html
+   * js
+   * json
+   * xml
+   * xhtml
+
+🌎 Additional info:
+   * https://github.com/diffplug/spotless/tree/main/plugin-gradle#eclipse-web-to
+    ols-platform
+
+   * https://projects.eclipse.org/projects/webtools
+```
+
+<!---freshmark /usage_eclipse_wtp -->
+
+Example usage:
+
+```shell
+# format all js files using (multiple) project-specific configuration files
+# for details regarding the configuration files see the spotless documentation
+spotless --target '**/*.js' eclipse-wtp --type js --config-file spotless.xml.prefs --config-file spotless.common.properties
+# or use defaults and infer type from files
+spotless --target '**/*.css' eclipse-wtp
+```
+
 ### format-annotations
 
 In Java, type annotations should be on the same line as the type that they qualify. This formatter fixes this for you.
diff --git a/app/src/main/java/com/diffplug/spotless/cli/steps/EclipseWtp.java b/app/src/main/java/com/diffplug/spotless/cli/steps/EclipseWtp.java
index 2607557..487b75b 100644
--- a/app/src/main/java/com/diffplug/spotless/cli/steps/EclipseWtp.java
+++ b/app/src/main/java/com/diffplug/spotless/cli/steps/EclipseWtp.java
@@ -26,7 +26,9 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.cli.core.SpotlessActionContext;
 import com.diffplug.spotless.cli.core.TargetFileTypeInferer;
+import com.diffplug.spotless.cli.help.AdditionalInfoLinks;
 import com.diffplug.spotless.cli.help.OptionConstants;
+import com.diffplug.spotless.cli.help.SupportedFileTypes;
 import com.diffplug.spotless.extra.EclipseBasedStepBuilder;
 import com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep;
 
@@ -35,6 +37,11 @@
 @CommandLine.Command(
         name = "eclipse-wtp",
         description = "Runs Eclipse WTP formatter (" + EclipseWtp.ECLIPSE_WTP_VERSION + ")")
+@SupportedFileTypes({"css", "html", "js", "json", "xml", "xhtml"})
+@AdditionalInfoLinks({
+    "https://github.com/diffplug/spotless/tree/main/plugin-gradle#eclipse-web-tools-platform",
+    "https://projects.eclipse.org/projects/webtools"
+})
 public class EclipseWtp extends SpotlessFormatterStep {
 
     public static final String ECLIPSE_WTP_VERSION = "4.21.0"; // TODO we need to slurp in the lock file also
@@ -42,9 +49,8 @@ public class EclipseWtp extends SpotlessFormatterStep {
     @CommandLine.Option(
             names = {"-f", "--config-file"},
             arity = "0",
-            description =
-                    "The path to the Eclipse WTP configuration file.\n"
-                            + "For supported config file options see <https://github.com/diffplug/spotless/tree/main/plugin-gradle#eclipse-web-tools-platform>")
+            description = "The path to the Eclipse WTP configuration file. "
+                    + "For supported config file options see spotless documentation (additional info links).")
     List<Path> configFiles;
 
     @CommandLine.Option(
diff --git a/build-logic/src/main/groovy/com/diffplug/spotless/cli/picocli/usage/DocumentedUsages.groovy b/build-logic/src/main/groovy/com/diffplug/spotless/cli/picocli/usage/DocumentedUsages.groovy
index 3f6a62a..af9e094 100644
--- a/build-logic/src/main/groovy/com/diffplug/spotless/cli/picocli/usage/DocumentedUsages.groovy
+++ b/build-logic/src/main/groovy/com/diffplug/spotless/cli/picocli/usage/DocumentedUsages.groovy
@@ -4,6 +4,7 @@ enum DocumentedUsages {
 
 	CLANG_FORMAT(),
 	CLEAN_THAT(),
+	ECLIPSE_WTP(),
 	FORMAT_ANNOTATIONS(),
 	MAIN(""),
 	GOOGLE_JAVA_FORMAT(),
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4741fcc..76d68cd 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -12,6 +12,7 @@ native-include-palantirJavaFormat = "2.67.0"
 # to find required version here check eclipse_wtp_formatter/v4.21.0.lockfile
 # where <4.21.0> is the default version of com.diffplug.spotless.extra.wtp.EclipseWtpFormatterStep#defaultVersion
 native-include-spotlessEclipseWtp = "3.23.0"
+native-include-spotlessEclipseWtpFormatter = "4.21.0"
 picocli = "4.7.6"
 selfie = "2.5.1"
 slf4j = "2.0.17"