[Fix] Error fixes

jscs-dev · Apr 13, 2016 · db5b76c · db5b76c
1 parent affa854
commit db5b76c
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/lib/errors.js b/lib/errors.js
@@ -302,24 +302,33 @@ Errors.getPosition = function(element, offset) {
 
     var pos = loc.start;
 
+    if (offset === 0) {
+        return pos;
+    }
+
     var newlineCount = element.getNewlineCount();
     if (newlineCount > 0) {
         var code = element.getSourceCode();
         LINE_SEPARATOR.lastIndex = 0;
         var lineOffset = 0;
         var match;
+        var previousOffset = 0;
+        var firstLineColumnOffset = pos.column;
         while ((match = LINE_SEPARATOR.exec(code)) !== null) {
             var currentOffset = match.index;
             if (offset <= currentOffset) {
                 return {
                     line: pos.line + lineOffset,
-                    column: currentOffset - offset
+                    column: firstLineColumnOffset + offset - previousOffset
                 };
             }
+            previousOffset = currentOffset + match[0].length;
+            firstLineColumnOffset = 0;
+            lineOffset++;
         }
         return {
             line: pos.line + newlineCount,
-            column: code.length - offset
+            column: offset - previousOffset
         };
     } else {
         pos = {