Skip to content

Commit 60b9805

Browse files
committed
Minor refactor of the antlr4 defaults.
1 parent 837df92 commit 60b9805

File tree

3 files changed

+5
-13
lines changed

3 files changed

+5
-13
lines changed

lib/src/main/java/com/diffplug/spotless/antlr4/Antlr4Defaults.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,17 @@
1515
*/
1616
package com.diffplug.spotless.antlr4;
1717

18-
import java.util.Collections;
19-
import java.util.List;
20-
2118
public class Antlr4Defaults {
22-
2319
private static final String LICENSE_HEADER_DELIMITER = "(grammar|lexer grammar|parser grammar)";
24-
25-
private static final List<String> defaultIncludes = Collections.singletonList("src/*/antlr4/**/*.g4");
20+
private static final String INCLUDES = "src/*/antlr4/**/*.g4";
2621

2722
private Antlr4Defaults() {}
2823

2924
public static String licenseHeaderDelimiter() {
3025
return LICENSE_HEADER_DELIMITER;
3126
}
3227

33-
public static List<String> defaultIncludes() {
34-
return defaultIncludes;
28+
public static String includes() {
29+
return INCLUDES;
3530
}
3631
}

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/Antlr4Extension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ private FormatterStep createStep() {
5353
@Override
5454
protected void setupTask(SpotlessTask task) {
5555
if (target == null) {
56-
target = parseTarget(Antlr4Defaults.defaultIncludes());
56+
target = parseTarget(Antlr4Defaults.includes());
5757
}
5858
super.setupTask(task);
5959
}

plugin-maven/src/main/java/com/diffplug/spotless/maven/antlr4/Antlr4.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,9 @@
2929
* and anltr4-specific (e.g. {@link Antlr4Formatter}) steps.
3030
*/
3131
public class Antlr4 extends FormatterFactory {
32-
33-
private static final Set<String> DEFAULT_INCLUDES = ImmutableSet.copyOf(Antlr4Defaults.defaultIncludes());
34-
3532
@Override
3633
public Set<String> defaultIncludes() {
37-
return DEFAULT_INCLUDES;
34+
return ImmutableSet.of(Antlr4Defaults.includes());
3835
}
3936

4037
@Override

0 commit comments

Comments
 (0)