kotovalexarian-likes-github/haml--haml
1
0
Fork 0
mirror of https://github.com/haml/haml.git synced 2022-11-09 12:33:31 -05:00
Code Releases Activity

[Sass] [SCSS] Properly parse oddly-quoted import directives.

Browse source
This commit is contained in:
Nathan Weizenbaum 2010-02-14 13:01:22 -08:00
parent 74c1372f6a
commit f130017fcd
4 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/sass/scss/parser.rb
View file

@ -164,7 +164,7 @@ module Sass
def import
@expected = "string or url()"
arg = tok(STRING) || tok!(URI)
path = @scanner[1]
path = @scanner[1] || @scanner[2] || @scanner[3]
ss
media = str {media_type}.strip

2
lib/sass/scss/rx.rb
View file

@ -30,7 +30,7 @@ module Sass
NAME = /#{NMCHAR}+/
NUM = /[0-9]+|[0-9]*.[0-9]+/
STRING = /#{STRING1}|#{STRING2}/
URL = /([!#%$&*-~]|#{NONASCII}|#{ESCAPE})*/
URL = /((?:[!#%$&*-~]|#{NONASCII}|#{ESCAPE})*)/
W = /[ \t\r\n\f]*/
# This is more liberal than the spec's definition,

8
test/sass/scss/css_test.rb
View file

@ -413,6 +413,14 @@ SCSS
SCSS
end
def test_import_directive
assert_parses '@import "foo.css";'
assert_parses "@import 'foo.css';"
assert_parses '@import url("foo.css");'
assert_parses "@import url('foo.css');"
assert_parses '@import url(foo.css);'
end
def test_import_directive_with_media
assert_parses '@import "foo.css" screen;'
assert_parses '@import "foo.css" screen, print;'

8
test/sass/scss/scss_test.rb
View file

@ -171,6 +171,14 @@ CSS
SCSS
end
def test_css_import_directive
assert_equal "@import url(foo.css);\n", render('@import "foo.css";')
assert_equal "@import url(foo.css);\n", render("@import 'foo.css';")
assert_equal "@import url(foo.css);\n", render('@import url("foo.css");')
assert_equal "@import url(foo.css);\n", render("@import url('foo.css');")
assert_equal "@import url(foo.css);\n", render('@import url(foo.css);')
end
def test_block_comment_in_script
assert_equal <<CSS, render(<<SCSS)
foo {