Merge pull request #344 from sass/3_6_5

update libsass to 3.6.5
sass · May 21, 2021 · 5c94c2a · 5c94c2a
2 parents 38735e2 + ad69f6e
commit 5c94c2a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/libsass b/libsass
diff --git a/sasstests.py b/sasstests.py
@@ -785,8 +785,8 @@ def test_build_one(self):
                     'names': [],
                     'mappings': (
                         ';AAKA,AAAA,IAAI,CAAC;EAHH,gBAAgB,EAAE,KAAK,GAQxB;'
-                        'EALD,AAEE,IAFE,CAEF,CAAC,CAAC;IACA,IAAI,EAAE,sBAAsB,'
-                        'GAC7B'
+                        'EALD,AAEE,IAFE,CAEF,CAAC,CAAC;IACA,IAAI,EAAE,kBAAkB,'
+                        'GACzB'
                     ),
                 },
                 os.path.join(d, 'css', 'd.scss.css.map'),
@@ -1633,9 +1633,9 @@ def test_stack_trace_formatting():
     # TODO: https://github.com/sass/libsass/issues/3092
     assert tb.endswith(
         'CompileError: Error: Invalid CSS after "a{☃": expected "{", was ""\n'
-        '        on line 1:5 of stdin\n'
+        '        on line 1:4 of stdin\n'
         '>> a{☃\n'
-        '   ----^\n\n',
+        '   ---^\n\n',
     )
+218 −0		.github/workflows/build-and-test.yml
+0 −70		.travis.yml
+3 −2		Makefile
+86 −1		Makefile.conf
+11 −4		Readme.md
+4 −4		docs/build.md
+1 −0		docs/implementations.md
+4 −2		script/ci-build-libsass
+5 −5		script/ci-install-compiler
+3 −3		src/ast.hpp
+25 −1		src/ast_helpers.hpp
+1 −1		src/ast_sel_unify.cpp
+29 −4		src/ast_selectors.cpp
+9 −8		src/ast_selectors.hpp
+2 −2		src/ast_values.cpp
+6 −0		src/error_handling.cpp
+9 −0		src/error_handling.hpp
+56 −18		src/extender.cpp
+21 −2		src/fn_numbers.cpp
+1 −1		src/fn_selectors.cpp
+5 −6		src/inspect.cpp
+1 −1		src/lexer.cpp
+1 −1		src/operators.cpp
+1 −1		src/parser.cpp
+7 −9		src/position.cpp
+1 −0		src/sass_context.cpp
+6 −1		test/Makefile
+6 −0		utils/README.md
+8 −0		utils/build-skeletons/libsass.targets
+20 −0		utils/build-skeletons/libsass.vcxproj.filters
+88 −0		utils/update-builds.pl
+64 −62		win/libsass.targets
+278 −285		win/libsass.vcxproj.filters