Skip to content

Issue #2667 Add normalizeTargetExclusion to handle directory #2691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Issue #2667 Add normalizeTargetExclusion to handle directory #2691

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4b4317
[2667] Add `normalizeTargetExclude` to handle directory
Oct 18, 2025
4959612
[2667] Add `normalizeTargetExclusion` to handle directory
Oct 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 24 additions & 7 deletions plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,11 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.Set;
import java.util.TreeMap;
import java.util.function.Consumer;
import java.util.function.Function;
Expand All @@ -45,7 +47,6 @@
import org.gradle.api.GradleException;
import org.gradle.api.Project;
import org.gradle.api.file.ConfigurableFileTree;
import org.gradle.api.file.Directory;
import org.gradle.api.file.FileCollection;
import org.gradle.api.plugins.BasePlugin;
import org.gradle.api.tasks.TaskProvider;
Expand Down Expand Up @@ -1075,7 +1076,26 @@ public void toggleOffOnDisable() {
protected void setupTask(SpotlessTask task) {
task.setEncoding(getEncoding().name());
task.setLintSuppressions(lintSuppressions);
FileCollection totalTarget = targetExclude == null ? target : target.minus(targetExclude);
setupTask(task, normalizeTargetExclusion());
}

private FileCollection normalizeTargetExclusion() {
if (targetExclude != null) {
Set<File> expandedExcludeFiles = new HashSet<>();
for (File file : targetExclude.getFiles()) {
if (file.isDirectory()) {
expandedExcludeFiles.addAll(getProject().fileTree(file).getFiles()); // include all files within it recursively.
} else {
expandedExcludeFiles.add(file);
}
}
return target.minus(getProject().files(expandedExcludeFiles));
} else {
return target;
}
}

private void setupTask(final SpotlessTask task, final FileCollection totalTarget) {
task.setTarget(totalTarget);
List<FormatterStep> steps;
if (toggleFence != null) {
Expand All @@ -1087,13 +1107,10 @@ protected void setupTask(SpotlessTask task) {
}
if (targetExcludeContentPattern != null) {
steps.replaceAll(
formatterStep -> formatterStep.filterByContent(OnMatch.EXCLUDE, targetExcludeContentPattern));
formatterStep -> formatterStep.filterByContent(OnMatch.EXCLUDE, targetExcludeContentPattern));
}
task.setSteps(steps);
Directory projectDir = getProject().getLayout().getProjectDirectory();
LineEnding lineEndings = getLineEndings();
task.setLineEndingsPolicy(
getProject().provider(() -> lineEndings.createPolicy(projectDir.getAsFile(), () -> totalTarget)));
task.setLineEndingsPolicy(getProject().provider(() -> getLineEndings().createPolicy(getProject().getLayout().getProjectDirectory().getAsFile(), () -> totalTarget)));
spotless.getRegisterDependenciesTask().hookSubprojectTask(task);
task.setupRatchet(getRatchetFrom() != null ? getRatchetFrom() : "");
}
Expand Down
Loading