Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
10 changes: 8 additions & 2 deletions src/main/java/org/eolang/lints/DefectMissing.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,11 @@ public Boolean apply(final String unlint) {
final String name = split[0];
final List<Integer> lines = this.defects.get(name);
if (unlint.matches(String.format("%s:\\d+-\\d+", name))) {
missing = !lines.stream().allMatch(new UnlintInRange(unlint));
if (lines == null) {
missing = !this.excluded.contains(name);
} else {
missing = !lines.stream().allMatch(new UnlintInRange(unlint));
}
} else {
final Set<String> names;
if (this.defects != null) {
Expand All @@ -53,7 +57,9 @@ public Boolean apply(final String unlint) {
names = new SetOf<>();
}
if (split.length > 1) {
missing = (!names.contains(name) || !lines.contains(Integer.parseInt(split[1])))
missing = (!names.contains(name)
|| lines == null
|| !lines.contains(Integer.parseInt(split[1])))
&& !this.excluded.contains(name);
} else {
missing = !names.contains(name) && !this.excluded.contains(name);
Expand Down
19 changes: 19 additions & 0 deletions src/test/java/org/eolang/lints/DefectMissingTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,23 @@ void returnsTrueIfSomeLineIsOutOfRange() {
Matchers.equalTo(true)
);
}

@Test
void returnsTrueWhenRangeReferencesAbsentLint() {
MatcherAssert.assertThat(
"Defect should be missing when range pattern references an absent lint",
new DefectMissing(new MapOf<>(), new ListOf<>()).apply("ascii-only:1-5"),
Matchers.equalTo(true)
);
}

@Test
void returnsFalseWhenRangeReferencesExcludedAbsentLint() {
MatcherAssert.assertThat(
"Defect should not be missing when the absent lint is excluded",
new DefectMissing(new MapOf<>(), new ListOf<>("ascii-only"))
.apply("ascii-only:1-5"),
Matchers.equalTo(false)
);
}
}
22 changes: 22 additions & 0 deletions src/test/java/org/eolang/lints/LtUnlintNonExistingDefectTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -222,4 +222,26 @@ void catchesUnlintWithOutOfRangeLines() throws IOException {
Matchers.iterableWithSize(1)
);
}

@Test
void catchesUnlintWithRangeForAbsentLint() throws IOException {
MatcherAssert.assertThat(
"Non-existing unlint with range should be reported, not crash with NPE",
new LtUnlintNonExistingDefect(
new ListOf<>(new LtAsciiOnly()),
new ListOf<>()
).defects(
new EoSyntax(
String.join(
"\n",
"+unlint ascii-only:1-5",
"[] > main",
" QQ.io.stdout > @",
" \"Hello\""
)
).parsed()
),
Matchers.iterableWithSize(1)
);
}
}
Loading