Merge pull request #295 from sass/3_6_0

asottile · web-flow · commit 2a0615e79e01 · 2019-05-18T11:59:39.000-07:00
libsass 3.6.0
diff --git a/libsass b/libsass
@@ -1 +1 @@
-Subproject commit 39e30874b9a5dd6a802c20e8b0470ba44eeba929
+Subproject commit 8d220b74770ad16aaf7819b5e18d85746aa63d7d
diff --git a/sasstests.py b/sasstests.py
@@ -457,7 +457,7 @@ def importer(path):
                     r'       Traceback \(most recent call last\):\n'
                     r'.+'
                     r'ValueError: Bad path: hi\n'
-                    r'        on line 1 of stdin\n'
+                    r'        on line 1:9 of stdin\n'
                     r'>> @import "hi";\n'
                     r'   --------\^\n',
             ),
@@ -475,7 +475,7 @@ def importer(path):
                     r'.+'
                     r'ValueError: Expected importer result to be a tuple of '
                     r'length \(1, 2, 3\) but got 0: \(\)\n'
-                    r'        on line 1 of stdin\n'
+                    r'        on line 1:9 of stdin\n'
                     r'>> @import "hi";\n'
                     r'   --------\^\n',
             ),
@@ -493,7 +493,7 @@ def importer(path):
                     r'.+'
                     r'ValueError: Expected importer result to be a tuple of '
                     r"length \(1, 2, 3\) but got 4: \('a', 'b', 'c', 'd'\)\n"
-                    r'        on line 1 of stdin\n'
+                    r'        on line 1:9 of stdin\n'
                     r'>> @import "hi";\n'
                     r'   --------\^\n',
             ),
@@ -1398,8 +1398,8 @@ def test_raises(self):
                     r'       Traceback \(most recent call last\):\n'
                     r'.+'
                     r'AssertionError: foo\n'
-                    r'        on line 1 of stdin, in function `raises`\n'
-                    r'        from line 1 of stdin\n'
+                    r'        on line 1:14 of stdin, in function `raises`\n'
+                    r'        from line 1:14 of stdin\n'
                     r'>> a { content: raises\(\); }\n'
                     r'   -------------\^\n$',
             ),
@@ -1410,8 +1410,9 @@ def test_warning(self):
         with assert_raises_compile_error(
                 'Error: warning in C function returns_warning: '
                 'This is a warning\n'
-                '        on line 1 of stdin, in function `returns_warning`\n'
-                '        from line 1 of stdin\n'
+                '        on line 1:14 of stdin, '
+                'in function `returns_warning`\n'
+                '        from line 1:14 of stdin\n'
                 '>> a { content: returns_warning(); }\n'
                 '   -------------^\n',
         ):
@@ -1421,8 +1422,8 @@ def test_error(self):
         with assert_raises_compile_error(
                 'Error: error in C function returns_error: '
                 'This is an error\n'
-                '        on line 1 of stdin, in function `returns_error`\n'
-                '        from line 1 of stdin\n'
+                '        on line 1:14 of stdin, in function `returns_error`\n'
+                '        from line 1:14 of stdin\n'
                 '>> a { content: returns_error(); }\n'
                 '   -------------^\n',
         ):
@@ -1443,8 +1444,9 @@ def test_returns_unknown_object(self):
                 '       - SassMap\n'
                 '       - SassWarning\n'
                 '       - SassError\n'
-                '        on line 1 of stdin, in function `returns_unknown`\n'
-                '        from line 1 of stdin\n'
+                '        on line 1:14 of stdin, '
+                'in function `returns_unknown`\n'
+                '        from line 1:14 of stdin\n'
                 '>> a { content: returns_unknown(); }\n'
                 '   -------------^\n',
         ):
@@ -1631,7 +1633,7 @@ def test_stack_trace_formatting():
         tb = traceback.format_exc()
     assert tb.endswith(
         'CompileError: Error: Invalid CSS after "a{☃": expected "{", was ""\n'
-        '        on line 1 of stdin\n'
+        '        on line 1:3 of stdin\n'
         '>> a{☃\n'
         '   --^\n\n',
     )
