trim selected parts

Author: yyx990803

lib/parser.js

@@ -80,11 +80,13 @@ 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 lineOffset = content.slice(0, start).split(splitRE).length - 1
+    var trimmedResult = result.trim() + '\n'
+    var trimmed = trimmedResult.length - result.length
+    var lineOffset = content.slice(0, start + trimmed).split(splitRE).length
     var map = new SourceMapGenerator()
     map.setSourceContent(filenameWithHash, content)
 
-    result.split(splitRE).forEach(function (line, index) {
+    trimmedResult.split(splitRE).forEach(function (line, index) {
       map.addMapping({
         source: filenameWithHash,
         original: {
@@ -101,7 +103,7 @@ module.exports = function (content, filename) {
     output[type].push({
       lang: lang,
       scoped: scoped,
-      content: result,
+      content: trimmedResult,
       map: map.toJSON()
     })
   })

test/test.js

@@ -152,11 +152,10 @@ describe('vue-loader', function () {
         getFile('test.build.js', function (code) {
           var line
           var col
-          var lines = code.split('\n')
-          lines.some(function (l, i) {
+          code.split('\n').some(function (l, i) {
             if (l.indexOf('Hello from Component A') > -1) {
-              line = i
-              col = lines[i - 1].length
+              line = i + 1
+              col = l.length
               return true
             }
           })
@@ -208,7 +207,7 @@ describe('vue-loader', function () {
     }), function (err) {
       expect(err).to.be.null
       getFile('test.output.css', function (data) {
-        expect(data).to.contain('h1 {\n  color: #f00;\n}\n\nh2 {\n  color: green;\n}')
+        expect(data).to.contain('h1 {\n  color: #f00;\n}\nh2 {\n  color: green;\n}')
         done()
       })
     })