sass 3.3.0.alpha.215 → 3.3.0.alpha.216

data/REVISION

@@ -1 +1 @@
-57f4d0e46d42fb99b311ea1d5793630ffea60d94
+8c564fa59aaefcd1263cf8ec370b60f15510f780

data/VERSION

@@ -1 +1 @@
-3.3.0.alpha.215
+3.3.0.alpha.216

data/VERSION_DATE

@@ -1 +1 @@
-26 July 2013 23:28:51 GMT
+27 July 2013 00:44:58 GMT

data/lib/sass/engine.rb

@@ -668,25 +668,35 @@ WARNING
         @options[:filename], @options[:importer])
       offset = parser.offset - 1
       res.unshift(hack_char) if hack_char
+
+      # Handle comments after a property name but before the colon.
       if comment = scanner.scan(Sass::SCSS::RX::COMMENT)
         res << comment
         offset += comment.length
       end
 
       name = line.text[0...scanner.pos]
-      if scanned = scanner.scan(/\s*:(?:\s+|$)/)
+      if scanned = scanner.scan(/\s*:(?:\s+|$)/) # test for a property
         offset += scanned.length
         property = parse_property(name, res, scanner.rest, :new, line, offset)
         property.name_source_range = ident_range
         property
       else
         res.pop if comment
+
+        if trailing = (scanner.scan(/\s*#{Sass::SCSS::RX::COMMENT}/) ||
+                       scanner.scan(/\s*#{Sass::SCSS::RX::SINGLE_LINE_COMMENT}/))
+          offset += trailing.length # skip over comment for rule processing
+          trailing.strip!
+        end
         interp_parsed = parse_interp(scanner.rest)
         selector_range = Sass::Source::Range.new(
           ident_range.start_pos,
           Sass::Source::Position.new(@line, to_parser_offset(line.offset) + line.text.length),
           @options[:filename], @options[:importer])
-        Tree::RuleNode.new(res + interp_parsed, selector_range)
+        rule = Tree::RuleNode.new(res + interp_parsed, selector_range)
+        rule << Tree::CommentNode.new([trailing], :silent) if trailing
+        rule
       end
     end
 

data/test/sass/conversion_test.rb

@@ -531,6 +531,28 @@ SASS
 SCSS
   end
 
+  def test_immediately_following_comments
+    assert_sass_to_scss <<SCSS, <<SASS
+.foobar {
+  // trailing comment
+  a: 1px;
+}
+SCSS
+.foobar // trailing comment
+  a: 1px
+SASS
+
+    assert_sass_to_scss <<SCSS, <<SASS
+.foobar {
+  // trailing comment
+  a: 1px;
+}
+SCSS
+.foobar  /* trailing comment */
+  a: 1px
+SASS
+  end
+
   def test_debug
     assert_renders <<SASS, <<SCSS
 foo

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302755
+  hash: 592302781
   prerelease: 6
   segments: 
   - 3
   - 3
   - 0
   - alpha
-  - 215
-  version: 3.3.0.alpha.215
+  - 216
+  version: 3.3.0.alpha.216
 platform: ruby
 authors: 
 - Nathan Weizenbaum