fix #326

cflint · Jul 1, 2017 · 3f46f52 · 3f46f52
1 parent a52d489
commit 3f46f52
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 1 deletion.
diff --git a/src/main/java/com/cflint/BugInfo.java b/src/main/java/com/cflint/BugInfo.java
@@ -155,7 +155,13 @@ public BugInfo build(final CFExpression expression, final Element elem) {
                 elemColumn = elem.getSource().getColumn(elem.getBegin());
             }
             bugInfo.setLine(elemLine + Math.max(expression == null ? 0 : expression.getLine() - 1, 0));
-            bugInfo.setColumn(elemColumn + Math.max(expression == null ? 0 : expression.getColumn() - 1, 0));
+            if(expression == null || expression.getColumn() < 1){
+            	bugInfo.setColumn(elemColumn);
+            }else if (expression.getLine()>1){
+            	bugInfo.setColumn(expression.getColumn());
+            }else{
+            	bugInfo.setColumn(elemColumn + expression.getColumn() - 1);
+            }
             doMessageText(elem);
             return bugInfo;
         }

diff --git a/src/test/resources/com/cflint/tests/LiteralChecker/.cflintrc b/src/test/resources/com/cflint/tests/LiteralChecker/.cflintrc
@@ -0,0 +1,7 @@
+{
+  "includes" : [ 
+    {"code" : "LOCAL_LITERAL_VALUE_USED_TOO_OFTEN"}
+    ,{"code" : "GLOBAL_LITERAL_VALUE_USED_TOO_OFTEN"}
+     ],
+  "inheritParent" : false
+}
diff --git a/src/test/resources/com/cflint/tests/LiteralChecker/literal_checker_326.cfm b/src/test/resources/com/cflint/tests/LiteralChecker/literal_checker_326.cfm
@@ -0,0 +1,10 @@
+<cfset variables.list1 = "123,456,789">
+					<cfset variables.list2 = "abc,def,ghi">
+					<cfset variables.string1 = "0123456789">
+					<cfset variables.string2 = "abcdefghi">
+
+					<cfif (listFind(variables.list1, left(variables.string1, 3), ",") && listFind(variables.list1, left(variables.string2, 3), ","))
+        || (listFind(variables.list2, left(variables.string1, 3), ",") && listFind(variables.list2, left(variables.string2, 3), ","))
+					>
+						Test
+					</cfif>
diff --git a/src/test/resources/com/cflint/tests/LiteralChecker/literal_checker_326.expected.txt b/src/test/resources/com/cflint/tests/LiteralChecker/literal_checker_326.expected.txt
@@ -0,0 +1,33 @@
+[ {
+  "severity" : "WARNING",
+  "id" : "GLOBAL_LITERAL_VALUE_USED_TOO_OFTEN",
+  "message" : "GLOBAL_LITERAL_VALUE_USED_TOO_OFTEN",
+  "category" : "CFLINT",
+  "abbrev" : "GL",
+  "locations" : [ {
+    "file" : "src\\test\\resources\\com\\cflint\\tests\\LiteralChecker\\literal_checker_326.cfm",
+    "fileName" : "literal_checker_326.cfm",
+    "function" : "",
+    "column" : "130",
+    "line" : "7",
+    "message" : "Literal 3 occurs several times in one or more files. Consider giving it a name and not hard coding values.",
+    "variable" : "3",
+    "expression" : "3"
+  } ]
+}, {
+  "severity" : "WARNING",
+  "id" : "GLOBAL_LITERAL_VALUE_USED_TOO_OFTEN",
+  "message" : "GLOBAL_LITERAL_VALUE_USED_TOO_OFTEN",
+  "category" : "CFLINT",
+  "abbrev" : "GL",
+  "locations" : [ {
+    "file" : "src\\test\\resources\\com\\cflint\\tests\\LiteralChecker\\literal_checker_326.cfm",
+    "fileName" : "literal_checker_326.cfm",
+    "function" : "",
+    "column" : "135",
+    "line" : "7",
+    "message" : "Literal , occurs several times in one or more files. Consider giving it a name and not hard coding values.",
+    "variable" : ",",
+    "expression" : "','"
+  } ]
+} ]