Skip to content

Commit 2919a8e

Browse files
authored
Update specs for global member conflicts (#1435)
1 parent 3a9889c commit 2919a8e

File tree

8 files changed

+30
-10
lines changed

8 files changed

+30
-10
lines changed

spec/core_functions/meta/function_exists.hrx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,9 @@ 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: Multiple global modules have a function named "member":
303+
* other1.scss
304+
* other2.scss
303305
,
304306
4 | a {b: function-exists(member)}
305307
| ^^^^^^^^^^^^^^^^^^^^^^^

spec/core_functions/meta/get_function/error.hrx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,9 @@ 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: Multiple global modules have a function named "member":
230+
* other1.scss
231+
* other2.scss
230232
,
231233
4 | a {b: get-function(member)}
232234
| ^^^^^^^^^^^^^^^^^^^^

spec/core_functions/meta/global_variable_exists.hrx

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

309309
<===> error/conflict/error
310-
Error: Multiple global modules have a variable named "$member".
310+
Error: Multiple global modules have a variable named "$member":
311+
* other1.scss
312+
* other2.scss
311313
,
312314
4 | a {b: global-variable-exists(member)}
313315
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

spec/core_functions/meta/load_css/error.hrx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,9 @@ $a: left;
200200
$a: right;
201201

202202
<===> with/conflict/error
203-
Error: Multiple global modules have a variable named "$a".
203+
Error: Multiple global modules have a variable named "$a":
204+
* _left.scss
205+
* _right.scss
204206
,
205207
4 | $a: c !default;
206208
| ^^^^^^^^^^^^^^

spec/core_functions/meta/mixin_exists.hrx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,9 @@ 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: Multiple global modules have a mixin named "member":
311+
* other1.scss
312+
* other2.scss
311313
,
312314
4 | a {b: mixin-exists(member)}
313315
| ^^^^^^^^^^^^^^^^^^^^

spec/core_functions/meta/variable_exists.hrx

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

231231
<===> conflict/error
232-
Error: Multiple global modules have a variable named "$member".
232+
Error: Multiple global modules have a variable named "$member":
233+
* other1.scss
234+
* other2.scss
233235
,
234236
4 | a {b: variable-exists(member)}
235237
| ^^^^^^^^^^^^^^^^^^^^^^^

spec/directives/use/error/member.hrx

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,9 @@ $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: Multiple global modules have a variable named "$member":
182+
* other1.scss
183+
* other2.scss
182184
,
183185
4 | a {b: $member}
184186
| ^^^^^^^
@@ -200,7 +202,9 @@ a {b: member()}
200202
@function member() {@return from other2}
201203

202204
<===> member_conflict/function/error
203-
Error: Multiple global modules have a function named "member".
205+
Error: Multiple global modules have a function named "member":
206+
* other1.scss
207+
* other2.scss
204208
,
205209
4 | a {b: member()}
206210
| ^^^^^^^^
@@ -222,7 +226,9 @@ a {@include member}
222226
@mixin member {a: from other2}
223227

224228
<===> member_conflict/mixin/error
225-
Error: Multiple global modules have a mixin named "member".
229+
Error: Multiple global modules have a mixin named "member":
230+
* other1.scss
231+
* other2.scss
226232
,
227233
4 | a {@include member}
228234
| ^^^^^^^^^^^^^^^

spec/directives/use/error/with.hrx

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

8888
<===> conflict/error
89-
Error: Multiple global modules have a variable named "$a".
89+
Error: Multiple global modules have a variable named "$a":
90+
* _left.scss
91+
* _right.scss
9092
,
9193
4 | $a: c !default;
9294
| ^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)