Merge 634ee72 into 2f65280

sevntu-checkstyle · Sep 5, 2014 · 9353058 · 9353058
2 parents 2f65280 + 634ee72
commit 9353058
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/...ecks/src/main/java/com/github/sevntu/checkstyle/checks/sizes/LineLengthExtendedCheck.java b/...ecks/src/main/java/com/github/sevntu/checkstyle/checks/sizes/LineLengthExtendedCheck.java
@@ -239,7 +239,7 @@ public void finishTree(DetailAST aRootAST)
 					line.length(), getTabWidth());
 
 			if ((realLength > mMax) && !mIgnorePattern.matcher(line).find()) {
-				log(i + 1, MSG_KEY, mMax);
+				log(i + 1, MSG_KEY, mMax, realLength);
 			}
 		}
 	}

diff --git a/...u-checks/src/main/resources/com/github/sevntu/checkstyle/checks/sizes/messages.properties b/...u-checks/src/main/resources/com/github/sevntu/checkstyle/checks/sizes/messages.properties
@@ -2,6 +2,6 @@ executableStatementCount=Executable statement count is {0,number,integer} (max a
 maxLen.file=File length is {0,number,integer} lines (max allowed is {1,number,integer}).
 maxLen.method=Method length is {0,number,integer} lines (max allowed is {1,number,integer}).
 maxLen.anonInner=Anonymous inner class length is {0,number,integer} lines (max allowed is {1,number,integer}).
-maxLineLen=Line is longer than {0,number,integer} characters.
+maxLineLen=Line is longer than {0,number,integer} characters. Current line length is {1,number,integer}.
 maxOuterTypes=Outer types defined is {0,number,integer} (max allowed is {1,number,integer}).
 maxParam=More than {0,number,integer} parameters.
diff --git a/...u-checks/src/test/java/com/github/sevntu/checkstyle/checks/sizes/LineLengthCheckTest.java b/...u-checks/src/test/java/com/github/sevntu/checkstyle/checks/sizes/LineLengthCheckTest.java
@@ -18,8 +18,8 @@ public void testSimple()
 		checkConfig.addAttribute("max", "80");
 		checkConfig.addAttribute("ignorePattern", "^.*is OK.*regexp.*$");
 		final String[] expected = {
-				"18: " + getCheckMessage(MSG_KEY, 80),
-				"145: " + getCheckMessage(MSG_KEY, 80),
+				"18: " + getCheckMessage(MSG_KEY, 80, 81),
+				"145: " + getCheckMessage(MSG_KEY, 80, 83),
 		};
 		verify(checkConfig, getPath("InputSimple.java"), expected);
 	}
@@ -33,22 +33,22 @@ public void testSimpleIgnore()
 		checkConfig.addAttribute("max", "40");
 		checkConfig.addAttribute("ignorePattern", "^.*is OK.*regexp.*$");
 		final String[] expected = {
-				"1: " + getCheckMessage(MSG_KEY, 40),
-				"5: " + getCheckMessage(MSG_KEY, 40),
-				"6: " + getCheckMessage(MSG_KEY, 40),
-				"18: " + getCheckMessage(MSG_KEY, 40),
-				"101: " + getCheckMessage(MSG_KEY, 40),
-				"125: " + getCheckMessage(MSG_KEY, 40),
-				"128: " + getCheckMessage(MSG_KEY, 40),
-				"132: " + getCheckMessage(MSG_KEY, 40),
-				"145: " + getCheckMessage(MSG_KEY, 40),
-				"146: " + getCheckMessage(MSG_KEY, 40),
-				"148: " + getCheckMessage(MSG_KEY, 40),
-				"151: " + getCheckMessage(MSG_KEY, 40),
-				"152: " + getCheckMessage(MSG_KEY, 40),
-				"192: " + getCheckMessage(MSG_KEY, 40),
-				"200: " + getCheckMessage(MSG_KEY, 40),
-				"207: " + getCheckMessage(MSG_KEY, 40),
+				"1: " + getCheckMessage(MSG_KEY, 40, 80),
+				"5: " + getCheckMessage(MSG_KEY, 40, 80),
+				"6: " + getCheckMessage(MSG_KEY, 40, 50),
+				"18: " + getCheckMessage(MSG_KEY, 40, 81),
+				"101: " + getCheckMessage(MSG_KEY, 40, 45),
+				"125: " + getCheckMessage(MSG_KEY, 40, 42),
+				"128: " + getCheckMessage(MSG_KEY, 40, 43),
+				"132: " + getCheckMessage(MSG_KEY, 40, 43),
+				"145: " + getCheckMessage(MSG_KEY, 40, 83),
+				"146: " + getCheckMessage(MSG_KEY, 40, 78),
+				"148: " + getCheckMessage(MSG_KEY, 40, 57),
+				"151: " + getCheckMessage(MSG_KEY, 40, 74),
+				"152: " + getCheckMessage(MSG_KEY, 40, 75),
+				"192: " + getCheckMessage(MSG_KEY, 40, 66),
+				"200: " + getCheckMessage(MSG_KEY, 40, 58),
+				"207: " + getCheckMessage(MSG_KEY, 40, 50),
 		};
 		checkConfig.addAttribute("ignoreClass", "true");
 		checkConfig.addAttribute("ignoreConstructor", "true");