pad results with whitespace - re vuejs#190 (vuejs#230)

indirectlylit · yyx990803 · commit abd045377412 · 2016-05-25T12:35:25.000-04:00
* pad results with whitespace - re vuejs#190 * address linter issues * fix failing test * remove debug log * move var definition inside else block
diff --git a/lib/parser.js b/lib/parser.js
@@ -97,18 +97,19 @@ module.exports = function (content, filename, needMap) {
     var start = node.childNodes[0].__location.startOffset
     var end = node.childNodes[node.childNodes.length - 1].__location.endOffset
     var result
-    var lineOffset
     if (type === 'script') {
-      lineOffset = 0
       // preserve other parts as commenets so that linters
       // and babel can output correct line numbers in warnings
       result =
         commentScript(content.slice(0, start), lang) +
         deindent(content.slice(start, end)) +
         commentScript(content.slice(end), lang)
     } else {
-      lineOffset = content.slice(0, start).split(splitRE).length - 1
+      var lineOffset = content.slice(0, start).split(splitRE).length - 1
       result = deindent(content.slice(start, end))
+
+      // pad whith whitespace so that error messages are correct
+      result = Array(lineOffset + 1).join('\n') + result
     }
 
     if (needMap) {
@@ -128,7 +129,7 @@ module.exports = function (content, filename, needMap) {
           map.addMapping({
             source: filenameWithHash,
             original: {
-              line: index + 1 + lineOffset,
+              line: index + 1,
               column: 0
             },
             generated: {
diff --git a/test/test.js b/test/test.js
@@ -215,7 +215,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}\n\n\n\n\n\n\nh2 {\n  color: green;\n}')
         done()
       })
     })
