Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
a93a424
removeWildcardImports: throw new AssertionError instead of removing
Jul 17, 2025
b846b0b
removeWildcardImports: throw new AssertionError instead of removing
Jul 17, 2025
730f211
Update lib/src/main/java/com/diffplug/spotless/java/RemoveWildcardImp…
Pankraz76 Jul 18, 2025
43adf9e
Merge remote-tracking branch 'f/fix-RemoveWildcardImportsStep' into f…
Jul 18, 2025
777f496
removeWildcardImports: throw new AssertionError instead of removing
Jul 18, 2025
0956a48
removeWildcardImports: throw new AssertionError instead of removing
Jul 18, 2025
350b8a4
wip
Jul 18, 2025
e13b9b0
Fix lint
iddeepak Jul 22, 2025
1cb31dd
spotless-apply
iddeepak Jul 22, 2025
0f95d2f
lib-spotless-apply
iddeepak Jul 22, 2025
362502a
use lint-errors
iddeepak Jul 22, 2025
c4f0150
Merge branch 'diffplug:main' into fix-RemoveWildcardImportsStep
iddeepak Jul 22, 2025
04e40ff
no lint-errors for maven spotless-apply
iddeepak Jul 22, 2025
c0cf2da
undo changes
iddeepak Jul 24, 2025
b331249
Merge branch 'diffplug:main' into fix-RemoveWildcardImportsStep
iddeepak Jul 24, 2025
9042049
undo changes
iddeepak Jul 24, 2025
8999fb2
undo changes
iddeepak Jul 24, 2025
2cc47d2
Merge branch 'main' into fix-RemoveWildcardImportsStep
nedtwigg Sep 23, 2025
a6b7d52
Update changelog.
nedtwigg Sep 23, 2025
a83807f
Make `ReplaceRegexStep` a bit more idiomatically a linter.
nedtwigg Sep 23, 2025
31302c8
Improve error messages.
nedtwigg Sep 23, 2025
7140dcd
Merge branch 'main' into fix-RemoveWildcardImportsStep
nedtwigg Sep 23, 2025
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
### Fixed
* Fix `spaceBeforeSeparator` in Jackson formatter. ([#2103](https://github.com/diffplug/spotless/pull/2103))
* `GitPrePushHookInstaller` uses a lock to run gracefully if it is called many times in parallel. ([#2570](https://github.com/diffplug/spotless/pull/2570))
### Added
* Add a `lint` mode to `ReplaceRegexStep` ([#2571](https://github.com/diffplug/spotless/pull/2571))

## [3.3.1] - 2025-07-21
### Fixed
Expand Down
4 changes: 2 additions & 2 deletions lib/src/main/java/com/diffplug/spotless/Lint.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2022-2024 DiffPlug
* Copyright 2022-2025 DiffPlug
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -91,7 +91,7 @@ public ShortcutException(Lint... lints) {
private final List<Lint> lints;

ShortcutException(Collection<Lint> lints) {
super(lints.iterator().next().detail);
super(lints.iterator().next().toString());
this.lints = List.copyOf(lints);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2016 DiffPlug
* Copyright 2016-2025 DiffPlug
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -15,12 +15,16 @@
*/
package com.diffplug.spotless.generic;

import java.io.File;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.regex.Pattern;

import com.diffplug.spotless.FormatterFunc;
import com.diffplug.spotless.FormatterStep;
import com.diffplug.spotless.Lint;

public final class ReplaceRegexStep {
// prevent direct instantiation
Expand All @@ -35,6 +39,15 @@ public static FormatterStep create(String name, String regex, String replacement
State::toFormatter);
}

public static FormatterStep lint(String name, String regex, String lintDetail) {
Objects.requireNonNull(name, "name");
Objects.requireNonNull(regex, "regex");
Objects.requireNonNull(lintDetail, "lintDetail");
return FormatterStep.createLazy(name,
() -> new LintState(Pattern.compile(regex, Pattern.UNIX_LINES | Pattern.MULTILINE), name, lintDetail),
LintState::toLinter);
}

private static final class State implements Serializable {
private static final long serialVersionUID = 1L;

Expand All @@ -50,4 +63,38 @@ FormatterFunc toFormatter() {
return raw -> regex.matcher(raw).replaceAll(replacement);
}
}

private static final class LintState implements Serializable {
private static final long serialVersionUID = 1L;

private final Pattern regex;
private final String ruleId;
private final String lintDetail;

LintState(Pattern regex, String ruleId, String lintDetail) {
this.regex = regex;
this.ruleId = ruleId;
this.lintDetail = lintDetail;
}

FormatterFunc toLinter() {
return new FormatterFunc() {
@Override
public String apply(String raw) {
return raw;
}

@Override
public List<Lint> lint(String raw, File file) {
List<Lint> lints = new ArrayList<>();
var matcher = regex.matcher(raw);
while (matcher.find()) {
int line = 1 + (int) raw.codePoints().limit(matcher.start()).filter(c -> c == '\n').count();
lints.add(Lint.atLine(line, matcher.group(0), lintDetail));
}
return lints;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nedtwigg
spotless:apply for maven does not show lint errors ? for gradle it does.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

aha! you are correct! i will try to fix that problem this week...

Copy link
Contributor

@Pankraz76 Pankraz76 Aug 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is it resolved so we can continue, or is the issue bigger than expected?

}
};
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,17 @@

/** Removes any wildcard import statements. */
public final class RemoveWildcardImportsStep {

/**
* Matches lines like 'import foo.*;' or 'import static foo.*;'.
*/
private static final String REGEX = "(?m)^import\\s+(?:static\\s+)?[^;\\n]*\\*;\\R?";
private static final String NAME = "removeWildcardImports";
private static final String ERROR = "Do not use wildcard imports (e.g. java.util.*) - replace with specific class imports (e.g. java.util.List) as 'spotlessApply' cannot auto-fix this";

private RemoveWildcardImportsStep() {}

public static FormatterStep create() {
// Matches lines like 'import foo.*;' or 'import static foo.*;'.
return ReplaceRegexStep.create(
"removeWildcardImports",
"(?m)^import\\s+(?:static\\s+)?[^;\\n]*\\*;\\R?",
"");
return ReplaceRegexStep.lint(NAME, REGEX, ERROR);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ void removeWildCardImports() throws IOException {
"}");

setFile("test.java").toResource("java/removewildcardimports/JavaCodeWildcardsUnformatted.test");
gradleRunner().withArguments("spotlessApply").build();
gradleRunner().withArguments("spotlessApply").buildAndFail();
assertFile("test.java").sameAsResource("java/removewildcardimports/JavaCodeWildcardsFormatted.test");
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import java.util.List;
import mylib.Helper;

public class Test {}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import java.util.List;
import mylib.Helper;

public class Test {}
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
import java.util.*;
import static java.util.Collections.*;
import java.util.List;
import mylib.Helper;
import io.quarkus.maven.dependency.*;
import static io.quarkus.vertx.web.Route.HttpMethod.*;
import static org.springframework.web.reactive.function.BodyInserters.*;

public class Test {}
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
/*
* 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.generic;

import org.junit.jupiter.api.Test;

import com.diffplug.common.base.StringPrinter;
import com.diffplug.spotless.FormatterStep;
import com.diffplug.spotless.StepHarness;

class ReplaceRegexStepTest {
@Test
void formatter() throws Exception {
FormatterStep step = ReplaceRegexStep.create("replace", "bad", "good");
StepHarness.forStep(step)
.test("bad bad", "good good");
}

@Test
void lint() throws Exception {
FormatterStep step = ReplaceRegexStep.lint("stayPositive", "(bad|awful)", "no negative words");
StepHarness.forStep(step)
.expectLintsOf(StringPrinter.buildStringFromLines(
"bad",
"oh boy",
"x awful y",
"yippeee"))
.toBe("L1 stayPositive(bad) no negative words",
"L3 stayPositive(awful) no negative words");
}
}
Loading