rebase squashed commits on top of main and fix style/lint issues - on…

…e test is now failing - not done yet
sass · Jun 1, 2022 · 3696db4 · 3696db4
1 parent 76822b1
commit 3696db4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/lib/src/visitor/serialize.dart b/lib/src/visitor/serialize.dart
@@ -1319,7 +1319,8 @@ class _SerializeVisitor
         _buffer.writeCharCode($semicolon);
       }
 
-      if (prePrevious_ == parent && _isTrailingComment(previous, prePrevious_)) {
+      if (prePrevious_ == parent &&
+          _isTrailingComment(previous, prePrevious_!)) {
         _writeOptionalSpace();
       } else {
         _writeLineFeed();

diff --git a/test/dart_api_test.dart b/test/dart_api_test.dart
@@ -304,7 +304,7 @@ a {
     expect(compileStringAsync("""
       @use 'sass:meta';
       @include meta.load-css("other.scss");
-    """, loadPaths: [d.sandbox]), completion(equals("/**/\n/**/")));
+    """, loadPaths: [d.sandbox]), completion(equals("/**/ /**/")));
 
     // Give the race condition time to appear.
     await pumpEventQueue();

diff --git a/test/output_test.dart b/test/output_test.dart
@@ -204,12 +204,12 @@ selector {
     test("selector contains left brace", () {
       expect(compileString("""@rule1;
 @rule2;
-selector[href*=\"{\"]
+selector[href*="{"]
 { /* please don't move me */ }
 
 @rule3;"""), equals("""@rule1;
 @rule2;
-selector[href*=\"{\"] { /* please don't move me */ }
+selector[href*="{"] { /* please don't move me */ }
 
 @rule3;"""));
     });