Merge remote-tracking branch 'origin/522_colu' into dev

src/main/java/com/cflint/CFLint.java

@@ -1328,6 +1328,12 @@ public void reportRule(final Element elem, final Object currentExpression, final
         bldr.setRuleParameters(ruleInfo.getParameters());
         if (configuration.includes(ruleInfo.getMessageByCode(msgcode))
                 && !configuration.excludes(ruleInfo.getMessageByCode(msgcode))) {
+            //A bit of a hack to fix the offset issue 
+            //This could be handled better at the source where line and offset are calc'd.
+            int idxOffSet = 1;
+            if(lineOffsets != null && msg.getLine()!=null && msg.getOffset() != null && msg.getOffset() >=lineOffsets[msg.getLine()] ){
+                idxOffSet=0;
+            }
             if (expression instanceof CFExpression) {
                 final BugInfo bugInfo = bldr.build((CFExpression) expression, elem);
                 final Token token = ((CFExpression) expression).getToken();
@@ -1340,9 +1346,9 @@ public void reportRule(final Element elem, final Object currentExpression, final
                         bugInfo.setLine(msg.getLine());
                         if (msg.getOffset() != null) {
                             bugInfo.setOffset(msg.getOffset());
-                            bugInfo.setColumn(msg.getOffset() - lineOffsets[msg.getLine() - 1]);
+                            bugInfo.setColumn(msg.getOffset() - lineOffsets[msg.getLine() - idxOffSet]);
                         } else {
-                            bugInfo.setOffset(lineOffsets != null ? lineOffsets[msg.getLine() - 1] : 0);
+                            bugInfo.setOffset(lineOffsets != null ? lineOffsets[msg.getLine() - idxOffSet] : 0);
                             bugInfo.setColumn(0);
                         }
                     }    
@@ -1353,9 +1359,9 @@ public void reportRule(final Element elem, final Object currentExpression, final
                     bug.setLine(msg.getLine());
                     if (msg.getOffset() != null) {
                         bug.setOffset(msg.getOffset());
-                        bug.setColumn(msg.getOffset() - lineOffsets[msg.getLine() - 1]);
+                        bug.setColumn(msg.getOffset() - lineOffsets[msg.getLine() - idxOffSet]);
                     } else {
-                        bug.setOffset(lineOffsets != null ? lineOffsets[msg.getLine() - 1] : 0);
+                        bug.setOffset(lineOffsets != null ? lineOffsets[msg.getLine() - idxOffSet] : 0);
                         bug.setColumn(0);
                     }
                     bug.setLength(msg.getVariable() != null ? msg.getVariable().length() : 0);

src/test/resources/com/cflint/tests/Parsing/columns/.cflintrc

@@ -0,0 +1,10 @@
+{
+  "rule" : [ ],
+  "excludes" : [ ],
+  "includes" : [ {
+    "code" : "ARGUMENT_HAS_PREFIX_OR_POSTFIX"
+  },
+  { "code" : "ARGUMENT_IS_TEMPORARY"} ,
+  { "code" : "COMPONENT_INVALID_NAME"} ],
+  "inheritParent" : false
+}

src/test/resources/com/cflint/tests/Parsing/columns/test.cfc

@@ -0,0 +1,15 @@
+/**               
+ * Test h         
+ */               
+component   {     
+    /**           
+     * Conver     
+     * @dateO     
+           */     
+    public string function formatDate(          
+      date dateObj
+    )             
+    {             
+        return dateFormat(arguments.dateObj, "mm/dd/yyyy");
+    }
+}

src/test/resources/com/cflint/tests/Parsing/columns/test.expected.txt

@@ -0,0 +1,71 @@
+{
+  "version" : "",
+  "timestamp" : 0,
+  "issues" : [ {
+    "severity" : "INFO",
+    "id" : "ARGUMENT_HAS_PREFIX_OR_POSTFIX",
+    "message" : "ARGUMENT_HAS_PREFIX_OR_POSTFIX",
+    "category" : "CFLINT",
+    "abbrev" : "AH",
+    "locations" : [ {
+      "file" : "src/test/resources/com/cflint/tests/Parsing/columns/test.cfc",
+      "fileName" : "test.cfc",
+      "function" : "formatDate",
+      "column" : 11,
+      "line" : 9,
+      "message" : "Argument has prefix or postfix dateObj and could be named better.",
+      "variable" : "dateObj",
+      "expression" : "public string function formatDate(dateObj)   {/n    return dateFormat(arguments.dateObj, 'mm/dd/yyyy');/n/n  }"
+    } ]
+  }, {
+    "severity" : "INFO",
+    "id" : "ARGUMENT_IS_TEMPORARY",
+    "message" : "ARGUMENT_IS_TEMPORARY",
+    "category" : "CFLINT",
+    "abbrev" : "AI",
+    "locations" : [ {
+      "file" : "src/test/resources/com/cflint/tests/Parsing/columns/test.cfc",
+      "fileName" : "test.cfc",
+      "function" : "formatDate",
+      "column" : 11,
+      "line" : 9,
+      "message" : "Temporary argument dateObj could be named better.",
+      "variable" : "dateObj",
+      "expression" : "public string function formatDate(dateObj)   {/n    return dateFormat(arguments.dateObj, 'mm/dd/yyyy');/n/n  }"
+    } ]
+  }, {
+    "severity" : "INFO",
+    "id" : "COMPONENT_INVALID_NAME",
+    "message" : "COMPONENT_INVALID_NAME",
+    "category" : "CFLINT",
+    "abbrev" : "CI",
+    "locations" : [ {
+      "file" : "src/test/resources/com/cflint/tests/Parsing/columns/test.cfc",
+      "fileName" : "test.cfc",
+      "function" : "",
+      "column" : 40,
+      "line" : 1,
+      "message" : "Component name test is not a valid name. Please use PascalCase and start with a capital letter.",
+      "variable" : "",
+      "expression" : "component {/n  public string function formatDate(dateObj)     {/n      return dateFormat(arguments.dateObj, 'mm/dd/yyyy');/n/n    }/n}"
+    } ]
+  } ],
+  "counts" : {
+    "totalFiles" : 0,
+    "totalLines" : 0,
+    "countByCode" : [ {
+      "code" : "ARGUMENT_IS_TEMPORARY",
+      "count" : 1
+    }, {
+      "code" : "COMPONENT_INVALID_NAME",
+      "count" : 1
+    }, {
+      "code" : "ARGUMENT_HAS_PREFIX_OR_POSTFIX",
+      "count" : 1
+    } ],
+    "countBySeverity" : [ {
+      "severity" : "INFO",
+      "count" : 3
+    } ]
+  }
+}