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

Fix exception in SuppressWarnings check on complex annotations. #1201

This commit is contained in:
Michal Kordas 2015-06-27 18:27:45 +02:00 committed by Roman Ivanov
parent 3dd97d4e85
commit 840034a6cb
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCheck.java
View File

@ -146,7 +146,8 @@ public class SuppressWarningsCheck extends AbstractFormatCheck {
final DetailAST warningHolder =
this.findWarningsHolder(annotation);
final DetailAST token = warningHolder.findFirstToken(TokenTypes.ANNOTATION_MEMBER_VALUE_PAIR);
final DetailAST token =
warningHolder.findFirstToken(TokenTypes.ANNOTATION_MEMBER_VALUE_PAIR);
DetailAST warning;
if (token != null) {
@ -188,8 +189,8 @@ public class SuppressWarningsCheck extends AbstractFormatCheck {
case TokenTypes.DOT:
break;
default:
throw new IllegalStateException("Should never get here, type: "
+ fChild.getType() + " text: " + fChild.getText());
// #1252 - cases like @SuppressWarnings("un" + "used") or
// @SuppressWarnings((String) "unused")
}
}
warning = warning.getNextSibling();

14
src/test/java/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCheckTest.java
View File

@ -826,4 +826,18 @@ public class SuppressWarningsCheckTest extends BaseCheckTestSupport {
verify(checkConfig, getPath("annotation" + File.separator
+ "SuppressWarningsValuePair.java"), expected);
}
@Test
public void testWorkingProperlyOnComplexAnnotations() throws Exception {
DefaultConfiguration checkConfig = createCheckConfig(SuppressWarningsCheck.class);
String[] expected = {
"18:34: " + getCheckMessage(MSG_KEY_SUPPRESSED_WARNING_NOT_ALLOWED, ""),
"24:23: " + getCheckMessage(MSG_KEY_SUPPRESSED_WARNING_NOT_ALLOWED, ""),
"28:52: " + getCheckMessage(MSG_KEY_SUPPRESSED_WARNING_NOT_ALLOWED, ""),
"33:5: " + getCheckMessage(MSG_KEY_SUPPRESSED_WARNING_NOT_ALLOWED, ""),
};
verify(checkConfig, getPath("InputSuppressWarningsHolder.java"), expected);
}
}