From 2919a8eba5ac5822ddd8d8f0355d12430c36a3dd Mon Sep 17 00:00:00 2001 From: Natalie Weizenbaum Date: Thu, 18 Jul 2019 01:47:54 +0100 Subject: [PATCH] Update specs for global member conflicts (#1435) --- spec/core_functions/meta/function_exists.hrx | 4 +++- spec/core_functions/meta/get_function/error.hrx | 4 +++- spec/core_functions/meta/global_variable_exists.hrx | 4 +++- spec/core_functions/meta/load_css/error.hrx | 4 +++- spec/core_functions/meta/mixin_exists.hrx | 4 +++- spec/core_functions/meta/variable_exists.hrx | 4 +++- spec/directives/use/error/member.hrx | 12 +++++++++--- spec/directives/use/error/with.hrx | 4 +++- 8 files changed, 30 insertions(+), 10 deletions(-) diff --git a/spec/core_functions/meta/function_exists.hrx b/spec/core_functions/meta/function_exists.hrx index 6d991bf5ef..644a88c071 100644 --- a/spec/core_functions/meta/function_exists.hrx +++ b/spec/core_functions/meta/function_exists.hrx @@ -299,7 +299,9 @@ a {b: function-exists(member)} @function member() {@return from other2} <===> error/conflict/error -Error: Multiple global modules have a function named "member". +Error: Multiple global modules have a function named "member": +* other1.scss +* other2.scss , 4 | a {b: function-exists(member)} | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/spec/core_functions/meta/get_function/error.hrx b/spec/core_functions/meta/get_function/error.hrx index 439e34b7ce..0e1f9826ac 100644 --- a/spec/core_functions/meta/get_function/error.hrx +++ b/spec/core_functions/meta/get_function/error.hrx @@ -226,7 +226,9 @@ a {b: get-function(member)} @function member() {@return from other2} <===> conflict/error -Error: Multiple global modules have a function named "member". +Error: Multiple global modules have a function named "member": +* other1.scss +* other2.scss , 4 | a {b: get-function(member)} | ^^^^^^^^^^^^^^^^^^^^ diff --git a/spec/core_functions/meta/global_variable_exists.hrx b/spec/core_functions/meta/global_variable_exists.hrx index cb33caff85..ed97a511d2 100644 --- a/spec/core_functions/meta/global_variable_exists.hrx +++ b/spec/core_functions/meta/global_variable_exists.hrx @@ -307,7 +307,9 @@ $member: from other1; $member: from other2; <===> error/conflict/error -Error: Multiple global modules have a variable named "$member". +Error: Multiple global modules have a variable named "$member": +* other1.scss +* other2.scss , 4 | a {b: global-variable-exists(member)} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/spec/core_functions/meta/load_css/error.hrx b/spec/core_functions/meta/load_css/error.hrx index a4e06cdcf4..ca4ae55c14 100644 --- a/spec/core_functions/meta/load_css/error.hrx +++ b/spec/core_functions/meta/load_css/error.hrx @@ -200,7 +200,9 @@ $a: left; $a: right; <===> with/conflict/error -Error: Multiple global modules have a variable named "$a". +Error: Multiple global modules have a variable named "$a": +* _left.scss +* _right.scss , 4 | $a: c !default; | ^^^^^^^^^^^^^^ diff --git a/spec/core_functions/meta/mixin_exists.hrx b/spec/core_functions/meta/mixin_exists.hrx index 47e262e949..76ff346738 100644 --- a/spec/core_functions/meta/mixin_exists.hrx +++ b/spec/core_functions/meta/mixin_exists.hrx @@ -307,7 +307,9 @@ a {b: mixin-exists(member)} @mixin member() {} <===> error/conflict/error -Error: Multiple global modules have a mixin named "member". +Error: Multiple global modules have a mixin named "member": +* other1.scss +* other2.scss , 4 | a {b: mixin-exists(member)} | ^^^^^^^^^^^^^^^^^^^^ diff --git a/spec/core_functions/meta/variable_exists.hrx b/spec/core_functions/meta/variable_exists.hrx index dadbdff6b6..cd3e1c28fe 100644 --- a/spec/core_functions/meta/variable_exists.hrx +++ b/spec/core_functions/meta/variable_exists.hrx @@ -229,7 +229,9 @@ $member: from other1; $member: from other2; <===> conflict/error -Error: Multiple global modules have a variable named "$member". +Error: Multiple global modules have a variable named "$member": +* other1.scss +* other2.scss , 4 | a {b: variable-exists(member)} | ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/spec/directives/use/error/member.hrx b/spec/directives/use/error/member.hrx index 5466246505..e25aa2af18 100644 --- a/spec/directives/use/error/member.hrx +++ b/spec/directives/use/error/member.hrx @@ -178,7 +178,9 @@ $member: from other1; $member: from other2; <===> member_conflict/variable/error -Error: Multiple global modules have a variable named "$member". +Error: Multiple global modules have a variable named "$member": +* other1.scss +* other2.scss , 4 | a {b: $member} | ^^^^^^^ @@ -200,7 +202,9 @@ a {b: member()} @function member() {@return from other2} <===> member_conflict/function/error -Error: Multiple global modules have a function named "member". +Error: Multiple global modules have a function named "member": +* other1.scss +* other2.scss , 4 | a {b: member()} | ^^^^^^^^ @@ -222,7 +226,9 @@ a {@include member} @mixin member {a: from other2} <===> member_conflict/mixin/error -Error: Multiple global modules have a mixin named "member". +Error: Multiple global modules have a mixin named "member": +* other1.scss +* other2.scss , 4 | a {@include member} | ^^^^^^^^^^^^^^^ diff --git a/spec/directives/use/error/with.hrx b/spec/directives/use/error/with.hrx index bef5e6282b..b64c16ae30 100644 --- a/spec/directives/use/error/with.hrx +++ b/spec/directives/use/error/with.hrx @@ -86,7 +86,9 @@ $a: left; $a: right; <===> conflict/error -Error: Multiple global modules have a variable named "$a". +Error: Multiple global modules have a variable named "$a": +* _left.scss +* _right.scss , 4 | $a: c !default; | ^^^^^^^^^^^^^^