Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make the dart-sass output canonical in all specs #1694

Merged
merged 1 commit into from
Sep 7, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
60 changes: 25 additions & 35 deletions spec/css/custom_properties/error.hrx
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,18 @@ Error: Custom property values may not be empty.
baz: qux

<===> nested/error
Error: Illegal nesting: Nothing may be nested beneath custom properties.
on line 3 of /sass/spec/css/custom_properties/error/no_nesting/input.sass
Use --trace for backtrace.

<===> nested/error-dart-sass
Error: Nothing may be indented beneath a custom property.
,
3 | baz: qux
| ^
'
input.sass 3:5 root stylesheet

<===> nested/error-libsass
Error: Illegal nesting: Nothing may be nested beneath custom properties.
on line 3 of /sass/spec/css/custom_properties/error/no_nesting/input.sass
Use --trace for backtrace.

<===>
================================================================================
<===> brackets/curly/input.scss
Expand All @@ -75,18 +75,18 @@ Error: Nothing may be indented beneath a custom property.
}

<===> brackets/curly/error
Error: Invalid CSS after " --prop: };": expected selector or at-rule, was "}"
on line 3 of /sass/spec/css/custom_properties/error/unmatched_brackets/curly/input.scss
Use --trace for backtrace.

<===> brackets/curly/error-dart-sass
Error: unmatched "}".
,
3 | }
| ^
'
input.scss 3:1 root stylesheet

<===> brackets/curly/error-libsass
Error: Invalid CSS after " --prop: };": expected selector or at-rule, was "}"
on line 3 of /sass/spec/css/custom_properties/error/unmatched_brackets/curly/input.scss
Use --trace for backtrace.

<===>
================================================================================
<===> brackets/paren/input.scss
Expand All @@ -95,11 +95,6 @@ Error: unmatched "}".
}

<===> brackets/paren/error
Error: Invalid CSS after " --prop: ": expected "}", was ");"
on line 2 of /sass/spec/css/custom_properties/error/unmatched_brackets/paren/input.scss
Use --trace for backtrace.

<===> brackets/paren/error-dart-sass
Error: expected ";".
,
2 | --prop: );
Expand All @@ -120,11 +115,6 @@ Error: Invalid CSS after " --prop:": expected "}", was ");"
}

<===> brackets/square/error
Error: Invalid CSS after " --prop: ": expected "}", was "];"
on line 2 of /sass/spec/css/custom_properties/error/unmatched_brackets/square/input.scss
Use --trace for backtrace.

<===> brackets/square/error-dart-sass
Error: expected ";".
,
2 | --prop: ];
Expand All @@ -145,18 +135,18 @@ Error: Invalid CSS after " --prop:": expected "}", was "];"
}

<===> brackets/curly_in_square/error
Error: Invalid CSS after " --prop: [{": expected "}", was "];"
on line 2 of /sass/spec/css/custom_properties/error/unmatched_brackets/curly_in_square/input.scss
Use --trace for backtrace.

<===> brackets/curly_in_square/error-dart-sass
Error: expected "}".
,
2 | --prop: [{];
| ^
'
input.scss 2:13 root stylesheet

<===> brackets/curly_in_square/error-libsass
Error: Invalid CSS after " --prop: [{": expected "}", was "];"
on line 2 of /sass/spec/css/custom_properties/error/unmatched_brackets/curly_in_square/input.scss
Use --trace for backtrace.

<===>
================================================================================
<===> brackets/paren_in_curly/input.scss
Expand All @@ -165,18 +155,18 @@ Error: expected "}".
}

<===> brackets/paren_in_curly/error
Error: Invalid CSS after " --prop: {(": expected ")", was "};"
on line 2 of /sass/spec/css/custom_properties/error/unmatched_brackets/paren_in_curly/input.scss
Use --trace for backtrace.

<===> brackets/paren_in_curly/error-dart-sass
Error: expected ")".
,
2 | --prop: {(};
| ^
'
input.scss 2:13 root stylesheet

<===> brackets/paren_in_curly/error-libsass
Error: Invalid CSS after " --prop: {(": expected ")", was "};"
on line 2 of /sass/spec/css/custom_properties/error/unmatched_brackets/paren_in_curly/input.scss
Use --trace for backtrace.

<===>
================================================================================
<===> brackets/square_in_paren/input.scss
Expand All @@ -185,14 +175,14 @@ Error: expected ")".
}

<===> brackets/square_in_paren/error
Error: Invalid CSS after " --prop: ([": expected "]", was ");"
on line 2 of /sass/spec/css/custom_properties/error/unmatched_brackets/square_in_paren/input.scss
Use --trace for backtrace.

<===> brackets/square_in_paren/error-dart-sass
Error: expected "]".
,
2 | --prop: ([);
| ^
'
input.scss 2:13 root stylesheet

<===> brackets/square_in_paren/error-libsass
Error: Invalid CSS after " --prop: ([": expected "]", was ");"
on line 2 of /sass/spec/css/custom_properties/error/unmatched_brackets/square_in_paren/input.scss
Use --trace for backtrace.
8 changes: 0 additions & 8 deletions spec/css/custom_properties/trailing_whitespace.hrx
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,6 @@
}

<===> output.css
.trailing-whitespace {
--space: value ;
--tab: value ;
--newline: value ;
--before-closing-brace: value ;
}

<===> output-dart-sass.css
.trailing-whitespace {
--space: value ;
--tab: value ;
Expand Down
16 changes: 8 additions & 8 deletions spec/css/unknown_directive/value_interpolation.hrx
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,21 @@

<===> output.css
@asdf 3;

@asdf foobarbaz;

@asdf "foo bar baz";

@asdf 'foo bar baz';

@asdf "foo bar baz";
@asdf url(http://).com/);

@asdf url("http://).com/");

<===> output-dart-sass.css
<===> output-libsass.css
@asdf 3;

@asdf foobarbaz;

@asdf "foo bar baz";
@asdf "foo bar baz";

@asdf 'foo bar baz';

@asdf url(http://).com/);

@asdf url("http://).com/");
76 changes: 38 additions & 38 deletions spec/directives/import/error/conflict.hrx
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,6 @@ a {partial: true}
a {partial: false}

<===> partial/error
Error: It's not clear which file to import for '@import "other"'.
Candidates:
_other.scss
other.scss
Please delete or rename all but one of these files.
on line 1 of /sass/spec/scss/import/partial_conflict/input.scss
Use --trace for backtrace.

<===> partial/error-dart-sass
Error: It's not clear which file to import. Found:
_other.scss
other.scss
Expand All @@ -28,6 +19,15 @@ Error: It's not clear which file to import. Found:
'
input.scss 3:9 root stylesheet

<===> partial/error-libsass
Error: It's not clear which file to import for '@import "other"'.
Candidates:
_other.scss
other.scss
Please delete or rename all but one of these files.
on line 1 of /sass/spec/scss/import/partial_conflict/input.scss
Use --trace for backtrace.

<===>
================================================================================
<===> extension/input.scss
Expand All @@ -43,15 +43,6 @@ a
a {syntax: scss}

<===> extension/error
Error: It's not clear which file to import for '@import "other"'.
Candidates:
other.sass
other.scss
Please delete or rename all but one of these files.
on line 1 of /sass/spec/scss/import/extension_conflict/input.scss
Use --trace for backtrace.

<===> extension/error-dart-sass
Error: It's not clear which file to import. Found:
other.sass
other.scss
Expand All @@ -61,6 +52,15 @@ Error: It's not clear which file to import. Found:
'
input.scss 3:9 root stylesheet

<===> extension/error-libsass
Error: It's not clear which file to import for '@import "other"'.
Candidates:
other.sass
other.scss
Please delete or rename all but one of these files.
on line 1 of /sass/spec/scss/import/extension_conflict/input.scss
Use --trace for backtrace.

<===>
================================================================================
<===> all/input.scss
Expand All @@ -85,17 +85,6 @@ a
a {syntax: scss; partial: true}

<===> all/error
Error: It's not clear which file to import for '@import "other"'.
Candidates:
_other.sass
other.sass
_other.scss
other.scss
Please delete or rename all but one of these files.
on line 1 of /sass/spec/scss/import/all_conflict/input.scss
Use --trace for backtrace.

<===> all/error-dart-sass
Error: It's not clear which file to import. Found:
_other.sass
other.sass
Expand All @@ -107,6 +96,17 @@ Error: It's not clear which file to import. Found:
'
input.scss 3:9 root stylesheet

<===> all/error-libsass
Error: It's not clear which file to import for '@import "other"'.
Candidates:
_other.sass
other.sass
_other.scss
other.scss
Please delete or rename all but one of these files.
on line 1 of /sass/spec/scss/import/all_conflict/input.scss
Use --trace for backtrace.

<===>
================================================================================
<===> index/input.scss
Expand All @@ -121,15 +121,6 @@ a {partial: true}
a {partial: false}

<===> index/error
Error: It's not clear which file to import for '@import "other"'.
Candidates:
_index.scss
index.scss
Please delete or rename all but one of these files.
on line 1 of spec/directives/import/conflict/index/input.scss
Use --trace for backtrace.

<===> index/error-dart-sass
Error: It's not clear which file to import. Found:
other/_index.scss
other/index.scss
Expand All @@ -139,6 +130,15 @@ Error: It's not clear which file to import. Found:
'
input.scss 3:9 root stylesheet

<===> index/error-libsass
Error: It's not clear which file to import for '@import "other"'.
Candidates:
_index.scss
index.scss
Please delete or rename all but one of these files.
on line 1 of spec/directives/import/conflict/index/input.scss
Use --trace for backtrace.

<===>
================================================================================
<===> import_only/options.yml
Expand Down
20 changes: 10 additions & 10 deletions spec/directives/import/error/not_found.hrx
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@
a {b: c}

<===> no_extension/error
Error: File to import not found or unreadable: other.
on line 1 of /sass/spec/directives/import/no_extension/input.scss
Use --trace for backtrace.

<===> no_extension/error-dart-sass
Error: Can't find stylesheet to import.
,
1 | @import "other";
| ^^^^^^^
'
input.scss 1:9 root stylesheet

<===> no_extension/error-libsass
Error: File to import not found or unreadable: other.
on line 1 of /sass/spec/directives/import/no_extension/input.scss
Use --trace for backtrace.

<===>
================================================================================
<===> directory_dot_import/input.scss
Expand All @@ -33,18 +33,18 @@ Error: Can't find stylesheet to import.
a {b: c}

<===> directory_dot_import/error
Error: File to import not found or unreadable: other.
on line 1 of /sass/spec/directives/import/directory_dot_import/input.scss
Use --trace for backtrace.

<===> directory_dot_import/error-dart-sass
Error: Can't find stylesheet to import.
,
3 | @import "other";
| ^^^^^^^
'
input.scss 3:9 root stylesheet

<===> directory_dot_import/error-libsass
Error: File to import not found or unreadable: other.
on line 1 of /sass/spec/directives/import/directory_dot_import/input.scss
Use --trace for backtrace.

<===>
================================================================================
<===> parent_relative/input.scss
Expand Down
Loading