fix split and trim regex

yyx990803 · yyx990803 · commit d79282d55e08 · 2015-12-30T17:10:20.000-05:00
diff --git a/lib/parser.js b/lib/parser.js
@@ -2,7 +2,8 @@ var parse5 = require('parse5')
 var parser = new parse5.Parser(null, { locationInfo: true })
 var cache = require('lru-cache')(100)
 var SourceMapGenerator = require('source-map').SourceMapGenerator
-var splitRE = /\n\r|\n|\r/g
+var splitRE = /\r?\n/g
+var trimRE = /^(\s|\r?\n)+/
 var hash = require('hash-sum')
 
 module.exports = function (content, filename) {
@@ -80,7 +81,7 @@ module.exports = function (content, filename) {
     var start = node.childNodes[0].__location.start
     var end = node.childNodes[node.childNodes.length - 1].__location.end
     var result = content.slice(start, end)
-    var trimmedResult = result.trim() + '\n'
+    var trimmedResult = result.replace(trimRE, '')
     var trimmed = trimmedResult.length - result.length
     var lineOffset = content.slice(0, start + trimmed).split(splitRE).length
     var map = new SourceMapGenerator()
diff --git a/test/test.js b/test/test.js
@@ -152,10 +152,11 @@ describe('vue-loader', function () {
         getFile('test.build.js', function (code) {
           var line
           var col
-          code.split('\n').some(function (l, i) {
+          var lines = code.split(/\r?\n/g)
+          lines.some(function (l, i) {
             if (l.indexOf('Hello from Component A') > -1) {
-              line = i + 1
-              col = l.length
+              line = i
+              col = lines[i - 1].length
               return true
             }
           })
