sass 3.3.0.alpha.142 → 3.3.0.alpha.144

data/REVISION

@@ -1 +1 @@
-7109e242c902419c9bd839c2b4e2b8f7b48a19c7
+5a0e84467c4bbc4ac847aa17acaf1fb4dcebcfce

data/VERSION

@@ -1 +1 @@
-3.3.0.alpha.142
+3.3.0.alpha.144

data/VERSION_DATE

@@ -1 +1 @@
-24 May 2013 22:28:19 GMT
+24 May 2013 23:25:31 GMT

data/lib/sass/engine.rb

@@ -813,7 +813,15 @@ WARNING
         parser = Sass::SCSS::Parser.new(value,
           @options[:filename], @options[:importer],
           @line, to_parser_offset(@offset))
-        Tree::MediaNode.new(parser.parse_media_query_list.to_a)
+        # -1 includes the '@' into the range.
+        offset = line.offset + line.text.index(directive).to_i - 1
+        parsed_media_query_list = parser.parse_media_query_list.to_a
+        node = Tree::MediaNode.new(parsed_media_query_list)
+        node.source_range = Sass::Source::Range.new(
+          Sass::Source::Position.new(@line, to_parser_offset(offset)),
+          Sass::Source::Position.new(@line, to_parser_offset(line.offset) + line.text.length),
+          @options[:filename], @options[:importer])
+        node
       else
         unprefixed_directive = directive.gsub(/^-[a-z0-9]+-/i, '')
         if unprefixed_directive == 'supports'

data/lib/sass/scss/parser.rb

@@ -558,7 +558,6 @@ module Sass
         tok!(/\{/)
         block_contents(node, context)
         tok!(/\}/)
-        node.source_range.end_pos = source_position if node.source_range
         node
       end
 

data/test/sass/source_map_test.rb

@@ -219,6 +219,36 @@ SASS
 {{4}}@import url(baz.css){{/4}};
 {{5}}@import url(qux.css) screen print{{/5}};
 
+/*@ sourceMappingURL=test.css.map */
+CSS
+  end
+
+  def test_media_sourcemap_scss
+    assert_parses_with_mapping <<'SCSS', <<'CSS'
+{{1}}@media screen, tv  {{/1}}{
+  {{2}}body {{/2}}{
+    {{3}}max-width{{/3}}: {{4}}1070px{{/4}};
+  }
+}
+SCSS
+{{1}}@media screen, tv{{/1}} {
+  {{2}}body{{/2}} {
+    {{3}}max-width{{/3}}: {{4}}1070px{{/4}}; } }
+
+/*@ sourceMappingURL=test.css.map */
+CSS
+  end
+
+  def test_media_sourcemap_sass
+    assert_parses_with_mapping <<'SASS', <<'CSS', :syntax => :sass
+{{1}}@media screen, tv{{/1}}
+  {{2}}body{{/2}}
+    {{3}}max-width{{/3}}: {{4}}1070px{{/4}}
+SASS
+{{1}}@media screen, tv{{/1}} {
+  {{2}}body{{/2}} {
+    {{3}}max-width{{/3}}: {{4}}1070px{{/4}}; } }
+
 /*@ sourceMappingURL=test.css.map */
 CSS
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302609
+  hash: 592302637
   prerelease: 6
   segments: 
   - 3
   - 3
   - 0
   - alpha
-  - 142
-  version: 3.3.0.alpha.142
+  - 144
+  version: 3.3.0.alpha.144
 platform: ruby
 authors: 
 - Nathan Weizenbaum