Skip to content

Commit 16a640b

Browse files
authored
Merge pull request #1468 from sass/merge-use
Merge and enable feature.use 🎉
2 parents fcd6bd6 + 93c3f01 commit 16a640b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+8509
-68
lines changed

.travis.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ language: ruby
22

33
# Only building master means that we don't run two builds for each pull request.
44
branches:
5-
only: [master]
5+
only:
6+
- master
7+
# Feature branches beginning with "feature."
8+
- "/^feature\\..*/"
69

710
matrix:
811
fast_finish: true

spec/core_functions/meta/function_exists.hrx

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ a {
7777
---
7878
:todo:
7979
- sass/libsass#2807
80-
- sass/dart-sass#554
8180

8281
<===>
8382
================================================================================
@@ -214,7 +213,6 @@ a {
214213
---
215214
:todo:
216215
- sass/libsass#2807
217-
- sass/dart-sass#554
218216

219217
<===> named/input.scss
220218
@use "sass:color";
@@ -253,7 +251,6 @@ Error: $name: 12px is not a string for `function-exists'
253251
---
254252
:todo:
255253
- sass/libsass#2807
256-
- sass/dart-sass#554
257254

258255
<===> error/argument/type/module/input.scss
259256
a {b: function-exists("red", 1)}
@@ -312,7 +309,6 @@ Error: wrong number of arguments (3 for 1) for `function-exists'
312309
---
313310
:todo:
314311
- sass/libsass#2807
315-
- sass/dart-sass#554
316312

317313
<===> error/conflict/input.scss
318314
@use "other1" as *;
@@ -327,7 +323,9 @@ a {b: function-exists(member)}
327323
@function member() {@return from other2}
328324

329325
<===> error/conflict/error
330-
Error: Multiple global modules have a function named "member".
326+
Error: This function is available from multiple global modules:
327+
* other1.scss
328+
* other2.scss
331329
,
332330
4 | a {b: function-exists(member)}
333331
| ^^^^^^^^^^^^^^^^^^^^^^^
@@ -340,7 +338,6 @@ Error: Multiple global modules have a function named "member".
340338
---
341339
:todo:
342340
- sass/libsass#2807
343-
- sass/dart-sass#554
344341

345342
<===>
346343
================================================================================

spec/core_functions/meta/get_function/different_module.hrx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
---
33
:todo:
44
- sass/libsass#2807
5-
- sass/dart-sass#554
65

76
<===>
87
================================================================================
@@ -120,7 +119,6 @@ a {
120119
---
121120
:todo:
122121
- sass/libsass#2807
123-
- sass/dart-sass#554
124122

125123
<===> named/input.scss
126124
@use "sass:color";

spec/core_functions/meta/get_function/error.hrx

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ Error: $name: 2px is not a string for `get-function'
2121
---
2222
:todo:
2323
- sass/libsass#2807
24-
- sass/dart-sass#554
2524

2625
<===> argument/type/module/input.scss
2726
a {b: get-function(c, $module: 1)}
@@ -117,14 +116,6 @@ Error: Function not found: does-not-exist
117116
Use --trace for backtrace.
118117

119118

120-
<===>
121-
================================================================================
122-
<===> through_forward/options.yml
123-
---
124-
:todo:
125-
- sass/libsass#2807
126-
- sass/dart-sass#554
127-
128119
<===>
129120
================================================================================
130121
<===> through_forward/show/input.scss
@@ -221,7 +212,6 @@ Error: $name: get-function("add-two") is not a string for `get-function'
221212
---
222213
:todo:
223214
- sass/libsass#2807
224-
- sass/dart-sass#554
225215

226216
<===> conflict/input.scss
227217
@use "other1" as *;
@@ -236,7 +226,9 @@ a {b: get-function(member)}
236226
@function member() {@return from other2}
237227

238228
<===> conflict/error
239-
Error: Multiple global modules have a function named "member".
229+
Error: This function is available from multiple global modules:
230+
* other1.scss
231+
* other2.scss
240232
,
241233
4 | a {b: get-function(member)}
242234
| ^^^^^^^^^^^^^^^^^^^^
@@ -249,7 +241,6 @@ Error: Multiple global modules have a function named "member".
249241
---
250242
:todo:
251243
- sass/libsass#2807
252-
- sass/dart-sass#554
253244

254245
<===>
255246
================================================================================

spec/core_functions/meta/global_variable_exists.hrx

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ a {
7777
---
7878
:todo:
7979
- sass/libsass#2807
80-
- sass/dart-sass#554
8180

8281
<===>
8382
================================================================================
@@ -118,6 +117,8 @@ b {
118117
c: true;
119118
}
120119

120+
<===>
121+
================================================================================
121122
<===> different_module/through_use/input.scss
122123
@use "other" as *;
123124
a {b: global-variable-exists(global-variable)}
@@ -218,7 +219,6 @@ a {
218219
---
219220
:todo:
220221
- sass/libsass#2807
221-
- sass/dart-sass#554
222222

223223
<===> named/input.scss
224224
@use "other";
@@ -259,7 +259,6 @@ Error: argument `$name` of `global-variable-exists($name)` must be a string
259259
---
260260
:todo:
261261
- sass/libsass#2807
262-
- sass/dart-sass#554
263262

264263
<===> error/argument/type/module/input.scss
265264
a {b: global-variable-exists("c", 1)}
@@ -318,7 +317,6 @@ Error: wrong number of arguments (3 for 1) for `global-variable-exists'
318317
---
319318
:todo:
320319
- sass/libsass#2807
321-
- sass/dart-sass#554
322320

323321
<===> error/conflict/input.scss
324322
@use "other1" as *;
@@ -333,7 +331,9 @@ $member: from other1;
333331
$member: from other2;
334332

335333
<===> error/conflict/error
336-
Error: Multiple global modules have a variable named "$member".
334+
Error: This variable is available from multiple global modules:
335+
* other1.scss
336+
* other2.scss
337337
,
338338
4 | a {b: global-variable-exists(member)}
339339
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -346,7 +346,6 @@ Error: Multiple global modules have a variable named "$member".
346346
---
347347
:todo:
348348
- sass/libsass#2807
349-
- sass/dart-sass#554
350349

351350
<===>
352351
================================================================================

0 commit comments

Comments
 (0)