Merge remote-tracking branch 'origin/main' into jfriend/respect-git-config-global

Author: nedtwigg

.github/workflows/ci.yml

@@ -91,7 +91,7 @@ jobs:
           download_link=$(curl https://data.services.jetbrains.com/products/releases\?code\=IIC\&latest\=true\&type\=release | jq -r '.IIC[0].downloads.linux.link')
           curl --location "$download_link" -o idea.tar.gz
           tar -xf idea.tar.gz
-          cd idea-IC*
+          cd idea-IU*
           export PATH=${PATH}:$(pwd)/bin
           cd ..
           ./gradlew testIdea

CHANGES.md

@@ -11,7 +11,10 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
 
 ## [Unreleased]
 ### Added
+- Add `versionCatalog` step for formatting and sorting Gradle version catalog (`.toml`) files. ([#2916](https://github.com/diffplug/spotless/issues/2916))
 - Add `javaparserVersion` option to the Cleanthat step, allowing callers to override the JavaParser version pulled in transitively by Cleanthat. ([#2903](https://github.com/diffplug/spotless/pull/2903))
+### Fixed
+- Fix non-idempotent formatting when `importOrder()` is combined with `greclipse()`: a single catch-all group no longer strips blank lines that `greclipse()` independently inserted between import groups. ([#2914](https://github.com/diffplug/spotless/pull/2914))
 ### Changes
 - Bump default `cleanthat` version `2.24` -> `2.25`. ([#2903](https://github.com/diffplug/spotless/pull/2903))
 - Bump default `eclipse-jdt` version from `4.35` to `4.39`. ([#2912](https://github.com/diffplug/spotless/pull/2912))

gradle/libs.versions.toml

@@ -57,9 +57,9 @@ sortpom-sorter = "com.github.ekryd.sortpom:sortpom-sorter:4.0.0"
 tabletest-formatter-core = "org.tabletest:tabletest-formatter-core:1.1.1"
 zjsonpatch = "com.flipkart.zjsonpatch:zjsonpatch:0.4.16"
 
-rewrite-recipe-migrate-java = "org.openrewrite.recipe:rewrite-migrate-java:3.30.0"
-rewrite-recipe-static-analysis = "org.openrewrite.recipe:rewrite-static-analysis:2.30.0"
-rewrite-recipe-third-party = "org.openrewrite.recipe:rewrite-third-party:0.36.2"
+rewrite-recipe-migrate-java = "org.openrewrite.recipe:rewrite-migrate-java:3.34.0"
+rewrite-recipe-static-analysis = "org.openrewrite.recipe:rewrite-static-analysis:2.34.0"
+rewrite-recipe-third-party = "org.openrewrite.recipe:rewrite-third-party:0.38.1"
 
 errorprone-core = "com.google.errorprone:error_prone_core:2.42.0"
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 DiffPlug
+ * Copyright 2016-2026 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 import java.util.List;
 import java.util.Scanner;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * @author Vojtech Krasa
@@ -91,6 +92,15 @@ String format(String raw, String lineFormat) {
 
 		List<String> sortedImports = ImportSorterImpl.sort(imports, importsOrder, wildcardsLast, semanticSort,
 				treatAsPackage, treatAsClass, lineFormat);
+		boolean sortedHasNoBlanks = sortedImports.stream().noneMatch(N::equals);
+		if (sortedHasNoBlanks && firstImportLine > 0) {
+			List<String> originalFormatted = imports.stream()
+					.map(i -> lineFormat.formatted(i) + N)
+					.collect(Collectors.toList());
+			if (sortedImports.equals(originalFormatted)) {
+				return raw;
+			}
+		}
 		return applyImportsToDocument(raw, firstImportLine, lastImportLine, sortedImports);
 	}
 

lib/src/main/java/com/diffplug/spotless/toml/TODO.md

@@ -0,0 +1,36 @@
+# VersionCatalogStep — Known Limitations & Future Work
+
+Tracked issues found during review against the TOML v1.1.0 spec (https://toml.io/en/v1.1.0).
+
+## Fixed
+
+- [x] Comments inside sections are silently dropped (data loss for annotated catalogs)
+- [x] Inline comments after values break inline-table/array formatting
+- [x] Blank lines in preamble are dropped
+- [x] Sort uses raw string including quote characters instead of logical key name
+- [x] Multi-line inline tables are not parsed correctly (split across lines and corrupted)
+- [x] Long lines can be split into multi-line inline tables (configurable `maxLineLength`)
+- [x] Short multi-line inline tables are joined into single lines when they fit
+
+## TODO — TOML spec edge cases
+
+These are valid TOML constructs that the current implementation does not handle correctly.
+They are uncommon (or impossible) in typical Gradle version catalogs, but should be
+addressed for full TOML spec compliance.
+
+### Parsing
+
+- [ ] `ENTRY_LINE` regex `^([^=]+)=(.+)$` is not quote-aware — breaks on quoted keys
+      containing `=`, e.g. `"key=val" = "foo"`. Needs a state-machine parser to find
+      the separator `=` outside quoting context.
+- [ ] `TABLE_HEADER` regex only matches bare keys — rejects dotted table headers
+      (`[section.subsection]`) and quoted table headers (`["quoted.key"]`).
+      Their entries are silently dropped.
+
+### String handling in `splitTopLevel`
+
+- [ ] Single-quoted (literal) strings `'...'` are not recognized — commas or `=` inside
+      them will incorrectly split or match.
+- [ ] Multiline string delimiters (`"""`, `'''`) confuse the single-char quote toggle.
+- [ ] Double-backslash before closing quote (`"value\\"`) is misidentified as an escaped
+      quote. Needs odd/even backslash counting instead of single-char lookbehind.