[improve] Add xhtml, jsp, jspx to html formatter and wsdl/xsd to xml …

…formatter
hazendaz · May 29, 2024 · 450709a · 450709a
1 parent 545d405
commit 450709a
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/main/java/net/revelc/code/formatter/FormatterMojo.java b/src/main/java/net/revelc/code/formatter/FormatterMojo.java
@@ -86,8 +86,8 @@ public class FormatterMojo extends AbstractMojo implements ConfigurationSource {
     private static final String CACHE_PROPERTIES_FILENAME = "formatter-maven-cache.properties";
 
     /** The Constant DEFAULT_INCLUDES. */
-    private static final String[] DEFAULT_INCLUDES = { "**/*.css", "**/*.json", "**/*.html", "**/*.java", "**/*.js",
-            "**/*.xml" };
+    private static final String[] DEFAULT_INCLUDES = { "**/*.css", "**/*.json", "**/*.html", "**/*.xhtml", "**/*.java",
+            "**/*.js", "**/*.jsp", "**/*.jspx", "**/*.wsdl", "**/*.xml", "**/*.xsd" };
 
     /** The Constant REMOVE_TRAILING_PATTERN. */
     private static final Pattern REMOVE_TRAILING_PATTERN = Pattern.compile("\\p{Blank}+$", Pattern.MULTILINE);
@@ -744,14 +744,17 @@ protected void doFormatFile(final File file, final ResultCollector rc, final Pro
             } else {
                 formattedCode = this.jsFormatter.formatFile(file, originalCode, this.lineEnding);
             }
-        } else if (file.getName().endsWith(".html") && this.htmlFormatter.isInitialized()) {
+        } else if (file.getName().endsWith(".html") || file.getName().endsWith(".xhtml")
+                || file.getName().endsWith(".jsp")
+                || file.getName().endsWith(".jspx") && this.htmlFormatter.isInitialized()) {
             if (this.skipHtmlFormatting) {
                 log.debug(Type.HTML + FormatterMojo.FORMATTING_IS_SKIPPED);
                 result = Result.SKIPPED;
             } else {
                 formattedCode = this.htmlFormatter.formatFile(file, originalCode, this.lineEnding);
             }
-        } else if (file.getName().endsWith(".xml") && this.xmlFormatter.isInitialized()) {
+        } else if (file.getName().endsWith(".xml") || file.getName().endsWith(".wsdl")
+                || file.getName().endsWith(".xsd") && this.xmlFormatter.isInitialized()) {
             if (this.skipXmlFormatting) {
                 log.debug(Type.XML + FormatterMojo.FORMATTING_IS_SKIPPED);
                 result = Result.SKIPPED;