TouchInstinct
/
checkstyle
307
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Issue #1566: ReturnCount violation fixed for SuppressWithNearbyCommentFilter

This commit is contained in:
Ruslan Diachenko 2015-08-29 01:15:55 +01:00 committed by Roman Ivanov
parent c3674faad8
commit c3c1b9ae06
1 changed files with 42 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java
View File

@ -194,28 +194,38 @@ public class SuppressWithNearbyCommentFilter
@Override
public boolean accept(AuditEvent event) {
if (event.getLocalizedMessage() == null) {
// A special event
return true;
}
boolean accepted = true;
// Lazy update. If the first event for the current file, update file
// contents and tag suppressions
final FileContents currentContents = FileContentsHolder.getContents();
if (currentContents == null) {
// we have no contents, so we can not filter.
return true;
}
if (getFileContents() != currentContents) {
setFileContents(currentContents);
tagSuppressions();
}
for (final Tag tag : tags) {
if (tag.isMatch(event)) {
return false;
if (event.getLocalizedMessage() != null) {
// Lazy update. If the first event for the current file, update file
// contents and tag suppressions
final FileContents currentContents = FileContentsHolder.getContents();
if (currentContents != null) {
if (getFileContents() != currentContents) {
setFileContents(currentContents);
tagSuppressions();
}
if (matchTag(event)) {
accepted = false;
}
}
}
return true;
return accepted;
}
/**
* Whether current event matches any tag from {@link #tags}.
* @param event AuditEvent to test match on {@link #tags}.
* @return true if event matches any tag from {@link #tags}, false otherwise.
*/
private boolean matchTag(AuditEvent event) {
for (final Tag tag : tags) {
if (tag.isMatch(event)) {
return true;
}
}
return false;
}
/**
@ -397,23 +407,20 @@ public class SuppressWithNearbyCommentFilter
*/
public boolean isMatch(AuditEvent event) {
final int line = event.getLine();
if (line < firstLine) {
return false;
boolean match = false;
if (line >= firstLine && line <= lastLine) {
final Matcher tagMatcher = tagCheckRegexp.matcher(event.getSourceName());
if (tagMatcher.find()) {
match = true;
}
else if (tagMessageRegexp != null) {
final Matcher messageMatcher = tagMessageRegexp.matcher(event.getMessage());
match = messageMatcher.find();
}
}
if (line > lastLine) {
return false;
}
final Matcher tagMatcher =
tagCheckRegexp.matcher(event.getSourceName());
if (tagMatcher.find()) {
return true;
}
if (tagMessageRegexp != null) {
final Matcher messageMatcher =
tagMessageRegexp.matcher(event.getMessage());
return messageMatcher.find();
}
return false;
return match;
}
/**