don't use String.length for literal count in MultipleStringLiterals, … (#319)

* don't use String.length for literal count in MultipleStringLiterals, fixes #318
* added SuppressWarnings test for MultipleStringLiterals

Author: AlexHaxe

src/checkstyle/checks/literal/MultipleStringLiteralsCheck.hx

@@ -40,15 +40,15 @@ class MultipleStringLiteralsCheck extends Check {
 			if (!filterLiteral(literalToken.parent)) continue;
 			// skip string object keys issue #116
 			if (literalToken.parent.tok.match(BrOpen)) continue;
+			if (isPosSuppressed(literalToken.pos)) continue;
 
 			switch (literalToken.tok) {
 				case Const(CString(s)):
 					if (StringUtils.isStringInterpolation(s, checker.file.content, literalToken.pos)) continue;
 					if (ignoreRE.match(s)) continue;
 					if (s.length < minLength) continue;
 					if (checkLiteralCount(s, allLiterals)) {
-						if (isPosSuppressed(literalToken.pos)) continue;
-						logPos('String "$s" appears ${s.length} times in the file', literalToken.pos);
+						logPos('String "$s" appears ${allLiterals.get(s)} times in the file', literalToken.pos);
 					}
 				default:
 			}

test/checks/literal/MultipleStringLiteralsCheckTest.hx

@@ -11,13 +11,15 @@ class MultipleStringLiteralsCheckTest extends CheckTestCase<MultipleStringLitera
 		assertNoMsg(check, SINGLE_CHARS);
 		assertNoMsg(check, THREE_SPACE);
 		assertNoMsg(check, OBJECT_FIELD_KEYS_ISSUE_116);
+		assertNoMsg(check, SUPPRESSION);
 	}
 
 	public function testMultipleStringLiterals() {
 		var check = new MultipleStringLiteralsCheck();
 		assertMsg(check, THREE_XML, 'String "xml" appears 3 times in the file');
 		assertMsg(check, THREE_XML_SWITCH, 'String "xml" appears 3 times in the file');
-		assertMsg(check, OBJECT_FIELD_VALUES_ISSUE_116, 'String "duplicate" appears 9 times in the file');
+		assertMsg(check, OBJECT_FIELD_VALUES_ISSUE_116, 'String "duplicate" appears 4 times in the file');
+		assertMsg(check, EXAGGERATION_ISSUE_318, 'String "user.name" appears 3 times in the file');
 	}
 
 	public function testIgnoreRegEx() {
@@ -32,8 +34,8 @@ class MultipleStringLiteralsCheckTest extends CheckTestCase<MultipleStringLitera
 		check.allowDuplicates = 1;
 		assertNoMsg(check, INTERPOLATION_ISSUE_109);
 		#if (haxeparser < "3.3.0")
-		assertMsg(check, NO_INTERPOLATION_ISSUE_109, 'String "value $$$$is i" appears 12 times in the file');
-		assertMsg(check, NO_INTERPOLATION_AT_START_ISSUE_109, 'String "$$$$is i" appears 6 times in the file');
+		assertMsg(check, NO_INTERPOLATION_ISSUE_109, 'String "value $$$$is i" appears 2 times in the file');
+		assertMsg(check, NO_INTERPOLATION_AT_START_ISSUE_109, 'String "$$$$is i" appears 2 times in the file');
 		#end
 	}
 }
@@ -158,4 +160,25 @@ abstract MultipleStringLiteralsCheckTests(String) to String {
 			trace('$$is i');
 		}
 	}";
+
+	var EXAGGERATION_ISSUE_318 = "
+	class Test {
+		function foo() {
+			name = new Value<String>(System.storage.get('user.name'), function(to, _) System.storage.set('user.name', to));
+		}
+		function clear() {
+			System.storage.remove('user.name');
+		}
+	}";
+
+	var SUPPRESSION  = "
+	class Test {
+		function foo() {
+			name = new Value<String>(System.storage.get('user.name'), function(to, _) System.storage.set('user.name', to));
+		}
+		@SuppressWarnings('checkstyle:MultipleStringLiterals')
+		function clear() {
+			System.storage.remove('user.name');
+		}
+	}";
 }