[prone] Apply UnnecessaryDefaultInEnumSwitch

Author: Vincent Potucek

lib-extra/src/jdt/java/com/diffplug/spotless/extra/glue/jdt/DefaultJavaElementComparator.java

@@ -347,28 +347,14 @@ public int compare(BodyDeclaration bodyDeclaration1, BodyDeclaration bodyDeclara
 	}
 
 	private static int sortPreservedCategory(int category) {
-		switch (category) {
-		case STATIC_FIELDS_INDEX:
-		case STATIC_INIT_INDEX:
-			return STATIC_FIELDS_INDEX;
-		case FIELDS_INDEX:
-		case INIT_INDEX:
-			return FIELDS_INDEX;
-		default:
-			return category;
-		}
+		return switch (category) {
+			case STATIC_FIELDS_INDEX, STATIC_INIT_INDEX -> STATIC_FIELDS_INDEX;
+			case FIELDS_INDEX, INIT_INDEX -> FIELDS_INDEX;
+			default -> category;
+		};
 	}
 
-	private boolean isSortPreserved(BodyDeclaration bodyDeclaration) {
-		switch (bodyDeclaration.getNodeType()) {
-		case ASTNode.FIELD_DECLARATION:
-		case ASTNode.ENUM_CONSTANT_DECLARATION:
-		case ASTNode.INITIALIZER:
-			return true;
-		default:
-			return false;
-		}
-	}
+	private boolean isSortPreserved(BodyDeclaration bodyDeclaration) {return switch(bodyDeclaration.getNodeType()){case ASTNode.FIELD_DECLARATION,ASTNode.ENUM_CONSTANT_DECLARATION,ASTNode.INITIALIZER->true;default->false;};}
 
 	private int preserveRelativeOrder(BodyDeclaration bodyDeclaration1, BodyDeclaration bodyDeclaration2) {
 		int value1 = (Integer) bodyDeclaration1.getProperty(CompilationUnitSorter.RELATIVE_ORDER);

lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java

@@ -15,6 +15,10 @@
  */
 package com.diffplug.spotless.extra;
 
+import static com.diffplug.spotless.LineEnding.PLATFORM_NATIVE;
+import static com.diffplug.spotless.LineEnding.UNIX;
+import static com.diffplug.spotless.LineEnding.WINDOWS;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -91,10 +95,9 @@ public LazyAllTheSame(File projectDir, Supplier<Iterable<File>> toFormat) {
 		protected String calculateState() throws Exception {
 			var files = toFormat.get().iterator();
 			if (files.hasNext()) {
-				Runtime runtime = new RuntimeInit(projectDir).atRuntime();
-				return runtime.getEndingFor(files.next());
+				return new RuntimeInit(projectDir).atRuntime().getEndingFor(files.next());
 			} else {
-				return LineEnding.UNIX.str();
+				return UNIX.str();
 			}
 		}
 
@@ -300,15 +303,14 @@ public String getEndingFor(File file) {
 		}
 
 		private static String convertEolToLineEnding(String eol, File file) {
-			switch (eol.toLowerCase(Locale.ROOT)) {
-			case "lf":
-				return LineEnding.UNIX.str();
-			case "crlf":
-				return LineEnding.WINDOWS.str();
-			default:
-				LOGGER.warn(".gitattributes file has unspecified eol value: {} for {}, defaulting to platform native", eol, file);
-				return LineEnding.PLATFORM_NATIVE.str();
-			}
+			return switch (eol.toLowerCase(Locale.ROOT)) {
+				case "lf" -> UNIX.str();
+				case "crlf" -> WINDOWS.str();
+				default -> {
+					LOGGER.warn(".gitattributes file has unspecified eol value: {} for {}, defaulting to platform native", eol, file);
+					yield PLATFORM_NATIVE.str();
+				}
+			};
 		}
 
 		private LineEnding findDefaultLineEnding(Config config) {
@@ -318,12 +320,12 @@ private LineEnding findDefaultLineEnding(Config config) {
 				// autocrlf=true converts CRLF->LF during commit
 				//               and converts LF->CRLF during checkout
 				// so CRLF is the default line ending
-				return LineEnding.WINDOWS;
+				return WINDOWS;
 			} else if (autoCRLF == AutoCRLF.INPUT) {
 				// autocrlf=input converts CRLF->LF during commit
 				//                and does no conversion during checkout
 				// mostly used on Unix, so LF is the default encoding
-				return LineEnding.UNIX;
+				return UNIX;
 			} else if (autoCRLF == AutoCRLF.FALSE) {
 				// handle core.eol
 				EOL eol = config.getEnum(ConfigConstants.CONFIG_CORE_SECTION, null, ConfigConstants.CONFIG_KEY_EOL, EOL.NATIVE);
@@ -335,14 +337,11 @@ private LineEnding findDefaultLineEnding(Config config) {
 
 		/** Creates a LineEnding from an EOL. */
 		private static LineEnding fromEol(EOL eol) {
-			// @formatter:off
-			switch (eol) {
-			case CRLF:    return LineEnding.WINDOWS;
-			case LF:      return LineEnding.UNIX;
-			case NATIVE:  return LineEnding.PLATFORM_NATIVE;
-			default: throw new IllegalArgumentException("Unknown eol " + eol);
-			}
-			// @formatter:on
+			return switch (eol) {
+				case CRLF -> WINDOWS;
+				case LF -> UNIX;
+				case NATIVE -> PLATFORM_NATIVE;
+			};
 		}
 	}
 

lib/src/ktfmt/java/com/diffplug/spotless/glue/ktfmt/KtfmtFormatterFunc.java

@@ -58,7 +58,6 @@ private FormattingOptions createFormattingOptions() throws Exception {
 			case META -> Formatter.META_FORMAT;
 			case GOOGLE -> Formatter.GOOGLE_FORMAT;
 			case KOTLIN_LANG -> Formatter.KOTLINLANG_FORMAT;
-			default -> throw new IllegalStateException("Unknown formatting option " + style);
 		};
 
 		if (ktfmtFormattingOptions != null) {

lib/src/main/java/com/diffplug/spotless/GitPrePushHookInstaller.java

@@ -266,7 +266,7 @@ protected String preHookTemplate(Executor executor, String commandCheck, String
 	private String executorPath(Executor executor) {
 		final var wrapper = executorWrapperFile(executor);
 		if (wrapper.exists()) {
-			return wrapper.getAbsolutePath().replace("\\", "/");
+			return "./" + wrapper.getName();
 		}
 
 		logger.info("Local %s wrapper (%s) not found, falling back to global command '%s'",

lib/src/main/java/com/diffplug/spotless/LineEnding.java

@@ -83,14 +83,8 @@ public Policy createPolicy(File projectDir, Supplier<Iterable<File>> toFormat) {
 	// @formatter:off
 	/** Should use {@link #createPolicy(File, Supplier)} instead, but this will work iff its a path-independent LineEnding policy. */
 	public Policy createPolicy() {
-		switch (this) {
-		case PLATFORM_NATIVE:	return _PLATFORM_NATIVE_POLICY;
-		case WINDOWS:			return WINDOWS_POLICY;
-		case UNIX:				return UNIX_POLICY;
-		case MAC_CLASSIC:		return MAC_CLASSIC_POLICY;
-		case PRESERVE:			return PRESERVE_POLICY;
-		default:	throw new UnsupportedOperationException(this + " is a path-specific line ending.");
-		}
+		return switch (this) {case PLATFORM_NATIVE->_PLATFORM_NATIVE_POLICY;case WINDOWS->WINDOWS_POLICY;case UNIX->UNIX_POLICY;case MAC_CLASSIC->MAC_CLASSIC_POLICY;case PRESERVE->PRESERVE_POLICY;default->throw new UnsupportedOperationException(this + " is a path-specific line ending.");
+};
 	}
 
 	static class ConstantLineEndingPolicy extends NoLambda.EqualityBasedOnSerialization implements Policy {
@@ -169,13 +163,8 @@ public static boolean nativeIsWin() {
 
 	/** Returns the standard line ending for this policy. */
 	public String str() {
-		switch (this) {
-		case PLATFORM_NATIVE:	return _PLATFORM_NATIVE;
-		case WINDOWS:			return "\r\n";
-		case UNIX:				return "\n";
-		case MAC_CLASSIC:		return "\r";
-		default:	throw new UnsupportedOperationException(this + " is a path-specific line ending.");
-		}
+		return switch (this) {case PLATFORM_NATIVE->_PLATFORM_NATIVE;case WINDOWS->"\r\n";case UNIX->"\n";case MAC_CLASSIC->"\r";default->throw new UnsupportedOperationException(this + " is a path-specific line ending.");
+};
 	}
 	// @formatter:on
 

lib/src/main/java/com/diffplug/spotless/PaddedCell.java

@@ -150,25 +150,20 @@ public boolean isResolvable() {
 
 	/** Returns the "canonical" form for this particular result (only possible if isResolvable). */
 	public String canonical() {
-		// @formatter:off
-		switch (type) {
-		case CONVERGE:	return steps.get(steps.size() - 1);
-		case CYCLE:		return Collections.min(steps, Comparator.comparingInt(String::length).thenComparing(Function.identity()));
-		case DIVERGE:	throw new IllegalArgumentException("No canonical form for a diverging result");
-		default:	throw new IllegalArgumentException("Unknown type: " + type);
-		}
-		// @formatter:on
+		return switch (type) {
+			case CONVERGE -> steps.get(steps.size() - 1);
+			case CYCLE ->
+				Collections.min(steps, Comparator.comparingInt(String::length).thenComparing(Function.identity()));
+			case DIVERGE -> throw new IllegalArgumentException("No canonical form for a diverging result");
+		};
 	}
 
 	/** Returns a string which describes this result. */
 	public String userMessage() {
-		// @formatter:off
-		switch (type) {
-		case CONVERGE:	return "converges after " + steps.size() + " steps";
-		case CYCLE:		return "cycles between " + steps.size() + " steps";
-		case DIVERGE:	return "diverges after " + steps.size() + " steps";
-		default:	throw new IllegalArgumentException("Unknown type: " + type);
-		}
-		// @formatter:on
+		return switch (type) {
+			case CONVERGE -> "converges after " + steps.size() + " steps";
+			case CYCLE -> "cycles between " + steps.size() + " steps";
+			case DIVERGE -> "diverges after " + steps.size() + " steps";
+		};
 	}
 }

lib/src/main/java/com/diffplug/spotless/biome/BiomeExecutableDownloader.java

@@ -241,14 +241,10 @@ private String computeChecksum(Path file, String algorithm) throws IOException {
 	 * @throws IOException When the given OS is not supported by Biome.
 	 */
 	private String getArchitectureCodeName(Architecture architecture) throws IOException {
-		switch (architecture) {
-		case ARM64:
-			return "arm64";
-		case X64:
-			return "x64";
-		default:
-			throw new IOException("Unsupported architecture: " + architecture);
-		}
+		return switch (architecture) {
+			case ARM64 -> "arm64";
+			case X64 -> "x64";
+		};
 	}
 
 	/**
@@ -290,16 +286,10 @@ private String getDownloadUrl(String version, Platform platform) throws IOExcept
 	 * @throws IOException When the given OS is not supported by Biome.
 	 */
 	private String getDownloadUrlExtension(OS os) throws IOException {
-		switch (os) {
-		case LINUX:
-			return "";
-		case MAC_OS:
-			return "";
-		case WINDOWS:
-			return ".exe";
-		default:
-			throw new IOException("Unsupported OS: " + os);
-		}
+		return switch (os) {
+			case LINUX, MAC_OS -> "";
+			case WINDOWS -> ".exe";
+		};
 	}
 
 	/**
@@ -326,16 +316,11 @@ private Path getExecutablePath(String version, Platform platform) {
 	 * @throws IOException When the given OS is not supported by Biome.
 	 */
 	private String getOsCodeName(OS os) throws IOException {
-		switch (os) {
-		case LINUX:
-			return "linux";
-		case MAC_OS:
-			return "darwin";
-		case WINDOWS:
-			return "win32";
-		default:
-			throw new IOException("Unsupported OS: " + os);
-		}
+		return switch (os) {
+			case LINUX -> "linux";
+			case MAC_OS -> "darwin";
+			case WINDOWS -> "win32";
+		};
 	}
 
 	/**

lib/src/main/java/com/diffplug/spotless/biome/BiomeStep.java

@@ -456,32 +456,22 @@ private String resolveFileName(File file) {
 			}
 			var dot = name.lastIndexOf(".");
 			var ext = dot >= 0 ? name.substring(dot + 1) : name;
-			switch (language) {
-			case "js?":
-				return "jsx".equals(ext) || "js".equals(ext) || "mjs".equals(ext) || "cjs".equals(ext) ? name
-						: "file.js";
-			case "ts?":
-				return "tsx".equals(ext) || "ts".equals(ext) || "mts".equals(ext) || "cts".equals(ext) ? name
-						: "file.js";
-			case "js":
-				return "js".equals(ext) || "mjs".equals(ext) || "cjs".equals(ext) ? name : "file.js";
-			case "jsx":
-				return "jsx".equals(ext) ? name : "file.jsx";
-			case "ts":
-				return "ts".equals(ext) || "mts".equals(ext) || "cts".equals(ext) ? name : "file.ts";
-			case "tsx":
-				return "tsx".equals(ext) ? name : "file.tsx";
-			case "json":
-				return "json".equals(ext) ? name : "file.json";
-			case "jsonc":
-				return "jsonc".equals(ext) ? name : "file.jsonc";
-			case "css":
-				return "css".equals(ext) ? name : "file.css";
-			// so that we can support new languages such as css or yaml when Biome adds
-			// support for them without having to change the code
-			default:
-				return "file." + language;
-			}
+			return switch (language) {
+				case "js?" -> "jsx".equals(ext) || "js".equals(ext) || "mjs".equals(ext) || "cjs".equals(ext) ? name
+					: "file.js";
+				case "ts?" -> "tsx".equals(ext) || "ts".equals(ext) || "mts".equals(ext) || "cts".equals(ext) ? name
+					: "file.js";
+				case "js" -> "js".equals(ext) || "mjs".equals(ext) || "cjs".equals(ext) ? name : "file.js";
+				case "jsx" -> "jsx".equals(ext) ? name : "file.jsx";
+				case "ts" -> "ts".equals(ext) || "mts".equals(ext) || "cts".equals(ext) ? name : "file.ts";
+				case "tsx" -> "tsx".equals(ext) ? name : "file.tsx";
+				case "json" -> "json".equals(ext) ? name : "file.json";
+				case "jsonc" -> "jsonc".equals(ext) ? name : "file.jsonc";
+				case "css" -> "css".equals(ext) ? name : "file.css";
+				// so that we can support new languages such as css or yaml when Biome adds
+				// support for them without having to change the code
+				default -> "file." + language;
+			};
 		}
 
 		/**
@@ -491,8 +481,7 @@ private String resolveFileName(File file) {
 		 * @return A formatter function for formatting code.
 		 */
 		private FormatterFunc.Closeable toFunc() {
-			var runner = new ProcessRunner();
-			return FormatterFunc.Closeable.of(runner, this::format);
+			return FormatterFunc.Closeable.of(new ProcessRunner(), this::format);
 		}
 	}
 }

lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java

@@ -15,6 +15,9 @@
  */
 package com.diffplug.spotless.generic;
 
+import static com.diffplug.spotless.generic.FenceStep.Kind.APPLY;
+import static com.diffplug.spotless.generic.FenceStep.Kind.PRESERVE;
+
 import java.io.File;
 import java.io.Serializable;
 import java.nio.charset.StandardCharsets;
@@ -78,15 +81,15 @@ private void assertRegexSet() {
 
 	/** Returns a step which will apply the given steps but preserve the content selected by the regex / openClose pair. */
 	public FormatterStep preserveWithin(List<FormatterStep> steps) {
-		return createStep(Kind.PRESERVE, steps);
+		return createStep(PRESERVE, steps);
 	}
 
 	/**
 	 * Returns a step which will apply the given steps only within the blocks selected by the regex / openClose pair.
 	 * Linting within the substeps is not supported.
 	 */
 	public FormatterStep applyWithin(List<FormatterStep> steps) {
-		return createStep(Kind.APPLY, steps);
+		return createStep(APPLY, steps);
 	}
 
 	private FormatterStep createStep(Kind kind, List<FormatterStep> steps) {
@@ -96,7 +99,7 @@ private FormatterStep createStep(Kind kind, List<FormatterStep> steps) {
 				RoundtripAndEqualityState::toFormatterFunc);
 	}
 
-	private enum Kind {
+	enum Kind {
 		APPLY, PRESERVE
 	}
 
@@ -210,24 +213,22 @@ public String applyWithFile(String unix, File file) throws Exception {
 			}
 			List<String> groups = groupsZeroed();
 			Matcher matcher = regex.matcher(unix);
-			switch (kind) {
-			case APPLY:
+			if (kind == APPLY) {
 				while (matcher.find()) {
 					// apply the formatter to each group
 					groups.add(formatter.compute(matcher.group(1), file));
 				}
 				// and then assemble the result right away
 				return assembleGroups(unix);
-			case PRESERVE:
+			} else if (kind == PRESERVE) {
 				while (matcher.find()) {
 					// store whatever is within the open/close tags
 					groups.add(matcher.group(1));
 				}
 				String formatted = formatter.compute(unix, file);
 				return assembleGroups(formatted);
-			default:
-				throw new Error();
 			}
+			throw new Error();
 		}
 
 		@Override