From cbcbe3a3eedb9c99e9b36f3e8a5483591fee9d7b Mon Sep 17 00:00:00 2001 From: Nathan Weizenbaum Date: Mon, 21 Dec 2009 01:48:26 -0800 Subject: [PATCH] [Sass] Fix the string CSS regexps so that they correctly handle escaped quotes. --- lib/sass/scss/rx.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/sass/scss/rx.rb b/lib/sass/scss/rx.rb index 8e0f7869..c5e806d7 100644 --- a/lib/sass/scss/rx.rb +++ b/lib/sass/scss/rx.rb @@ -12,8 +12,8 @@ module Sass ESCAPE = /#{UNICODE}|\\[ -~\200-\377]/ NMSTART = /[a-z]|#{NONASCII}|#{ESCAPE}/i NMCHAR = /[a-z0-9_-]|#{NONASCII}|#{ESCAPE}/i - STRING1 = /\"([\t !#%$&(-~]|\\#{NL}|\'|#{NONASCII}|#{ESCAPE})*\"/ - STRING2 = /\'([\t !#%$&(-~]|\\#{NL}|\"|#{NONASCII}|#{ESCAPE})*\'/ + STRING1 = /\"([^\n\r\f\\"]|\\#{NL}|#{ESCAPE})*\"/ + STRING2 = /\'([^\n\r\f\\']|\\#{NL}|#{ESCAPE})*\'/ IDENT = /[-_]?#{NMSTART}#{NMCHAR}*/ NAME = /#{NMCHAR}+/