Merge pull request #3021 from mgreter/bugfix/3018-nested-sel-nl-ws

Fix some nested mode indentation
sass · Nov 2, 2019 · 081bbbf · 081bbbf
2 parents a089875 + 5c267e1
commit 081bbbf
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/inspect.cpp b/src/inspect.cpp
@@ -72,15 +72,15 @@ namespace Sass {
     append_indentation();
     append_token("@media", rule);
     append_mandatory_space();
-    in_media_block = true;
-    in_media_block = false;
     if (rule->block()) {
       rule->block()->perform(this);
     }
   }
 
   void Inspect::operator()(CssMediaRule* rule)
   {
+    if (output_style() == NESTED)
+      indentation += rule->tabs();
     append_indentation();
     append_token("@media", rule);
     append_mandatory_space();
@@ -97,6 +97,9 @@ namespace Sass {
     if (rule->block()) {
       rule->block()->perform(this);
     }
+    in_media_block = false;
+    if (output_style() == NESTED)
+      indentation -= rule->tabs();
   }
 
   void Inspect::operator()(CssMediaQuery* query)
@@ -1056,6 +1059,9 @@ namespace Sass {
   {
     if (sel->hasPreLineFeed()) {
       append_optional_linefeed();
+      if (!in_wrapped && output_style() == NESTED) {
+        append_indentation();
+      }
     }
     const SelectorComponent* prev = nullptr;
     for (auto& item : sel->elements()) {