Squashed 'libsass_src/' changes from f6afdbb9..7037f03f

bep · bep · commit 1dea8b931c57 · 2024-08-28T12:03:37.000+02:00
7037f03f Merge pull request #3184 from mgreter/bugfix/x-mas-2023
5bb0ea0c Fix most urgent issues in 2023
2102188d Merge pull request #3176 from LilyWangLL/vcpkg-instructions
f0605a31 Add vcpkg installation instructions
006bbf5c docs: Fix a few typos (#3172)
b035bc3f Merge pull request #3169 from Taritsyn/master
0161a9f2 Add support of Visual Studio 2022 to the Visual C++ project file
da91d985 Remove references to libsass.org (#3160)
d593a6b1 Create libsass.spec
2f383929 Remove slack invite link from readme

git-subtree-dir: libsass_src
git-subtree-split: 7037f03fabeb2b18b5efa84403f5a6d7a990f460
diff --git a/libsass_src/Readme.md b/libsass_src/Readme.md
@@ -10,7 +10,6 @@ Originally created by Aaron Leung ([@akhleung]) and Hampton Catlin ([@hcatlin])
 [![Percentage of issues still open](http://isitmaintained.com/badge/open/sass/libsass.svg)](http://isitmaintained.com/project/sass/libsass "Percentage of issues still open")
 [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/sass/libsass.svg)](http://isitmaintained.com/project/sass/libsass "Average time to resolve an issue")
 [![Bountysource](https://www.bountysource.com/badge/tracker?tracker_id=283068)](https://www.bountysource.com/trackers/283068-libsass?utm_source=283068&utm_medium=shield&utm_campaign=TRACKER_BADGE "Bountysource")
-[![Join us](https://libsass-slack.herokuapp.com/badge.svg)](https://libsass-slack.herokuapp.com/ "Slack communication channels")
 
 **Warning:** [LibSass is deprecated](https://sass-lang.com/blog/libsass-is-deprecated).
 While it will continue to receive maintenance releases indefinitely, there are no
diff --git a/libsass_src/contrib/libsass.spec b/libsass_src/contrib/libsass.spec
@@ -4,7 +4,7 @@ Release:        1%{?dist}
 Summary:        A C/C++ implementation of a Sass compiler
 
 License:        MIT
-URL:            http://libsass.org
+URL:            https://sass-lang.com/
 Source0:        %{name}-%{version}.tar.gz
 
 BuildRequires:  gcc-c++ >= 4.7
diff --git a/libsass_src/docs/build-on-gentoo.md b/libsass_src/docs/build-on-gentoo.md
@@ -7,7 +7,7 @@ EAPI=4
 inherit eutils git-2 autotools
 
 DESCRIPTION="A C/C++ implementation of a Sass compiler."
-HOMEPAGE="http://libsass.org/"
+HOMEPAGE="https://sass-lang.com/"
 EGIT_PROJECT='libsass'
 EGIT_REPO_URI="https://github.com/sass/libsass.git"
 LICENSE="MIT"
@@ -38,7 +38,7 @@ EAPI=4
 inherit eutils git-2 autotools
 
 DESCRIPTION="Command Line Tool for LibSass."
-HOMEPAGE="http://libsass.org/"
+HOMEPAGE="https://sass-lang.com/"
 EGIT_PROJECT='sassc'
 EGIT_REPO_URI="https://github.com/sass/sassc.git"
 LICENSE="MIT"
diff --git a/libsass_src/docs/build.md b/libsass_src/docs/build.md
@@ -33,6 +33,20 @@ Since `libsass` is a library, it makes sense to install it as a shared library o
 
 - [Building shared system library][4]
 
+### Building from vcpkg
+
+The libsass port in [vcpkg][12] is kept up to date by Microsoft team members and community contributors. You can download and install libsass using the vcpkg dependency manager:
+
+```bash
+git clone https://github.com/Microsoft/vcpkg.git
+cd vcpkg
+./bootstrap-vcpkg.sh  # ./bootstrap-vcpkg.bat for Windows
+./vcpkg integrate install
+./vcpkg install libsass
+```
+
+If the version is out of date, please [create an issue or pull request][12] on the vcpkg repository.
+
 Compiling with clang instead of gcc
 --
 
@@ -95,3 +109,4 @@ Miscellaneous
 [9]: implementations.md
 [10]: build-on-darwin.md
 [11]: build-with-visual-studio.md
+[12]: https://github.com/Microsoft/vcpkg
diff --git a/libsass_src/docs/dev-ast-memory.md b/libsass_src/docs/dev-ast-memory.md
@@ -200,7 +200,7 @@ define DEBUG_SHARED_PTR
 ```
 
 This will print lost memory on exit to stderr. You can also use
-`setDbg(true)` on sepecific variables to emit reference counter
+`setDbg(true)` on specific variables to emit reference counter
 increase, decrease and other events.
 
 
diff --git a/libsass_src/res/resource.rc b/libsass_src/res/resource.rc
@@ -22,7 +22,7 @@ BEGIN
       VALUE "FileDescription", "A C/C++ implementation of a Sass compiler"
       VALUE "FileVersion", "1.0.0.0"
       VALUE "InternalName", "libsass"
-      VALUE "LegalCopyright", "\251 2017 libsass.org"
+      VALUE "LegalCopyright", "\251 2017 sass-lang.org"
       VALUE "OriginalFilename", "libsass.dll"
       VALUE "ProductName", "LibSass Library"
       VALUE "ProductVersion", "1.0.0.0"
diff --git a/libsass_src/src/ast_selectors.cpp b/libsass_src/src/ast_selectors.cpp
@@ -868,7 +868,7 @@ namespace Sass {
     for (SimpleSelectorObj simple : elements()) {
       if (PseudoSelector * pseudo = Cast<PseudoSelector>(simple)) {
         if (SelectorList* sel = Cast<SelectorList>(pseudo->selector())) {
-          if (parent) {
+          if (parent && !parent->has_real_parent_ref()) {
             pseudo->selector(sel->resolve_parent_refs(
               pstack, traces, implicit_parent));
           }
@@ -976,20 +976,22 @@ namespace Sass {
   }
 
   /* better return sass::vector? only - is empty container anyway? */
-  SelectorList* ComplexSelector::resolve_parent_refs(SelectorStack pstack, Backtraces& traces, bool implicit_parent)
+  SelectorList* ComplexSelector::resolve_parent_refs(
+    SelectorStack pstack, Backtraces& traces, bool implicit_parent)
   {
 
     sass::vector<sass::vector<ComplexSelectorObj>> vars;
 
     auto parent = pstack.back();
+    auto hasRealParent = has_real_parent_ref();
 
-    if (has_real_parent_ref() && !parent) {
+    if (hasRealParent && !parent) {
       throw Exception::TopLevelParent(traces, pstate());
     }
 
     if (!chroots() && parent) {
 
-      if (!has_real_parent_ref() && !implicit_parent) {
+      if (!hasRealParent && !implicit_parent) {
         SelectorList* retval = SASS_MEMORY_NEW(SelectorList, pstate(), 1);
         retval->append(this);
         return retval;
@@ -1020,10 +1022,10 @@ namespace Sass {
     for (auto items : res) {
       if (items.size() > 0) {
         ComplexSelectorObj first = SASS_MEMORY_COPY(items[0]);
-        first->hasPreLineFeed(first->hasPreLineFeed() || (!has_real_parent_ref() && hasPreLineFeed()));
+        first->hasPreLineFeed(first->hasPreLineFeed() || (!hasRealParent && hasPreLineFeed()));
         // ToDo: remove once we know how to handle line feeds
         // ToDo: currently a mashup between ruby and dart sass
-        // if (has_real_parent_ref()) first->has_line_feed(false);
+        // if (hasRealParent) first->has_line_feed(false);
         // first->has_line_break(first->has_line_break() || has_line_break());
         first->chroots(true); // has been resolved by now
         for (size_t i = 1; i < items.size(); i += 1) {
diff --git a/libsass_src/src/debugger.hpp b/libsass_src/src/debugger.hpp
@@ -430,6 +430,7 @@ inline void debug_ast(AST_Node* node, sass::string ind, Env* env)
     std::cerr << " <<" << selector->ns_name() << ">>";
     std::cerr << (selector->isClass() ? " [isClass]": " -");
     std::cerr << (selector->isSyntacticClass() ? " [isSyntacticClass]": " -");
+    std::cerr << (selector->has_real_parent_ref(nullptr) ? " [real parent]" : " -");
     std::cerr << std::endl;
     debug_ast(selector->argument(), ind + " <= ", env);
     debug_ast(selector->selector(), ind + " || ", env);
diff --git a/libsass_src/src/fn_miscs.cpp b/libsass_src/src/fn_miscs.cpp
@@ -160,10 +160,14 @@ namespace Sass {
       ExpressionObj cond = ARG("$condition", Expression)->perform(&expand.eval);
       bool is_true = !cond->is_false();
       ExpressionObj res = ARG(is_true ? "$if-true" : "$if-false", Expression);
-      ValueObj qwe = Cast<Value>(res->perform(&expand.eval));
-      // res = res->perform(&expand.eval.val_eval);
-      qwe->set_delayed(false); // clone?
-      return qwe.detach();
+      ExpressionObj rv = res->perform(&expand.eval);
+      ValueObj value = Cast<Value>(rv);
+      if (value != nullptr) {
+        value->set_delayed(false);
+        return value.detach();
+      }
+      rv->set_delayed(false);
+      return nullptr;
     }
 
     //////////////////////////
diff --git a/libsass_src/src/inspect.cpp b/libsass_src/src/inspect.cpp
@@ -463,6 +463,7 @@ namespace Sass {
       { sep[0] = i % 2 ? ':' : ','; }
       ExpressionObj list_item = list->at(i);
       if (output_style() != TO_SASS) {
+        if (list_item == nullptr) continue;
         if (list_item->is_invisible()) {
           // this fixes an issue with "" in a list
           if (!Cast<String_Constant>(list_item)) {
@@ -1088,7 +1089,7 @@ namespace Sass {
 
   void Inspect::operator()(CompoundSelector* sel)
   {
-    if (sel->hasRealParent()) {
+    if (sel->hasRealParent() /* || sel->has_real_parent_ref() */) {
       append_string("&");
     }
     for (auto& item : sel->elements()) {
diff --git a/libsass_src/src/prelexer.cpp b/libsass_src/src/prelexer.cpp
@@ -305,7 +305,7 @@ namespace Sass {
     const char* css_whitespace(const char* src) {
       return one_plus< alternatives<spaces, line_comment> >(src);
     }
-    // Match optional_css_whitepace plus block_comments
+    // Match optional_css_whitespace plus block_comments
     const char* optional_css_comments(const char* src) {
       return zero_plus< alternatives<spaces, line_comment, block_comment> >(src);
     }
diff --git a/libsass_src/src/prelexer.hpp b/libsass_src/src/prelexer.hpp
@@ -189,7 +189,7 @@ namespace Sass {
     // Match zero plus white-space or line_comments
     const char* optional_css_whitespace(const char* src);
     const char* css_whitespace(const char* src);
-    // Match optional_css_whitepace plus block_comments
+    // Match optional_css_whitespace plus block_comments
     const char* optional_css_comments(const char* src);
     const char* css_comments(const char* src);
 
diff --git a/libsass_src/src/sass2scss.cpp b/libsass_src/src/sass2scss.cpp
@@ -179,10 +179,10 @@ namespace Sass
 		while (true)
 		{
 
-			// try to find some meaningfull char
+			// try to find some meaningful char
 			col_pos = sass.find_first_not_of(" \t\n\v\f\r", col_pos);
 
-			// there was no meaningfull char found
+			// there was no meaningful char found
 			if (col_pos == std::string::npos) return false;
 
 			// found a multiline comment opener
@@ -467,7 +467,7 @@ namespace Sass
 		// right trim input
 		sass = rtrim(sass);
 
-		// get position of first meaningfull character in string
+		// get position of first meaningful character in string
 		size_t pos_left = sass.find_first_not_of(SASS2SCSS_FIND_WHITESPACE);
 
 		// special case for final run
@@ -479,7 +479,7 @@ namespace Sass
 			// just add complete whitespace
 			converter.whitespace += sass + "\n";
 		}
-		// have meaningfull first char
+		// have meaningful first char
 		else
 		{
 
@@ -683,7 +683,7 @@ namespace Sass
 				// not in comment mode
 				if (IS_PARSING(converter))
 				{
-					// has meaningfull chars
+					// has meaningful chars
 					if (hasCharData(sass))
 					{
 						// is probably a property
@@ -698,7 +698,7 @@ namespace Sass
 				// not in comment mode
 				if (IS_PARSING(converter))
 				{
-					// had meaningfull chars
+					// had meaningful chars
 					if (converter.property)
 					{
 						// print block opener
@@ -758,22 +758,22 @@ namespace Sass
 				scss += flush(sass, converter);
 			}
 
-			// get position of last meaningfull char
+			// get position of last meaningful char
 			size_t pos_right = sass.find_last_not_of(SASS2SCSS_FIND_WHITESPACE);
 
 			// check for invalid result
 			if (pos_right != std::string::npos)
 			{
 
-				// get the last meaningfull char
+				// get the last meaningful char
 				std::string close = sass.substr(pos_right, 1);
 
 				// check if next line should be concatenated (list mode)
 				converter.comma = IS_PARSING(converter) && close == ",";
 				converter.semicolon = IS_PARSING(converter) && close == ";";
 
 				// check if we have more than
-				// one meaningfull char
+				// one meaningful char
 				if (pos_right > 0)
 				{
 
@@ -785,10 +785,10 @@ namespace Sass
 				}
 
 			}
-			// EO have meaningfull chars from end
+			// EO have meaningful chars from end
 
 		}
-		// EO have meaningfull chars from start
+		// EO have meaningful chars from start
 
 		// return scss
 		return scss;
diff --git a/libsass_src/src/util.cpp b/libsass_src/src/util.cpp
@@ -306,7 +306,7 @@ namespace Sass {
           // if (cp == '\n') cp = 32;
 
           // use a very simple approach to convert via utf8 lib
-          // maybe there is a more elegant way; maybe we shoud
+          // maybe there is a more elegant way; maybe we should
           // convert the whole output from string to a stream!?
           // allocate memory for utf8 char and convert to utf8
           unsigned char u[5] = {0,0,0,0,0}; utf8::append(cp, u);
@@ -395,7 +395,7 @@ namespace Sass {
           // if (cp == '\n') cp = 32;
 
           // use a very simple approach to convert via utf8 lib
-          // maybe there is a more elegant way; maybe we shoud
+          // maybe there is a more elegant way; maybe we should
           // convert the whole output from string to a stream!?
           // allocate memory for utf8 char and convert to utf8
           unsigned char u[5] = {0,0,0,0,0}; utf8::append(cp, u);
diff --git a/libsass_src/win/libsass.vcxproj b/libsass_src/win/libsass.vcxproj
@@ -72,6 +72,9 @@
   <PropertyGroup Label="VS2019 toolset selection" Condition="'$(VisualStudioVersion)' == '16.0'">
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup Label="VS2022 toolset selection" Condition="'$(VisualStudioVersion)' == '17.0'">
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>
