fix col position

htmlhint · Oct 30, 2015 · 99aceeb · 99aceeb
1 parent 86adde1
commit 99aceeb
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/lib/htmlhint.js b/lib/htmlhint.js
diff --git a/src/core.js b/src/core.js
@@ -53,7 +53,7 @@ var HTMLHint = (function (undefined) {
         }
 
         var parser = new HTMLParser();
-        var reporter = new HTMLHint.Reporter(html.split(/\r?\n/), ruleset);
+        var reporter = new HTMLHint.Reporter(html, ruleset);
 
         var rules = HTMLHint.rules,
             rule;

diff --git a/src/reporter.js b/src/reporter.js
@@ -10,9 +10,12 @@
     };
 
     Reporter.prototype = {
-        _init: function(lines, ruleset){
+        _init: function(html, ruleset){
             var self = this;
-            self.lines = lines;
+            self.html = html;
+            self.lines = html.split(/\r?\n/);
+            var match = html.match(/\r?\n/);
+            self.brLen = match !== null ? match[0].length : 0;
             self.ruleset = ruleset;
             self.messages = [];
         },
@@ -32,13 +35,17 @@
         report: function(type, message, line, col, rule, raw){
             var self = this;
             var lines = self.lines;
+            var brLen = self.brLen;
             var evidence, evidenceLen;
             for(var i=line-1, lineCount=lines.length;i<lineCount;i++){
                 evidence = lines[i];
                 evidenceLen = evidence.length;
                 if(col > evidenceLen && line < lineCount){
                     line ++;
                     col -= evidenceLen;
+                    if(col !== 1){
+                        col -= brLen;
+                    }
                 }
                 else{
                     break;

diff --git a/test/rules/attr-lowercase.spec.js b/test/rules/attr-lowercase.spec.js
@@ -22,12 +22,15 @@ describe('Rules: '+ruldId, function(){
         expect(messages[0].line).to.be(1);
         expect(messages[0].col).to.be(3);
 
-        code = '<p id=""\r\n TEST="abc">';
+        code = '<p id=""\r\n TEST1="abc" TEST2="abc">';
         messages = HTMLHint.verify(code, ruleOptions);
-        expect(messages.length).to.be(1);
+        expect(messages.length).to.be(2);
         expect(messages[0].rule.id).to.be(ruldId);
         expect(messages[0].line).to.be(2);
         expect(messages[0].col).to.be(1);
+        expect(messages[1].rule.id).to.be(ruldId);
+        expect(messages[1].line).to.be(2);
+        expect(messages[1].col).to.be(13);
     });
 
     it('Lowercase attr should not result in an error', function(){