Merge pull request #58 from asottile/beta5

dahlia · dahlia · commit f02e71c67895 · 2015-04-12T01:54:04.000+09:00
3.2.0-beta.5
diff --git a/libsass b/libsass
@@ -1 +1 @@
-Subproject commit b87f4c7a14fd03852bda7238c305269d3340447e
+Subproject commit f82a41ba56094e586dd33b7d2451d84abf5a4f55
diff --git a/sasstests.py b/sasstests.py
@@ -57,7 +57,7 @@ def normalize_path(path):
     'sources': ['test/a.scss'],
     'sourcesContent': [],
     'names': [],
-    'mappings': ';AAKA,IAAI,CAAC;EAHH,gBAAgB,EAAE,KAAM,GAGpB;;EAEJ,IAAI,CAAC,CAAC,CAAJ;IACA,KAAK,EAAE,IAAK,GADX',
+    'mappings': ';AAKI,IAAI,CAAH;EAHH,gBAAgB,EAAE,KAAM,GAGpB;;EAEH,IAAI,CAAC,CAAC,CAAL;IACA,KAAK,EAAE,IAAK,GADX',
 }
 
 B_EXPECTED_CSS = '''\
@@ -457,7 +457,7 @@ def test_build_one(self):
                     'sources': ['../test/b.scss'],
                     'sourcesContent': [],
                     'names': [],
-                    'mappings': ';AACE,CAAC,CAAC,CAAC,CAAD;EACA,SAAS,EAAE,IAAI,GADd',
+                    'mappings': ';AACG,CAAC,CAAC,CAAC,CAAF;EACA,SAAS,EAAE,IAAI,GADd',
                 },
                 os.path.join(d, 'css', 'b.scss.css.map')
             )
@@ -475,7 +475,7 @@ def test_build_one(self):
                     'sources': ['../test/d.scss'],
                     'sourcesContent': [],
                     'names': [],
-                    'mappings': ';;AAKA,IAAI,CAAC;EAHH,gBAAgB,EAAE,KAAM,GAGpB;;EAEJ,IAAI,CAAC,CAAC,CAAJ;IACA,IAAI,EAAE,0BAA2B,GADhC',
+                    'mappings': ';;AAKI,IAAI,CAAH;EAHH,gBAAgB,EAAE,KAAM,GAGpB;;EAEH,IAAI,CAAC,CAAC,CAAL;IACA,IAAI,EAAE,0BAA2B,GADhC',
                 },
                 os.path.join(d, 'css', 'd.scss.css.map')
             )
@@ -1021,7 +1021,7 @@ def test_raises(self):
                 r'       \tstdin:0\n'
                 r'        on line 1 of stdin\n'
                 r'>> a { content: raises\(\); }\n'
-                r'   -------------\^\n$'
+                r'   --------------------\^\n$'
         )):
             compile_with_func('a { content: raises(); }')
 
@@ -1034,7 +1034,7 @@ def test_warning(self):
                 '       \tstdin:0\n'
                 '        on line 1 of stdin\n'
                 '>> a { content: returns_warning(); }\n'
-                '   -------------^\n'
+                '   -----------------------------^\n'
         ):
             compile_with_func('a { content: returns_warning(); }')
 
@@ -1046,7 +1046,7 @@ def test_error(self):
                 '       \tstdin:0\n'
                 '        on line 1 of stdin\n'
                 '>> a { content: returns_error(); }\n'
-                '   -------------^\n'
+                '   ---------------------------^\n'
         ):
             compile_with_func('a { content: returns_error(); }')
 
@@ -1070,7 +1070,7 @@ def test_returns_unknown_object(self):
                 '       \tstdin:0\n'
                 '        on line 1 of stdin\n'
                 '>> a { content: returns_unknown(); }\n'
-                '   -------------^\n'
+                '   -----------------------------^\n'
         ):
             compile_with_func('a { content: returns_unknown(); }')
 
