Merge pull request #2263 from mgreter/bugfix/issue-2243

Fix parsing of url with quoted argument

Author: mgreter

src/prelexer.cpp

@@ -243,16 +243,19 @@ namespace Sass {
         exactly <'l'>,
         exactly <'('>,
         W,
-        non_greedy<
-          alternatives<
-            class_char< real_uri_chars >,
-            uri_character,
-            NONASCII,
-            ESCAPE
-          >,
-          alternatives<
-            sequence < W, exactly <')'> >,
-            exactly< hash_lbrace >
+        alternatives<
+          quoted_string,
+          non_greedy<
+            alternatives<
+              class_char< real_uri_chars >,
+              uri_character,
+              NONASCII,
+              ESCAPE
+            >,
+            alternatives<
+              sequence < W, exactly <')'> >,
+              exactly< hash_lbrace >
+            >
           >
         >
       >(src);

src/sass2scss.cpp

@@ -587,7 +587,8 @@ namespace Sass
 				sass.substr(pos_left, 5) == "@warn" ||
 				sass.substr(pos_left, 6) == "@debug" ||
 				sass.substr(pos_left, 6) == "@error" ||
-				sass.substr(pos_left, 8) == "@charset"
+				sass.substr(pos_left, 8) == "@charset" ||
+				sass.substr(pos_left, 10) == "@namespace"
 			) { sass = indent + sass.substr(pos_left); }
 			// replace some specific sass shorthand directives (if not fallowed by a white space character)
 			else if (sass.substr(pos_left, 1) == "=")