Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 10 additions & 8 deletions plugin/src/main/java/org/ec4j/maven/AbstractEditorConfigMojo.java
Original file line number Diff line number Diff line change
Expand Up @@ -264,16 +264,18 @@ public void execute() throws MojoExecutionException, MojoFailureException {
}
final Resource resource = new Resource(absFile, file, useEncoding);
final List<Linter> filteredLinters = linterRegistry.filter(file);
ViolationHandler.ReturnState state = ViolationHandler.ReturnState.RECHECK;
while (state != ViolationHandler.ReturnState.FINISHED) {
for (Linter linter : filteredLinters) {
if (log.isTraceEnabled()) {
log.trace("Processing file '{}' using linter {}", file, linter.getClass().getName());
if (!filteredLinters.isEmpty()) {
ViolationHandler.ReturnState state = ViolationHandler.ReturnState.RECHECK;
while (state != ViolationHandler.ReturnState.FINISHED) {
for (Linter linter : filteredLinters) {
if (log.isTraceEnabled()) {
log.trace("Processing file '{}' using linter {}", file, linter.getClass().getName());
}
handler.startFile(resource);
linter.process(resource, editorConfigProperties, handler);
}
handler.startFile(resource);
linter.process(resource, editorConfigProperties, handler);
state = handler.endFile();
}
state = handler.endFile();
}
}
}
Expand Down
8 changes: 8 additions & 0 deletions plugin/src/main/java/org/ec4j/maven/LinterConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,14 @@ public class LinterConfig {
private String[] includes;
private boolean useDefaultIncludesAndExcludes = true;

public LinterConfig() {
}

public LinterConfig(String id, boolean enabled) {
this.id = id;
this.enabled = enabled;
}

public String getClassName() {
return className.indexOf('.') < 0 ? TextLinter.class.getPackage().getName() + "." + className + "Linter"
: className;
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
<maven-project.version>3.0-alpha-2</maven-project.version>
<maven.plugin-tools.version>3.15.2</maven.plugin-tools.version>
<maven-shared-utils.version>3.4.2</maven-shared-utils.version>
<ec4j-core.version>1.1.1</ec4j-core.version>
<ec4j-core.version>1.2.0</ec4j-core.version>
<ec4j-linters.version>2.2.2</ec4j-linters.version>
<slf4j.version>2.0.17</slf4j.version>

Expand Down
16 changes: 16 additions & 0 deletions test/src/test/java/org/ec4j/maven/EditorConfigMojosTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,22 @@ public void check() throws Exception {
;
}

@Test
public void allLintersDisabled() throws Exception {

final Verifier<EditorConfigFormatMojo> mavenExec = new Verifier<>(
"defaults",
EditorConfigFormatMojo.class,
Arrays.asList("log.txt"));

mavenExec.mojo.linters = Arrays.asList(new LinterConfig("org.ec4j.linters.TextLinter", false),
new LinterConfig("org.ec4j.linters.XmlLinter", false));

mavenExec //
.execute() //
.assertErrorFreeLog();
}

@Test
public void encoding() throws Exception {
final Verifier<EditorConfigCheckMojo> mavenExec = new Verifier<EditorConfigCheckMojo>(
Expand Down