Fix embedding source file contents in source maps and add tests

Somehow these had been added in #33 but lost in a later merge.

Author: conradz

lib/source-map-support.js

@@ -70,7 +70,7 @@ exports.emit = function(str, pos, startOnly) {
       }
     });
 
-    this.addFile(pos);
+    this.addFile(sourceFile, pos);
   }
 
   this.updatePosition(str);
@@ -88,32 +88,37 @@ exports.emit = function(str, pos, startOnly) {
       }
     });
 
-    this.addFile(pos);
+    this.addFile(sourceFile, pos);
   }
 
   return str;
 };
 
 /**
  * Adds a file to the source map output if it has not already been added
+ * @param {String} file
  * @param {Object} pos
  */
 
-exports.addFile = function(pos) {
-  var file = pos.source || 'source.css';
-  if (Object.prototype.hasOwnProperty.call(this.files, file)) return;
+exports.addFile = function(file, pos) {
   if (typeof pos.content !== 'string') return;
+  if (Object.prototype.hasOwnProperty.call(this.files, file)) return;
+
   this.files[file] = pos.content;
 };
 
 /**
- * Applies any original source maps to the output.
+ * Applies any original source maps to the output and embeds the source file
+ * contents in the source map.
  */
 
 exports.applySourceMaps = function() {
   Object.keys(this.files).forEach(function(file) {
+    var content = this.files[file];
+    this.map.setSourceContent(file, content);
+
     var originalMap = sourceMapResolve.resolveSync(
-      this.files[file], file, fs.readFileSync);
+      content, file, fs.readFileSync);
     if (originalMap) {
       originalMap = new SourceMapConsumer(originalMap.map);
       this.map.applySourceMap(originalMap, file);

test/css-stringify.js

@@ -28,10 +28,11 @@ describe('stringify(obj)', function(){
 });
 
 describe('stringify(obj, {sourcemap: true})', function(){
-  var src = read('test/source-map-case.css', 'utf8');
-  var stylesheet = parse(src, { source: 'rules.css', position: true });
+  var file = 'test/source-map-case.css';
+  var src = read(file, 'utf8');
+  var stylesheet = parse(src, { source: file, position: true });
   function loc(line, column) {
-    return { line: line, column: column, source: 'rules.css', name: null }
+    return { line: line, column: column, source: file, name: null }
   };
 
   var locs = {
@@ -54,6 +55,7 @@ describe('stringify(obj, {sourcemap: true})', function(){
     map.originalPositionFor({ line: 11, column: 0 }).should.eql(locs.mediaBlock);
     map.originalPositionFor({ line: 12, column: 2 }).should.eql(locs.mediaOnly);
     map.originalPositionFor({ line: 17, column: 0 }).should.eql(locs.comment);
+    map.sourceContentFor(file).should.eql(src);
   });
 
   it('should generate source maps alongside when using compress compiler', function(){
@@ -66,6 +68,7 @@ describe('stringify(obj, {sourcemap: true})', function(){
     map.originalPositionFor({ line: 1, column: 10 }).should.eql(locs.tobiNameValue);
     map.originalPositionFor({ line: 1, column: 50 }).should.eql(locs.mediaBlock);
     map.originalPositionFor({ line: 1, column: 64 }).should.eql(locs.mediaOnly);
+    map.sourceContentFor(file).should.eql(src);
   });
 
   it('should apply included source maps', function(){