Skip to content

Commit c49b78b

Browse files
committed
Update specs for new variable messages and sass/sass#2726
1 parent 12bc338 commit c49b78b

File tree

10 files changed

+13
-13
lines changed

10 files changed

+13
-13
lines changed

spec/core_functions/meta/function_exists.hrx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ a {b: function-exists(member)}
299299
@function member() {@return from other2}
300300

301301
<===> error/conflict/error
302-
Error: Multiple global modules have a function named "member":
302+
Error: This function is available from multiple global modules:
303303
* other1.scss
304304
* other2.scss
305305
,

spec/core_functions/meta/get_function/error.hrx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ a {b: get-function(member)}
226226
@function member() {@return from other2}
227227

228228
<===> conflict/error
229-
Error: Multiple global modules have a function named "member":
229+
Error: This function is available from multiple global modules:
230230
* other1.scss
231231
* other2.scss
232232
,

spec/core_functions/meta/global_variable_exists.hrx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ $member: from other1;
307307
$member: from other2;
308308

309309
<===> error/conflict/error
310-
Error: Multiple global modules have a variable named "$member":
310+
Error: This variable is available from multiple global modules:
311311
* other1.scss
312312
* other2.scss
313313
,

spec/core_functions/meta/load_css/error.hrx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ $a: left;
200200
$a: right;
201201

202202
<===> with/conflict/error
203-
Error: Multiple global modules have a variable named "$a":
203+
Error: This variable is available from multiple global modules:
204204
* _left.scss
205205
* _right.scss
206206
,
@@ -220,7 +220,7 @@ Error: Multiple global modules have a variable named "$a":
220220
$a-b: c !default;
221221

222222
<===> with/repeated_variable/error
223-
Error: The variable $a_b was configured twice.
223+
Error: The variable $a-b was configured twice.
224224
,
225225
2 | @include meta.load-css("other", $with: (a-b: c, a_b: c));
226226
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

spec/core_functions/meta/mixin_exists.hrx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ a {b: mixin-exists(member)}
307307
@mixin member() {}
308308

309309
<===> error/conflict/error
310-
Error: Multiple global modules have a mixin named "member":
310+
Error: This mixin is available from multiple global modules:
311311
* other1.scss
312312
* other2.scss
313313
,

spec/core_functions/meta/module_functions.hrx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ a {
6969
<===> dash_sensitive/output.css
7070
a {
7171
b-c: b-c value;
72-
d_e: d_e value;
72+
d-e: d_e value;
7373
}
7474

7575
<===>

spec/core_functions/meta/module_variables.hrx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ $e_f: e_f value;
5151

5252
<===> dash_sensitive/output.css
5353
a {
54-
b: ("c-d": c-d value, "e_f": e_f value);
54+
b: ("c-d": c-d value, "e-f": e_f value);
5555
}
5656

5757
<===>

spec/core_functions/meta/variable_exists.hrx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ $member: from other1;
229229
$member: from other2;
230230

231231
<===> conflict/error
232-
Error: Multiple global modules have a variable named "$member":
232+
Error: This variable is available from multiple global modules:
233233
* other1.scss
234234
* other2.scss
235235
,

spec/directives/use/error/member.hrx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ $member: from other1;
178178
$member: from other2;
179179

180180
<===> member_conflict/variable/error
181-
Error: Multiple global modules have a variable named "$member":
181+
Error: This variable is available from multiple global modules:
182182
* other1.scss
183183
* other2.scss
184184
,
@@ -202,7 +202,7 @@ a {b: member()}
202202
@function member() {@return from other2}
203203

204204
<===> member_conflict/function/error
205-
Error: Multiple global modules have a function named "member":
205+
Error: This function is available from multiple global modules:
206206
* other1.scss
207207
* other2.scss
208208
,
@@ -226,7 +226,7 @@ a {@include member}
226226
@mixin member {a: from other2}
227227

228228
<===> member_conflict/mixin/error
229-
Error: Multiple global modules have a mixin named "member":
229+
Error: This mixin is available from multiple global modules:
230230
* other1.scss
231231
* other2.scss
232232
,

spec/directives/use/error/with.hrx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ $a: left;
8686
$a: right;
8787

8888
<===> conflict/error
89-
Error: Multiple global modules have a variable named "$a":
89+
Error: This variable is available from multiple global modules:
9090
* _left.scss
9191
* _right.scss
9292
,

0 commit comments

Comments
 (0)