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

Issue #2639: RE is removed from allowed abbreviations

This commit is contained in:
Roman Ivanov 2015-11-25 08:47:47 -08:00
parent f8d7894b17
commit 56df5087fe
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/checkstyle_checks.xml
View File

@ -320,7 +320,7 @@
<module name="AbbreviationAsWordInName">
<property name="ignoreFinal" value="false"/>
<property name="allowedAbbreviationLength" value="1"/>
<property name="allowedAbbreviations" value="AST,CPP,RTE,RE,CSV"/>
<property name="allowedAbbreviations" value="AST,CPP,RTE,CSV"/>
</module>
<module name="AbstractClassName"/>
<module name="ClassTypeParameterName"/>

14
src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/WriteTagCheck.java
View File

@ -87,9 +87,9 @@ public class WriteTagCheck
public static final String TAG_FORMAT = "type.tagFormat";
/** Compiled regexp to match tag. **/
private Pattern tagRE;
private Pattern tagRegExp;
/** Compiled regexp to match tag content. **/
private Pattern tagFormatRE;
private Pattern tagFormatRegExp;
/** Regexp to match tag. */
private String tag;
@ -104,7 +104,7 @@ public class WriteTagCheck
*/
public void setTag(String tag) {
this.tag = tag;
tagRE = CommonUtils.createPattern(tag + "\\s*(.*$)");
tagRegExp = CommonUtils.createPattern(tag + "\\s*(.*$)");
}
/**
@ -113,7 +113,7 @@ public class WriteTagCheck
*/
public void setTagFormat(String format) {
tagFormat = format;
tagFormatRE = CommonUtils.createPattern(format);
tagFormatRegExp = CommonUtils.createPattern(format);
}
/**
@ -174,19 +174,19 @@ public class WriteTagCheck
* @param comment the Javadoc comment for the type definition.
*/
private void checkTag(int lineNo, String... comment) {
if (tagRE == null) {
if (tagRegExp == null) {
return;
}
int tagCount = 0;
for (int i = 0; i < comment.length; i++) {
final String commentValue = comment[i];
final Matcher matcher = tagRE.matcher(commentValue);
final Matcher matcher = tagRegExp.matcher(commentValue);
if (matcher.find()) {
tagCount += 1;
final int contentStart = matcher.start(1);
final String content = commentValue.substring(contentStart);
if (tagFormatRE == null || tagFormatRE.matcher(content).find()) {
if (tagFormatRegExp == null || tagFormatRegExp.matcher(content).find()) {
logTag(lineNo + i - comment.length, tag, content);
}
else {