From 42dcf185d0b6f74e5941f29e6cc42ce8df402946 Mon Sep 17 00:00:00 2001 From: Jennifer Thakar Date: Thu, 11 Jul 2024 11:04:44 -0700 Subject: [PATCH 01/10] Migrate some more inspect calls --- .../core_functions/meta/get_function/meta.hrx | 8 +++- .../issue_1169/error/color.hrx | 22 +++++----- .../issue_1169/error/functioncall.hrx | 30 +++++++------ .../issue_1169/error/interpolate.hrx | 22 +++++----- .../issue_1169/error/simple.hrx | 16 ++++--- .../issue_1169/functioncall.hrx | 4 +- .../issue_1169/interpolated.hrx | 21 +++++---- .../issue_1169/simple.hrx | 28 ++++++------ spec/libsass-closed-issues/issue_1178.hrx | 4 +- spec/libsass-closed-issues/issue_1187.hrx | 10 +++-- spec/libsass-closed-issues/issue_1192.hrx | 6 ++- spec/libsass-closed-issues/issue_1269.hrx | 9 ++-- spec/libsass-closed-issues/issue_1283.hrx | 7 ++- spec/libsass-closed-issues/issue_1583.hrx | 26 ++++++----- spec/libsass-closed-issues/issue_1604.hrx | 7 ++- spec/libsass-closed-issues/issue_1709.hrx | 4 +- spec/libsass-closed-issues/issue_1723.hrx | 44 ++++++++++--------- spec/libsass-closed-issues/issue_2020.hrx | 14 +++--- spec/libsass-closed-issues/issue_2330.hrx | 30 +++++++------ spec/libsass-closed-issues/issue_2333.hrx | 4 +- spec/libsass-closed-issues/issue_238760.hrx | 10 +++-- spec/libsass-closed-issues/issue_701.hrx | 20 +++++---- spec/values/maps/invalid-key.hrx | 10 +++-- spec/values/numbers/modulo/zeros.hrx | 4 +- .../divide_by_multiple_denominators.hrx | 21 ++++----- .../divide_by_multiple_numerators.hrx | 9 ++-- .../units/multiple/division_cancels_both.hrx | 23 +++++----- .../multiple/division_cancels_compatible.hrx | 17 +++---- .../multiple/division_cancels_denominator.hrx | 23 +++++----- .../division_cancels_denominator_twice.hrx | 29 ++++++------ .../multiple/division_cancels_numerator.hrx | 17 +++---- .../division_cancels_numerator_twice.hrx | 17 +++---- .../multiple/division_cancels_unknown.hrx | 17 +++---- .../units/multiple/multiple_denominators.hrx | 15 ++++--- .../units/multiple/multiple_numerators.hrx | 3 +- .../multiple/multiplication_cancels_both.hrx | 17 +++---- .../multiplication_cancels_compatible.hrx | 11 ++--- .../multiplication_cancels_denominator.hrx | 11 ++--- ...ltiplication_cancels_denominator_twice.hrx | 11 ++--- .../multiplication_cancels_numerator.hrx | 17 +++---- ...multiplication_cancels_numerator_twice.hrx | 23 +++++----- .../multiplication_cancels_unknown.hrx | 11 ++--- 42 files changed, 364 insertions(+), 288 deletions(-) diff --git a/spec/core_functions/meta/get_function/meta.hrx b/spec/core_functions/meta/get_function/meta.hrx index b6493587ba..40fdde75b0 100644 --- a/spec/core_functions/meta/get_function/meta.hrx +++ b/spec/core_functions/meta/get_function/meta.hrx @@ -1,5 +1,7 @@ <===> inspect/input.scss -a {b: inspect(get-function(lighten))}; +@use "sass:meta"; + +a {b: meta.inspect(meta.get-function(lighten))}; <===> inspect/output.css a { @@ -9,7 +11,9 @@ a { <===> ================================================================================ <===> type_of/input.scss -a {b: type-of(get-function(lighten))}; +@use "sass:meta"; + +a {b: meta.type-of(meta.get-function(lighten))}; <===> type_of/output.css a { diff --git a/spec/libsass-closed-issues/issue_1169/error/color.hrx b/spec/libsass-closed-issues/issue_1169/error/color.hrx index 8a138abb62..660f4a0ed0 100644 --- a/spec/libsass-closed-issues/issue_1169/error/color.hrx +++ b/spec/libsass-closed-issues/issue_1169/error/color.hrx @@ -1,18 +1,20 @@ <===> input.scss -$map: ( - red: 'foo', - red: 'bar', -); - -.foo { - content: inspect($map); +@use "sass:meta"; + +$map: ( + red: 'foo', + red: 'bar', +); + +.foo { + content: meta.inspect($map); } <===> error Error: Duplicate key. , -2 | red: 'foo', +4 | red: 'foo', | === first key -3 | red: 'bar', +5 | red: 'bar', | ^^^ second key ' - input.scss 3:3 root stylesheet + input.scss 5:3 root stylesheet diff --git a/spec/libsass-closed-issues/issue_1169/error/functioncall.hrx b/spec/libsass-closed-issues/issue_1169/error/functioncall.hrx index 5f68b53aff..a84c587b79 100644 --- a/spec/libsass-closed-issues/issue_1169/error/functioncall.hrx +++ b/spec/libsass-closed-issues/issue_1169/error/functioncall.hrx @@ -1,22 +1,24 @@ <===> input.scss -@function fncall($void) { - @return "key"; -} - -$map: ( - fncall(1+2): 'foo', - fncall(1+2): 'bar', -); - -.foo { - content: inspect($map); +@use "sass:meta"; + +@function fncall($void) { + @return "key"; +} + +$map: ( + fncall(1+2): 'foo', + fncall(1+2): 'bar', +); + +.foo { + content: meta.inspect($map); } <===> error Error: Duplicate key. , -6 | fncall(1+2): 'foo', +8 | fncall(1+2): 'foo', | =========== first key -7 | fncall(1+2): 'bar', +9 | fncall(1+2): 'bar', | ^^^^^^^^^^^ second key ' - input.scss 7:3 root stylesheet + input.scss 9:3 root stylesheet diff --git a/spec/libsass-closed-issues/issue_1169/error/interpolate.hrx b/spec/libsass-closed-issues/issue_1169/error/interpolate.hrx index 5b9c7f7f89..cff83db364 100644 --- a/spec/libsass-closed-issues/issue_1169/error/interpolate.hrx +++ b/spec/libsass-closed-issues/issue_1169/error/interpolate.hrx @@ -1,18 +1,20 @@ <===> input.scss -$map: ( - 'red': 'bar', - #{re}#{'d'}: 'baz', -); - -.foo { - content: inspect($map); +@use "sass:meta"; + +$map: ( + 'red': 'bar', + #{re}#{'d'}: 'baz', +); + +.foo { + content: meta.inspect($map); } <===> error Error: Duplicate key. , -2 | 'red': 'bar', +4 | 'red': 'bar', | ===== first key -3 | #{re}#{'d'}: 'baz', +5 | #{re}#{'d'}: 'baz', | ^^^^^^^^^^^ second key ' - input.scss 3:3 root stylesheet + input.scss 5:3 root stylesheet diff --git a/spec/libsass-closed-issues/issue_1169/error/simple.hrx b/spec/libsass-closed-issues/issue_1169/error/simple.hrx index 9d544844e3..7c3ec8be17 100644 --- a/spec/libsass-closed-issues/issue_1169/error/simple.hrx +++ b/spec/libsass-closed-issues/issue_1169/error/simple.hrx @@ -1,11 +1,13 @@ <===> input.scss -$map: ( - red: 'bar', - #{red}: 'baz', -); - -.foo { - content: inspect($map); +@use "sass:meta"; + +$map: ( + red: 'bar', + #{red}: 'baz', +); + +.foo { + content: meta.inspect($map); } <===> output.css .foo { diff --git a/spec/libsass-closed-issues/issue_1169/functioncall.hrx b/spec/libsass-closed-issues/issue_1169/functioncall.hrx index 84f0fc33e0..c076f0006a 100644 --- a/spec/libsass-closed-issues/issue_1169/functioncall.hrx +++ b/spec/libsass-closed-issues/issue_1169/functioncall.hrx @@ -1,4 +1,6 @@ <===> input.scss +@use "sass:meta"; + $count: 0; @function counter() { @@ -12,7 +14,7 @@ $map: ( ); .foo { - content: inspect($map); + content: meta.inspect($map); } <===> output.css .foo { diff --git a/spec/libsass-closed-issues/issue_1169/interpolated.hrx b/spec/libsass-closed-issues/issue_1169/interpolated.hrx index efe3ff151e..501644bc7d 100644 --- a/spec/libsass-closed-issues/issue_1169/interpolated.hrx +++ b/spec/libsass-closed-issues/issue_1169/interpolated.hrx @@ -1,22 +1,25 @@ <===> input.scss +@use "sass:map"; +@use "sass:meta"; + $map1: ( red: 'literal', transparent: 'literal' ); $map2: ( 'red': 'quoted', transparent: 'quoted' ); $map3: ( #{re}#{d}: 'interpolated', #{trans}#{parent}: 'quoted' ); foo { - content: inspect($map1); - content: inspect($map2); - content: inspect($map3); + content: meta.inspect($map1); + content: meta.inspect($map2); + content: meta.inspect($map3); } -$merge1: map-merge($map1, $map2); -$merge2: map-merge($map1, $map3); -$merge3: map-merge($map2, $map3); +$merge1: map.merge($map1, $map2); +$merge2: map.merge($map1, $map3); +$merge3: map.merge($map2, $map3); bar { - content: inspect($merge1); - content: inspect($merge2); - content: inspect($merge3); + content: meta.inspect($merge1); + content: meta.inspect($merge2); + content: meta.inspect($merge3); } <===> output.css foo { diff --git a/spec/libsass-closed-issues/issue_1169/simple.hrx b/spec/libsass-closed-issues/issue_1169/simple.hrx index c95c0ee17c..93dd51a6e4 100644 --- a/spec/libsass-closed-issues/issue_1169/simple.hrx +++ b/spec/libsass-closed-issues/issue_1169/simple.hrx @@ -1,17 +1,19 @@ <===> input.scss -$map1: ( - red: 'bar', - 'red': 'foo', -); - -$map2: ( - red: 'bar', - 'red': #{red}, -); - -.foo { - content: inspect($map1); - content: inspect($map2); +@use "sass:meta"; + +$map1: ( + red: 'bar', + 'red': 'foo', +); + +$map2: ( + red: 'bar', + 'red': #{red}, +); + +.foo { + content: meta.inspect($map1); + content: meta.inspect($map2); } <===> output.css .foo { diff --git a/spec/libsass-closed-issues/issue_1178.hrx b/spec/libsass-closed-issues/issue_1178.hrx index 876d88c73d..e3a50f7d96 100644 --- a/spec/libsass-closed-issues/issue_1178.hrx +++ b/spec/libsass-closed-issues/issue_1178.hrx @@ -1,11 +1,13 @@ <===> input.scss +@use "sass:meta"; + $foo: ((4, 5), 6, (7 8) 9); bar { a: $foo; f: 1 2 3 + $foo; b: 1, 2, 3 + (2 ($foo)); - x: inspect($foo); + x: meta.inspect($foo); } <===> output.css diff --git a/spec/libsass-closed-issues/issue_1187.hrx b/spec/libsass-closed-issues/issue_1187.hrx index 3080da6d84..e8d941cf41 100644 --- a/spec/libsass-closed-issues/issue_1187.hrx +++ b/spec/libsass-closed-issues/issue_1187.hrx @@ -1,4 +1,6 @@ <===> input.scss +@use "sass:meta"; + $a: 'foo'; $b: 'foo'; $map: ( @@ -8,14 +10,14 @@ $map: ( .foo { content: $a == $b; - content: inspect($map); + content: meta.inspect($map); } <===> error Error: Duplicate key. , -4 | $a: 1, +6 | $a: 1, | == first key -5 | $b: 2 +7 | $b: 2 | ^^ second key ' - input.scss 5:3 root stylesheet + input.scss 7:3 root stylesheet diff --git a/spec/libsass-closed-issues/issue_1192.hrx b/spec/libsass-closed-issues/issue_1192.hrx index f69ffc635f..33fcef5cc2 100644 --- a/spec/libsass-closed-issues/issue_1192.hrx +++ b/spec/libsass-closed-issues/issue_1192.hrx @@ -1,10 +1,12 @@ <===> input.scss +@use "sass:meta"; + $keyword: foobar; @mixin test($arglist...){ $map: keywords($arglist); - /*#{inspect($map)}*/ - /*#{inspect($arglist)}*/ + /*#{meta.inspect($map)}*/ + /*#{meta.inspect($arglist)}*/ } // Works diff --git a/spec/libsass-closed-issues/issue_1269.hrx b/spec/libsass-closed-issues/issue_1269.hrx index 73f07cc434..572ee92087 100644 --- a/spec/libsass-closed-issues/issue_1269.hrx +++ b/spec/libsass-closed-issues/issue_1269.hrx @@ -1,12 +1,15 @@ <===> input.scss +@use "sass:list"; +@use "sass:meta"; + @function push($list, $items...) { - @return join($list, $items, $separator: auto); + @return list.join($list, $items, $separator: auto); } .test { $list: push(1 2 3, 4, 5); - list: inspect($list); - value: nth($list, 4); + list: meta.inspect($list); + value: list.nth($list, 4); } <===> output.css .test { diff --git a/spec/libsass-closed-issues/issue_1283.hrx b/spec/libsass-closed-issues/issue_1283.hrx index 59d43b8a80..940a3181e3 100644 --- a/spec/libsass-closed-issues/issue_1283.hrx +++ b/spec/libsass-closed-issues/issue_1283.hrx @@ -1,8 +1,11 @@ <===> input.scss -$map: map-merge((1 2: 3), (2 1: 3)); +@use "sass:map"; +@use "sass:meta"; + +$map: map.merge((1 2: 3), (2 1: 3)); .test { - test: inspect($map); + test: meta.inspect($map); } <===> output.css diff --git a/spec/libsass-closed-issues/issue_1583.hrx b/spec/libsass-closed-issues/issue_1583.hrx index d6696fde67..51a18f23a7 100644 --- a/spec/libsass-closed-issues/issue_1583.hrx +++ b/spec/libsass-closed-issues/issue_1583.hrx @@ -1,28 +1,32 @@ <===> input.scss +@use "sass:list"; +@use "sass:meta"; +@use "sass:string"; + $ls: ((foo,)); foo { - baz: length($ls); - baz: type-of($ls); - baz: inspect($ls); + baz: list.length($ls); + baz: meta.type-of($ls); + baz: meta.inspect($ls); } bar { - baz: length(&); - baz: type-of(&); - baz: inspect(&); + baz: list.length(&); + baz: meta.type-of(&); + baz: meta.inspect(&); } foo { - string: inspect(&); - str-length: str-length(inspect(&)); + string: meta.inspect(&); + str-length: str-length(meta.inspect(&)); list-length: length(&); } foo, bar { - string: inspect(&); - str-length: str-length(inspect(&)); - list-length: length(&); + string: meta.inspect(&); + str-length: string.length(meta.inspect(&)); + list-length: list.length(&); } <===> output.css diff --git a/spec/libsass-closed-issues/issue_1604.hrx b/spec/libsass-closed-issues/issue_1604.hrx index 2ba63f8414..205d552323 100644 --- a/spec/libsass-closed-issues/issue_1604.hrx +++ b/spec/libsass-closed-issues/issue_1604.hrx @@ -1,12 +1,15 @@ <===> input.scss +@use "sass:list"; +@use "sass:meta"; + @function test($args...) { $all: (); @each $arg in $args { - $all: append($all, $arg); + $all: list.append($all, $arg); } - @return inspect($all); + @return meta.inspect($all); } test { diff --git a/spec/libsass-closed-issues/issue_1709.hrx b/spec/libsass-closed-issues/issue_1709.hrx index 7a1d654268..13eb585d2f 100644 --- a/spec/libsass-closed-issues/issue_1709.hrx +++ b/spec/libsass-closed-issues/issue_1709.hrx @@ -1,7 +1,9 @@ <===> input.scss +@use "sass:meta"; + @mixin transition( $prefix_properties, $transitions... ) { - @if not str-index( inspect( $transitions ), ',') { + @if not str-index( meta.inspect( $transitions ), ',') { $transitions: ( $transitions ); } diff --git a/spec/libsass-closed-issues/issue_1723.hrx b/spec/libsass-closed-issues/issue_1723.hrx index 0b823d18be..564d040d06 100644 --- a/spec/libsass-closed-issues/issue_1723.hrx +++ b/spec/libsass-closed-issues/issue_1723.hrx @@ -1,25 +1,27 @@ <===> input.scss -test-1 test-2 test-3 test-4 test-5, -test-6 test-7 test-8 test-9 test-10 { - @each $set in & { - set: inspect($set); - - @each $selector in $set { - selector: inspect($selector); - } - } -} - -test-1 test-2 test-3 test-4 test-5, -test-6 test-7 test-8 test-9 test-10 { - @for $i from 1 through length(&) { - $set: nth(&, $i); - set: inspect($set); - - @each $selector in $set { - selector: inspect($selector); - } - } +@use "sass:meta"; + +test-1 test-2 test-3 test-4 test-5, +test-6 test-7 test-8 test-9 test-10 { + @each $set in & { + set: meta.inspect($set); + + @each $selector in $set { + selector: meta.inspect($selector); + } + } +} + +test-1 test-2 test-3 test-4 test-5, +test-6 test-7 test-8 test-9 test-10 { + @for $i from 1 through length(&) { + $set: nth(&, $i); + set: meta.inspect($set); + + @each $selector in $set { + selector: meta.inspect($selector); + } + } } <===> output.css test-1 test-2 test-3 test-4 test-5, diff --git a/spec/libsass-closed-issues/issue_2020.hrx b/spec/libsass-closed-issues/issue_2020.hrx index bc496a3da3..12f1736e99 100644 --- a/spec/libsass-closed-issues/issue_2020.hrx +++ b/spec/libsass-closed-issues/issue_2020.hrx @@ -1,10 +1,12 @@ <===> input.scss -form { - $selector: nth(&, 1); - sel: inspect($selector); - $selector: nth($selector, 1); - sel: inspect($selector); -} +@use "sass:meta"; + +form { + $selector: nth(&, 1); + sel: meta.inspect($selector); + $selector: nth($selector, 1); + sel: meta.inspect($selector); +} <===> output.css form { sel: form; diff --git a/spec/libsass-closed-issues/issue_2330.hrx b/spec/libsass-closed-issues/issue_2330.hrx index d7fbe0705f..21a534a1fe 100644 --- a/spec/libsass-closed-issues/issue_2330.hrx +++ b/spec/libsass-closed-issues/issue_2330.hrx @@ -1,17 +1,21 @@ <===> input.scss -@function test () { - $m: (); - $abc: (a b c d e f g h i j k); - - @for $index from 1 through length($abc) {; - $m: map-merge($m, (nth($abc, $index):$index) ); - } - - @return $m; -} - -test { - content: inspect(test()); +@use "sass:list"; +@use "sass:map"; +@use "sass:meta"; + +@function test () { + $m: (); + $abc: (a b c d e f g h i j k); + + @for $index from 1 through list.length($abc) {; + $m: map.merge($m, (list.nth($abc, $index):$index) ); + } + + @return $m; +} + +test { + content: meta.inspect(test()); } <===> output.css test { diff --git a/spec/libsass-closed-issues/issue_2333.hrx b/spec/libsass-closed-issues/issue_2333.hrx index 726ced1de6..0fed7e7eba 100644 --- a/spec/libsass-closed-issues/issue_2333.hrx +++ b/spec/libsass-closed-issues/issue_2333.hrx @@ -1,5 +1,7 @@ <===> input.scss -test { test: inspect((a:1,b:(foo,bar),c:3)); } +@use "sass:meta"; + +test { test: meta.inspect((a:1,b:(foo,bar),c:3)); } <===> output.css test { test: (a: 1, b: (foo, bar), c: 3); diff --git a/spec/libsass-closed-issues/issue_238760.hrx b/spec/libsass-closed-issues/issue_238760.hrx index e0ddd2cc42..f218471fdf 100644 --- a/spec/libsass-closed-issues/issue_238760.hrx +++ b/spec/libsass-closed-issues/issue_238760.hrx @@ -1,10 +1,12 @@ <===> input.scss -$id: inspect((a#b:c)...) +@use "sass:meta"; + +$id: meta.inspect((a#b:c)...) <===> error Error: Variable keyword argument map must have string keys. a #b is not a string in (a #b: c). , -1 | $id: inspect((a#b:c)...) - | ^^^^^^^ +3 | $id: meta.inspect((a#b:c)...) + | ^^^^^^^ ' - input.scss 1:14 root stylesheet + input.scss 3:19 root stylesheet diff --git a/spec/libsass-closed-issues/issue_701.hrx b/spec/libsass-closed-issues/issue_701.hrx index 3d79490caf..db4b96ce3e 100644 --- a/spec/libsass-closed-issues/issue_701.hrx +++ b/spec/libsass-closed-issues/issue_701.hrx @@ -1,17 +1,19 @@ <===> input.scss +@use "sass:meta"; + .test-1 { content: null; - content: inspect(null); - content: inspect(false); - content: inspect(true); - content: inspect(42); - content: inspect(42.3); - content: inspect(42px); - content: inspect("string"); + content: meta.inspect(null); + content: meta.inspect(false); + content: meta.inspect(true); + content: meta.inspect(42); + content: meta.inspect(42.3); + content: meta.inspect(42px); + content: meta.inspect("string"); $list: 1, 2, 3; - content: inspect($list); + content: meta.inspect($list); $map: ( a: 1, b: 2, c: 3 ); - content: inspect($map); + content: meta.inspect($map); } <===> output.css diff --git a/spec/values/maps/invalid-key.hrx b/spec/values/maps/invalid-key.hrx index 65467733e0..945fe17a9b 100644 --- a/spec/values/maps/invalid-key.hrx +++ b/spec/values/maps/invalid-key.hrx @@ -1,10 +1,12 @@ <===> input.scss -$id: inspect((a,b:c)...) +@use "sass:meta"; + +$id: meta.inspect((a,b:c)...) <===> error Error: expected ")". , -1 | $id: inspect((a,b:c)...) - | ^ +3 | $id: meta.inspect((a,b:c)...) + | ^ ' - input.scss 1:18 root stylesheet + input.scss 3:23 root stylesheet diff --git a/spec/values/numbers/modulo/zeros.hrx b/spec/values/numbers/modulo/zeros.hrx index 2a81b0915c..9ebf56ffe4 100644 --- a/spec/values/numbers/modulo/zeros.hrx +++ b/spec/values/numbers/modulo/zeros.hrx @@ -46,8 +46,10 @@ a { <===> ================================================================================ <===> zero_divider/input.scss +@use "sass:meta"; + a { - b: inspect(1 % 0); + b: meta.inspect(1 % 0); } <===> zero_divider/output.css diff --git a/spec/values/numbers/units/multiple/divide_by_multiple_denominators.hrx b/spec/values/numbers/units/multiple/divide_by_multiple_denominators.hrx index 207b314898..64e9092aea 100644 --- a/spec/values/numbers/units/multiple/divide_by_multiple_denominators.hrx +++ b/spec/values/numbers/units/multiple/divide_by_multiple_denominators.hrx @@ -1,6 +1,7 @@ <===> input.scss +@use "sass:meta"; a { - b: inspect(1 / (1 / 1px / 1rad)); + b: meta.inspect(1 / (1 / 1px / 1rad)); } <===> output.css @@ -16,10 +17,10 @@ Recommendation: math.div(1, 1px) or calc(1 / 1px) More info and automated migrator: https://sass-lang.com/d/slash-div , -2 | b: inspect(1 / (1 / 1px / 1rad)); - | ^^^^^^^ +3 | b: meta.inspect(1 / (1 / 1px / 1rad)); + | ^^^^^^^ ' - input.scss 2:19 root stylesheet + input.scss 3:24 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -28,10 +29,10 @@ Recommendation: math.div(math.div(1, 1px), 1rad) or calc(1 / 1px / 1rad) More info and automated migrator: https://sass-lang.com/d/slash-div , -2 | b: inspect(1 / (1 / 1px / 1rad)); - | ^^^^^^^^^^^^^^ +3 | b: meta.inspect(1 / (1 / 1px / 1rad)); + | ^^^^^^^^^^^^^^ ' - input.scss 2:19 root stylesheet + input.scss 3:24 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -40,7 +41,7 @@ Recommendation: math.div(1, 1 / 1px / 1rad) or calc(1 / (1 / 1px / 1rad)) More info and automated migrator: https://sass-lang.com/d/slash-div , -2 | b: inspect(1 / (1 / 1px / 1rad)); - | ^^^^^^^^^^^^^^^^^^^^ +3 | b: meta.inspect(1 / (1 / 1px / 1rad)); + | ^^^^^^^^^^^^^^^^^^^^ ' - input.scss 2:14 root stylesheet + input.scss 3:19 root stylesheet diff --git a/spec/values/numbers/units/multiple/divide_by_multiple_numerators.hrx b/spec/values/numbers/units/multiple/divide_by_multiple_numerators.hrx index ccbc7883ae..56889cffaf 100644 --- a/spec/values/numbers/units/multiple/divide_by_multiple_numerators.hrx +++ b/spec/values/numbers/units/multiple/divide_by_multiple_numerators.hrx @@ -1,6 +1,7 @@ <===> input.scss +@use "sass:meta"; a { - b: inspect(1 / (1px * 1rad)); + b: meta.inspect(1 / (1px * 1rad)); } <===> output.css @@ -16,7 +17,7 @@ Recommendation: math.div(1, 1px * 1rad) or calc(1 / (1px * 1rad)) More info and automated migrator: https://sass-lang.com/d/slash-div , -2 | b: inspect(1 / (1px * 1rad)); - | ^^^^^^^^^^^^^^^^ +3 | b: meta.inspect(1 / (1px * 1rad)); + | ^^^^^^^^^^^^^^^^ ' - input.scss 2:14 root stylesheet + input.scss 3:19 root stylesheet diff --git a/spec/values/numbers/units/multiple/division_cancels_both.hrx b/spec/values/numbers/units/multiple/division_cancels_both.hrx index 463b745011..56c4394dc8 100644 --- a/spec/values/numbers/units/multiple/division_cancels_both.hrx +++ b/spec/values/numbers/units/multiple/division_cancels_both.hrx @@ -1,7 +1,8 @@ <===> input.scss +@use "sass:meta"; $number: 1px * 1rad / 1ms / 1Hz; a { - b: inspect($number / (1px / 1ms)); + b: meta.inspect($number / (1px / 1ms)); } <===> output.css @@ -17,10 +18,10 @@ Recommendation: math.div(1px * 1rad, 1ms) or calc(1px * 1rad / 1ms) More info and automated migrator: https://sass-lang.com/d/slash-div , -1 | $number: 1px * 1rad / 1ms / 1Hz; +2 | $number: 1px * 1rad / 1ms / 1Hz; | ^^^^^^^^^^^^^^^^ ' - input.scss 1:10 root stylesheet + input.scss 2:10 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -29,10 +30,10 @@ Recommendation: math.div(math.div(1px * 1rad, 1ms), 1Hz) or calc(1px * 1rad / 1m More info and automated migrator: https://sass-lang.com/d/slash-div , -1 | $number: 1px * 1rad / 1ms / 1Hz; +2 | $number: 1px * 1rad / 1ms / 1Hz; | ^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:10 root stylesheet + input.scss 2:10 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -41,10 +42,10 @@ Recommendation: math.div(1px, 1ms) or calc(1px / 1ms) More info and automated migrator: https://sass-lang.com/d/slash-div , -3 | b: inspect($number / (1px / 1ms)); - | ^^^^^^^^^ +4 | b: meta.inspect($number / (1px / 1ms)); + | ^^^^^^^^^ ' - input.scss 3:25 root stylesheet + input.scss 4:30 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -53,7 +54,7 @@ Recommendation: math.div($number, 1px / 1ms) or calc($number / (1px / 1ms)) More info and automated migrator: https://sass-lang.com/d/slash-div , -3 | b: inspect($number / (1px / 1ms)); - | ^^^^^^^^^^^^^^^^^^^^^ +4 | b: meta.inspect($number / (1px / 1ms)); + | ^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 3:14 root stylesheet + input.scss 4:19 root stylesheet diff --git a/spec/values/numbers/units/multiple/division_cancels_compatible.hrx b/spec/values/numbers/units/multiple/division_cancels_compatible.hrx index 4b3b6bc5fd..bd125d55df 100644 --- a/spec/values/numbers/units/multiple/division_cancels_compatible.hrx +++ b/spec/values/numbers/units/multiple/division_cancels_compatible.hrx @@ -1,7 +1,8 @@ <===> input.scss +@use "sass:meta"; $number: 1px * 1rad / 1ms / 1Hz; a { - b: inspect($number / 1in); + b: meta.inspect($number / 1in); } <===> output.css @@ -17,10 +18,10 @@ Recommendation: math.div(1px * 1rad, 1ms) or calc(1px * 1rad / 1ms) More info and automated migrator: https://sass-lang.com/d/slash-div , -1 | $number: 1px * 1rad / 1ms / 1Hz; +2 | $number: 1px * 1rad / 1ms / 1Hz; | ^^^^^^^^^^^^^^^^ ' - input.scss 1:10 root stylesheet + input.scss 2:10 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -29,10 +30,10 @@ Recommendation: math.div(math.div(1px * 1rad, 1ms), 1Hz) or calc(1px * 1rad / 1m More info and automated migrator: https://sass-lang.com/d/slash-div , -1 | $number: 1px * 1rad / 1ms / 1Hz; +2 | $number: 1px * 1rad / 1ms / 1Hz; | ^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:10 root stylesheet + input.scss 2:10 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -41,7 +42,7 @@ Recommendation: math.div($number, 1in) or calc($number / 1in) More info and automated migrator: https://sass-lang.com/d/slash-div , -3 | b: inspect($number / 1in); - | ^^^^^^^^^^^^^ +4 | b: meta.inspect($number / 1in); + | ^^^^^^^^^^^^^ ' - input.scss 3:14 root stylesheet + input.scss 4:19 root stylesheet diff --git a/spec/values/numbers/units/multiple/division_cancels_denominator.hrx b/spec/values/numbers/units/multiple/division_cancels_denominator.hrx index ff5bb5d28f..131ca9e7f3 100644 --- a/spec/values/numbers/units/multiple/division_cancels_denominator.hrx +++ b/spec/values/numbers/units/multiple/division_cancels_denominator.hrx @@ -1,7 +1,8 @@ <===> input.scss +@use "sass:meta"; $number: 1px * 1rad / 1ms / 1Hz; a { - b: inspect($number / (1 / 1ms)); + b: meta.inspect($number / (1 / 1ms)); } <===> output.css @@ -17,10 +18,10 @@ Recommendation: math.div(1px * 1rad, 1ms) or calc(1px * 1rad / 1ms) More info and automated migrator: https://sass-lang.com/d/slash-div , -1 | $number: 1px * 1rad / 1ms / 1Hz; +2 | $number: 1px * 1rad / 1ms / 1Hz; | ^^^^^^^^^^^^^^^^ ' - input.scss 1:10 root stylesheet + input.scss 2:10 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -29,10 +30,10 @@ Recommendation: math.div(math.div(1px * 1rad, 1ms), 1Hz) or calc(1px * 1rad / 1m More info and automated migrator: https://sass-lang.com/d/slash-div , -1 | $number: 1px * 1rad / 1ms / 1Hz; +2 | $number: 1px * 1rad / 1ms / 1Hz; | ^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:10 root stylesheet + input.scss 2:10 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -41,10 +42,10 @@ Recommendation: math.div(1, 1ms) or calc(1 / 1ms) More info and automated migrator: https://sass-lang.com/d/slash-div , -3 | b: inspect($number / (1 / 1ms)); - | ^^^^^^^ +4 | b: meta.inspect($number / (1 / 1ms)); + | ^^^^^^^ ' - input.scss 3:25 root stylesheet + input.scss 4:30 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -53,7 +54,7 @@ Recommendation: math.div($number, 1 / 1ms) or calc($number / (1 / 1ms)) More info and automated migrator: https://sass-lang.com/d/slash-div , -3 | b: inspect($number / (1 / 1ms)); - | ^^^^^^^^^^^^^^^^^^^ +4 | b: meta.inspect($number / (1 / 1ms)); + | ^^^^^^^^^^^^^^^^^^^ ' - input.scss 3:14 root stylesheet + input.scss 4:19 root stylesheet diff --git a/spec/values/numbers/units/multiple/division_cancels_denominator_twice.hrx b/spec/values/numbers/units/multiple/division_cancels_denominator_twice.hrx index 9b201fc6af..9d530d07a7 100644 --- a/spec/values/numbers/units/multiple/division_cancels_denominator_twice.hrx +++ b/spec/values/numbers/units/multiple/division_cancels_denominator_twice.hrx @@ -1,7 +1,8 @@ <===> input.scss +@use "sass:meta"; $number: 1px * 1rad / 1ms / 1Hz; a { - b: inspect($number / (1 / 1ms / 1Hz)); + b: meta.inspect($number / (1 / 1ms / 1Hz)); } <===> output.css @@ -17,10 +18,10 @@ Recommendation: math.div(1px * 1rad, 1ms) or calc(1px * 1rad / 1ms) More info and automated migrator: https://sass-lang.com/d/slash-div , -1 | $number: 1px * 1rad / 1ms / 1Hz; +2 | $number: 1px * 1rad / 1ms / 1Hz; | ^^^^^^^^^^^^^^^^ ' - input.scss 1:10 root stylesheet + input.scss 2:10 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -29,10 +30,10 @@ Recommendation: math.div(math.div(1px * 1rad, 1ms), 1Hz) or calc(1px * 1rad / 1m More info and automated migrator: https://sass-lang.com/d/slash-div , -1 | $number: 1px * 1rad / 1ms / 1Hz; +2 | $number: 1px * 1rad / 1ms / 1Hz; | ^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:10 root stylesheet + input.scss 2:10 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -41,10 +42,10 @@ Recommendation: math.div(1, 1ms) or calc(1 / 1ms) More info and automated migrator: https://sass-lang.com/d/slash-div , -3 | b: inspect($number / (1 / 1ms / 1Hz)); - | ^^^^^^^ +4 | b: meta.inspect($number / (1 / 1ms / 1Hz)); + | ^^^^^^^ ' - input.scss 3:25 root stylesheet + input.scss 4:30 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -53,10 +54,10 @@ Recommendation: math.div(math.div(1, 1ms), 1Hz) or calc(1 / 1ms / 1Hz) More info and automated migrator: https://sass-lang.com/d/slash-div , -3 | b: inspect($number / (1 / 1ms / 1Hz)); - | ^^^^^^^^^^^^^ +4 | b: meta.inspect($number / (1 / 1ms / 1Hz)); + | ^^^^^^^^^^^^^ ' - input.scss 3:25 root stylesheet + input.scss 4:30 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -65,7 +66,7 @@ Recommendation: math.div($number, 1 / 1ms / 1Hz) or calc($number / (1 / 1ms / 1H More info and automated migrator: https://sass-lang.com/d/slash-div , -3 | b: inspect($number / (1 / 1ms / 1Hz)); - | ^^^^^^^^^^^^^^^^^^^^^^^^^ +4 | b: meta.inspect($number / (1 / 1ms / 1Hz)); + | ^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 3:14 root stylesheet + input.scss 4:19 root stylesheet diff --git a/spec/values/numbers/units/multiple/division_cancels_numerator.hrx b/spec/values/numbers/units/multiple/division_cancels_numerator.hrx index b35ffcf2d0..6188796ddb 100644 --- a/spec/values/numbers/units/multiple/division_cancels_numerator.hrx +++ b/spec/values/numbers/units/multiple/division_cancels_numerator.hrx @@ -1,7 +1,8 @@ <===> input.scss +@use "sass:meta"; $number: 1px * 1rad / 1ms / 1Hz; a { - b: inspect($number / 1px); + b: meta.inspect($number / 1px); } <===> output.css @@ -17,10 +18,10 @@ Recommendation: math.div(1px * 1rad, 1ms) or calc(1px * 1rad / 1ms) More info and automated migrator: https://sass-lang.com/d/slash-div , -1 | $number: 1px * 1rad / 1ms / 1Hz; +2 | $number: 1px * 1rad / 1ms / 1Hz; | ^^^^^^^^^^^^^^^^ ' - input.scss 1:10 root stylesheet + input.scss 2:10 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -29,10 +30,10 @@ Recommendation: math.div(math.div(1px * 1rad, 1ms), 1Hz) or calc(1px * 1rad / 1m More info and automated migrator: https://sass-lang.com/d/slash-div , -1 | $number: 1px * 1rad / 1ms / 1Hz; +2 | $number: 1px * 1rad / 1ms / 1Hz; | ^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:10 root stylesheet + input.scss 2:10 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -41,7 +42,7 @@ Recommendation: math.div($number, 1px) or calc($number / 1px) More info and automated migrator: https://sass-lang.com/d/slash-div , -3 | b: inspect($number / 1px); - | ^^^^^^^^^^^^^ +4 | b: meta.inspect($number / 1px); + | ^^^^^^^^^^^^^ ' - input.scss 3:14 root stylesheet + input.scss 4:19 root stylesheet diff --git a/spec/values/numbers/units/multiple/division_cancels_numerator_twice.hrx b/spec/values/numbers/units/multiple/division_cancels_numerator_twice.hrx index ec7d700e94..5629bc2204 100644 --- a/spec/values/numbers/units/multiple/division_cancels_numerator_twice.hrx +++ b/spec/values/numbers/units/multiple/division_cancels_numerator_twice.hrx @@ -1,7 +1,8 @@ <===> input.scss +@use "sass:meta"; $number: 1px * 1rad / 1ms / 1Hz; a { - b: inspect($number / (1px * 1rad)); + b: meta.inspect($number / (1px * 1rad)); } <===> output.css @@ -17,10 +18,10 @@ Recommendation: math.div(1px * 1rad, 1ms) or calc(1px * 1rad / 1ms) More info and automated migrator: https://sass-lang.com/d/slash-div , -1 | $number: 1px * 1rad / 1ms / 1Hz; +2 | $number: 1px * 1rad / 1ms / 1Hz; | ^^^^^^^^^^^^^^^^ ' - input.scss 1:10 root stylesheet + input.scss 2:10 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -29,10 +30,10 @@ Recommendation: math.div(math.div(1px * 1rad, 1ms), 1Hz) or calc(1px * 1rad / 1m More info and automated migrator: https://sass-lang.com/d/slash-div , -1 | $number: 1px * 1rad / 1ms / 1Hz; +2 | $number: 1px * 1rad / 1ms / 1Hz; | ^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:10 root stylesheet + input.scss 2:10 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -41,7 +42,7 @@ Recommendation: math.div($number, 1px * 1rad) or calc($number / (1px * 1rad)) More info and automated migrator: https://sass-lang.com/d/slash-div , -3 | b: inspect($number / (1px * 1rad)); - | ^^^^^^^^^^^^^^^^^^^^^^ +4 | b: meta.inspect($number / (1px * 1rad)); + | ^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 3:14 root stylesheet + input.scss 4:19 root stylesheet diff --git a/spec/values/numbers/units/multiple/division_cancels_unknown.hrx b/spec/values/numbers/units/multiple/division_cancels_unknown.hrx index 910a8baf14..c61ac53787 100644 --- a/spec/values/numbers/units/multiple/division_cancels_unknown.hrx +++ b/spec/values/numbers/units/multiple/division_cancels_unknown.hrx @@ -1,8 +1,9 @@ <===> input.scss +@use "sass:meta"; // Units cancel even if they're totally unknown to Sass. $number: 1foo * 1bar / 1baz / 1qux; a { - b: inspect($number / 1foo); + b: meta.inspect($number / 1foo); } <===> output.css @@ -18,10 +19,10 @@ Recommendation: math.div(1foo * 1bar, 1baz) or calc(1foo * 1bar / 1baz) More info and automated migrator: https://sass-lang.com/d/slash-div , -2 | $number: 1foo * 1bar / 1baz / 1qux; +3 | $number: 1foo * 1bar / 1baz / 1qux; | ^^^^^^^^^^^^^^^^^^ ' - input.scss 2:10 root stylesheet + input.scss 3:10 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -30,10 +31,10 @@ Recommendation: math.div(math.div(1foo * 1bar, 1baz), 1qux) or calc(1foo * 1bar More info and automated migrator: https://sass-lang.com/d/slash-div , -2 | $number: 1foo * 1bar / 1baz / 1qux; +3 | $number: 1foo * 1bar / 1baz / 1qux; | ^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 2:10 root stylesheet + input.scss 3:10 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -42,7 +43,7 @@ Recommendation: math.div($number, 1foo) or calc($number / 1foo) More info and automated migrator: https://sass-lang.com/d/slash-div , -4 | b: inspect($number / 1foo); - | ^^^^^^^^^^^^^^ +5 | b: meta.inspect($number / 1foo); + | ^^^^^^^^^^^^^^ ' - input.scss 4:14 root stylesheet + input.scss 5:19 root stylesheet diff --git a/spec/values/numbers/units/multiple/multiple_denominators.hrx b/spec/values/numbers/units/multiple/multiple_denominators.hrx index d0e476be60..e60276ed28 100644 --- a/spec/values/numbers/units/multiple/multiple_denominators.hrx +++ b/spec/values/numbers/units/multiple/multiple_denominators.hrx @@ -1,6 +1,7 @@ <===> input.scss +@use "sass:meta"; a { - b: inspect((1 / 1px / 1rad)); + b: meta.inspect((1 / 1px / 1rad)); } <===> output.css @@ -16,10 +17,10 @@ Recommendation: math.div(1, 1px) or calc(1 / 1px) More info and automated migrator: https://sass-lang.com/d/slash-div , -2 | b: inspect((1 / 1px / 1rad)); - | ^^^^^^^ +3 | b: meta.inspect((1 / 1px / 1rad)); + | ^^^^^^^ ' - input.scss 2:15 root stylesheet + input.scss 3:20 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -28,7 +29,7 @@ Recommendation: math.div(math.div(1, 1px), 1rad) or calc(1 / 1px / 1rad) More info and automated migrator: https://sass-lang.com/d/slash-div , -2 | b: inspect((1 / 1px / 1rad)); - | ^^^^^^^^^^^^^^ +3 | b: meta.inspect((1 / 1px / 1rad)); + | ^^^^^^^^^^^^^^ ' - input.scss 2:15 root stylesheet + input.scss 3:20 root stylesheet diff --git a/spec/values/numbers/units/multiple/multiple_numerators.hrx b/spec/values/numbers/units/multiple/multiple_numerators.hrx index 125233ce55..94dd1f004e 100644 --- a/spec/values/numbers/units/multiple/multiple_numerators.hrx +++ b/spec/values/numbers/units/multiple/multiple_numerators.hrx @@ -1,6 +1,7 @@ <===> input.scss +@use "sass:meta"; a { - b: inspect(1px * 1rad); + b: meta.inspect(1px * 1rad); } <===> output.css diff --git a/spec/values/numbers/units/multiple/multiplication_cancels_both.hrx b/spec/values/numbers/units/multiple/multiplication_cancels_both.hrx index 30ee9a9dd6..9b670cd498 100644 --- a/spec/values/numbers/units/multiple/multiplication_cancels_both.hrx +++ b/spec/values/numbers/units/multiple/multiplication_cancels_both.hrx @@ -1,7 +1,8 @@ <===> input.scss +@use "sass:meta"; $number: 1px * 1rad / 1ms / 1Hz; a { - b: inspect($number * (1ms / 1px)); + b: meta.inspect($number * (1ms / 1px)); } <===> output.css @@ -17,10 +18,10 @@ Recommendation: math.div(1px * 1rad, 1ms) or calc(1px * 1rad / 1ms) More info and automated migrator: https://sass-lang.com/d/slash-div , -1 | $number: 1px * 1rad / 1ms / 1Hz; +2 | $number: 1px * 1rad / 1ms / 1Hz; | ^^^^^^^^^^^^^^^^ ' - input.scss 1:10 root stylesheet + input.scss 2:10 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -29,10 +30,10 @@ Recommendation: math.div(math.div(1px * 1rad, 1ms), 1Hz) or calc(1px * 1rad / 1m More info and automated migrator: https://sass-lang.com/d/slash-div , -1 | $number: 1px * 1rad / 1ms / 1Hz; +2 | $number: 1px * 1rad / 1ms / 1Hz; | ^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:10 root stylesheet + input.scss 2:10 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -41,7 +42,7 @@ Recommendation: math.div(1ms, 1px) or calc(1ms / 1px) More info and automated migrator: https://sass-lang.com/d/slash-div , -3 | b: inspect($number * (1ms / 1px)); - | ^^^^^^^^^ +4 | b: meta.inspect($number * (1ms / 1px)); + | ^^^^^^^^^ ' - input.scss 3:25 root stylesheet + input.scss 4:30 root stylesheet diff --git a/spec/values/numbers/units/multiple/multiplication_cancels_compatible.hrx b/spec/values/numbers/units/multiple/multiplication_cancels_compatible.hrx index 38266e904a..e0bb186abb 100644 --- a/spec/values/numbers/units/multiple/multiplication_cancels_compatible.hrx +++ b/spec/values/numbers/units/multiple/multiplication_cancels_compatible.hrx @@ -1,7 +1,8 @@ <===> input.scss +@use "sass:meta"; $number: 1px * 1rad / 1ms / 1Hz; a { - b: inspect($number * 1s); + b: meta.inspect($number * 1s); } <===> output.css @@ -17,10 +18,10 @@ Recommendation: math.div(1px * 1rad, 1ms) or calc(1px * 1rad / 1ms) More info and automated migrator: https://sass-lang.com/d/slash-div , -1 | $number: 1px * 1rad / 1ms / 1Hz; +2 | $number: 1px * 1rad / 1ms / 1Hz; | ^^^^^^^^^^^^^^^^ ' - input.scss 1:10 root stylesheet + input.scss 2:10 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -29,7 +30,7 @@ Recommendation: math.div(math.div(1px * 1rad, 1ms), 1Hz) or calc(1px * 1rad / 1m More info and automated migrator: https://sass-lang.com/d/slash-div , -1 | $number: 1px * 1rad / 1ms / 1Hz; +2 | $number: 1px * 1rad / 1ms / 1Hz; | ^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:10 root stylesheet + input.scss 2:10 root stylesheet diff --git a/spec/values/numbers/units/multiple/multiplication_cancels_denominator.hrx b/spec/values/numbers/units/multiple/multiplication_cancels_denominator.hrx index e075e321f8..16a8791a8d 100644 --- a/spec/values/numbers/units/multiple/multiplication_cancels_denominator.hrx +++ b/spec/values/numbers/units/multiple/multiplication_cancels_denominator.hrx @@ -1,7 +1,8 @@ <===> input.scss +@use "sass:meta"; $number: 1px * 1rad / 1ms / 1Hz; a { - b: inspect($number * 1ms); + b: meta.inspect($number * 1ms); } <===> output.css @@ -17,10 +18,10 @@ Recommendation: math.div(1px * 1rad, 1ms) or calc(1px * 1rad / 1ms) More info and automated migrator: https://sass-lang.com/d/slash-div , -1 | $number: 1px * 1rad / 1ms / 1Hz; +2 | $number: 1px * 1rad / 1ms / 1Hz; | ^^^^^^^^^^^^^^^^ ' - input.scss 1:10 root stylesheet + input.scss 2:10 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -29,7 +30,7 @@ Recommendation: math.div(math.div(1px * 1rad, 1ms), 1Hz) or calc(1px * 1rad / 1m More info and automated migrator: https://sass-lang.com/d/slash-div , -1 | $number: 1px * 1rad / 1ms / 1Hz; +2 | $number: 1px * 1rad / 1ms / 1Hz; | ^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:10 root stylesheet + input.scss 2:10 root stylesheet diff --git a/spec/values/numbers/units/multiple/multiplication_cancels_denominator_twice.hrx b/spec/values/numbers/units/multiple/multiplication_cancels_denominator_twice.hrx index 1c471b9bbf..af9cfcc4e2 100644 --- a/spec/values/numbers/units/multiple/multiplication_cancels_denominator_twice.hrx +++ b/spec/values/numbers/units/multiple/multiplication_cancels_denominator_twice.hrx @@ -1,7 +1,8 @@ <===> input.scss +@use "sass:meta"; $number: 1px * 1rad / 1ms / 1Hz; a { - b: inspect($number * (1ms * 1Hz)); + b: meta.inspect($number * (1ms * 1Hz)); } <===> output.css @@ -17,10 +18,10 @@ Recommendation: math.div(1px * 1rad, 1ms) or calc(1px * 1rad / 1ms) More info and automated migrator: https://sass-lang.com/d/slash-div , -1 | $number: 1px * 1rad / 1ms / 1Hz; +2 | $number: 1px * 1rad / 1ms / 1Hz; | ^^^^^^^^^^^^^^^^ ' - input.scss 1:10 root stylesheet + input.scss 2:10 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -29,7 +30,7 @@ Recommendation: math.div(math.div(1px * 1rad, 1ms), 1Hz) or calc(1px * 1rad / 1m More info and automated migrator: https://sass-lang.com/d/slash-div , -1 | $number: 1px * 1rad / 1ms / 1Hz; +2 | $number: 1px * 1rad / 1ms / 1Hz; | ^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:10 root stylesheet + input.scss 2:10 root stylesheet diff --git a/spec/values/numbers/units/multiple/multiplication_cancels_numerator.hrx b/spec/values/numbers/units/multiple/multiplication_cancels_numerator.hrx index ccf7dea844..620adf4ab9 100644 --- a/spec/values/numbers/units/multiple/multiplication_cancels_numerator.hrx +++ b/spec/values/numbers/units/multiple/multiplication_cancels_numerator.hrx @@ -1,7 +1,8 @@ <===> input.scss +@use "sass:meta"; $number: 1px * 1rad / 1ms / 1Hz; a { - b: inspect($number * (1 / 1px)); + b: meta.inspect($number * (1 / 1px)); } <===> output.css @@ -17,10 +18,10 @@ Recommendation: math.div(1px * 1rad, 1ms) or calc(1px * 1rad / 1ms) More info and automated migrator: https://sass-lang.com/d/slash-div , -1 | $number: 1px * 1rad / 1ms / 1Hz; +2 | $number: 1px * 1rad / 1ms / 1Hz; | ^^^^^^^^^^^^^^^^ ' - input.scss 1:10 root stylesheet + input.scss 2:10 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -29,10 +30,10 @@ Recommendation: math.div(math.div(1px * 1rad, 1ms), 1Hz) or calc(1px * 1rad / 1m More info and automated migrator: https://sass-lang.com/d/slash-div , -1 | $number: 1px * 1rad / 1ms / 1Hz; +2 | $number: 1px * 1rad / 1ms / 1Hz; | ^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:10 root stylesheet + input.scss 2:10 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -41,7 +42,7 @@ Recommendation: math.div(1, 1px) or calc(1 / 1px) More info and automated migrator: https://sass-lang.com/d/slash-div , -3 | b: inspect($number * (1 / 1px)); - | ^^^^^^^ +4 | b: meta.inspect($number * (1 / 1px)); + | ^^^^^^^ ' - input.scss 3:25 root stylesheet + input.scss 4:30 root stylesheet diff --git a/spec/values/numbers/units/multiple/multiplication_cancels_numerator_twice.hrx b/spec/values/numbers/units/multiple/multiplication_cancels_numerator_twice.hrx index 78fc1da7fa..92d4396a31 100644 --- a/spec/values/numbers/units/multiple/multiplication_cancels_numerator_twice.hrx +++ b/spec/values/numbers/units/multiple/multiplication_cancels_numerator_twice.hrx @@ -1,7 +1,8 @@ <===> input.scss +@use "sass:meta"; $number: 1px * 1rad / 1ms / 1Hz; a { - b: inspect($number * (1 / 1px / 1rad)); + b: meta.inspect($number * (1 / 1px / 1rad)); } <===> output.css @@ -17,10 +18,10 @@ Recommendation: math.div(1px * 1rad, 1ms) or calc(1px * 1rad / 1ms) More info and automated migrator: https://sass-lang.com/d/slash-div , -1 | $number: 1px * 1rad / 1ms / 1Hz; +2 | $number: 1px * 1rad / 1ms / 1Hz; | ^^^^^^^^^^^^^^^^ ' - input.scss 1:10 root stylesheet + input.scss 2:10 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -29,10 +30,10 @@ Recommendation: math.div(math.div(1px * 1rad, 1ms), 1Hz) or calc(1px * 1rad / 1m More info and automated migrator: https://sass-lang.com/d/slash-div , -1 | $number: 1px * 1rad / 1ms / 1Hz; +2 | $number: 1px * 1rad / 1ms / 1Hz; | ^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:10 root stylesheet + input.scss 2:10 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -41,10 +42,10 @@ Recommendation: math.div(1, 1px) or calc(1 / 1px) More info and automated migrator: https://sass-lang.com/d/slash-div , -3 | b: inspect($number * (1 / 1px / 1rad)); - | ^^^^^^^ +4 | b: meta.inspect($number * (1 / 1px / 1rad)); + | ^^^^^^^ ' - input.scss 3:25 root stylesheet + input.scss 4:30 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -53,7 +54,7 @@ Recommendation: math.div(math.div(1, 1px), 1rad) or calc(1 / 1px / 1rad) More info and automated migrator: https://sass-lang.com/d/slash-div , -3 | b: inspect($number * (1 / 1px / 1rad)); - | ^^^^^^^^^^^^^^ +4 | b: meta.inspect($number * (1 / 1px / 1rad)); + | ^^^^^^^^^^^^^^ ' - input.scss 3:25 root stylesheet + input.scss 4:30 root stylesheet diff --git a/spec/values/numbers/units/multiple/multiplication_cancels_unknown.hrx b/spec/values/numbers/units/multiple/multiplication_cancels_unknown.hrx index ab2af839f8..9a15e8a77b 100644 --- a/spec/values/numbers/units/multiple/multiplication_cancels_unknown.hrx +++ b/spec/values/numbers/units/multiple/multiplication_cancels_unknown.hrx @@ -1,8 +1,9 @@ <===> input.scss +@use "sass:meta"; // Units cancel even if they're totally unknown to Sass. $number: 1foo * 1bar / 1baz / 1qux; a { - b: inspect($number * 1baz); + b: meta.inspect($number * 1baz); } <===> output.css @@ -18,10 +19,10 @@ Recommendation: math.div(1foo * 1bar, 1baz) or calc(1foo * 1bar / 1baz) More info and automated migrator: https://sass-lang.com/d/slash-div , -2 | $number: 1foo * 1bar / 1baz / 1qux; +3 | $number: 1foo * 1bar / 1baz / 1qux; | ^^^^^^^^^^^^^^^^^^ ' - input.scss 2:10 root stylesheet + input.scss 3:10 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -30,7 +31,7 @@ Recommendation: math.div(math.div(1foo * 1bar, 1baz), 1qux) or calc(1foo * 1bar More info and automated migrator: https://sass-lang.com/d/slash-div , -2 | $number: 1foo * 1bar / 1baz / 1qux; +3 | $number: 1foo * 1bar / 1baz / 1qux; | ^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 2:10 root stylesheet + input.scss 3:10 root stylesheet From 4ddc00efbcf53004a37f0de7263b56ff3ec6e3d6 Mon Sep 17 00:00:00 2001 From: Jennifer Thakar Date: Fri, 12 Jul 2024 13:07:54 -0700 Subject: [PATCH 02/10] Migrate some additional global functions --- spec/core_functions/color/alpha.hrx | 6 +- spec/core_functions/global/color.hrx | 10 ++ spec/core_functions/global/list.hrx | 10 ++ spec/core_functions/list/is_bracketed.hrx | 42 +++--- spec/core_functions/math/random.hrx | 7 +- .../extend/complex/combinator_only.hrx | 14 +- .../extend/complex/with_unification.hrx | 124 ++++++++++-------- .../extend/complex/without_unification.hrx | 124 ++++++++++-------- spec/core_functions/selector/extend/error.hrx | 91 +++++++------ .../core_functions/selector/extend/format.hrx | 21 ++- spec/core_functions/selector/extend/list.hrx | 9 +- spec/core_functions/selector/extend/named.hrx | 3 +- spec/core_functions/selector/extend/no_op.hrx | 78 +++++++---- .../selector/extend/simple/attribute.hrx | 12 +- .../selector/extend/simple/class.hrx | 6 +- .../selector/extend/simple/id.hrx | 6 +- .../selector/extend/simple/placeholder.hrx | 6 +- .../selector/extend/simple/pseudo/arg.hrx | 24 ++-- .../selector/extend/simple/pseudo/no_arg.hrx | 18 ++- .../simple/pseudo/selector/idempotent/any.hrx | 9 +- .../pseudo/selector/idempotent/current.hrx | 9 +- .../simple/pseudo/selector/idempotent/is.hrx | 9 +- .../pseudo/selector/idempotent/matches.hrx | 9 +- .../simple/pseudo/selector/idempotent/not.hrx | 45 ++++--- .../pseudo/selector/idempotent/nth_child.hrx | 12 +- .../selector/idempotent/nth_last_child.hrx | 12 +- .../pseudo/selector/idempotent/prefixed.hrx | 12 +- .../pseudo/selector/idempotent/where.hrx | 9 +- .../extend/simple/pseudo/selector/match.hrx | 63 ++++++--- .../simple/pseudo/selector/non_idempotent.hrx | 36 +++-- .../selector/extend/simple/type.hrx | 48 ++++--- .../selector/extend/simple/universal.hrx | 87 ++++++++---- 32 files changed, 621 insertions(+), 350 deletions(-) diff --git a/spec/core_functions/color/alpha.hrx b/spec/core_functions/color/alpha.hrx index 0425c8d073..f27dc60fd1 100644 --- a/spec/core_functions/color/alpha.hrx +++ b/spec/core_functions/color/alpha.hrx @@ -86,7 +86,8 @@ Recommendation: alpha(c = d) <===> ================================================================================ <===> opacity/positional/input.scss -a {b: opacity(rgba(red, 0.2))} +@use "sass:color"; +a {b: color.opacity(rgba(red, 0.2))} <===> opacity/positional/output.css a { @@ -96,7 +97,8 @@ a { <===> ================================================================================ <===> opacity/named/input.scss -a {b: opacity($color: rgba(red, 0.2))} +@use "sass:color"; +a {b: color.opacity($color: rgba(red, 0.2))} <===> opacity/named/output.css a { diff --git a/spec/core_functions/global/color.hrx b/spec/core_functions/global/color.hrx index 99424ea459..435f04fe23 100644 --- a/spec/core_functions/global/color.hrx +++ b/spec/core_functions/global/color.hrx @@ -167,6 +167,16 @@ a { b: 1; } +<===> +================================================================================ +<===> opacity/input.scss +a {b: opacity(#abcdef)} + +<===> opacity/output.css +a { + b: 1; +} + <===> ================================================================================ <===> scale/input.scss diff --git a/spec/core_functions/global/list.hrx b/spec/core_functions/global/list.hrx index 74e6f365ac..b654655ebd 100644 --- a/spec/core_functions/global/list.hrx +++ b/spec/core_functions/global/list.hrx @@ -16,6 +16,16 @@ a { b: 2; } +<===> +================================================================================ +<===> is_bracketed/input.scss +a {b: is-bracketed(a b c)} + +<===> is-bracketed/output.css +a { + b: false; +} + <===> ================================================================================ <===> join/input.scss diff --git a/spec/core_functions/list/is_bracketed.hrx b/spec/core_functions/list/is_bracketed.hrx index 59954e31be..f7c556623e 100644 --- a/spec/core_functions/list/is_bracketed.hrx +++ b/spec/core_functions/list/is_bracketed.hrx @@ -1,5 +1,6 @@ <===> unbracketed/empty/input.scss -a {b: is-bracketed(())} +@use "sass:list"; +a {b: list.is-bracketed(())} <===> unbracketed/empty/output.css a { @@ -9,7 +10,8 @@ a { <===> ================================================================================ <===> unbracketed/single/input.scss -a {b: is-bracketed((1,))} +@use "sass:list"; +a {b: list.is-bracketed((1,))} <===> unbracketed/single/output.css a { @@ -19,7 +21,8 @@ a { <===> ================================================================================ <===> unbracketed/multi/input.scss -a {b: is-bracketed(1 2 3)} +@use "sass:list"; +a {b: list.is-bracketed(1 2 3)} <===> unbracketed/multi/output.css a { @@ -29,7 +32,8 @@ a { <===> ================================================================================ <===> unbracketed/non_list/input.scss -a {b: is-bracketed(1)} +@use "sass:list"; +a {b: list.is-bracketed(1)} <===> unbracketed/non_list/output.css a { @@ -39,7 +43,8 @@ a { <===> ================================================================================ <===> unbracketed/map/input.scss -a {b: is-bracketed((c: d, e: f, g: h))} +@use "sass:list"; +a {b: list.is-bracketed((c: d, e: f, g: h))} <===> unbracketed/map/output.css a { @@ -49,7 +54,8 @@ a { <===> ================================================================================ <===> bracketed/empty/input.scss -a {b: is-bracketed([])} +@use "sass:list"; +a {b: list.is-bracketed([])} <===> bracketed/empty/output.css a { @@ -59,7 +65,8 @@ a { <===> ================================================================================ <===> bracketed/single/input.scss -a {b: is-bracketed([1])} +@use "sass:list"; +a {b: list.is-bracketed([1])} <===> bracketed/single/output.css a { @@ -69,7 +76,8 @@ a { <===> ================================================================================ <===> bracketed/multi/input.scss -a {b: is-bracketed([1, 2, 3])} +@use "sass:list"; +a {b: list.is-bracketed([1, 2, 3])} <===> bracketed/multi/output.css a { @@ -79,33 +87,35 @@ a { <===> ================================================================================ <===> error/too_few_args/input.scss -a {b: is-bracketed()} +@use "sass:list"; +a {b: list.is-bracketed()} <===> error/too_few_args/error Error: Missing argument $list. ,--> input.scss -1 | a {b: is-bracketed()} - | ^^^^^^^^^^^^^^ invocation +2 | a {b: list.is-bracketed()} + | ^^^^^^^^^^^^^^^^^^^ invocation ' ,--> sass:list 1 | @function is-bracketed($list) { | =================== declaration ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> error/too_many_args/input.scss -a {b: is-bracketed(a b, c d)} +@use "sass:list"; +a {b: list.is-bracketed(a b, c d)} <===> error/too_many_args/error Error: Only 1 argument allowed, but 2 were passed. ,--> input.scss -1 | a {b: is-bracketed(a b, c d)} - | ^^^^^^^^^^^^^^^^^^^^^^ invocation +2 | a {b: list.is-bracketed(a b, c d)} + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ invocation ' ,--> sass:list 1 | @function is-bracketed($list) { | =================== declaration ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet diff --git a/spec/core_functions/math/random.hrx b/spec/core_functions/math/random.hrx index a805ba2523..e18ad0dcee 100644 --- a/spec/core_functions/math/random.hrx +++ b/spec/core_functions/math/random.hrx @@ -1,10 +1,13 @@ <===> _util.scss +@use "sass:math"; +@use "sass:meta"; + // Calls `random()` one thousand times, and throws an error if `$check` returns // `false` for any of the values. @mixin check-values($arg, $check) { @for $i from 1 through 1000 { - $value: random($arg); - @if not call($check, $value) { + $value: math.random($arg); + @if not meta.call($check, $value) { @error "#{$value} did not match expectation"; } } diff --git a/spec/core_functions/selector/extend/complex/combinator_only.hrx b/spec/core_functions/selector/extend/complex/combinator_only.hrx index 2313d6ff43..6195bb17f0 100644 --- a/spec/core_functions/selector/extend/complex/combinator_only.hrx +++ b/spec/core_functions/selector/extend/complex/combinator_only.hrx @@ -1,5 +1,6 @@ <===> selector/input.scss -a {b: selector-extend("+", ".c", ".d")} +@use "sass:selector"; +a {b: selector.extend("+", ".c", ".d")} <===> selector/output.css a { @@ -13,15 +14,16 @@ This will be an error in Dart Sass 2.0.0. More info: https://sass-lang.com/d/bogus-combinators , -1 | a {b: selector-extend("+", ".c", ".d")} +2 | a {b: selector.extend("+", ".c", ".d")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> extender/input.scss -a {b: selector-extend(".c", ".c", ">")} +@use "sass:selector"; +a {b: selector.extend(".c", ".c", ">")} <===> extender/output.css a { @@ -35,7 +37,7 @@ This will be an error in Dart Sass 2.0.0. More info: https://sass-lang.com/d/bogus-combinators , -1 | a {b: selector-extend(".c", ".c", ">")} +2 | a {b: selector.extend(".c", ".c", ">")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet diff --git a/spec/core_functions/selector/extend/complex/with_unification.hrx b/spec/core_functions/selector/extend/complex/with_unification.hrx index 578a69c317..78d1cbc286 100644 --- a/spec/core_functions/selector/extend/complex/with_unification.hrx +++ b/spec/core_functions/selector/extend/complex/with_unification.hrx @@ -1,5 +1,6 @@ <===> parent/without_grandparent/simple/input.scss -a {b: selector-extend(".c.x .d", ".c", ".e")} +@use "sass:selector"; +a {b: selector.extend(".c.x .d", ".c", ".e")} <===> parent/without_grandparent/simple/output.css a { @@ -9,7 +10,8 @@ a { <===> ================================================================================ <===> parent/without_grandparent/complex/input.scss -a {b: selector-extend(".c.x .d", ".c", ".e .f")} +@use "sass:selector"; +a {b: selector.extend(".c.x .d", ".c", ".e .f")} <===> parent/without_grandparent/complex/output.css a { @@ -19,7 +21,8 @@ a { <===> ================================================================================ <===> parent/without_grandparent/list/input.scss -a {b: selector-extend(".c.x .d", ".c", ".e, .f")} +@use "sass:selector"; +a {b: selector.extend(".c.x .d", ".c", ".e, .f")} <===> parent/without_grandparent/list/output.css a { @@ -29,7 +32,8 @@ a { <===> ================================================================================ <===> parent/with_grandparent/simple/input.scss -a {b: selector-extend(".c .d.x .e", ".d", ".f")} +@use "sass:selector"; +a {b: selector.extend(".c .d.x .e", ".d", ".f")} <===> parent/with_grandparent/simple/output.css a { @@ -39,7 +43,8 @@ a { <===> ================================================================================ <===> parent/with_grandparent/complex/input.scss -a {b: selector-extend(".c .d.x .e", ".d", ".f .g")} +@use "sass:selector"; +a {b: selector.extend(".c .d.x .e", ".d", ".f .g")} <===> parent/with_grandparent/complex/output.css a { @@ -49,7 +54,8 @@ a { <===> ================================================================================ <===> parent/with_grandparent/list/input.scss -a {b: selector-extend(".c .d.x .e", ".d", ".f, .g")} +@use "sass:selector"; +a {b: selector.extend(".c .d.x .e", ".d", ".f, .g")} <===> parent/with_grandparent/list/output.css a { @@ -59,7 +65,8 @@ a { <===> ================================================================================ <===> leading_combinator/selector/input.scss -a {b: selector-extend("> .c.x", ".c", ".d")} +@use "sass:selector"; +a {b: selector.extend("> .c.x", ".c", ".d")} <===> leading_combinator/selector/output.css a { @@ -73,15 +80,16 @@ This will be an error in Dart Sass 2.0.0. More info: https://sass-lang.com/d/bogus-combinators , -1 | a {b: selector-extend("> .c.x", ".c", ".d")} +2 | a {b: selector.extend("> .c.x", ".c", ".d")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> leading_combinator/extender/input.scss -a {b: selector-extend(".c.x", ".c", "+ .d")} +@use "sass:selector"; +a {b: selector.extend(".c.x", ".c", "+ .d")} <===> leading_combinator/extender/output.css a { @@ -95,15 +103,16 @@ This will be an error in Dart Sass 2.0.0. More info: https://sass-lang.com/d/bogus-combinators , -1 | a {b: selector-extend(".c.x", ".c", "+ .d")} +2 | a {b: selector.extend(".c.x", ".c", "+ .d")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> leading_combinator/both/input.scss -a {b: selector-extend("~ .c.x", ".c", "+ .d")} +@use "sass:selector"; +a {b: selector.extend("~ .c.x", ".c", "+ .d")} <===> leading_combinator/both/output.css a { @@ -117,10 +126,10 @@ This will be an error in Dart Sass 2.0.0. More info: https://sass-lang.com/d/bogus-combinators , -1 | a {b: selector-extend("~ .c.x", ".c", "+ .d")} +2 | a {b: selector.extend("~ .c.x", ".c", "+ .d")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet DEPRECATION WARNING: $extender: + .d is not valid CSS. This will be an error in Dart Sass 2.0.0. @@ -128,15 +137,16 @@ This will be an error in Dart Sass 2.0.0. More info: https://sass-lang.com/d/bogus-combinators , -1 | a {b: selector-extend("~ .c.x", ".c", "+ .d")} +2 | a {b: selector.extend("~ .c.x", ".c", "+ .d")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> trailing_combinator/selector/input.scss -a {b: selector-extend(".c.x +", ".c", ".d")} +@use "sass:selector"; +a {b: selector.extend(".c.x +", ".c", ".d")} <===> trailing_combinator/selector/output.css a { @@ -150,15 +160,16 @@ This will be an error in Dart Sass 2.0.0. More info: https://sass-lang.com/d/bogus-combinators , -1 | a {b: selector-extend(".c.x +", ".c", ".d")} +2 | a {b: selector.extend(".c.x +", ".c", ".d")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> trailing_combinator/extender/child/input.scss -a {b: selector-extend(".c.x .d", ".c", ".e >")} +@use "sass:selector"; +a {b: selector.extend(".c.x .d", ".c", ".e >")} <===> trailing_combinator/extender/child/output.css a { @@ -172,15 +183,16 @@ This will be an error in Dart Sass 2.0.0. More info: https://sass-lang.com/d/bogus-combinators , -1 | a {b: selector-extend(".c.x .d", ".c", ".e >")} +2 | a {b: selector.extend(".c.x .d", ".c", ".e >")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> trailing_combinator/extender/sibling/input.scss -a {b: selector-extend(".c.x .d", ".c", ".e ~")} +@use "sass:selector"; +a {b: selector.extend(".c.x .d", ".c", ".e ~")} <===> trailing_combinator/extender/sibling/output.css a { @@ -194,15 +206,16 @@ This will be an error in Dart Sass 2.0.0. More info: https://sass-lang.com/d/bogus-combinators , -1 | a {b: selector-extend(".c.x .d", ".c", ".e ~")} +2 | a {b: selector.extend(".c.x .d", ".c", ".e ~")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> trailing_combinator/extender/next_sibling/input.scss -a {b: selector-extend(".c.x .d", ".c", ".e +")} +@use "sass:selector"; +a {b: selector.extend(".c.x .d", ".c", ".e +")} <===> trailing_combinator/extender/next_sibling/output.css a { @@ -216,15 +229,16 @@ This will be an error in Dart Sass 2.0.0. More info: https://sass-lang.com/d/bogus-combinators , -1 | a {b: selector-extend(".c.x .d", ".c", ".e +")} +2 | a {b: selector.extend(".c.x .d", ".c", ".e +")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> trailing_combinator/both/input.scss -a {b: selector-extend(".c.x ~", ".c", ".d >")} +@use "sass:selector"; +a {b: selector.extend(".c.x ~", ".c", ".d >")} <===> trailing_combinator/both/output.css a { @@ -238,10 +252,10 @@ This will be an error in Dart Sass 2.0.0. More info: https://sass-lang.com/d/bogus-combinators , -1 | a {b: selector-extend(".c.x ~", ".c", ".d >")} +2 | a {b: selector.extend(".c.x ~", ".c", ".d >")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet DEPRECATION WARNING: $extender: .d > is not valid CSS. This will be an error in Dart Sass 2.0.0. @@ -249,15 +263,16 @@ This will be an error in Dart Sass 2.0.0. More info: https://sass-lang.com/d/bogus-combinators , -1 | a {b: selector-extend(".c.x ~", ".c", ".d >")} +2 | a {b: selector.extend(".c.x ~", ".c", ".d >")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> multiple_combinators/middle/selector/input.scss -a {b: selector-extend(".c.x ~ ~ .d", ".c", ".e")} +@use "sass:selector"; +a {b: selector.extend(".c.x ~ ~ .d", ".c", ".e")} <===> multiple_combinators/middle/selector/output.css a { @@ -271,15 +286,16 @@ This will be an error in Dart Sass 2.0.0. More info: https://sass-lang.com/d/bogus-combinators , -1 | a {b: selector-extend(".c.x ~ ~ .d", ".c", ".e")} +2 | a {b: selector.extend(".c.x ~ ~ .d", ".c", ".e")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> multiple_combinators/middle/extender/input.scss -a {b: selector-extend(".c.x", ".c", ".d ~ + .e")} +@use "sass:selector"; +a {b: selector.extend(".c.x", ".c", ".d ~ + .e")} <===> multiple_combinators/middle/extender/output.css a { @@ -293,15 +309,16 @@ This will be an error in Dart Sass 2.0.0. More info: https://sass-lang.com/d/bogus-combinators , -1 | a {b: selector-extend(".c.x", ".c", ".d ~ + .e")} +2 | a {b: selector.extend(".c.x", ".c", ".d ~ + .e")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> multiple_combinators/leading/selector/input.scss -a {b: selector-extend("> + .c.x", ".c", ".d")} +@use "sass:selector"; +a {b: selector.extend("> + .c.x", ".c", ".d")} <===> multiple_combinators/leading/selector/output.css a { @@ -315,15 +332,16 @@ This will be an error in Dart Sass 2.0.0. More info: https://sass-lang.com/d/bogus-combinators , -1 | a {b: selector-extend("> + .c.x", ".c", ".d")} +2 | a {b: selector.extend("> + .c.x", ".c", ".d")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> multiple_combinators/leading/extender/input.scss -a {b: selector-extend(".c.x", ".c", "+ ~ .d")} +@use "sass:selector"; +a {b: selector.extend(".c.x", ".c", "+ ~ .d")} <===> multiple_combinators/leading/extender/output.css a { @@ -337,15 +355,16 @@ This will be an error in Dart Sass 2.0.0. More info: https://sass-lang.com/d/bogus-combinators , -1 | a {b: selector-extend(".c.x", ".c", "+ ~ .d")} +2 | a {b: selector.extend(".c.x", ".c", "+ ~ .d")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> multiple_combinators/trailing/selector/input.scss -a {b: selector-extend(".c.x > ~", ".c", ".d")} +@use "sass:selector"; +a {b: selector.extend(".c.x > ~", ".c", ".d")} <===> multiple_combinators/trailing/selector/output.css a { @@ -359,15 +378,16 @@ This will be an error in Dart Sass 2.0.0. More info: https://sass-lang.com/d/bogus-combinators , -1 | a {b: selector-extend(".c.x > ~", ".c", ".d")} +2 | a {b: selector.extend(".c.x > ~", ".c", ".d")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> multiple_combinators/trailing/extender/input.scss -a {b: selector-extend(".c.x", ".c", ".d + +")} +@use "sass:selector"; +a {b: selector.extend(".c.x", ".c", ".d + +")} <===> multiple_combinators/trailing/extender/output.css a { @@ -381,7 +401,7 @@ This will be an error in Dart Sass 2.0.0. More info: https://sass-lang.com/d/bogus-combinators , -1 | a {b: selector-extend(".c.x", ".c", ".d + +")} +2 | a {b: selector.extend(".c.x", ".c", ".d + +")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet diff --git a/spec/core_functions/selector/extend/complex/without_unification.hrx b/spec/core_functions/selector/extend/complex/without_unification.hrx index b15fa787ca..2414249ad5 100644 --- a/spec/core_functions/selector/extend/complex/without_unification.hrx +++ b/spec/core_functions/selector/extend/complex/without_unification.hrx @@ -1,5 +1,6 @@ <===> parent/without_grandparent/simple/input.scss -a {b: selector-extend(".c .d", ".c", ".e")} +@use "sass:selector"; +a {b: selector.extend(".c .d", ".c", ".e")} <===> parent/without_grandparent/simple/output.css a { @@ -9,7 +10,8 @@ a { <===> ================================================================================ <===> parent/without_grandparent/complex/input.scss -a {b: selector-extend(".c .d", ".c", ".e .f")} +@use "sass:selector"; +a {b: selector.extend(".c .d", ".c", ".e .f")} <===> parent/without_grandparent/complex/output.css a { @@ -19,7 +21,8 @@ a { <===> ================================================================================ <===> parent/without_grandparent/list/input.scss -a {b: selector-extend(".c .d", ".c", ".e, .f")} +@use "sass:selector"; +a {b: selector.extend(".c .d", ".c", ".e, .f")} <===> parent/without_grandparent/list/output.css a { @@ -29,7 +32,8 @@ a { <===> ================================================================================ <===> parent/with_grandparent/simple/input.scss -a {b: selector-extend(".c .d .e", ".d", ".f")} +@use "sass:selector"; +a {b: selector.extend(".c .d .e", ".d", ".f")} <===> parent/with_grandparent/simple/output.css a { @@ -39,7 +43,8 @@ a { <===> ================================================================================ <===> parent/with_grandparent/complex/input.scss -a {b: selector-extend(".c .d .e", ".d", ".f .g")} +@use "sass:selector"; +a {b: selector.extend(".c .d .e", ".d", ".f .g")} <===> parent/with_grandparent/complex/output.css a { @@ -49,7 +54,8 @@ a { <===> ================================================================================ <===> parent/with_grandparent/list/input.scss -a {b: selector-extend(".c .d .e", ".d", ".f, .g")} +@use "sass:selector"; +a {b: selector.extend(".c .d .e", ".d", ".f, .g")} <===> parent/with_grandparent/list/output.css a { @@ -59,7 +65,8 @@ a { <===> ================================================================================ <===> leading_combinator/selector/input.scss -a {b: selector-extend("> .c", ".c", ".d")} +@use "sass:selector"; +a {b: selector.extend("> .c", ".c", ".d")} <===> leading_combinator/selector/output.css a { @@ -73,15 +80,16 @@ This will be an error in Dart Sass 2.0.0. More info: https://sass-lang.com/d/bogus-combinators , -1 | a {b: selector-extend("> .c", ".c", ".d")} +2 | a {b: selector.extend("> .c", ".c", ".d")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> leading_combinator/extender/input.scss -a {b: selector-extend(".c", ".c", "+ .d")} +@use "sass:selector"; +a {b: selector.extend(".c", ".c", "+ .d")} <===> leading_combinator/extender/output.css a { @@ -95,15 +103,16 @@ This will be an error in Dart Sass 2.0.0. More info: https://sass-lang.com/d/bogus-combinators , -1 | a {b: selector-extend(".c", ".c", "+ .d")} +2 | a {b: selector.extend(".c", ".c", "+ .d")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> leading_combinator/both/input.scss -a {b: selector-extend("~ .c", ".c", "+ .d")} +@use "sass:selector"; +a {b: selector.extend("~ .c", ".c", "+ .d")} <===> leading_combinator/both/output.css a { @@ -117,10 +126,10 @@ This will be an error in Dart Sass 2.0.0. More info: https://sass-lang.com/d/bogus-combinators , -1 | a {b: selector-extend("~ .c", ".c", "+ .d")} +2 | a {b: selector.extend("~ .c", ".c", "+ .d")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet DEPRECATION WARNING: $extender: + .d is not valid CSS. This will be an error in Dart Sass 2.0.0. @@ -128,15 +137,16 @@ This will be an error in Dart Sass 2.0.0. More info: https://sass-lang.com/d/bogus-combinators , -1 | a {b: selector-extend("~ .c", ".c", "+ .d")} +2 | a {b: selector.extend("~ .c", ".c", "+ .d")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> trailing_combinator/selector/input.scss -a {b: selector-extend(".c +", ".c", ".d")} +@use "sass:selector"; +a {b: selector.extend(".c +", ".c", ".d")} <===> trailing_combinator/selector/output.css a { @@ -150,15 +160,16 @@ This will be an error in Dart Sass 2.0.0. More info: https://sass-lang.com/d/bogus-combinators , -1 | a {b: selector-extend(".c +", ".c", ".d")} +2 | a {b: selector.extend(".c +", ".c", ".d")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> trailing_combinator/extender/child/input.scss -a {b: selector-extend(".c .d", ".c", ".e >")} +@use "sass:selector"; +a {b: selector.extend(".c .d", ".c", ".e >")} <===> trailing_combinator/extender/child/output.css a { @@ -172,15 +183,16 @@ This will be an error in Dart Sass 2.0.0. More info: https://sass-lang.com/d/bogus-combinators , -1 | a {b: selector-extend(".c .d", ".c", ".e >")} +2 | a {b: selector.extend(".c .d", ".c", ".e >")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> trailing_combinator/extender/sibling/input.scss -a {b: selector-extend(".c .d", ".c", ".e ~")} +@use "sass:selector"; +a {b: selector.extend(".c .d", ".c", ".e ~")} <===> trailing_combinator/extender/sibling/output.css a { @@ -194,15 +206,16 @@ This will be an error in Dart Sass 2.0.0. More info: https://sass-lang.com/d/bogus-combinators , -1 | a {b: selector-extend(".c .d", ".c", ".e ~")} +2 | a {b: selector.extend(".c .d", ".c", ".e ~")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> trailing_combinator/extender/next_sibling/input.scss -a {b: selector-extend(".c .d", ".c", ".e +")} +@use "sass:selector"; +a {b: selector.extend(".c .d", ".c", ".e +")} <===> trailing_combinator/extender/next_sibling/output.css a { @@ -216,15 +229,16 @@ This will be an error in Dart Sass 2.0.0. More info: https://sass-lang.com/d/bogus-combinators , -1 | a {b: selector-extend(".c .d", ".c", ".e +")} +2 | a {b: selector.extend(".c .d", ".c", ".e +")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> trailing_combinator/both/input.scss -a {b: selector-extend(".c ~", ".c", ".d >")} +@use "sass:selector"; +a {b: selector.extend(".c ~", ".c", ".d >")} <===> trailing_combinator/both/output.css a { @@ -238,10 +252,10 @@ This will be an error in Dart Sass 2.0.0. More info: https://sass-lang.com/d/bogus-combinators , -1 | a {b: selector-extend(".c ~", ".c", ".d >")} +2 | a {b: selector.extend(".c ~", ".c", ".d >")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet DEPRECATION WARNING: $extender: .d > is not valid CSS. This will be an error in Dart Sass 2.0.0. @@ -249,15 +263,16 @@ This will be an error in Dart Sass 2.0.0. More info: https://sass-lang.com/d/bogus-combinators , -1 | a {b: selector-extend(".c ~", ".c", ".d >")} +2 | a {b: selector.extend(".c ~", ".c", ".d >")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> multiple_combinators/middle/selector/input.scss -a {b: selector-extend(".c ~ ~ .d", ".c", ".e")} +@use "sass:selector"; +a {b: selector.extend(".c ~ ~ .d", ".c", ".e")} <===> multiple_combinators/middle/selector/output.css a { @@ -271,15 +286,16 @@ This will be an error in Dart Sass 2.0.0. More info: https://sass-lang.com/d/bogus-combinators , -1 | a {b: selector-extend(".c ~ ~ .d", ".c", ".e")} +2 | a {b: selector.extend(".c ~ ~ .d", ".c", ".e")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> multiple_combinators/middle/extender/input.scss -a {b: selector-extend(".c", ".c", ".d ~ + .e")} +@use "sass:selector"; +a {b: selector.extend(".c", ".c", ".d ~ + .e")} <===> multiple_combinators/middle/extender/output.css a { @@ -293,15 +309,16 @@ This will be an error in Dart Sass 2.0.0. More info: https://sass-lang.com/d/bogus-combinators , -1 | a {b: selector-extend(".c", ".c", ".d ~ + .e")} +2 | a {b: selector.extend(".c", ".c", ".d ~ + .e")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> multiple_combinators/leading/selector/input.scss -a {b: selector-extend("> + .c", ".c", ".d")} +@use "sass:selector"; +a {b: selector.extend("> + .c", ".c", ".d")} <===> multiple_combinators/leading/selector/output.css a { @@ -315,15 +332,16 @@ This will be an error in Dart Sass 2.0.0. More info: https://sass-lang.com/d/bogus-combinators , -1 | a {b: selector-extend("> + .c", ".c", ".d")} +2 | a {b: selector.extend("> + .c", ".c", ".d")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> multiple_combinators/leading/extender/input.scss -a {b: selector-extend(".c", ".c", "+ ~ .d")} +@use "sass:selector"; +a {b: selector.extend(".c", ".c", "+ ~ .d")} <===> multiple_combinators/leading/extender/output.css a { @@ -337,15 +355,16 @@ This will be an error in Dart Sass 2.0.0. More info: https://sass-lang.com/d/bogus-combinators , -1 | a {b: selector-extend(".c", ".c", "+ ~ .d")} +2 | a {b: selector.extend(".c", ".c", "+ ~ .d")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> multiple_combinators/trailing/selector/input.scss -a {b: selector-extend(".c > ~", ".c", ".d")} +@use "sass:selector"; +a {b: selector.extend(".c > ~", ".c", ".d")} <===> multiple_combinators/trailing/selector/output.css a { @@ -359,15 +378,16 @@ This will be an error in Dart Sass 2.0.0. More info: https://sass-lang.com/d/bogus-combinators , -1 | a {b: selector-extend(".c > ~", ".c", ".d")} +2 | a {b: selector.extend(".c > ~", ".c", ".d")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> multiple_combinators/trailing/extender/input.scss -a {b: selector-extend(".c", ".c", ".d + +")} +@use "sass:selector"; +a {b: selector.extend(".c", ".c", ".d + +")} <===> multiple_combinators/trailing/extender/output.css a { @@ -381,7 +401,7 @@ This will be an error in Dart Sass 2.0.0. More info: https://sass-lang.com/d/bogus-combinators , -1 | a {b: selector-extend(".c", ".c", ".d + +")} +2 | a {b: selector.extend(".c", ".c", ".d + +")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet diff --git a/spec/core_functions/selector/extend/error.hrx b/spec/core_functions/selector/extend/error.hrx index 6d1835a851..0ed9097126 100644 --- a/spec/core_functions/selector/extend/error.hrx +++ b/spec/core_functions/selector/extend/error.hrx @@ -1,5 +1,6 @@ <===> selector/parent/input.scss -a {b: selector-extend("&", "c", "d")} +@use "sass:selector"; +a {b: selector.extend("&", "c", "d")} <===> selector/parent/error Error: $selector: Parent selectors aren't allowed here. @@ -9,15 +10,16 @@ Error: $selector: Parent selectors aren't allowed here. ' - 1:1 root stylesheet , -1 | a {b: selector-extend("&", "c", "d")} +2 | a {b: selector.extend("&", "c", "d")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> selector/invalid/input.scss -a {b: selector-extend("[c", "d", "e")} +@use "sass:selector"; +a {b: selector.extend("[c", "d", "e")} <===> selector/invalid/error Error: $selector: expected more input. @@ -27,29 +29,31 @@ Error: $selector: expected more input. ' - 1:3 root stylesheet , -1 | a {b: selector-extend("[c", "d", "e")} +2 | a {b: selector.extend("[c", "d", "e")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> selector/type/input.scss -a {b: selector-extend(1, "c", "d")} +@use "sass:selector"; +a {b: selector.extend(1, "c", "d")} <===> selector/type/error Error: $selector: 1 is not a valid selector: it must be a string, a list of strings, or a list of lists of strings. , -1 | a {b: selector-extend(1, "c", "d")} +2 | a {b: selector.extend(1, "c", "d")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> extendee/parent/input.scss -a {b: selector-extend("c", "&", "d")} +@use "sass:selector"; +a {b: selector.extend("c", "&", "d")} <===> extendee/parent/error Error: $extendee: Parent selectors aren't allowed here. @@ -59,41 +63,44 @@ Error: $extendee: Parent selectors aren't allowed here. ' - 1:1 root stylesheet , -1 | a {b: selector-extend("c", "&", "d")} +2 | a {b: selector.extend("c", "&", "d")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> extendee/complex/string/input.scss -a {b: selector-extend("c", "d e", "f")} +@use "sass:selector"; +a {b: selector.extend("c", "d e", "f")} <===> extendee/complex/string/error Error: Can't extend complex selector d e. , -1 | a {b: selector-extend("c", "d e", "f")} +2 | a {b: selector.extend("c", "d e", "f")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> extendee/complex/list/input.scss -a {b: selector-extend("c", d e, "f")} +@use "sass:selector"; +a {b: selector.extend("c", d e, "f")} <===> extendee/complex/list/error Error: Can't extend complex selector d e. , -1 | a {b: selector-extend("c", d e, "f")} +2 | a {b: selector.extend("c", d e, "f")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> extendee/invalid/input.scss -a {b: selector-extend("c", "[d", "e")} +@use "sass:selector"; +a {b: selector.extend("c", "[d", "e")} <===> extendee/invalid/error Error: $extendee: expected more input. @@ -103,29 +110,31 @@ Error: $extendee: expected more input. ' - 1:3 root stylesheet , -1 | a {b: selector-extend("c", "[d", "e")} +2 | a {b: selector.extend("c", "[d", "e")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> extendee/type/input.scss -a {b: selector-extend("c", 1, "d")} +@use "sass:selector"; +a {b: selector.extend("c", 1, "d")} <===> extendee/type/error Error: $extendee: 1 is not a valid selector: it must be a string, a list of strings, or a list of lists of strings. , -1 | a {b: selector-extend("c", 1, "d")} +2 | a {b: selector.extend("c", 1, "d")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> extender/parent/input.scss -a {b: selector-extend("c", "d", "&")} +@use "sass:selector"; +a {b: selector.extend("c", "d", "&")} <===> extender/parent/error Error: $extender: Parent selectors aren't allowed here. @@ -135,15 +144,16 @@ Error: $extender: Parent selectors aren't allowed here. ' - 1:1 root stylesheet , -1 | a {b: selector-extend("c", "d", "&")} +2 | a {b: selector.extend("c", "d", "&")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> extender/invalid/input.scss -a {b: selector-extend("c", "d", "[e")} +@use "sass:selector"; +a {b: selector.extend("c", "d", "[e")} <===> extender/invalid/error Error: $extender: expected more input. @@ -153,24 +163,25 @@ Error: $extender: expected more input. ' - 1:3 root stylesheet , -1 | a {b: selector-extend("c", "d", "[e")} +2 | a {b: selector.extend("c", "d", "[e")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> extender/type/input.scss -a {b: selector-extend("c", "d", 1)} +@use "sass:selector"; +a {b: selector.extend("c", "d", 1)} <===> extender/type/error Error: $extender: 1 is not a valid selector: it must be a string, a list of strings, or a list of lists of strings. , -1 | a {b: selector-extend("c", "d", 1)} +2 | a {b: selector.extend("c", "d", 1)} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ @@ -189,33 +200,35 @@ Error: Undefined function. <===> ================================================================================ <===> too_many_args/input.scss -a {b: selector-extend("c", "d", "e", "f")} +@use "sass:selector"; +a {b: selector.extend("c", "d", "e", "f")} <===> too_many_args/error Error: Only 3 arguments allowed, but 4 were passed. ,--> input.scss -1 | a {b: selector-extend("c", "d", "e", "f")} +2 | a {b: selector.extend("c", "d", "e", "f")} | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ invocation ' ,--> sass:selector 1 | @function extend($selector, $extendee, $extender) { | ======================================= declaration ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> too_few_args/input.scss -a {b: selector-extend("c", "d")} +@use "sass:selector"; +a {b: selector.extend("c", "d")} <===> too_few_args/error Error: Missing argument $extender. ,--> input.scss -1 | a {b: selector-extend("c", "d")} +2 | a {b: selector.extend("c", "d")} | ^^^^^^^^^^^^^^^^^^^^^^^^^ invocation ' ,--> sass:selector 1 | @function extend($selector, $extendee, $extender) { | ======================================= declaration ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet diff --git a/spec/core_functions/selector/extend/format.hrx b/spec/core_functions/selector/extend/format.hrx index 7f7b9561c4..54708ae496 100644 --- a/spec/core_functions/selector/extend/format.hrx +++ b/spec/core_functions/selector/extend/format.hrx @@ -7,7 +7,8 @@ spec just verifies one example for each parameter. <===> ================================================================================ <===> input/non_string/selector/input.scss -a {b: selector-extend((c, d c), "c", "e")} +@use "sass:selector"; +a {b: selector.extend((c, d c), "c", "e")} <===> input/non_string/selector/output.css a { @@ -17,7 +18,8 @@ a { <===> ================================================================================ <===> input/non_string/extendee/input.scss -a {b: selector-extend("c.d", (c, ".d"), ".e")} +@use "sass:selector"; +a {b: selector.extend("c.d", (c, ".d"), ".e")} <===> input/non_string/extendee/output.css a { @@ -27,7 +29,8 @@ a { <===> ================================================================================ <===> input/non_string/extender/input.scss -a {b: selector-extend("c", "c", (d, e f))} +@use "sass:selector"; +a {b: selector.extend("c", "c", (d, e f))} <===> input/non_string/extender/output.css a { @@ -37,7 +40,8 @@ a { <===> ================================================================================ <===> input/multiple_extendees/compound/input.scss -a {b: selector-extend("c.d", "c.d", ".e")} +@use "sass:selector"; +a {b: selector.extend("c.d", "c.d", ".e")} <===> input/multiple_extendees/compound/output.css a { @@ -47,7 +51,8 @@ a { <===> ================================================================================ <===> input/multiple_extendees/list/input.scss -a {b: selector-extend("c.d", "c, .d", ".e")} +@use "sass:selector"; +a {b: selector.extend("c.d", "c, .d", ".e")} <===> input/multiple_extendees/list/output.css a { @@ -57,7 +62,8 @@ a { <===> ================================================================================ <===> input/multiple_extendees/list_of_compound/input.scss -a {b: selector-extend("c.d.e.f", "c.d, .e.f", ".g")} +@use "sass:selector"; +a {b: selector.extend("c.d.e.f", "c.d, .e.f", ".g")} <===> input/multiple_extendees/list_of_compound/output.css a { @@ -67,7 +73,8 @@ a { <===> ================================================================================ <===> output/input.scss -$result: selector-extend("c d, e f", "g", "g"); +@use "sass:selector"; +$result: selector.extend("c d, e f", "g", "g"); a { result: $result; structure: $result == ("c" "d", "e" "f"); diff --git a/spec/core_functions/selector/extend/list.hrx b/spec/core_functions/selector/extend/list.hrx index be0180fe8d..f654a3fc75 100644 --- a/spec/core_functions/selector/extend/list.hrx +++ b/spec/core_functions/selector/extend/list.hrx @@ -1,5 +1,6 @@ <===> one_matches/input.scss -a {b: selector-extend(".c", ".c, .d", ".e")} +@use "sass:selector"; +a {b: selector.extend(".c", ".c, .d", ".e")} <===> one_matches/output.css a { @@ -9,7 +10,8 @@ a { <===> ================================================================================ <===> all_match/input.scss -a {b: selector-extend(".c.d", ".c, .d", ".e")} +@use "sass:selector"; +a {b: selector.extend(".c.d", ".c, .d", ".e")} <===> all_match/output.css a { @@ -19,7 +21,8 @@ a { <===> ================================================================================ <===> different_matches/input.scss -a {b: selector-extend(".c.d, .c .e, .d .f", ".c, .d", ".g")} +@use "sass:selector"; +a {b: selector.extend(".c.d, .c .e, .d .f", ".c, .d", ".g")} <===> different_matches/output.css a { diff --git a/spec/core_functions/selector/extend/named.hrx b/spec/core_functions/selector/extend/named.hrx index 52feb2383d..7a21b3526c 100644 --- a/spec/core_functions/selector/extend/named.hrx +++ b/spec/core_functions/selector/extend/named.hrx @@ -1,5 +1,6 @@ <===> input.scss -a {b: selector-extend($selector: "c.d", $extendee: "c", $extender: "e")} +@use "sass:selector"; +a {b: selector.extend($selector: "c.d", $extendee: "c", $extender: "e")} <===> output.css a { diff --git a/spec/core_functions/selector/extend/no_op.hrx b/spec/core_functions/selector/extend/no_op.hrx index d3d126f2b8..18503083ad 100644 --- a/spec/core_functions/selector/extend/no_op.hrx +++ b/spec/core_functions/selector/extend/no_op.hrx @@ -1,5 +1,6 @@ <===> missing/input.scss -a {b: selector-extend("c", "d", "e")} +@use "sass:selector"; +a {b: selector.extend("c", "d", "e")} <===> missing/output.css a { @@ -9,7 +10,8 @@ a { <===> ================================================================================ <===> conflict/element/alone/input.scss -a {b: selector-extend("c.d", ".d", "e")} +@use "sass:selector"; +a {b: selector.extend("c.d", ".d", "e")} <===> conflict/element/alone/output.css a { @@ -19,7 +21,8 @@ a { <===> ================================================================================ <===> conflict/element/with_class/input.scss -a {b: selector-extend("c.d", ".d", "e.f")} +@use "sass:selector"; +a {b: selector.extend("c.d", ".d", "e.f")} <===> conflict/element/with_class/output.css a { @@ -29,7 +32,8 @@ a { <===> ================================================================================ <===> conflict/id/input.scss -a {b: selector-extend("#c.d", ".d", "#e")} +@use "sass:selector"; +a {b: selector.extend("#c.d", ".d", "#e")} <===> conflict/id/output.css a { @@ -39,7 +43,8 @@ a { <===> ================================================================================ <===> conflict/pseudo_element/unknown/input.scss -a {b: selector-extend("::c.d", ".d", "::e")} +@use "sass:selector"; +a {b: selector.extend("::c.d", ".d", "::e")} <===> conflict/pseudo_element/unknown/output.css a { @@ -49,7 +54,8 @@ a { <===> ================================================================================ <===> conflict/pseudo_element/class_syntax/input.scss -a {b: selector-extend(":before.c", ".c", ":after")} +@use "sass:selector"; +a {b: selector.extend(":before.c", ".c", ":after")} <===> conflict/pseudo_element/class_syntax/output.css a { @@ -59,7 +65,8 @@ a { <===> ================================================================================ <===> conflict/universal/namespace_and_namespace/input.scss -a {b: selector-extend("c|*.d", ".d", "e|*")} +@use "sass:selector"; +a {b: selector.extend("c|*.d", ".d", "e|*")} <===> conflict/universal/namespace_and_namespace/output.css a { @@ -69,7 +76,8 @@ a { <===> ================================================================================ <===> conflict/universal/namespace_and_empty/input.scss -a {b: selector-extend("c|*.d", ".d", "|*")} +@use "sass:selector"; +a {b: selector.extend("c|*.d", ".d", "|*")} <===> conflict/universal/namespace_and_empty/output.css a { @@ -79,7 +87,8 @@ a { <===> ================================================================================ <===> conflict/universal/empty_and_namespace/input.scss -a {b: selector-extend("|*.c", ".c", "d|*")} +@use "sass:selector"; +a {b: selector.extend("|*.c", ".c", "d|*")} <===> conflict/universal/empty_and_namespace/output.css a { @@ -89,7 +98,8 @@ a { <===> ================================================================================ <===> conflict/universal/namespace_and_default/input.scss -a {b: selector-extend("c|*.d", ".d", "*")} +@use "sass:selector"; +a {b: selector.extend("c|*.d", ".d", "*")} <===> conflict/universal/namespace_and_default/output.css a { @@ -99,7 +109,8 @@ a { <===> ================================================================================ <===> conflict/universal/default_and_namespace/input.scss -a {b: selector-extend("*.c", ".c", "d|*")} +@use "sass:selector"; +a {b: selector.extend("*.c", ".c", "d|*")} <===> conflict/universal/default_and_namespace/output.css a { @@ -109,7 +120,8 @@ a { <===> ================================================================================ <===> conflict/universal/empty_and_default/input.scss -a {b: selector-extend("|*.c", ".c", "*")} +@use "sass:selector"; +a {b: selector.extend("|*.c", ".c", "*")} <===> conflict/universal/empty_and_default/output.css a { @@ -119,7 +131,8 @@ a { <===> ================================================================================ <===> conflict/universal/default_and_empty/input.scss -a {b: selector-extend("*.c", ".c", "|*")} +@use "sass:selector"; +a {b: selector.extend("*.c", ".c", "|*")} <===> conflict/universal/default_and_empty/output.css a { @@ -129,7 +142,8 @@ a { <===> ================================================================================ <===> conflict/parent/input.scss -a {b: selector-extend("c > .d", ".d", "e > .f")} +@use "sass:selector"; +a {b: selector.extend("c > .d", ".d", "e > .f")} <===> conflict/parent/output.css a { @@ -139,7 +153,8 @@ a { <===> ================================================================================ <===> conflict/next_sibling/input.scss -a {b: selector-extend("c + .d", ".d", "e + .f")} +@use "sass:selector"; +a {b: selector.extend("c + .d", ".d", "e + .f")} <===> conflict/next_sibling/output.css a { @@ -149,7 +164,8 @@ a { <===> ================================================================================ <===> unification/identical_to_extendee/input.scss -a {b: selector-extend("c.d", ".d", ".d")} +@use "sass:selector"; +a {b: selector.extend("c.d", ".d", ".d")} <===> unification/identical_to_extendee/output.css a { @@ -159,7 +175,8 @@ a { <===> ================================================================================ <===> unification/identical_to_selector/input.scss -a {b: selector-extend("c.d", ".d", "c.d")} +@use "sass:selector"; +a {b: selector.extend("c.d", ".d", "c.d")} <===> unification/identical_to_selector/output.css a { @@ -169,7 +186,8 @@ a { <===> ================================================================================ <===> unification/additional/simple/input.scss -a {b: selector-extend("c", "c", "c.d")} +@use "sass:selector"; +a {b: selector.extend("c", "c", "c.d")} <===> unification/additional/simple/output.css a { @@ -179,7 +197,8 @@ a { <===> ================================================================================ <===> unification/additional/ancestor/input.scss -a {b: selector-extend("c", "c", "d c")} +@use "sass:selector"; +a {b: selector.extend("c", "c", "d c")} <===> unification/additional/ancestor/output.css a { @@ -189,7 +208,8 @@ a { <===> ================================================================================ <===> unification/additional/parent/input.scss -a {b: selector-extend("c", "c", "d > c")} +@use "sass:selector"; +a {b: selector.extend("c", "c", "d > c")} <===> unification/additional/parent/output.css a { @@ -199,7 +219,8 @@ a { <===> ================================================================================ <===> unification/additional/sibling/input.scss -a {b: selector-extend("c", "c", "d ~ c")} +@use "sass:selector"; +a {b: selector.extend("c", "c", "d ~ c")} <===> unification/additional/sibling/output.css a { @@ -209,7 +230,8 @@ a { <===> ================================================================================ <===> unification/additional/next_sibling/input.scss -a {b: selector-extend("c", "c", "d + c")} +@use "sass:selector"; +a {b: selector.extend("c", "c", "d + c")} <===> unification/additional/next_sibling/output.css a { @@ -219,7 +241,8 @@ a { <===> ================================================================================ <===> unification/subselector_of_target/is/input.scss -a {b: selector-extend(".c:is(d)", ":is(d)", "d.e")} +@use "sass:selector"; +a {b: selector.extend(".c:is(d)", ":is(d)", "d.e")} <===> unification/subselector_of_target/is/output.css a { @@ -229,7 +252,8 @@ a { <===> ================================================================================ <===> unification/subselector_of_target/where/input.scss -a {b: selector-extend(".c:where(d)", ":where(d)", "d.e")} +@use "sass:selector"; +a {b: selector.extend(".c:where(d)", ":where(d)", "d.e")} <===> unification/subselector_of_target/where/output.css a { @@ -239,7 +263,8 @@ a { <===> ================================================================================ <===> unification/subselector_of_target/matches/input.scss -a {b: selector-extend(".c:matches(d)", ":matches(d)", "d.e")} +@use "sass:selector"; +a {b: selector.extend(".c:matches(d)", ":matches(d)", "d.e")} <===> unification/subselector_of_target/matches/output.css a { @@ -249,8 +274,9 @@ a { <===> ================================================================================ <===> unification/specificity_modification/where/input.scss +@use "sass:selector"; a { - b: selector-extend(":where(.x)", ".x", ".x .y"); + b: selector.extend(":where(.x)", ".x", ".x .y"); } <===> unification/specificity_modification/where/output.css diff --git a/spec/core_functions/selector/extend/simple/attribute.hrx b/spec/core_functions/selector/extend/simple/attribute.hrx index e03c9efea0..a65c83d3f0 100644 --- a/spec/core_functions/selector/extend/simple/attribute.hrx +++ b/spec/core_functions/selector/extend/simple/attribute.hrx @@ -1,5 +1,6 @@ <===> equal/input.scss -a {b: selector-extend("[c=d]", "[c=d]", "e")} +@use "sass:selector"; +a {b: selector.extend("[c=d]", "[c=d]", "e")} <===> equal/output.css a { @@ -9,7 +10,8 @@ a { <===> ================================================================================ <===> unequal/name/input.scss -a {b: selector-extend("[c=d]", "[e=d]", "f")} +@use "sass:selector"; +a {b: selector.extend("[c=d]", "[e=d]", "f")} <===> unequal/name/output.css a { @@ -19,7 +21,8 @@ a { <===> ================================================================================ <===> unequal/value/input.scss -a {b: selector-extend("[c=d]", "[c=e]", "f")} +@use "sass:selector"; +a {b: selector.extend("[c=d]", "[c=e]", "f")} <===> unequal/value/output.css a { @@ -29,7 +32,8 @@ a { <===> ================================================================================ <===> unequal/operator/input.scss -a {b: selector-extend("[c=d]", "[c^=d]", "f")} +@use "sass:selector"; +a {b: selector.extend("[c=d]", "[c^=d]", "f")} <===> unequal/operator/output.css a { diff --git a/spec/core_functions/selector/extend/simple/class.hrx b/spec/core_functions/selector/extend/simple/class.hrx index 8faececf46..f1f6418658 100644 --- a/spec/core_functions/selector/extend/simple/class.hrx +++ b/spec/core_functions/selector/extend/simple/class.hrx @@ -1,5 +1,6 @@ <===> equal/input.scss -a {b: selector-extend(".c", ".c", "e")} +@use "sass:selector"; +a {b: selector.extend(".c", ".c", "e")} <===> equal/output.css a { @@ -9,7 +10,8 @@ a { <===> ================================================================================ <===> unequal/input.scss -a {b: selector-extend(".c", ".d", "e")} +@use "sass:selector"; +a {b: selector.extend(".c", ".d", "e")} <===> unequal/output.css a { diff --git a/spec/core_functions/selector/extend/simple/id.hrx b/spec/core_functions/selector/extend/simple/id.hrx index 9b6e533c41..3513551423 100644 --- a/spec/core_functions/selector/extend/simple/id.hrx +++ b/spec/core_functions/selector/extend/simple/id.hrx @@ -1,5 +1,6 @@ <===> equal/input.scss -a {b: selector-extend("#c", "#c", "e")} +@use "sass:selector"; +a {b: selector.extend("#c", "#c", "e")} <===> equal/output.css a { @@ -9,7 +10,8 @@ a { <===> ================================================================================ <===> unequal/input.scss -a {b: selector-extend("#c", "#d", "e")} +@use "sass:selector"; +a {b: selector.extend("#c", "#d", "e")} <===> unequal/output.css a { diff --git a/spec/core_functions/selector/extend/simple/placeholder.hrx b/spec/core_functions/selector/extend/simple/placeholder.hrx index 23f7749535..99e4631ce4 100644 --- a/spec/core_functions/selector/extend/simple/placeholder.hrx +++ b/spec/core_functions/selector/extend/simple/placeholder.hrx @@ -1,5 +1,6 @@ <===> equal/input.scss -a {b: selector-extend("%c", "%c", "e")} +@use "sass:selector"; +a {b: selector.extend("%c", "%c", "e")} <===> equal/output.css a { @@ -9,7 +10,8 @@ a { <===> ================================================================================ <===> unequal/input.scss -a {b: selector-extend("%c", "%d", "e")} +@use "sass:selector"; +a {b: selector.extend("%c", "%d", "e")} <===> unequal/output.css a { diff --git a/spec/core_functions/selector/extend/simple/pseudo/arg.hrx b/spec/core_functions/selector/extend/simple/pseudo/arg.hrx index 1f12b76eed..a869dddf0e 100644 --- a/spec/core_functions/selector/extend/simple/pseudo/arg.hrx +++ b/spec/core_functions/selector/extend/simple/pseudo/arg.hrx @@ -1,5 +1,6 @@ <===> class/equal/input.scss -a {b: selector-extend(":c(@#$)", ":c(@#$)", "e")} +@use "sass:selector"; +a {b: selector.extend(":c(@#$)", ":c(@#$)", "e")} <===> class/equal/output.css a { @@ -9,7 +10,8 @@ a { <===> ================================================================================ <===> class/unequal/name/input.scss -a {b: selector-extend(":c(@#$)", ":d(@#$)", "e")} +@use "sass:selector"; +a {b: selector.extend(":c(@#$)", ":d(@#$)", "e")} <===> class/unequal/name/output.css a { @@ -19,7 +21,8 @@ a { <===> ================================================================================ <===> class/unequal/argument/input.scss -a {b: selector-extend(":c(@#$)", ":c(*&^)", "e")} +@use "sass:selector"; +a {b: selector.extend(":c(@#$)", ":c(*&^)", "e")} <===> class/unequal/argument/output.css a { @@ -29,7 +32,8 @@ a { <===> ================================================================================ <===> class/unequal/has_argument/input.scss -a {b: selector-extend(":c(@#$)", ":c", "e")} +@use "sass:selector"; +a {b: selector.extend(":c(@#$)", ":c", "e")} <===> class/unequal/has_argument/output.css a { @@ -39,7 +43,8 @@ a { <===> ================================================================================ <===> element/equal/input.scss -a {b: selector-extend("::c(@#$)", "::c(@#$)", "e")} +@use "sass:selector"; +a {b: selector.extend("::c(@#$)", "::c(@#$)", "e")} <===> element/equal/output.css a { @@ -49,7 +54,8 @@ a { <===> ================================================================================ <===> element/unequal/name/input.scss -a {b: selector-extend("::c(@#$)", ":d(@#$)", "e")} +@use "sass:selector"; +a {b: selector.extend("::c(@#$)", ":d(@#$)", "e")} <===> element/unequal/name/output.css a { @@ -59,7 +65,8 @@ a { <===> ================================================================================ <===> element/unequal/argument/input.scss -a {b: selector-extend("::c(@#$)", "::c(*&^)", "e")} +@use "sass:selector"; +a {b: selector.extend("::c(@#$)", "::c(*&^)", "e")} <===> element/unequal/argument/output.css a { @@ -69,7 +76,8 @@ a { <===> ================================================================================ <===> element/unequal/has_argument/input.scss -a {b: selector-extend("::c(@#$)", "::c", "e")} +@use "sass:selector"; +a {b: selector.extend("::c(@#$)", "::c", "e")} <===> element/unequal/has_argument/output.css a { diff --git a/spec/core_functions/selector/extend/simple/pseudo/no_arg.hrx b/spec/core_functions/selector/extend/simple/pseudo/no_arg.hrx index 68fc1b5ac1..11a946010a 100644 --- a/spec/core_functions/selector/extend/simple/pseudo/no_arg.hrx +++ b/spec/core_functions/selector/extend/simple/pseudo/no_arg.hrx @@ -1,5 +1,6 @@ <===> class/equal/input.scss -a {b: selector-extend(":c", ":c", "e")} +@use "sass:selector"; +a {b: selector.extend(":c", ":c", "e")} <===> class/equal/output.css a { @@ -9,7 +10,8 @@ a { <===> ================================================================================ <===> class/unequal/input.scss -a {b: selector-extend(":c", ":d", "e")} +@use "sass:selector"; +a {b: selector.extend(":c", ":d", "e")} <===> class/unequal/output.css a { @@ -19,7 +21,8 @@ a { <===> ================================================================================ <===> class/and_element/input.scss -a {b: selector-extend(":c", "::c", "e")} +@use "sass:selector"; +a {b: selector.extend(":c", "::c", "e")} <===> class/and_element/output.css a { @@ -29,7 +32,8 @@ a { <===> ================================================================================ <===> element/equal/input.scss -a {b: selector-extend("::c", "::c", "e")} +@use "sass:selector"; +a {b: selector.extend("::c", "::c", "e")} <===> element/equal/output.css a { @@ -39,7 +43,8 @@ a { <===> ================================================================================ <===> element/unequal/input.scss -a {b: selector-extend("::c", "::d", "e")} +@use "sass:selector"; +a {b: selector.extend("::c", "::d", "e")} <===> element/unequal/output.css a { @@ -49,7 +54,8 @@ a { <===> ================================================================================ <===> element/and_class/input.scss -a {b: selector-extend("::c", ":c", "e")} +@use "sass:selector"; +a {b: selector.extend("::c", ":c", "e")} <===> element/and_class/output.css a { diff --git a/spec/core_functions/selector/extend/simple/pseudo/selector/idempotent/any.hrx b/spec/core_functions/selector/extend/simple/pseudo/selector/idempotent/any.hrx index 45b6e911cb..435bed03e4 100644 --- a/spec/core_functions/selector/extend/simple/pseudo/selector/idempotent/any.hrx +++ b/spec/core_functions/selector/extend/simple/pseudo/selector/idempotent/any.hrx @@ -1,5 +1,6 @@ <===> simple/input.scss -a {b: selector-extend(":any(.c)", ".c", ".d")} +@use "sass:selector"; +a {b: selector.extend(":any(.c)", ".c", ".d")} <===> simple/output.css a { @@ -9,7 +10,8 @@ a { <===> ================================================================================ <===> list/input.scss -a {b: selector-extend(":any(.c)", ".c", ".d, .e")} +@use "sass:selector"; +a {b: selector.extend(":any(.c)", ".c", ".d, .e")} <===> list/output.css a { @@ -19,7 +21,8 @@ a { <===> ================================================================================ <===> any_in_extender/input.scss -a {b: selector-extend(":any(.c)", ".c", ":any(.d, .e)")} +@use "sass:selector"; +a {b: selector.extend(":any(.c)", ".c", ":any(.d, .e)")} <===> any_in_extender/output.css a { diff --git a/spec/core_functions/selector/extend/simple/pseudo/selector/idempotent/current.hrx b/spec/core_functions/selector/extend/simple/pseudo/selector/idempotent/current.hrx index 6946d577f9..9aaf78f4da 100644 --- a/spec/core_functions/selector/extend/simple/pseudo/selector/idempotent/current.hrx +++ b/spec/core_functions/selector/extend/simple/pseudo/selector/idempotent/current.hrx @@ -1,5 +1,6 @@ <===> simple/input.scss -a {b: selector-extend(":current(.c)", ".c", ".d")} +@use "sass:selector"; +a {b: selector.extend(":current(.c)", ".c", ".d")} <===> simple/output.css a { @@ -9,7 +10,8 @@ a { <===> ================================================================================ <===> list/input.scss -a {b: selector-extend(":current(.c)", ".c", ".d, .e")} +@use "sass:selector"; +a {b: selector.extend(":current(.c)", ".c", ".d, .e")} <===> list/output.css a { @@ -19,7 +21,8 @@ a { <===> ================================================================================ <===> current_in_extender/input.scss -a {b: selector-extend(":current(.c)", ".c", ":current(.d, .e)")} +@use "sass:selector"; +a {b: selector.extend(":current(.c)", ".c", ":current(.d, .e)")} <===> current_in_extender/output.css a { diff --git a/spec/core_functions/selector/extend/simple/pseudo/selector/idempotent/is.hrx b/spec/core_functions/selector/extend/simple/pseudo/selector/idempotent/is.hrx index 75800dd5df..1629c81e52 100644 --- a/spec/core_functions/selector/extend/simple/pseudo/selector/idempotent/is.hrx +++ b/spec/core_functions/selector/extend/simple/pseudo/selector/idempotent/is.hrx @@ -1,5 +1,6 @@ <===> simple/input.scss -a {b: selector-extend(":is(.c)", ".c", ".d")} +@use "sass:selector"; +a {b: selector.extend(":is(.c)", ".c", ".d")} <===> simple/output.css a { @@ -9,7 +10,8 @@ a { <===> ================================================================================ <===> list/input.scss -a {b: selector-extend(":is(.c)", ".c", ".d, .e")} +@use "sass:selector"; +a {b: selector.extend(":is(.c)", ".c", ".d, .e")} <===> list/output.css a { @@ -19,7 +21,8 @@ a { <===> ================================================================================ <===> is_in_extender/input.scss -a {b: selector-extend(":is(.c)", ".c", ":is(.d, .e)")} +@use "sass:selector"; +a {b: selector.extend(":is(.c)", ".c", ":is(.d, .e)")} <===> is_in_extender/output.css a { diff --git a/spec/core_functions/selector/extend/simple/pseudo/selector/idempotent/matches.hrx b/spec/core_functions/selector/extend/simple/pseudo/selector/idempotent/matches.hrx index 7c035bd19c..8316f3be57 100644 --- a/spec/core_functions/selector/extend/simple/pseudo/selector/idempotent/matches.hrx +++ b/spec/core_functions/selector/extend/simple/pseudo/selector/idempotent/matches.hrx @@ -1,5 +1,6 @@ <===> simple/input.scss -a {b: selector-extend(":matches(.c)", ".c", ".d")} +@use "sass:selector"; +a {b: selector.extend(":matches(.c)", ".c", ".d")} <===> simple/output.css a { @@ -9,7 +10,8 @@ a { <===> ================================================================================ <===> list/input.scss -a {b: selector-extend(":matches(.c)", ".c", ".d, .e")} +@use "sass:selector"; +a {b: selector.extend(":matches(.c)", ".c", ".d, .e")} <===> list/output.css a { @@ -19,7 +21,8 @@ a { <===> ================================================================================ <===> matches_in_extender/input.scss -a {b: selector-extend(":matches(.c)", ".c", ":matches(.d, .e)")} +@use "sass:selector"; +a {b: selector.extend(":matches(.c)", ".c", ":matches(.d, .e)")} <===> matches_in_extender/output.css a { diff --git a/spec/core_functions/selector/extend/simple/pseudo/selector/idempotent/not.hrx b/spec/core_functions/selector/extend/simple/pseudo/selector/idempotent/not.hrx index 1fbbdfca6c..40873e9c78 100644 --- a/spec/core_functions/selector/extend/simple/pseudo/selector/idempotent/not.hrx +++ b/spec/core_functions/selector/extend/simple/pseudo/selector/idempotent/not.hrx @@ -9,7 +9,8 @@ than a selector list. <===> ================================================================================ <===> simple/input.scss -a {b: selector-extend(":not(.c)", ".c", ".d")} +@use "sass:selector"; +a {b: selector.extend(":not(.c)", ".c", ".d")} <===> simple/output.css a { @@ -19,7 +20,8 @@ a { <===> ================================================================================ <===> list/input.scss -a {b: selector-extend(":not(.c)", ".c", ".d, .e")} +@use "sass:selector"; +a {b: selector.extend(":not(.c)", ".c", ".d, .e")} <===> list/output.css a { @@ -29,7 +31,8 @@ a { <===> ================================================================================ <===> complex/input.scss -a {b: selector-extend(":not(.c .d)", ".d", ".e .f")} +@use "sass:selector"; +a {b: selector.extend(":not(.c .d)", ".d", ".e .f")} <===> complex/output.css a { @@ -39,7 +42,8 @@ a { <===> ================================================================================ <===> component/input.scss -a {b: selector-extend(":not(.c.d)", ".c", ".e")} +@use "sass:selector"; +a {b: selector.extend(":not(.c.d)", ".c", ".e")} <===> component/output.css a { @@ -49,9 +53,10 @@ a { <===> ================================================================================ <===> list_in_not/input.scss +@use "sass:selector"; // If the original :not() already contains a selector list, we add new selectors // to that list because there's no risk of breaking additional browsers. -a {b: selector-extend(":not(.c, .d)", ".c", ".e")} +a {b: selector.extend(":not(.c, .d)", ".c", ".e")} <===> list_in_not/output.css a { @@ -61,7 +66,8 @@ a { <===> ================================================================================ <===> is/list/input.scss -a {b: selector-extend(":not(.c)", ".c", ":is(.d, .e)")} +@use "sass:selector"; +a {b: selector.extend(":not(.c)", ".c", ":is(.d, .e)")} <===> is/list/output.css a { @@ -75,7 +81,8 @@ a { - libsass <===> is/list_of_complex/input.scss -a {b: selector-extend(":not(.c)", ".c", ":is(.d .e, .f .g)")} +@use "sass:selector"; +a {b: selector.extend(":not(.c)", ".c", ":is(.d .e, .f .g)")} <===> is/list_of_complex/output.css a { @@ -85,7 +92,8 @@ a { <===> ================================================================================ <===> is/in_compound/input.scss -a {b: selector-extend(":not(.c)", ".c", ".d:is(.e, .f)")} +@use "sass:selector"; +a {b: selector.extend(":not(.c)", ".c", ".d:is(.e, .f)")} <===> is/in_compound/output.css a { @@ -95,7 +103,8 @@ a { <===> ================================================================================ <===> matches/list/input.scss -a {b: selector-extend(":not(.c)", ".c", ":matches(.d, .e)")} +@use "sass:selector"; +a {b: selector.extend(":not(.c)", ".c", ":matches(.d, .e)")} <===> matches/list/output.css a { @@ -105,7 +114,8 @@ a { <===> ================================================================================ <===> matches/list_of_complex/input.scss -a {b: selector-extend(":not(.c)", ".c", ":matches(.d .e, .f .g)")} +@use "sass:selector"; +a {b: selector.extend(":not(.c)", ".c", ":matches(.d .e, .f .g)")} <===> matches/list_of_complex/output.css a { @@ -115,7 +125,8 @@ a { <===> ================================================================================ <===> matches/in_compound/input.scss -a {b: selector-extend(":not(.c)", ".c", ".d:matches(.e, .f)")} +@use "sass:selector"; +a {b: selector.extend(":not(.c)", ".c", ".d:matches(.e, .f)")} <===> matches/in_compound/output.css a { @@ -125,7 +136,8 @@ a { <===> ================================================================================ <===> where/list/input.scss -a {b: selector-extend(":not(.c)", ".c", ":where(.d, .e)")} +@use "sass:selector"; +a {b: selector.extend(":not(.c)", ".c", ":where(.d, .e)")} <===> where/list/output.css a { @@ -135,7 +147,8 @@ a { <===> ================================================================================ <===> where/list_of_complex/input.scss -a {b: selector-extend(":not(.c)", ".c", ":where(.d .e, .f .g)")} +@use "sass:selector"; +a {b: selector.extend(":not(.c)", ".c", ":where(.d .e, .f .g)")} <===> where/list_of_complex/output.css a { @@ -145,7 +158,8 @@ a { <===> ================================================================================ <===> where/in_compound/input.scss -a {b: selector-extend(":not(.c)", ".c", ".d:where(.e, .f)")} +@use "sass:selector"; +a {b: selector.extend(":not(.c)", ".c", ".d:where(.e, .f)")} <===> where/in_compound/output.css a { @@ -155,11 +169,12 @@ a { <===> ================================================================================ <===> not_in_extender/input.scss +@use "sass:selector"; // Ideally, this should emit `.d, :not(.c)`, but that would be the only // situation where extending a pseudo selector could produce a full-on selector // list. For the sake of simplicity of the `@extend` algorithm, we just ignore // nested `:not()`s instead. -a {b: selector-extend(":not(.c)", ".c", ":not(.d)")} +a {b: selector.extend(":not(.c)", ".c", ":not(.d)")} <===> not_in_extender/output.css a { diff --git a/spec/core_functions/selector/extend/simple/pseudo/selector/idempotent/nth_child.hrx b/spec/core_functions/selector/extend/simple/pseudo/selector/idempotent/nth_child.hrx index 9acd582c1d..f16a226919 100644 --- a/spec/core_functions/selector/extend/simple/pseudo/selector/idempotent/nth_child.hrx +++ b/spec/core_functions/selector/extend/simple/pseudo/selector/idempotent/nth_child.hrx @@ -1,5 +1,6 @@ <===> simple/input.scss -a {b: selector-extend(":nth-child(2n + 1 of .c)", ".c", ".d")} +@use "sass:selector"; +a {b: selector.extend(":nth-child(2n + 1 of .c)", ".c", ".d")} <===> simple/output.css a { @@ -9,7 +10,8 @@ a { <===> ================================================================================ <===> list/input.scss -a {b: selector-extend(":nth-child(2n + 1 of .c)", ".c", ".d, .e")} +@use "sass:selector"; +a {b: selector.extend(":nth-child(2n + 1 of .c)", ".c", ".d, .e")} <===> list/output.css a { @@ -19,8 +21,9 @@ a { <===> ================================================================================ <===> same_arg_in_extender/input.scss +@use "sass:selector"; a { - b: selector-extend( + b: selector.extend( ":nth-child(2n + 1 of .c)", ".c", ":nth-child(2n + 1 of .d, .e)"); @@ -34,10 +37,11 @@ a { <===> ================================================================================ <===> different_arg_in_extender/input.scss +@use "sass:selector"; // This should produce `:nth-child(2n + 1 of .c, :nth-child(2n + 1 of .d, .e))`. // See sass/sass#2828. a { - b: selector-extend( + b: selector.extend( ":nth-child(2n + 1 of .c)", ".c", ":nth-child(2n + 2 of .d, .e)"); diff --git a/spec/core_functions/selector/extend/simple/pseudo/selector/idempotent/nth_last_child.hrx b/spec/core_functions/selector/extend/simple/pseudo/selector/idempotent/nth_last_child.hrx index 7684e52b6b..172415705e 100644 --- a/spec/core_functions/selector/extend/simple/pseudo/selector/idempotent/nth_last_child.hrx +++ b/spec/core_functions/selector/extend/simple/pseudo/selector/idempotent/nth_last_child.hrx @@ -1,5 +1,6 @@ <===> simple/input.scss -a {b: selector-extend(":nth-last-child(2n + 1 of .c)", ".c", ".d")} +@use "sass:selector"; +a {b: selector.extend(":nth-last-child(2n + 1 of .c)", ".c", ".d")} <===> simple/output.css a { @@ -9,7 +10,8 @@ a { <===> ================================================================================ <===> list/input.scss -a {b: selector-extend(":nth-last-child(2n + 1 of .c)", ".c", ".d, .e")} +@use "sass:selector"; +a {b: selector.extend(":nth-last-child(2n + 1 of .c)", ".c", ".d, .e")} <===> list/output.css a { @@ -19,8 +21,9 @@ a { <===> ================================================================================ <===> same_arg_in_extender/input.scss +@use "sass:selector"; a { - b: selector-extend( + b: selector.extend( ":nth-last-child(2n + 1 of .c)", ".c", ":nth-last-child(2n + 1 of .d, .e)"); @@ -34,11 +37,12 @@ a { <===> ================================================================================ <===> different_arg_in_extender/input.scss +@use "sass:selector"; // This should produce // `:nth-last-child(2n + 1 of .c, :nth-last-child(2n + 1 of .d, .e))`. // See sass/sass#2828. a { - b: selector-extend( + b: selector.extend( ":nth-last-child(2n + 1 of .c)", ".c", ":nth-last-child(2n + 2 of .d, .e)"); diff --git a/spec/core_functions/selector/extend/simple/pseudo/selector/idempotent/prefixed.hrx b/spec/core_functions/selector/extend/simple/pseudo/selector/idempotent/prefixed.hrx index 47041539df..c8988c887c 100644 --- a/spec/core_functions/selector/extend/simple/pseudo/selector/idempotent/prefixed.hrx +++ b/spec/core_functions/selector/extend/simple/pseudo/selector/idempotent/prefixed.hrx @@ -1,5 +1,6 @@ <===> simple/input.scss -a {b: selector-extend(":-ms-matches(.c)", ".c", ".d")} +@use "sass:selector"; +a {b: selector.extend(":-ms-matches(.c)", ".c", ".d")} <===> simple/output.css a { @@ -9,7 +10,8 @@ a { <===> ================================================================================ <===> list/input.scss -a {b: selector-extend(":-ms-matches(.c)", ".c", ".d, .e")} +@use "sass:selector"; +a {b: selector.extend(":-ms-matches(.c)", ".c", ".d, .e")} <===> list/output.css a { @@ -19,7 +21,8 @@ a { <===> ================================================================================ <===> same_prefix_in_extender/input.scss -a {b: selector-extend(":-ms-matches(.c)", ".c", ":-ms-matches(.d, .e)")} +@use "sass:selector"; +a {b: selector.extend(":-ms-matches(.c)", ".c", ":-ms-matches(.d, .e)")} <===> same_prefix_in_extender/output.css a { @@ -29,7 +32,8 @@ a { <===> ================================================================================ <===> different_prefix_in_extender/input.scss -a {b: selector-extend(":-ms-matches(.c)", ".c", ":-moz-matches(.d, .e)")} +@use "sass:selector"; +a {b: selector.extend(":-ms-matches(.c)", ".c", ":-moz-matches(.d, .e)")} <===> different_prefix_in_extender/output.css a { diff --git a/spec/core_functions/selector/extend/simple/pseudo/selector/idempotent/where.hrx b/spec/core_functions/selector/extend/simple/pseudo/selector/idempotent/where.hrx index 41abc098ee..92e380b386 100644 --- a/spec/core_functions/selector/extend/simple/pseudo/selector/idempotent/where.hrx +++ b/spec/core_functions/selector/extend/simple/pseudo/selector/idempotent/where.hrx @@ -1,5 +1,6 @@ <===> simple/input.scss -a {b: selector-extend(":where(.c)", ".c", ".d")} +@use "sass:selector"; +a {b: selector.extend(":where(.c)", ".c", ".d")} <===> simple/output.css a { @@ -9,7 +10,8 @@ a { <===> ================================================================================ <===> list/input.scss -a {b: selector-extend(":where(.c)", ".c", ".d, .e")} +@use "sass:selector"; +a {b: selector.extend(":where(.c)", ".c", ".d, .e")} <===> list/output.css a { @@ -19,7 +21,8 @@ a { <===> ================================================================================ <===> is_in_extender/input.scss -a {b: selector-extend(":where(.c)", ".c", ":where(.d, .e)")} +@use "sass:selector"; +a {b: selector.extend(":where(.c)", ".c", ":where(.d, .e)")} <===> is_in_extender/output.css a { diff --git a/spec/core_functions/selector/extend/simple/pseudo/selector/match.hrx b/spec/core_functions/selector/extend/simple/pseudo/selector/match.hrx index f8be0425b4..a203589626 100644 --- a/spec/core_functions/selector/extend/simple/pseudo/selector/match.hrx +++ b/spec/core_functions/selector/extend/simple/pseudo/selector/match.hrx @@ -7,7 +7,8 @@ they're structurally equal. <===> ================================================================================ <===> unprefixed/is/class/equal/input.scss -a {b: selector-extend(":is(c d.e, f g)", ":is(c d.e, f g)", "h")} +@use "sass:selector"; +a {b: selector.extend(":is(c d.e, f g)", ":is(c d.e, f g)", "h")} <===> unprefixed/is/class/equal/output.css a { @@ -17,7 +18,8 @@ a { <===> ================================================================================ <===> unprefixed/is/class/unequal/name/input.scss -a {b: selector-extend(":is(c d.e, f g)", ":-pfx-is(c d.e, f g)", "h")} +@use "sass:selector"; +a {b: selector.extend(":is(c d.e, f g)", ":-pfx-is(c d.e, f g)", "h")} <===> unprefixed/is/class/unequal/name/output.css a { @@ -27,7 +29,8 @@ a { <===> ================================================================================ <===> unprefixed/is/class/unequal/argument/input.scss -a {b: selector-extend(":is(c d.e, f g)", ":is(d, g)", "h")} +@use "sass:selector"; +a {b: selector.extend(":is(c d.e, f g)", ":is(d, g)", "h")} <===> unprefixed/is/class/unequal/argument/output.css a { @@ -37,7 +40,8 @@ a { <===> ================================================================================ <===> unprefixed/is/class/unequal/has_argument/input.scss -a {b: selector-extend(":is(c d.e, f g)", ":is", "h")} +@use "sass:selector"; +a {b: selector.extend(":is(c d.e, f g)", ":is", "h")} <===> unprefixed/is/class/unequal/has_argument/output.css a { @@ -47,7 +51,8 @@ a { <===> ================================================================================ <===> unprefixed/where/class/equal/input.scss -a {b: selector-extend(":where(c d.e, f g)", ":where(c d.e, f g)", "h")} +@use "sass:selector"; +a {b: selector.extend(":where(c d.e, f g)", ":where(c d.e, f g)", "h")} <===> unprefixed/where/class/equal/output.css a { @@ -57,7 +62,8 @@ a { <===> ================================================================================ <===> unprefixed/where/class/unequal/name/input.scss -a {b: selector-extend(":where(c d.e, f g)", ":-pfx-where(c d.e, f g)", "h")} +@use "sass:selector"; +a {b: selector.extend(":where(c d.e, f g)", ":-pfx-where(c d.e, f g)", "h")} <===> unprefixed/where/class/unequal/name/output.css a { @@ -67,7 +73,8 @@ a { <===> ================================================================================ <===> unprefixed/where/class/unequal/argument/input.scss -a {b: selector-extend(":where(c d.e, f g)", ":where(d, g)", "h")} +@use "sass:selector"; +a {b: selector.extend(":where(c d.e, f g)", ":where(d, g)", "h")} <===> unprefixed/where/class/unequal/argument/output.css a { @@ -77,7 +84,8 @@ a { <===> ================================================================================ <===> unprefixed/where/class/unequal/has_argument/input.scss -a {b: selector-extend(":where(c d.e, f g)", ":where", "h")} +@use "sass:selector"; +a {b: selector.extend(":where(c d.e, f g)", ":where", "h")} <===> unprefixed/where/class/unequal/has_argument/output.css a { @@ -87,7 +95,8 @@ a { <===> ================================================================================ <===> unprefixed/matches/class/equal/input.scss -a {b: selector-extend(":matches(c d.e, f g)", ":matches(c d.e, f g)", "h")} +@use "sass:selector"; +a {b: selector.extend(":matches(c d.e, f g)", ":matches(c d.e, f g)", "h")} <===> unprefixed/matches/class/equal/output.css a { @@ -97,7 +106,8 @@ a { <===> ================================================================================ <===> unprefixed/matches/class/unequal/name/input.scss -a {b: selector-extend(":matches(c d.e, f g)", ":-pfx-matches(c d.e, f g)", "h")} +@use "sass:selector"; +a {b: selector.extend(":matches(c d.e, f g)", ":-pfx-matches(c d.e, f g)", "h")} <===> unprefixed/matches/class/unequal/name/output.css a { @@ -107,7 +117,8 @@ a { <===> ================================================================================ <===> unprefixed/matches/class/unequal/argument/input.scss -a {b: selector-extend(":matches(c d.e, f g)", ":matches(d, g)", "h")} +@use "sass:selector"; +a {b: selector.extend(":matches(c d.e, f g)", ":matches(d, g)", "h")} <===> unprefixed/matches/class/unequal/argument/output.css a { @@ -117,7 +128,8 @@ a { <===> ================================================================================ <===> unprefixed/matches/class/unequal/has_argument/input.scss -a {b: selector-extend(":matches(c d.e, f g)", ":matches", "h")} +@use "sass:selector"; +a {b: selector.extend(":matches(c d.e, f g)", ":matches", "h")} <===> unprefixed/matches/class/unequal/has_argument/output.css a { @@ -127,7 +139,8 @@ a { <===> ================================================================================ <===> unprefixed/element/equal/input.scss -a {b: selector-extend("::slotted(c.d, e.f)", "::slotted(c.d, e.f)", "g")} +@use "sass:selector"; +a {b: selector.extend("::slotted(c.d, e.f)", "::slotted(c.d, e.f)", "g")} <===> unprefixed/element/equal/output.css a { @@ -137,7 +150,8 @@ a { <===> ================================================================================ <===> unprefixed/element/unequal/name/input.scss -a {b: selector-extend("::slotted(c.d, e.f)", "::-pfx-slotted(c.d, e.f)", "g")} +@use "sass:selector"; +a {b: selector.extend("::slotted(c.d, e.f)", "::-pfx-slotted(c.d, e.f)", "g")} <===> unprefixed/element/unequal/name/output.css a { @@ -147,7 +161,8 @@ a { <===> ================================================================================ <===> unprefixed/element/unequal/argument/input.scss -a {b: selector-extend("::slotted(c.d, e.f)", "::slotted(d, g)", "g")} +@use "sass:selector"; +a {b: selector.extend("::slotted(c.d, e.f)", "::slotted(d, g)", "g")} <===> unprefixed/element/unequal/argument/output.css a { @@ -157,7 +172,8 @@ a { <===> ================================================================================ <===> unprefixed/element/unequal/has_argument/input.scss -a {b: selector-extend("::slotted(c.d, e.f)", "::slotted", "g")} +@use "sass:selector"; +a {b: selector.extend("::slotted(c.d, e.f)", "::slotted", "g")} <===> unprefixed/element/unequal/has_argument/output.css a { @@ -167,8 +183,9 @@ a { <===> ================================================================================ <===> prefixed/equal/input.scss +@use "sass:selector"; a { - b: selector-extend( + b: selector.extend( ":nth-child(2n + 1 of c d.e, f g)", ":nth-child(2n + 1 of c d.e, f g)", "h"); @@ -182,8 +199,9 @@ a { <===> ================================================================================ <===> prefixed/unequal/name/input.scss +@use "sass:selector"; a { - b: selector-extend( + b: selector.extend( ":nth-child(2n + 1 of c d.e, f g)", ":nth-last-child(2n + 1 of c d.e, f g)", "h"); @@ -197,8 +215,9 @@ a { <===> ================================================================================ <===> prefixed/unequal/argument/input.scss +@use "sass:selector"; a { - b: selector-extend( + b: selector.extend( ":nth-child(2n + 1 of c d.e, f g)", ":nth-child(2n + 1 of d, g)", "h"); @@ -212,8 +231,9 @@ a { <===> ================================================================================ <===> prefixed/unequal/prefix/input.scss +@use "sass:selector"; a { - b: selector-extend( + b: selector.extend( ":nth-child(2n + 1 of c d.e, f g)", ":nth-child(2n of c d.e, f g)", "h"); @@ -227,7 +247,8 @@ a { <===> ================================================================================ <===> prefixed/unequal/has_argument/input.scss -a {b: selector-extend(":nth-child(2n + 1 of c d.e, f g)", ":nth-child", "h")} +@use "sass:selector"; +a {b: selector.extend(":nth-child(2n + 1 of c d.e, f g)", ":nth-child", "h")} <===> prefixed/unequal/has_argument/output.css a { diff --git a/spec/core_functions/selector/extend/simple/pseudo/selector/non_idempotent.hrx b/spec/core_functions/selector/extend/simple/pseudo/selector/non_idempotent.hrx index 9ccaf634db..eb6241a272 100644 --- a/spec/core_functions/selector/extend/simple/pseudo/selector/non_idempotent.hrx +++ b/spec/core_functions/selector/extend/simple/pseudo/selector/non_idempotent.hrx @@ -5,7 +5,8 @@ pseudoclass changes its semantics, so Sass never flattens these nestings. <===> ================================================================================ <===> has/simple/input.scss -a {b: selector-extend(":has(.c)", ".c", ".d")} +@use "sass:selector"; +a {b: selector.extend(":has(.c)", ".c", ".d")} <===> has/simple/output.css a { @@ -15,7 +16,8 @@ a { <===> ================================================================================ <===> has/list/input.scss -a {b: selector-extend(":has(.c)", ".c", ".d, .e")} +@use "sass:selector"; +a {b: selector.extend(":has(.c)", ".c", ".d, .e")} <===> has/list/output.css a { @@ -25,7 +27,8 @@ a { <===> ================================================================================ <===> has/has_in_extender/input.scss -a {b: selector-extend(":has(.c)", ".c", ":has(.d)")} +@use "sass:selector"; +a {b: selector.extend(":has(.c)", ".c", ":has(.d)")} <===> has/has_in_extender/output.css a { @@ -35,7 +38,8 @@ a { <===> ================================================================================ <===> host/simple/input.scss -a {b: selector-extend(":host(.c)", ".c", ".d")} +@use "sass:selector"; +a {b: selector.extend(":host(.c)", ".c", ".d")} <===> host/simple/output.css a { @@ -45,7 +49,8 @@ a { <===> ================================================================================ <===> host/list/input.scss -a {b: selector-extend(":host(.c)", ".c", ".d, .e")} +@use "sass:selector"; +a {b: selector.extend(":host(.c)", ".c", ".d, .e")} <===> host/list/output.css a { @@ -55,7 +60,8 @@ a { <===> ================================================================================ <===> host/host_in_extender/input.scss -a {b: selector-extend(":host(.c)", ".c", ":host(.d)")} +@use "sass:selector"; +a {b: selector.extend(":host(.c)", ".c", ":host(.d)")} <===> host/host_in_extender/output.css a { @@ -65,7 +71,8 @@ a { <===> ================================================================================ <===> host_context/simple/input.scss -a {b: selector-extend(":host-context(.c)", ".c", ".d")} +@use "sass:selector"; +a {b: selector.extend(":host-context(.c)", ".c", ".d")} <===> host_context/simple/output.css a { @@ -75,7 +82,8 @@ a { <===> ================================================================================ <===> host_context/list/input.scss -a {b: selector-extend(":host-context(.c)", ".c", ".d, .e")} +@use "sass:selector"; +a {b: selector.extend(":host-context(.c)", ".c", ".d, .e")} <===> host_context/list/output.css a { @@ -85,7 +93,8 @@ a { <===> ================================================================================ <===> host_context/host_context_in_extender/input.scss -a {b: selector-extend(":host-context(.c)", ".c", ":host-context(.d)")} +@use "sass:selector"; +a {b: selector.extend(":host-context(.c)", ".c", ":host-context(.d)")} <===> host_context/host_context_in_extender/output.css a { @@ -95,7 +104,8 @@ a { <===> ================================================================================ <===> slotted/simple/input.scss -a {b: selector-extend("::slotted(.c)", ".c", ".d")} +@use "sass:selector"; +a {b: selector.extend("::slotted(.c)", ".c", ".d")} <===> slotted/simple/output.css a { @@ -105,7 +115,8 @@ a { <===> ================================================================================ <===> slotted/list/input.scss -a {b: selector-extend("::slotted(.c)", ".c", ".d, .e")} +@use "sass:selector"; +a {b: selector.extend("::slotted(.c)", ".c", ".d, .e")} <===> slotted/list/output.css a { @@ -115,7 +126,8 @@ a { <===> ================================================================================ <===> slotted/slotted_in_extender/input.scss -a {b: selector-extend("::slotted(.c)", ".c", "::slotted(.d)")} +@use "sass:selector"; +a {b: selector.extend("::slotted(.c)", ".c", "::slotted(.d)")} <===> slotted/slotted_in_extender/output.css a { diff --git a/spec/core_functions/selector/extend/simple/type.hrx b/spec/core_functions/selector/extend/simple/type.hrx index 2b25b6d7d5..c00de9d709 100644 --- a/spec/core_functions/selector/extend/simple/type.hrx +++ b/spec/core_functions/selector/extend/simple/type.hrx @@ -1,5 +1,6 @@ <===> equal/input.scss -a {b: selector-extend("c", "c", "e")} +@use "sass:selector"; +a {b: selector.extend("c", "c", "e")} <===> equal/output.css a { @@ -9,7 +10,8 @@ a { <===> ================================================================================ <===> unequal/input.scss -a {b: selector-extend("c", "d", "e")} +@use "sass:selector"; +a {b: selector.extend("c", "d", "e")} <===> unequal/output.css a { @@ -19,7 +21,8 @@ a { <===> ================================================================================ <===> and_universal/input.scss -a {b: selector-extend("c", "*", "d")} +@use "sass:selector"; +a {b: selector.extend("c", "*", "d")} <===> and_universal/output.css a { @@ -29,7 +32,8 @@ a { <===> ================================================================================ <===> namespace/explicit/and_explicit/equal/input.scss -a {b: selector-extend("c|d", "c|d", "e")} +@use "sass:selector"; +a {b: selector.extend("c|d", "c|d", "e")} <===> namespace/explicit/and_explicit/equal/output.css a { @@ -39,7 +43,8 @@ a { <===> ================================================================================ <===> namespace/explicit/and_explicit/unequal/input.scss -a {b: selector-extend("c|d", "e|d", "e")} +@use "sass:selector"; +a {b: selector.extend("c|d", "e|d", "e")} <===> namespace/explicit/and_explicit/unequal/output.css a { @@ -49,7 +54,8 @@ a { <===> ================================================================================ <===> namespace/explicit/and_implicit/input.scss -a {b: selector-extend("c|d", "d", "e")} +@use "sass:selector"; +a {b: selector.extend("c|d", "d", "e")} <===> namespace/explicit/and_implicit/output.css a { @@ -59,7 +65,8 @@ a { <===> ================================================================================ <===> namespace/explicit/and_empty/input.scss -a {b: selector-extend("c|d", "|d", "e")} +@use "sass:selector"; +a {b: selector.extend("c|d", "|d", "e")} <===> namespace/explicit/and_empty/output.css a { @@ -69,7 +76,8 @@ a { <===> ================================================================================ <===> namespace/explicit/and_universal/input.scss -a {b: selector-extend("c|d", "*|d", "e")} +@use "sass:selector"; +a {b: selector.extend("c|d", "*|d", "e")} <===> namespace/explicit/and_universal/output.css a { @@ -79,7 +87,8 @@ a { <===> ================================================================================ <===> namespace/empty/and_explicit/input.scss -a {b: selector-extend("|c", "d|c", "e")} +@use "sass:selector"; +a {b: selector.extend("|c", "d|c", "e")} <===> namespace/empty/and_explicit/output.css a { @@ -89,7 +98,8 @@ a { <===> ================================================================================ <===> namespace/empty/and_implicit/input.scss -a {b: selector-extend("|c", "c", "d")} +@use "sass:selector"; +a {b: selector.extend("|c", "c", "d")} <===> namespace/empty/and_implicit/output.css a { @@ -99,7 +109,8 @@ a { <===> ================================================================================ <===> namespace/empty/and_empty/input.scss -a {b: selector-extend("|c", "|c", "d")} +@use "sass:selector"; +a {b: selector.extend("|c", "|c", "d")} <===> namespace/empty/and_empty/output.css a { @@ -109,7 +120,8 @@ a { <===> ================================================================================ <===> namespace/empty/and_universal/input.scss -a {b: selector-extend("|c", "*|c", "d")} +@use "sass:selector"; +a {b: selector.extend("|c", "*|c", "d")} <===> namespace/empty/and_universal/output.css a { @@ -125,7 +137,8 @@ matched because this phase only cares about full structural equality. <===> ================================================================================ <===> namespace/universal/and_explicit/input.scss -a {b: selector-extend("*|c", "d|c", "d")} +@use "sass:selector"; +a {b: selector.extend("*|c", "d|c", "d")} <===> namespace/universal/and_explicit/output.css a { @@ -135,7 +148,8 @@ a { <===> ================================================================================ <===> namespace/universal/and_implicit/input.scss -a {b: selector-extend("*|c", "c", "d")} +@use "sass:selector"; +a {b: selector.extend("*|c", "c", "d")} <===> namespace/universal/and_implicit/output.css a { @@ -145,7 +159,8 @@ a { <===> ================================================================================ <===> namespace/universal/and_empty/input.scss -a {b: selector-extend("*|c", "|c", "d")} +@use "sass:selector"; +a {b: selector.extend("*|c", "|c", "d")} <===> namespace/universal/and_empty/output.css a { @@ -155,7 +170,8 @@ a { <===> ================================================================================ <===> namespace/universal/and_universal/input.scss -a {b: selector-extend("*|c", "*|c", "d")} +@use "sass:selector"; +a {b: selector.extend("*|c", "*|c", "d")} <===> namespace/universal/and_universal/output.css a { diff --git a/spec/core_functions/selector/extend/simple/universal.hrx b/spec/core_functions/selector/extend/simple/universal.hrx index 0bc8fcbe6c..892986ab99 100644 --- a/spec/core_functions/selector/extend/simple/universal.hrx +++ b/spec/core_functions/selector/extend/simple/universal.hrx @@ -5,7 +5,8 @@ matched because this phase only cares about full structural equality. <===> ================================================================================ <===> equal/input.scss -a {b: selector-extend("*", "*", "c")} +@use "sass:selector"; +a {b: selector.extend("*", "*", "c")} <===> equal/output.css a { @@ -15,7 +16,8 @@ a { <===> ================================================================================ <===> and_type/input.scss -a {b: selector-extend("*", "c", "d")} +@use "sass:selector"; +a {b: selector.extend("*", "c", "d")} <===> and_type/output.css a { @@ -25,7 +27,8 @@ a { <===> ================================================================================ <===> and_class/input.scss -a {b: selector-extend("*", ".c", "d")} +@use "sass:selector"; +a {b: selector.extend("*", ".c", "d")} <===> and_class/output.css a { @@ -35,7 +38,8 @@ a { <===> ================================================================================ <===> namespace/explicit/and_type/explicit/equal/input.scss -a {b: selector-extend("c|*", "c|d", "e")} +@use "sass:selector"; +a {b: selector.extend("c|*", "c|d", "e")} <===> namespace/explicit/and_type/explicit/equal/output.css a { @@ -45,7 +49,8 @@ a { <===> ================================================================================ <===> namespace/explicit/and_type/explicit/unequal/input.scss -a {b: selector-extend("c|*", "e|d", "e")} +@use "sass:selector"; +a {b: selector.extend("c|*", "e|d", "e")} <===> namespace/explicit/and_type/explicit/unequal/output.css a { @@ -55,7 +60,8 @@ a { <===> ================================================================================ <===> namespace/explicit/and_type/implicit/input.scss -a {b: selector-extend("c|*", "d", "e")} +@use "sass:selector"; +a {b: selector.extend("c|*", "d", "e")} <===> namespace/explicit/and_type/implicit/output.css a { @@ -65,7 +71,8 @@ a { <===> ================================================================================ <===> namespace/explicit/and_type/empty/input.scss -a {b: selector-extend("c|*", "|d", "e")} +@use "sass:selector"; +a {b: selector.extend("c|*", "|d", "e")} <===> namespace/explicit/and_type/empty/output.css a { @@ -75,7 +82,8 @@ a { <===> ================================================================================ <===> namespace/explicit/and_universal/explicit/equal/input.scss -a {b: selector-extend("c|*", "c|*", "e")} +@use "sass:selector"; +a {b: selector.extend("c|*", "c|*", "e")} <===> namespace/explicit/and_universal/explicit/equal/output.css a { @@ -85,7 +93,8 @@ a { <===> ================================================================================ <===> namespace/explicit/and_universal/explicit/unequal/input.scss -a {b: selector-extend("c|*", "d|*", "e")} +@use "sass:selector"; +a {b: selector.extend("c|*", "d|*", "e")} <===> namespace/explicit/and_universal/explicit/unequal/output.css a { @@ -95,7 +104,8 @@ a { <===> ================================================================================ <===> namespace/explicit/and_universal/implicit/input.scss -a {b: selector-extend("c|*", "*", "e")} +@use "sass:selector"; +a {b: selector.extend("c|*", "*", "e")} <===> namespace/explicit/and_universal/implicit/output.css a { @@ -105,7 +115,8 @@ a { <===> ================================================================================ <===> namespace/explicit/and_universal/empty/input.scss -a {b: selector-extend("c|*", "|*", "e")} +@use "sass:selector"; +a {b: selector.extend("c|*", "|*", "e")} <===> namespace/explicit/and_universal/empty/output.css a { @@ -115,7 +126,8 @@ a { <===> ================================================================================ <===> namespace/explicit/and_universal/universal/input.scss -a {b: selector-extend("c|*", "*|*", "e")} +@use "sass:selector"; +a {b: selector.extend("c|*", "*|*", "e")} <===> namespace/explicit/and_universal/universal/output.css a { @@ -125,7 +137,8 @@ a { <===> ================================================================================ <===> namespace/explicit/and_class/input.scss -a {b: selector-extend("c|*", ".d", "e")} +@use "sass:selector"; +a {b: selector.extend("c|*", ".d", "e")} <===> namespace/explicit/and_class/output.css a { @@ -135,7 +148,8 @@ a { <===> ================================================================================ <===> namespace/empty/and_type/explicit/input.scss -a {b: selector-extend("|*", "c|d", "e")} +@use "sass:selector"; +a {b: selector.extend("|*", "c|d", "e")} <===> namespace/empty/and_type/explicit/output.css a { @@ -145,7 +159,8 @@ a { <===> ================================================================================ <===> namespace/empty/and_type/implicit/input.scss -a {b: selector-extend("|*", "d", "e")} +@use "sass:selector"; +a {b: selector.extend("|*", "d", "e")} <===> namespace/empty/and_type/implicit/output.css a { @@ -155,7 +170,8 @@ a { <===> ================================================================================ <===> namespace/empty/and_type/empty/input.scss -a {b: selector-extend("|*", "|d", "e")} +@use "sass:selector"; +a {b: selector.extend("|*", "|d", "e")} <===> namespace/empty/and_type/empty/output.css a { @@ -165,7 +181,8 @@ a { <===> ================================================================================ <===> namespace/empty/and_universal/explicit/input.scss -a {b: selector-extend("|*", "c|*", "d")} +@use "sass:selector"; +a {b: selector.extend("|*", "c|*", "d")} <===> namespace/empty/and_universal/explicit/output.css a { @@ -175,7 +192,8 @@ a { <===> ================================================================================ <===> namespace/empty/and_universal/implicit/input.scss -a {b: selector-extend("|*", "*", "c")} +@use "sass:selector"; +a {b: selector.extend("|*", "*", "c")} <===> namespace/empty/and_universal/implicit/output.css a { @@ -185,7 +203,8 @@ a { <===> ================================================================================ <===> namespace/empty/and_universal/empty/input.scss -a {b: selector-extend("|*", "|*", "c")} +@use "sass:selector"; +a {b: selector.extend("|*", "|*", "c")} <===> namespace/empty/and_universal/empty/output.css a { @@ -195,7 +214,8 @@ a { <===> ================================================================================ <===> namespace/empty/and_universal/universal/input.scss -a {b: selector-extend("|*", "*|*", "c")} +@use "sass:selector"; +a {b: selector.extend("|*", "*|*", "c")} <===> namespace/empty/and_universal/universal/output.css a { @@ -205,7 +225,8 @@ a { <===> ================================================================================ <===> namespace/empty/and_class/input.scss -a {b: selector-extend("|*", ".c", "d")} +@use "sass:selector"; +a {b: selector.extend("|*", ".c", "d")} <===> namespace/empty/and_class/output.css a { @@ -215,7 +236,8 @@ a { <===> ================================================================================ <===> namespace/universal/and_type/explicit/input.scss -a {b: selector-extend("*|*", "c|d", "e")} +@use "sass:selector"; +a {b: selector.extend("*|*", "c|d", "e")} <===> namespace/universal/and_type/explicit/output.css a { @@ -225,7 +247,8 @@ a { <===> ================================================================================ <===> namespace/universal/and_type/implicit/input.scss -a {b: selector-extend("*|*", "c", "d")} +@use "sass:selector"; +a {b: selector.extend("*|*", "c", "d")} <===> namespace/universal/and_type/implicit/output.css a { @@ -235,7 +258,8 @@ a { <===> ================================================================================ <===> namespace/universal/and_type/empty/input.scss -a {b: selector-extend("*|*", "|c", "d")} +@use "sass:selector"; +a {b: selector.extend("*|*", "|c", "d")} <===> namespace/universal/and_type/empty/output.css a { @@ -245,7 +269,8 @@ a { <===> ================================================================================ <===> namespace/universal/and_universal/explicit/input.scss -a {b: selector-extend("*|*", "c|*", "d")} +@use "sass:selector"; +a {b: selector.extend("*|*", "c|*", "d")} <===> namespace/universal/and_universal/explicit/output.css a { @@ -255,7 +280,8 @@ a { <===> ================================================================================ <===> namespace/universal/and_universal/implicit/input.scss -a {b: selector-extend("*|*", "*", "c")} +@use "sass:selector"; +a {b: selector.extend("*|*", "*", "c")} <===> namespace/universal/and_universal/implicit/output.css a { @@ -265,7 +291,8 @@ a { <===> ================================================================================ <===> namespace/universal/and_universal/empty/input.scss -a {b: selector-extend("*|*", "|*", "c")} +@use "sass:selector"; +a {b: selector.extend("*|*", "|*", "c")} <===> namespace/universal/and_universal/empty/output.css a { @@ -275,7 +302,8 @@ a { <===> ================================================================================ <===> namespace/universal/and_universal/universal/input.scss -a {b: selector-extend("*|*", "*|*", "c")} +@use "sass:selector"; +a {b: selector.extend("*|*", "*|*", "c")} <===> namespace/universal/and_universal/universal/output.css a { @@ -285,7 +313,8 @@ a { <===> ================================================================================ <===> namespace/universal/and_class/input.scss -a {b: selector-extend("*|*", ".c", "d")} +@use "sass:selector"; +a {b: selector.extend("*|*", ".c", "d")} <===> namespace/universal/and_class/output.css a { From 58d17bbf41a6e7e441c4c7248288de2ea0666fc2 Mon Sep 17 00:00:00 2001 From: Jennifer Thakar Date: Fri, 12 Jul 2024 14:01:29 -0700 Subject: [PATCH 03/10] Migrate some additional meta functions --- .../meta/get_function/error.hrx | 110 ++++++++++-------- .../meta/get_function/same_module.hrx | 33 +++--- .../meta/get_function/scope.hrx | 8 +- spec/core_functions/meta/get_mixin/scope.hrx | 4 +- spec/core_functions/meta/inspect/color.hrx | 3 +- spec/core_functions/meta/keywords.hrx | 3 +- spec/core_functions/meta/load_css/with.hrx | 5 +- 7 files changed, 95 insertions(+), 71 deletions(-) diff --git a/spec/core_functions/meta/get_function/error.hrx b/spec/core_functions/meta/get_function/error.hrx index 8080e65de7..6174f75b08 100644 --- a/spec/core_functions/meta/get_function/error.hrx +++ b/spec/core_functions/meta/get_function/error.hrx @@ -80,22 +80,24 @@ Error: Only 3 arguments allowed, but 4 were passed. <===> ================================================================================ <===> non_existent/input.scss -a {b: get-function(does-not-exist)} +@use "sass:meta"; +a {b: meta.get-function(does-not-exist)} <===> non_existent/error Error: Function not found: does-not-exist , -1 | a {b: get-function(does-not-exist)} - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2 | a {b: meta.get-function(does-not-exist)} + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> through_forward/show/input.scss +@use "sass:meta"; @use "midstream" as *; a { - b: call(get-function(d)); + b: meta.call(meta.get-function(d)); } <===> through_forward/show/_midstream.scss @@ -107,17 +109,18 @@ a { <===> through_forward/show/error Error: Function not found: d , -3 | b: call(get-function(d)); - | ^^^^^^^^^^^^^^^ +4 | b: meta.call(meta.get-function(d)); + | ^^^^^^^^^^^^^^^^^^^^ ' - input.scss 3:11 root stylesheet + input.scss 4:16 root stylesheet <===> ================================================================================ <===> through_forward/hide/input.scss +@use "sass:meta"; @use "midstream" as *; a { - b: call(get-function(c)); + b: meta.call(meta.get-function(c)); } <===> through_forward/hide/_midstream.scss @@ -129,52 +132,56 @@ a { <===> through_forward/hide/error Error: Function not found: c , -3 | b: call(get-function(c)); - | ^^^^^^^^^^^^^^^ +4 | b: meta.call(meta.get-function(c)); + | ^^^^^^^^^^^^^^^^^^^^ ' - input.scss 3:11 root stylesheet + input.scss 4:16 root stylesheet <===> ================================================================================ <===> division/input.scss -a {b: get-function(rgb) / get-function(lighten)} +@use "sass:meta"; +a {b: meta.get-function(rgb) / meta.get-function(lighten)} <===> division/error Error: get-function("rgb") isn't a valid CSS value. , -1 | a {b: get-function(rgb) / get-function(lighten)} - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2 | a {b: meta.get-function(rgb) / meta.get-function(lighten)} + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> function_exists/input.scss +@use "sass:meta"; + @function add-two($v) { @return $v + 2; } -$add-two-fn: get-function(add-two); +$add-two-fn: meta.get-function(add-two); .error { - error: get-function($add-two-fn); + error: meta.get-function($add-two-fn); } <===> function_exists/error Error: $name: get-function("add-two") is not a string. - , -8 | error: get-function($add-two-fn); - | ^^^^^^^^^^^^^^^^^^^^^^^^^ - ' - input.scss 8:10 root stylesheet + , +10 | error: meta.get-function($add-two-fn); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ' + input.scss 10:10 root stylesheet <===> ================================================================================ <===> conflict/input.scss +@use "sass:meta"; @use "other1" as *; @use "other2" as *; -a {b: get-function(member)} +a {b: meta.get-function(member)} <===> conflict/other1.scss @function member() {@return from other1} @@ -185,80 +192,85 @@ a {b: get-function(member)} <===> conflict/error Error: This function is available from multiple global modules. , -1 | @use "other1" as *; +2 | @use "other1" as *; | ================== includes function -2 | @use "other2" as *; +3 | @use "other2" as *; | ================== includes function ... | -4 | a {b: get-function(member)} - | ^^^^^^^^^^^^^^^^^^^^ function use +5 | a {b: meta.get-function(member)} + | ^^^^^^^^^^^^^^^^^^^^^^^^^ function use ' - input.scss 4:7 root stylesheet + input.scss 5:7 root stylesheet <===> ================================================================================ <===> module/undefined/input.scss @use "sass:color"; -a {b: get-function("c", $module: "color")} +@use "sass:meta"; +a {b: meta.get-function("c", $module: "color")} <===> module/undefined/error Error: Function not found: "c" , -2 | a {b: get-function("c", $module: "color")} - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +3 | a {b: meta.get-function("c", $module: "color")} + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 2:7 root stylesheet + input.scss 3:7 root stylesheet <===> ================================================================================ <===> module/non_existent/input.scss -a {b: get-function("c", $module: "d")} +@use "sass:meta"; +a {b: meta.get-function("c", $module: "d")} <===> module/non_existent/error Error: There is no module with the namespace "d". , -1 | a {b: get-function("c", $module: "d")} - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2 | a {b: meta.get-function("c", $module: "d")} + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> module/built_in_but_not_loaded/input.scss -a {b: get-function("red", $module: "color")} +@use "sass:meta"; +a {b: meta.get-function("red", $module: "color")} <===> module/built_in_but_not_loaded/error Error: There is no module with the namespace "color". , -1 | a {b: get-function("red", $module: "color")} - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2 | a {b: meta.get-function("red", $module: "color")} + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:7 root stylesheet + input.scss 2:7 root stylesheet <===> ================================================================================ <===> module/dash_sensitive/input.scss @use "sass:color" as a-b; -c {d: get-function("c", $module: "a_b")} +@use "sass:meta"; +c {d: meta.get-function("c", $module: "a_b")} <===> module/dash_sensitive/error Error: There is no module with the namespace "a_b". , -2 | c {d: get-function("c", $module: "a_b")} - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +3 | c {d: meta.get-function("c", $module: "a_b")} + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 2:7 root stylesheet + input.scss 3:7 root stylesheet <===> ================================================================================ <===> module/and_css/input.scss @use "sass:color"; -a {b: get-function("red", $css: true, $module: "color")} +@use "sass:meta"; +a {b: meta.get-function("red", $css: true, $module: "color")} <===> module/and_css/error Error: $css and $module may not both be passed at once. , -2 | a {b: get-function("red", $css: true, $module: "color")} - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +3 | a {b: meta.get-function("red", $css: true, $module: "color")} + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 2:7 root stylesheet + input.scss 3:7 root stylesheet diff --git a/spec/core_functions/meta/get_function/same_module.hrx b/spec/core_functions/meta/get_function/same_module.hrx index a35dcb2ced..44c2ae7a08 100644 --- a/spec/core_functions/meta/get_function/same_module.hrx +++ b/spec/core_functions/meta/get_function/same_module.hrx @@ -1,8 +1,9 @@ <===> user_defined/input.scss +@use "sass:meta"; @function add-two($v) {@return $v + 2} -$add-two-fn: get-function(add-two); +$add-two-fn: meta.get-function(add-two); -a {b: call($add-two-fn, 10)} +a {b: meta.call($add-two-fn, 10)} <===> user_defined/output.css a { @@ -12,15 +13,16 @@ a { <===> ================================================================================ <===> redefined/input.scss +@use "sass:meta"; @function add-two($v) {@return $v + 2} -$add-two-fn: get-function(add-two); +$add-two-fn: meta.get-function(add-two); // The function returned by `get-function()` is locked in place when it's // called. Redefining the function after the fact shouldn't affect the stored // value. @function add-two($v) {@error "Should not be called"} -a {b: call($add-two-fn, 10)} +a {b: meta.call($add-two-fn, 10)} <===> redefined/output.css a { @@ -30,9 +32,10 @@ a { <===> ================================================================================ <===> built_in/input.scss -$lighten-fn: get-function(lighten); +@use "sass:meta"; +$lighten-fn: meta.get-function(lighten); -a {b: call($lighten-fn, red, 30%)} +a {b: meta.call($lighten-fn, red, 30%)} <===> built_in/output.css a { @@ -42,8 +45,9 @@ a { <===> ================================================================================ <===> through_import/input.scss +@use "sass:meta"; @import "other"; -a {b: call(get-function(add-two), 10)} +a {b: meta.call(meta.get-function(add-two), 10)} <===> through_import/other.scss @function add-two($v) {@return $v + 2} @@ -56,12 +60,13 @@ a { <===> ================================================================================ <===> plain_css/input.scss -$sass-fn: get-function(lighten); -$css-fn: get-function(lighten, $css: true); +@use "sass:meta"; +$sass-fn: meta.get-function(lighten); +$css-fn: meta.get-function(lighten, $css: true); a { - sass-fn: call($sass-fn, red, 30%); - css-fn: call($css-fn, red, 30%); + sass-fn: meta.call($sass-fn, red, 30%); + css-fn: meta.call($css-fn, red, 30%); } <===> plain_css/output.css @@ -73,9 +78,10 @@ a { <===> ================================================================================ <===> dash_insensitive/dash_to_underscore/input.scss +@use "sass:meta"; @function add_two($v) {@return $v + 2} -a {b: call(get-function(add-two), 10)} +a {b: meta.call(meta.get-function(add-two), 10)} <===> dash_insensitive/dash_to_underscore/output.css a { @@ -85,9 +91,10 @@ a { <===> ================================================================================ <===> dash_insensitive/underscore_to_dash/input.scss +@use "sass:meta"; @function add-two($v) {@return $v + 2} -a {b: call(get-function(add_two), 10)} +a {b: meta.call(meta.get-function(add_two), 10)} <===> dash_insensitive/underscore_to_dash/output.css a { diff --git a/spec/core_functions/meta/get_function/scope.hrx b/spec/core_functions/meta/get_function/scope.hrx index cbafdf5683..06a3334064 100644 --- a/spec/core_functions/meta/get_function/scope.hrx +++ b/spec/core_functions/meta/get_function/scope.hrx @@ -1,4 +1,5 @@ <===> stores_local_scope/input.scss +@use "sass:meta"; $add-two-fn: null; .scope { @@ -6,10 +7,10 @@ $add-two-fn: null; // This function reference will still refer to this nested `add-two` function // even when it goes out of scope. - $add-two-fn: get-function(add-two) !global; + $add-two-fn: meta.get-function(add-two) !global; } -a {b: call($add-two-fn, 10)} +a {b: meta.call($add-two-fn, 10)} <===> stores_local_scope/output.css a { @@ -19,6 +20,7 @@ a { <===> ================================================================================ <===> captures_inner_scope/input.scss +@use "sass:meta"; @function add-two($v) {@error "Should not be called"} .scope1 { @function add-two($v) {@error "Should not be called"} @@ -29,7 +31,7 @@ a { // Like a normal function call, get-function() will always use the // innermost definition of a function. - a: call(get-function(add-two), 10); + a: meta.call(meta.get-function(add-two), 10); } } } diff --git a/spec/core_functions/meta/get_mixin/scope.hrx b/spec/core_functions/meta/get_mixin/scope.hrx index 104f6c060d..d5fb42507f 100644 --- a/spec/core_functions/meta/get_mixin/scope.hrx +++ b/spec/core_functions/meta/get_mixin/scope.hrx @@ -11,7 +11,7 @@ $add-two-mixin: null; // This mixin reference will still refer to this nested `add-two` mixin // even when it goes out of scope. - $add-two-mixin: get-mixin(add-two) !global; + $add-two-mixin: meta.get-mixin(add-two) !global; } a {@include meta.apply($add-two-mixin, 10)} @@ -35,7 +35,7 @@ a { // Like a normal mixin call, get-mixin() will always use the // innermost definition of a mixin. - @include meta.apply(get-mixin(add-two), 10); + @include meta.apply(meta.get-mixin(add-two), 10); } } } diff --git a/spec/core_functions/meta/inspect/color.hrx b/spec/core_functions/meta/inspect/color.hrx index 99b98f0f1d..2c30d186f9 100644 --- a/spec/core_functions/meta/inspect/color.hrx +++ b/spec/core_functions/meta/inspect/color.hrx @@ -74,12 +74,13 @@ alpha channel is anything other than 1, or the color name if it has one, or else the hex code. <===> generated/_utils.scss +@use "sass:color"; /// Returns a copy of `$color` that doesn't have color-literal metadata /// associated with it. @function generated-color($color) { // This doesn't change the value of `$color` at all, but it does construct a // new object. - @return scale-color($color, $blue: 0%); + @return color.scale($color, $blue: 0%); } <===> diff --git a/spec/core_functions/meta/keywords.hrx b/spec/core_functions/meta/keywords.hrx index 7610abfc07..13de5458e4 100644 --- a/spec/core_functions/meta/keywords.hrx +++ b/spec/core_functions/meta/keywords.hrx @@ -1,7 +1,8 @@ <===> _utils.scss +@use "sass:meta"; /// Returns the keyword arguments passed to this function as a map. @function args-to-keywords($args...) { - @return keywords($args); + @return meta.keywords($args); } <===> diff --git a/spec/core_functions/meta/load_css/with.hrx b/spec/core_functions/meta/load_css/with.hrx index 2d711f8f80..6a2952ee59 100644 --- a/spec/core_functions/meta/load_css/with.hrx +++ b/spec/core_functions/meta/load_css/with.hrx @@ -134,11 +134,12 @@ b { @include meta.load-css("other", $with: (a: configured)); <===> variable_exists/_other.scss -$before-declaration: variable-exists(a); +@use "sass:meta"; +$before-declaration: meta.variable-exists(a); $a: original !default; b { before-declaration: $before-declaration; - after-declaration: variable-exists(a); + after-declaration: meta.variable-exists(a); } <===> variable_exists/output.css From fee504c434f18033570c24cb092dda35a5150e6a Mon Sep 17 00:00:00 2001 From: Jennifer Thakar Date: Fri, 12 Jul 2024 14:20:20 -0700 Subject: [PATCH 04/10] More libsass global functions --- .../forward/with/variable_exists.hrx | 5 +- spec/directives/use/with/variable_exists.hrx | 5 +- spec/libsass/arg-eval.hrx | 20 +- spec/libsass/at-error/feature-test.hrx | 3 +- spec/libsass/bool.hrx | 3 +- spec/libsass/bourbon.hrx | 288 ++++++- spec/libsass/charset.hrx | 3 +- .../libsass/color-functions/opacity/alpha.hrx | 23 +- .../color-functions/other/change-color/a.hrx | 23 +- .../color-functions/other/change-color/b.hrx | 513 ++++++------- .../color-functions/other/change-color/g.hrx | 513 ++++++------- .../color-functions/other/change-color/h.hrx | 725 +++++++++--------- .../color-functions/other/change-color/l.hrx | 201 ++--- .../color-functions/other/change-color/r.hrx | 513 ++++++------- .../color-functions/other/change-color/s.hrx | 203 ++--- spec/libsass/color-functions/saturate.hrx | 199 ++--- spec/libsass/delayed.hrx | 83 +- spec/libsass/div.hrx | 30 +- spec/libsass/list-evaluation.hrx | 32 +- spec/libsass/lists.hrx | 58 +- spec/libsass/mixin.hrx | 29 +- spec/libsass/parent-selector/missing.hrx | 11 +- spec/libsass/precision/default.hrx | 9 +- spec/libsass/precision/higher.hrx | 7 +- spec/libsass/precision/lower.hrx | 7 +- .../selector-functions/selector-length.hrx | 7 +- .../selector-functions/simple-selector.hrx | 5 +- spec/libsass/selectors/function-argument.hrx | 17 +- spec/libsass/selectors/mixin-argument.hrx | 14 +- spec/libsass/test.hrx | 31 +- spec/libsass/unary-ops.hrx | 3 +- spec/libsass/units/feature-test.hrx | 3 +- spec/libsass/units/simple.hrx | 55 +- .../blead-global/expanding/at-root.hrx | 15 +- .../blead-global/expanding/each.hrx | 19 +- .../blead-global/expanding/else.hrx | 15 +- .../blead-global/expanding/elseif.hrx | 15 +- .../blead-global/expanding/for.hrx | 19 +- .../blead-global/expanding/function.hrx | 21 +- .../blead-global/expanding/if.hrx | 15 +- .../blead-global/expanding/mixin.hrx | 17 +- .../blead-global/expanding/ruleset.hrx | 15 +- .../blead-global/expanding/while.hrx | 19 +- .../blead-global/functional/each.hrx | 45 +- .../blead-global/functional/else.hrx | 45 +- .../blead-global/functional/elseif.hrx | 45 +- .../blead-global/functional/for.hrx | 45 +- .../blead-global/functional/if.hrx | 45 +- .../blead-global/functional/while.hrx | 45 +- .../libsass/variable-scoping/feature-test.hrx | 3 +- 50 files changed, 2214 insertions(+), 1870 deletions(-) diff --git a/spec/directives/forward/with/variable_exists.hrx b/spec/directives/forward/with/variable_exists.hrx index 62110bd101..b42526120f 100644 --- a/spec/directives/forward/with/variable_exists.hrx +++ b/spec/directives/forward/with/variable_exists.hrx @@ -5,11 +5,12 @@ @forward "upstream" with ($a: configured); <===> _upstream.scss -$before-declaration: variable-exists(a); +@use "sass:meta"; +$before-declaration: meta.variable-exists(a); $a: original !default; b { before-declaration: $before-declaration; - after-declaration: variable-exists(a); + after-declaration: meta.variable-exists(a); } <===> output.css diff --git a/spec/directives/use/with/variable_exists.hrx b/spec/directives/use/with/variable_exists.hrx index eb59e63feb..cff1d23a90 100644 --- a/spec/directives/use/with/variable_exists.hrx +++ b/spec/directives/use/with/variable_exists.hrx @@ -2,11 +2,12 @@ @use "other" with ($a: configured); <===> _other.scss -$before-declaration: variable-exists(a); +@use "sass:meta"; +$before-declaration: meta.variable-exists(a); $a: original !default; b { before-declaration: $before-declaration; - after-declaration: variable-exists(a); + after-declaration: meta.variable-exists(a); } <===> output.css diff --git a/spec/libsass/arg-eval.hrx b/spec/libsass/arg-eval.hrx index 291d59ec52..34fee6e622 100644 --- a/spec/libsass/arg-eval.hrx +++ b/spec/libsass/arg-eval.hrx @@ -1,4 +1,6 @@ <===> input.scss +@use "sass:list"; +@use "sass:meta"; @function foo() { @return 1+2 3/4 5+6; } @@ -9,10 +11,10 @@ div { content: foobar(1+2 3/4 5+6, orange); - content: append(1+2 2/3 5+6, orange); + content: list.append(1+2 2/3 5+6, orange); content: 1+2 2/3 5+6; - content: type-of(2/3); - content: type-of(orange); + content: meta.type-of(2/3); + content: meta.type-of(orange); content: foo(); @include bar(); } @@ -35,10 +37,10 @@ Recommendation: math.div(2, 3) More info and automated migrator: https://sass-lang.com/d/slash-div , -13 | content: type-of(2/3); - | ^^^ +15 | content: meta.type-of(2/3); + | ^^^ ' - input.scss 13:20 root stylesheet + input.scss 15:25 root stylesheet DEPRECATION WARNING: Using / for division is deprecated and will be removed in Dart Sass 2.0.0. @@ -47,8 +49,8 @@ Recommendation: math.div(3, 4) More info and automated migrator: https://sass-lang.com/d/slash-div , -5 | @mixin bar($x: 3/4) { +7 | @mixin bar($x: 3/4) { | ^^^ ' - input.scss 5:16 bar() - input.scss 16:3 root stylesheet + input.scss 7:16 bar() + input.scss 18:3 root stylesheet diff --git a/spec/libsass/at-error/feature-test.hrx b/spec/libsass/at-error/feature-test.hrx index 1d1635f5ec..f19c31889a 100644 --- a/spec/libsass/at-error/feature-test.hrx +++ b/spec/libsass/at-error/feature-test.hrx @@ -1,5 +1,6 @@ <===> input.scss -@if feature-exists(at-error) { +@use "sass:meta"; +@if meta.feature-exists(at-error) { div { feature: true; } diff --git a/spec/libsass/bool.hrx b/spec/libsass/bool.hrx index 5344efdae1..e6bc3a838c 100644 --- a/spec/libsass/bool.hrx +++ b/spec/libsass/bool.hrx @@ -1,11 +1,12 @@ <===> input.scss +@use "sass:string"; div { a: (false and "hey"); b: ("hey" and "ho"); b: ("hey" or "ho"); a: false and "hey"; b: "hey" and "ho"; - b: unquote("hey") or "ho"; + b: string.unquote("hey") or "ho"; } <===> output.css div { diff --git a/spec/libsass/bourbon.hrx b/spec/libsass/bourbon.hrx index 25311a1372..3b564ed606 100644 --- a/spec/libsass/bourbon.hrx +++ b/spec/libsass/bourbon.hrx @@ -7,6 +7,7 @@ - lint-hrx <===> input.scss +@use "sass:color"; @import "lib/_bourbon.scss"; box:hover { @@ -31,7 +32,7 @@ div { // Multiple linear-gradients - Demo @include background-image(linear-gradient(hsla(0, 100%, 100%, 0.25) 0%, hsla(0, 100%, 100%, 0.08) 50%, transparent 50%), - linear-gradient(#4e7ba3, darken(#4e7ba4, 10%))); + linear-gradient(#4e7ba3, color.adjust(#4e7ba4, $lightness: -10%))); // NOT SUPPORTED - Multiple image assets with shorthand notation @include background-image(url("/images/a.png") center no-repeat, url("images/b.png") left repeat); @@ -1933,3 +1934,288 @@ div { background-image: -webkit-url("/images/a.png")-gradient(center), -webkit-url("images/b.png")-gradient(left); background-image: url("/images/a.png")-gradient( center), url("images/b.png")-gradient( left); } + +<===> warning +DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. +Use string.unquote instead. + +More info and automated migrator: https://sass-lang.com/d/import + + , +25 | $unquoted-inputs-list: append($unquoted-inputs-list, unquote($input-type), comma); + | ^^^^^^^^^^^^^^^^^^^^ + ' + lib/addons/_html5-input-types.scss 25:56 @import + lib/_bourbon.scss 50:9 @import + input.scss 2:9 root stylesheet + +DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. +Use list.append instead. + +More info and automated migrator: https://sass-lang.com/d/import + + , +25 | $unquoted-inputs-list: append($unquoted-inputs-list, unquote($input-type), comma); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ' + lib/addons/_html5-input-types.scss 25:26 @import + lib/_bourbon.scss 50:9 @import + input.scss 2:9 root stylesheet + +DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. +Use list.append instead. + +More info and automated migrator: https://sass-lang.com/d/import + + , +36 | $all-text-inputs-hover: append($all-text-inputs-hover, $input-type-hover, comma); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ' + lib/addons/_html5-input-types.scss 36:31 @import + lib/_bourbon.scss 50:9 @import + input.scss 2:9 root stylesheet + +DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. +Use list.append instead. + +More info and automated migrator: https://sass-lang.com/d/import + + , +44 | $all-text-inputs-focus: append($all-text-inputs-focus, $input-type-focus, comma); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ' + lib/addons/_html5-input-types.scss 44:31 @import + lib/_bourbon.scss 50:9 @import + input.scss 2:9 root stylesheet + +DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. +Use list.length instead. + +More info and automated migrator: https://sass-lang.com/d/import + + , +14 | @for $i from 1 through length($images) { + | ^^^^^^^^^^^^^^^ + ' + lib/css3/_background-image.scss 14:26 -add-prefix() + lib/css3/_background-image.scss 7:21 background-image() + input.scss 19:3 root stylesheet + +DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. +Use list.nth instead. + +More info and automated migrator: https://sass-lang.com/d/import + + , +15 | $type: type-of(nth($images, $i)); // Get type of variable - List or String + | ^^^^^^^^^^^^^^^^ + ' + lib/css3/_background-image.scss 15:20 -add-prefix() + lib/css3/_background-image.scss 7:21 background-image() + input.scss 19:3 root stylesheet + +DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. +Use meta.type-of instead. + +More info and automated migrator: https://sass-lang.com/d/import + + , +15 | $type: type-of(nth($images, $i)); // Get type of variable - List or String + | ^^^^^^^^^^^^^^^^^^^^^^^^^ + ' + lib/css3/_background-image.scss 15:12 -add-prefix() + lib/css3/_background-image.scss 7:21 background-image() + input.scss 19:3 root stylesheet + +DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. +Use list.nth instead. + +More info and automated migrator: https://sass-lang.com/d/import + + , +37 | $images-prefixed: join($images-prefixed, nth($images, $i), comma); + | ^^^^^^^^^^^^^^^^ + ' + lib/css3/_background-image.scss 37:48 -add-prefix() + lib/css3/_background-image.scss 7:21 background-image() + input.scss 19:3 root stylesheet + +DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. +Use list.join instead. + +More info and automated migrator: https://sass-lang.com/d/import + + , +37 | $images-prefixed: join($images-prefixed, nth($images, $i), comma); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ' + lib/css3/_background-image.scss 37:25 -add-prefix() + lib/css3/_background-image.scss 7:21 background-image() + input.scss 19:3 root stylesheet + +DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. +Use list.nth instead. + +More info and automated migrator: https://sass-lang.com/d/import + + , +3 | $pos-type: type-of(nth($pos, 1)); + | ^^^^^^^^^^^^ + ' + lib/functions/_linear-gradient.scss 3:22 linear-gradient() + input.scss 22:51 root stylesheet + +DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. +Use meta.type-of instead. + +More info and automated migrator: https://sass-lang.com/d/import + + , +3 | $pos-type: type-of(nth($pos, 1)); + | ^^^^^^^^^^^^^^^^^^^^^ + ' + lib/functions/_linear-gradient.scss 3:14 linear-gradient() + input.scss 22:51 root stylesheet + +DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. +Use list.zip instead. + +More info and automated migrator: https://sass-lang.com/d/import + + , +7 | $gradients: zip($pos $gradients); + | ^^^^^^^^^^^^^^^^^^^^ + ' + lib/functions/_linear-gradient.scss 7:17 linear-gradient() + input.scss 22:51 root stylesheet + +DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. +Use list.nth instead. + +More info and automated migrator: https://sass-lang.com/d/import + + , +19 | $gradient-type: nth(nth($images, $i), 1); // linear or radial + | ^^^^^^^^^^^^^^^^ + ' + lib/css3/_background-image.scss 19:27 -add-prefix() + lib/css3/_background-image.scss 7:21 background-image() + input.scss 22:3 root stylesheet + +DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. +Use list.nth instead. + +More info and automated migrator: https://sass-lang.com/d/import + + , +19 | $gradient-type: nth(nth($images, $i), 1); // linear or radial + | ^^^^^^^^^^^^^^^^^^^^^^^^ + ' + lib/css3/_background-image.scss 19:23 -add-prefix() + lib/css3/_background-image.scss 7:21 background-image() + input.scss 22:3 root stylesheet + +DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. +Use list.nth instead. + +More info and automated migrator: https://sass-lang.com/d/import + + , +24 | $gradient-pos: nth(nth($images, $i), 2); // Get gradient position + | ^^^^^^^^^^^^^^^^ + ' + lib/css3/_background-image.scss 24:29 -add-prefix() + lib/css3/_background-image.scss 7:21 background-image() + input.scss 22:3 root stylesheet + +DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. +Use list.nth instead. + +More info and automated migrator: https://sass-lang.com/d/import + + , +24 | $gradient-pos: nth(nth($images, $i), 2); // Get gradient position + | ^^^^^^^^^^^^^^^^^^^^^^^^ + ' + lib/css3/_background-image.scss 24:25 -add-prefix() + lib/css3/_background-image.scss 7:21 background-image() + input.scss 22:3 root stylesheet + +DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. +Use list.nth instead. + +More info and automated migrator: https://sass-lang.com/d/import + + , +25 | $gradient-args: nth(nth($images, $i), 3); // Get actual gradient (red, blue) + | ^^^^^^^^^^^^^^^^ + ' + lib/css3/_background-image.scss 25:29 -add-prefix() + lib/css3/_background-image.scss 7:21 background-image() + input.scss 22:3 root stylesheet + +DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. +Use list.nth instead. + +More info and automated migrator: https://sass-lang.com/d/import + + , +25 | $gradient-args: nth(nth($images, $i), 3); // Get actual gradient (red, blue) + | ^^^^^^^^^^^^^^^^^^^^^^^^ + ' + lib/css3/_background-image.scss 25:25 -add-prefix() + lib/css3/_background-image.scss 7:21 background-image() + input.scss 22:3 root stylesheet + +DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. +Use list.append instead. + +More info and automated migrator: https://sass-lang.com/d/import + + , +33 | $images-prefixed: append($images-prefixed, $gradient, comma); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + ' + lib/css3/_background-image.scss 33:25 -add-prefix() + lib/css3/_background-image.scss 7:21 background-image() + input.scss 22:3 root stylesheet + +DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. +Use string.unquote instead. + +More info and automated migrator: https://sass-lang.com/d/import + + , +23 | $vendor-gradients: unquote($vendor-gradients); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^ + ' + lib/helpers/_render-gradients.scss 23:24 -render-gradients() + lib/css3/_background-image.scss 32:18 -add-prefix() + lib/css3/_background-image.scss 8:21 background-image() + input.scss 22:3 root stylesheet + +DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. +Use list.nth instead. + +More info and automated migrator: https://sass-lang.com/d/import + + , +28 | $gradient-args: nth(nth($images, $i), 2); // Get actual gradient (red, blue) + | ^^^^^^^^^^^^^^^^ + ' + lib/css3/_background-image.scss 28:29 -add-prefix() + lib/css3/_background-image.scss 7:21 background-image() + input.scss 29:3 root stylesheet + +DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. +Use list.nth instead. + +More info and automated migrator: https://sass-lang.com/d/import + + , +28 | $gradient-args: nth(nth($images, $i), 2); // Get actual gradient (red, blue) + | ^^^^^^^^^^^^^^^^^^^^^^^^ + ' + lib/css3/_background-image.scss 28:25 -add-prefix() + lib/css3/_background-image.scss 7:21 background-image() + input.scss 29:3 root stylesheet diff --git a/spec/libsass/charset.hrx b/spec/libsass/charset.hrx index 1856bf7ae5..9678dde271 100644 --- a/spec/libsass/charset.hrx +++ b/spec/libsass/charset.hrx @@ -1,6 +1,7 @@ <===> input.scss +@use "sass:string"; div { - content: to-upper-case("øáéíóúüñ¿éàŤDžǂɊɱʭʬѪ҈ݓ"); + content: string.to-upper-case("øáéíóúüñ¿éàŤDžǂɊɱʭʬѪ҈ݓ"); } <===> output.css diff --git a/spec/libsass/color-functions/opacity/alpha.hrx b/spec/libsass/color-functions/opacity/alpha.hrx index cc9bb46b8b..ebd93a3c4d 100644 --- a/spec/libsass/color-functions/opacity/alpha.hrx +++ b/spec/libsass/color-functions/opacity/alpha.hrx @@ -1,16 +1,17 @@ <===> input.scss +@use "sass:color"; foo { - c0: opacity(rgba(0,0,0,0.0)); - c1: opacity(rgba(0,0,0,0.1)); - c2: opacity(rgba(0,0,0,0.2)); - c3: opacity(rgba(0,0,0,0.3)); - c4: opacity(rgba(0,0,0,0.4)); - c5: opacity(rgba(0,0,0,0.5)); - c6: opacity(rgba(0,0,0,0.6)); - c7: opacity(rgba(0,0,0,0.7)); - c8: opacity(rgba(0,0,0,0.8)); - c9: opacity(rgba(0,0,0,0.9)); - c10: opacity(rgba(0,0,0,1)); + c0: color.opacity(rgba(0,0,0,0.0)); + c1: color.opacity(rgba(0,0,0,0.1)); + c2: color.opacity(rgba(0,0,0,0.2)); + c3: color.opacity(rgba(0,0,0,0.3)); + c4: color.opacity(rgba(0,0,0,0.4)); + c5: color.opacity(rgba(0,0,0,0.5)); + c6: color.opacity(rgba(0,0,0,0.6)); + c7: color.opacity(rgba(0,0,0,0.7)); + c8: color.opacity(rgba(0,0,0,0.8)); + c9: color.opacity(rgba(0,0,0,0.9)); + c10: color.opacity(rgba(0,0,0,1)); } <===> output.css diff --git a/spec/libsass/color-functions/other/change-color/a.hrx b/spec/libsass/color-functions/other/change-color/a.hrx index 968f0781d7..da71953451 100644 --- a/spec/libsass/color-functions/other/change-color/a.hrx +++ b/spec/libsass/color-functions/other/change-color/a.hrx @@ -1,17 +1,18 @@ <===> input.scss +@use "sass:color"; foo { // c-1: change-color(black,$alpha:-1); - c0: change-color(black,$alpha:0.0); - c1: change-color(black,$alpha:0.1); - c2: change-color(black,$alpha:0.2); - c3: change-color(black,$alpha:0.3); - c4: change-color(black,$alpha:0.4); - c5: change-color(black,$alpha:0.5); - c6: change-color(black,$alpha:0.6); - c7: change-color(black,$alpha:0.7); - c8: change-color(black,$alpha:0.8); - c9: change-color(black,$alpha:0.9); - c10: change-color(black,$alpha:1); + c0: color.change(black,$alpha:0.0); + c1: color.change(black,$alpha:0.1); + c2: color.change(black,$alpha:0.2); + c3: color.change(black,$alpha:0.3); + c4: color.change(black,$alpha:0.4); + c5: color.change(black,$alpha:0.5); + c6: color.change(black,$alpha:0.6); + c7: color.change(black,$alpha:0.7); + c8: color.change(black,$alpha:0.8); + c9: color.change(black,$alpha:0.9); + c10: color.change(black,$alpha:1); // c11: change-color(black,$alpha:1.1); // c12: change-color(black,$alpha:2); } diff --git a/spec/libsass/color-functions/other/change-color/b.hrx b/spec/libsass/color-functions/other/change-color/b.hrx index 6cdcea5416..e11e69d1fd 100644 --- a/spec/libsass/color-functions/other/change-color/b.hrx +++ b/spec/libsass/color-functions/other/change-color/b.hrx @@ -1,262 +1,263 @@ <===> input.scss +@use "sass:color"; foo { // c-1: change-color(black,$blue:-1); - c0: change-color(black,$blue:0); - c1: change-color(black,$blue:1); - c2: change-color(black,$blue:2); - c3: change-color(black,$blue:3); - c4: change-color(black,$blue:4); - c5: change-color(black,$blue:5); - c6: change-color(black,$blue:6); - c7: change-color(black,$blue:7); - c8: change-color(black,$blue:8); - c9: change-color(black,$blue:9); - c10: change-color(black,$blue:10); - c11: change-color(black,$blue:11); - c12: change-color(black,$blue:12); - c13: change-color(black,$blue:13); - c14: change-color(black,$blue:14); - c15: change-color(black,$blue:15); - c16: change-color(black,$blue:16); - c17: change-color(black,$blue:17); - c18: change-color(black,$blue:18); - c19: change-color(black,$blue:19); - c20: change-color(black,$blue:20); - c21: change-color(black,$blue:21); - c22: change-color(black,$blue:22); - c23: change-color(black,$blue:23); - c24: change-color(black,$blue:24); - c25: change-color(black,$blue:25); - c26: change-color(black,$blue:26); - c27: change-color(black,$blue:27); - c28: change-color(black,$blue:28); - c29: change-color(black,$blue:29); - c30: change-color(black,$blue:30); - c31: change-color(black,$blue:31); - c32: change-color(black,$blue:32); - c33: change-color(black,$blue:33); - c34: change-color(black,$blue:34); - c35: change-color(black,$blue:35); - c36: change-color(black,$blue:36); - c37: change-color(black,$blue:37); - c38: change-color(black,$blue:38); - c39: change-color(black,$blue:39); - c40: change-color(black,$blue:40); - c41: change-color(black,$blue:41); - c42: change-color(black,$blue:42); - c43: change-color(black,$blue:43); - c44: change-color(black,$blue:44); - c45: change-color(black,$blue:45); - c46: change-color(black,$blue:46); - c47: change-color(black,$blue:47); - c48: change-color(black,$blue:48); - c49: change-color(black,$blue:49); - c50: change-color(black,$blue:50); - c51: change-color(black,$blue:51); - c52: change-color(black,$blue:52); - c53: change-color(black,$blue:53); - c54: change-color(black,$blue:54); - c55: change-color(black,$blue:55); - c56: change-color(black,$blue:56); - c57: change-color(black,$blue:57); - c58: change-color(black,$blue:58); - c59: change-color(black,$blue:59); - c60: change-color(black,$blue:60); - c61: change-color(black,$blue:61); - c62: change-color(black,$blue:62); - c63: change-color(black,$blue:63); - c64: change-color(black,$blue:64); - c65: change-color(black,$blue:65); - c66: change-color(black,$blue:66); - c67: change-color(black,$blue:67); - c68: change-color(black,$blue:68); - c69: change-color(black,$blue:69); - c70: change-color(black,$blue:70); - c71: change-color(black,$blue:71); - c72: change-color(black,$blue:72); - c73: change-color(black,$blue:73); - c74: change-color(black,$blue:74); - c75: change-color(black,$blue:75); - c76: change-color(black,$blue:76); - c77: change-color(black,$blue:77); - c78: change-color(black,$blue:78); - c79: change-color(black,$blue:79); - c80: change-color(black,$blue:80); - c81: change-color(black,$blue:81); - c82: change-color(black,$blue:82); - c83: change-color(black,$blue:83); - c84: change-color(black,$blue:84); - c85: change-color(black,$blue:85); - c86: change-color(black,$blue:86); - c87: change-color(black,$blue:87); - c88: change-color(black,$blue:88); - c89: change-color(black,$blue:89); - c90: change-color(black,$blue:90); - c91: change-color(black,$blue:91); - c92: change-color(black,$blue:92); - c93: change-color(black,$blue:93); - c94: change-color(black,$blue:94); - c95: change-color(black,$blue:95); - c96: change-color(black,$blue:96); - c97: change-color(black,$blue:97); - c98: change-color(black,$blue:98); - c99: change-color(black,$blue:99); - c100: change-color(black,$blue:100); - c101: change-color(black,$blue:101); - c102: change-color(black,$blue:102); - c103: change-color(black,$blue:103); - c104: change-color(black,$blue:104); - c105: change-color(black,$blue:105); - c106: change-color(black,$blue:106); - c107: change-color(black,$blue:107); - c108: change-color(black,$blue:108); - c109: change-color(black,$blue:109); - c110: change-color(black,$blue:110); - c111: change-color(black,$blue:111); - c112: change-color(black,$blue:112); - c113: change-color(black,$blue:113); - c114: change-color(black,$blue:114); - c115: change-color(black,$blue:115); - c116: change-color(black,$blue:116); - c117: change-color(black,$blue:117); - c118: change-color(black,$blue:118); - c119: change-color(black,$blue:119); - c120: change-color(black,$blue:120); - c121: change-color(black,$blue:121); - c122: change-color(black,$blue:122); - c123: change-color(black,$blue:123); - c124: change-color(black,$blue:124); - c125: change-color(black,$blue:125); - c126: change-color(black,$blue:126); - c127: change-color(black,$blue:127); - c128: change-color(black,$blue:128); - c129: change-color(black,$blue:129); - c130: change-color(black,$blue:130); - c131: change-color(black,$blue:131); - c132: change-color(black,$blue:132); - c133: change-color(black,$blue:133); - c134: change-color(black,$blue:134); - c135: change-color(black,$blue:135); - c136: change-color(black,$blue:136); - c137: change-color(black,$blue:137); - c138: change-color(black,$blue:138); - c139: change-color(black,$blue:139); - c140: change-color(black,$blue:140); - c141: change-color(black,$blue:141); - c142: change-color(black,$blue:142); - c143: change-color(black,$blue:143); - c144: change-color(black,$blue:144); - c145: change-color(black,$blue:145); - c146: change-color(black,$blue:146); - c147: change-color(black,$blue:147); - c148: change-color(black,$blue:148); - c149: change-color(black,$blue:149); - c150: change-color(black,$blue:150); - c151: change-color(black,$blue:151); - c152: change-color(black,$blue:152); - c153: change-color(black,$blue:153); - c154: change-color(black,$blue:154); - c155: change-color(black,$blue:155); - c156: change-color(black,$blue:156); - c157: change-color(black,$blue:157); - c158: change-color(black,$blue:158); - c159: change-color(black,$blue:159); - c160: change-color(black,$blue:160); - c161: change-color(black,$blue:161); - c162: change-color(black,$blue:162); - c163: change-color(black,$blue:163); - c164: change-color(black,$blue:164); - c165: change-color(black,$blue:165); - c166: change-color(black,$blue:166); - c167: change-color(black,$blue:167); - c168: change-color(black,$blue:168); - c169: change-color(black,$blue:169); - c170: change-color(black,$blue:170); - c171: change-color(black,$blue:171); - c172: change-color(black,$blue:172); - c173: change-color(black,$blue:173); - c174: change-color(black,$blue:174); - c175: change-color(black,$blue:175); - c176: change-color(black,$blue:176); - c177: change-color(black,$blue:177); - c178: change-color(black,$blue:178); - c179: change-color(black,$blue:179); - c180: change-color(black,$blue:180); - c181: change-color(black,$blue:181); - c182: change-color(black,$blue:182); - c183: change-color(black,$blue:183); - c184: change-color(black,$blue:184); - c185: change-color(black,$blue:185); - c186: change-color(black,$blue:186); - c187: change-color(black,$blue:187); - c188: change-color(black,$blue:188); - c189: change-color(black,$blue:189); - c190: change-color(black,$blue:190); - c191: change-color(black,$blue:191); - c192: change-color(black,$blue:192); - c193: change-color(black,$blue:193); - c194: change-color(black,$blue:194); - c195: change-color(black,$blue:195); - c196: change-color(black,$blue:196); - c197: change-color(black,$blue:197); - c198: change-color(black,$blue:198); - c199: change-color(black,$blue:199); - c200: change-color(black,$blue:200); - c201: change-color(black,$blue:201); - c202: change-color(black,$blue:202); - c203: change-color(black,$blue:203); - c204: change-color(black,$blue:204); - c205: change-color(black,$blue:205); - c206: change-color(black,$blue:206); - c207: change-color(black,$blue:207); - c208: change-color(black,$blue:208); - c209: change-color(black,$blue:209); - c210: change-color(black,$blue:210); - c211: change-color(black,$blue:211); - c212: change-color(black,$blue:212); - c213: change-color(black,$blue:213); - c214: change-color(black,$blue:214); - c215: change-color(black,$blue:215); - c216: change-color(black,$blue:216); - c217: change-color(black,$blue:217); - c218: change-color(black,$blue:218); - c219: change-color(black,$blue:219); - c220: change-color(black,$blue:220); - c221: change-color(black,$blue:221); - c222: change-color(black,$blue:222); - c223: change-color(black,$blue:223); - c224: change-color(black,$blue:224); - c225: change-color(black,$blue:225); - c226: change-color(black,$blue:226); - c227: change-color(black,$blue:227); - c228: change-color(black,$blue:228); - c229: change-color(black,$blue:229); - c230: change-color(black,$blue:230); - c231: change-color(black,$blue:231); - c232: change-color(black,$blue:232); - c233: change-color(black,$blue:233); - c234: change-color(black,$blue:234); - c235: change-color(black,$blue:235); - c236: change-color(black,$blue:236); - c237: change-color(black,$blue:237); - c238: change-color(black,$blue:238); - c239: change-color(black,$blue:239); - c240: change-color(black,$blue:240); - c241: change-color(black,$blue:241); - c242: change-color(black,$blue:242); - c243: change-color(black,$blue:243); - c244: change-color(black,$blue:244); - c245: change-color(black,$blue:245); - c246: change-color(black,$blue:246); - c247: change-color(black,$blue:247); - c248: change-color(black,$blue:248); - c249: change-color(black,$blue:249); - c250: change-color(black,$blue:250); - c251: change-color(black,$blue:251); - c252: change-color(black,$blue:252); - c253: change-color(black,$blue:253); - c254: change-color(black,$blue:254); - c255: change-color(black,$blue:255); + c0: color.change(black,$blue:0); + c1: color.change(black,$blue:1); + c2: color.change(black,$blue:2); + c3: color.change(black,$blue:3); + c4: color.change(black,$blue:4); + c5: color.change(black,$blue:5); + c6: color.change(black,$blue:6); + c7: color.change(black,$blue:7); + c8: color.change(black,$blue:8); + c9: color.change(black,$blue:9); + c10: color.change(black,$blue:10); + c11: color.change(black,$blue:11); + c12: color.change(black,$blue:12); + c13: color.change(black,$blue:13); + c14: color.change(black,$blue:14); + c15: color.change(black,$blue:15); + c16: color.change(black,$blue:16); + c17: color.change(black,$blue:17); + c18: color.change(black,$blue:18); + c19: color.change(black,$blue:19); + c20: color.change(black,$blue:20); + c21: color.change(black,$blue:21); + c22: color.change(black,$blue:22); + c23: color.change(black,$blue:23); + c24: color.change(black,$blue:24); + c25: color.change(black,$blue:25); + c26: color.change(black,$blue:26); + c27: color.change(black,$blue:27); + c28: color.change(black,$blue:28); + c29: color.change(black,$blue:29); + c30: color.change(black,$blue:30); + c31: color.change(black,$blue:31); + c32: color.change(black,$blue:32); + c33: color.change(black,$blue:33); + c34: color.change(black,$blue:34); + c35: color.change(black,$blue:35); + c36: color.change(black,$blue:36); + c37: color.change(black,$blue:37); + c38: color.change(black,$blue:38); + c39: color.change(black,$blue:39); + c40: color.change(black,$blue:40); + c41: color.change(black,$blue:41); + c42: color.change(black,$blue:42); + c43: color.change(black,$blue:43); + c44: color.change(black,$blue:44); + c45: color.change(black,$blue:45); + c46: color.change(black,$blue:46); + c47: color.change(black,$blue:47); + c48: color.change(black,$blue:48); + c49: color.change(black,$blue:49); + c50: color.change(black,$blue:50); + c51: color.change(black,$blue:51); + c52: color.change(black,$blue:52); + c53: color.change(black,$blue:53); + c54: color.change(black,$blue:54); + c55: color.change(black,$blue:55); + c56: color.change(black,$blue:56); + c57: color.change(black,$blue:57); + c58: color.change(black,$blue:58); + c59: color.change(black,$blue:59); + c60: color.change(black,$blue:60); + c61: color.change(black,$blue:61); + c62: color.change(black,$blue:62); + c63: color.change(black,$blue:63); + c64: color.change(black,$blue:64); + c65: color.change(black,$blue:65); + c66: color.change(black,$blue:66); + c67: color.change(black,$blue:67); + c68: color.change(black,$blue:68); + c69: color.change(black,$blue:69); + c70: color.change(black,$blue:70); + c71: color.change(black,$blue:71); + c72: color.change(black,$blue:72); + c73: color.change(black,$blue:73); + c74: color.change(black,$blue:74); + c75: color.change(black,$blue:75); + c76: color.change(black,$blue:76); + c77: color.change(black,$blue:77); + c78: color.change(black,$blue:78); + c79: color.change(black,$blue:79); + c80: color.change(black,$blue:80); + c81: color.change(black,$blue:81); + c82: color.change(black,$blue:82); + c83: color.change(black,$blue:83); + c84: color.change(black,$blue:84); + c85: color.change(black,$blue:85); + c86: color.change(black,$blue:86); + c87: color.change(black,$blue:87); + c88: color.change(black,$blue:88); + c89: color.change(black,$blue:89); + c90: color.change(black,$blue:90); + c91: color.change(black,$blue:91); + c92: color.change(black,$blue:92); + c93: color.change(black,$blue:93); + c94: color.change(black,$blue:94); + c95: color.change(black,$blue:95); + c96: color.change(black,$blue:96); + c97: color.change(black,$blue:97); + c98: color.change(black,$blue:98); + c99: color.change(black,$blue:99); + c100: color.change(black,$blue:100); + c101: color.change(black,$blue:101); + c102: color.change(black,$blue:102); + c103: color.change(black,$blue:103); + c104: color.change(black,$blue:104); + c105: color.change(black,$blue:105); + c106: color.change(black,$blue:106); + c107: color.change(black,$blue:107); + c108: color.change(black,$blue:108); + c109: color.change(black,$blue:109); + c110: color.change(black,$blue:110); + c111: color.change(black,$blue:111); + c112: color.change(black,$blue:112); + c113: color.change(black,$blue:113); + c114: color.change(black,$blue:114); + c115: color.change(black,$blue:115); + c116: color.change(black,$blue:116); + c117: color.change(black,$blue:117); + c118: color.change(black,$blue:118); + c119: color.change(black,$blue:119); + c120: color.change(black,$blue:120); + c121: color.change(black,$blue:121); + c122: color.change(black,$blue:122); + c123: color.change(black,$blue:123); + c124: color.change(black,$blue:124); + c125: color.change(black,$blue:125); + c126: color.change(black,$blue:126); + c127: color.change(black,$blue:127); + c128: color.change(black,$blue:128); + c129: color.change(black,$blue:129); + c130: color.change(black,$blue:130); + c131: color.change(black,$blue:131); + c132: color.change(black,$blue:132); + c133: color.change(black,$blue:133); + c134: color.change(black,$blue:134); + c135: color.change(black,$blue:135); + c136: color.change(black,$blue:136); + c137: color.change(black,$blue:137); + c138: color.change(black,$blue:138); + c139: color.change(black,$blue:139); + c140: color.change(black,$blue:140); + c141: color.change(black,$blue:141); + c142: color.change(black,$blue:142); + c143: color.change(black,$blue:143); + c144: color.change(black,$blue:144); + c145: color.change(black,$blue:145); + c146: color.change(black,$blue:146); + c147: color.change(black,$blue:147); + c148: color.change(black,$blue:148); + c149: color.change(black,$blue:149); + c150: color.change(black,$blue:150); + c151: color.change(black,$blue:151); + c152: color.change(black,$blue:152); + c153: color.change(black,$blue:153); + c154: color.change(black,$blue:154); + c155: color.change(black,$blue:155); + c156: color.change(black,$blue:156); + c157: color.change(black,$blue:157); + c158: color.change(black,$blue:158); + c159: color.change(black,$blue:159); + c160: color.change(black,$blue:160); + c161: color.change(black,$blue:161); + c162: color.change(black,$blue:162); + c163: color.change(black,$blue:163); + c164: color.change(black,$blue:164); + c165: color.change(black,$blue:165); + c166: color.change(black,$blue:166); + c167: color.change(black,$blue:167); + c168: color.change(black,$blue:168); + c169: color.change(black,$blue:169); + c170: color.change(black,$blue:170); + c171: color.change(black,$blue:171); + c172: color.change(black,$blue:172); + c173: color.change(black,$blue:173); + c174: color.change(black,$blue:174); + c175: color.change(black,$blue:175); + c176: color.change(black,$blue:176); + c177: color.change(black,$blue:177); + c178: color.change(black,$blue:178); + c179: color.change(black,$blue:179); + c180: color.change(black,$blue:180); + c181: color.change(black,$blue:181); + c182: color.change(black,$blue:182); + c183: color.change(black,$blue:183); + c184: color.change(black,$blue:184); + c185: color.change(black,$blue:185); + c186: color.change(black,$blue:186); + c187: color.change(black,$blue:187); + c188: color.change(black,$blue:188); + c189: color.change(black,$blue:189); + c190: color.change(black,$blue:190); + c191: color.change(black,$blue:191); + c192: color.change(black,$blue:192); + c193: color.change(black,$blue:193); + c194: color.change(black,$blue:194); + c195: color.change(black,$blue:195); + c196: color.change(black,$blue:196); + c197: color.change(black,$blue:197); + c198: color.change(black,$blue:198); + c199: color.change(black,$blue:199); + c200: color.change(black,$blue:200); + c201: color.change(black,$blue:201); + c202: color.change(black,$blue:202); + c203: color.change(black,$blue:203); + c204: color.change(black,$blue:204); + c205: color.change(black,$blue:205); + c206: color.change(black,$blue:206); + c207: color.change(black,$blue:207); + c208: color.change(black,$blue:208); + c209: color.change(black,$blue:209); + c210: color.change(black,$blue:210); + c211: color.change(black,$blue:211); + c212: color.change(black,$blue:212); + c213: color.change(black,$blue:213); + c214: color.change(black,$blue:214); + c215: color.change(black,$blue:215); + c216: color.change(black,$blue:216); + c217: color.change(black,$blue:217); + c218: color.change(black,$blue:218); + c219: color.change(black,$blue:219); + c220: color.change(black,$blue:220); + c221: color.change(black,$blue:221); + c222: color.change(black,$blue:222); + c223: color.change(black,$blue:223); + c224: color.change(black,$blue:224); + c225: color.change(black,$blue:225); + c226: color.change(black,$blue:226); + c227: color.change(black,$blue:227); + c228: color.change(black,$blue:228); + c229: color.change(black,$blue:229); + c230: color.change(black,$blue:230); + c231: color.change(black,$blue:231); + c232: color.change(black,$blue:232); + c233: color.change(black,$blue:233); + c234: color.change(black,$blue:234); + c235: color.change(black,$blue:235); + c236: color.change(black,$blue:236); + c237: color.change(black,$blue:237); + c238: color.change(black,$blue:238); + c239: color.change(black,$blue:239); + c240: color.change(black,$blue:240); + c241: color.change(black,$blue:241); + c242: color.change(black,$blue:242); + c243: color.change(black,$blue:243); + c244: color.change(black,$blue:244); + c245: color.change(black,$blue:245); + c246: color.change(black,$blue:246); + c247: color.change(black,$blue:247); + c248: color.change(black,$blue:248); + c249: color.change(black,$blue:249); + c250: color.change(black,$blue:250); + c251: color.change(black,$blue:251); + c252: color.change(black,$blue:252); + c253: color.change(black,$blue:253); + c254: color.change(black,$blue:254); + c255: color.change(black,$blue:255); // c256: change-color(black,$blue:256); } diff --git a/spec/libsass/color-functions/other/change-color/g.hrx b/spec/libsass/color-functions/other/change-color/g.hrx index 203e830290..1cd0834cdf 100644 --- a/spec/libsass/color-functions/other/change-color/g.hrx +++ b/spec/libsass/color-functions/other/change-color/g.hrx @@ -1,262 +1,263 @@ <===> input.scss +@use "sass:color"; foo { // c-1: change-color(black,$green:-1); - c0: change-color(black,$green:0); - c1: change-color(black,$green:1); - c2: change-color(black,$green:2); - c3: change-color(black,$green:3); - c4: change-color(black,$green:4); - c5: change-color(black,$green:5); - c6: change-color(black,$green:6); - c7: change-color(black,$green:7); - c8: change-color(black,$green:8); - c9: change-color(black,$green:9); - c10: change-color(black,$green:10); - c11: change-color(black,$green:11); - c12: change-color(black,$green:12); - c13: change-color(black,$green:13); - c14: change-color(black,$green:14); - c15: change-color(black,$green:15); - c16: change-color(black,$green:16); - c17: change-color(black,$green:17); - c18: change-color(black,$green:18); - c19: change-color(black,$green:19); - c20: change-color(black,$green:20); - c21: change-color(black,$green:21); - c22: change-color(black,$green:22); - c23: change-color(black,$green:23); - c24: change-color(black,$green:24); - c25: change-color(black,$green:25); - c26: change-color(black,$green:26); - c27: change-color(black,$green:27); - c28: change-color(black,$green:28); - c29: change-color(black,$green:29); - c30: change-color(black,$green:30); - c31: change-color(black,$green:31); - c32: change-color(black,$green:32); - c33: change-color(black,$green:33); - c34: change-color(black,$green:34); - c35: change-color(black,$green:35); - c36: change-color(black,$green:36); - c37: change-color(black,$green:37); - c38: change-color(black,$green:38); - c39: change-color(black,$green:39); - c40: change-color(black,$green:40); - c41: change-color(black,$green:41); - c42: change-color(black,$green:42); - c43: change-color(black,$green:43); - c44: change-color(black,$green:44); - c45: change-color(black,$green:45); - c46: change-color(black,$green:46); - c47: change-color(black,$green:47); - c48: change-color(black,$green:48); - c49: change-color(black,$green:49); - c50: change-color(black,$green:50); - c51: change-color(black,$green:51); - c52: change-color(black,$green:52); - c53: change-color(black,$green:53); - c54: change-color(black,$green:54); - c55: change-color(black,$green:55); - c56: change-color(black,$green:56); - c57: change-color(black,$green:57); - c58: change-color(black,$green:58); - c59: change-color(black,$green:59); - c60: change-color(black,$green:60); - c61: change-color(black,$green:61); - c62: change-color(black,$green:62); - c63: change-color(black,$green:63); - c64: change-color(black,$green:64); - c65: change-color(black,$green:65); - c66: change-color(black,$green:66); - c67: change-color(black,$green:67); - c68: change-color(black,$green:68); - c69: change-color(black,$green:69); - c70: change-color(black,$green:70); - c71: change-color(black,$green:71); - c72: change-color(black,$green:72); - c73: change-color(black,$green:73); - c74: change-color(black,$green:74); - c75: change-color(black,$green:75); - c76: change-color(black,$green:76); - c77: change-color(black,$green:77); - c78: change-color(black,$green:78); - c79: change-color(black,$green:79); - c80: change-color(black,$green:80); - c81: change-color(black,$green:81); - c82: change-color(black,$green:82); - c83: change-color(black,$green:83); - c84: change-color(black,$green:84); - c85: change-color(black,$green:85); - c86: change-color(black,$green:86); - c87: change-color(black,$green:87); - c88: change-color(black,$green:88); - c89: change-color(black,$green:89); - c90: change-color(black,$green:90); - c91: change-color(black,$green:91); - c92: change-color(black,$green:92); - c93: change-color(black,$green:93); - c94: change-color(black,$green:94); - c95: change-color(black,$green:95); - c96: change-color(black,$green:96); - c97: change-color(black,$green:97); - c98: change-color(black,$green:98); - c99: change-color(black,$green:99); - c100: change-color(black,$green:100); - c101: change-color(black,$green:101); - c102: change-color(black,$green:102); - c103: change-color(black,$green:103); - c104: change-color(black,$green:104); - c105: change-color(black,$green:105); - c106: change-color(black,$green:106); - c107: change-color(black,$green:107); - c108: change-color(black,$green:108); - c109: change-color(black,$green:109); - c110: change-color(black,$green:110); - c111: change-color(black,$green:111); - c112: change-color(black,$green:112); - c113: change-color(black,$green:113); - c114: change-color(black,$green:114); - c115: change-color(black,$green:115); - c116: change-color(black,$green:116); - c117: change-color(black,$green:117); - c118: change-color(black,$green:118); - c119: change-color(black,$green:119); - c120: change-color(black,$green:120); - c121: change-color(black,$green:121); - c122: change-color(black,$green:122); - c123: change-color(black,$green:123); - c124: change-color(black,$green:124); - c125: change-color(black,$green:125); - c126: change-color(black,$green:126); - c127: change-color(black,$green:127); - c128: change-color(black,$green:128); - c129: change-color(black,$green:129); - c130: change-color(black,$green:130); - c131: change-color(black,$green:131); - c132: change-color(black,$green:132); - c133: change-color(black,$green:133); - c134: change-color(black,$green:134); - c135: change-color(black,$green:135); - c136: change-color(black,$green:136); - c137: change-color(black,$green:137); - c138: change-color(black,$green:138); - c139: change-color(black,$green:139); - c140: change-color(black,$green:140); - c141: change-color(black,$green:141); - c142: change-color(black,$green:142); - c143: change-color(black,$green:143); - c144: change-color(black,$green:144); - c145: change-color(black,$green:145); - c146: change-color(black,$green:146); - c147: change-color(black,$green:147); - c148: change-color(black,$green:148); - c149: change-color(black,$green:149); - c150: change-color(black,$green:150); - c151: change-color(black,$green:151); - c152: change-color(black,$green:152); - c153: change-color(black,$green:153); - c154: change-color(black,$green:154); - c155: change-color(black,$green:155); - c156: change-color(black,$green:156); - c157: change-color(black,$green:157); - c158: change-color(black,$green:158); - c159: change-color(black,$green:159); - c160: change-color(black,$green:160); - c161: change-color(black,$green:161); - c162: change-color(black,$green:162); - c163: change-color(black,$green:163); - c164: change-color(black,$green:164); - c165: change-color(black,$green:165); - c166: change-color(black,$green:166); - c167: change-color(black,$green:167); - c168: change-color(black,$green:168); - c169: change-color(black,$green:169); - c170: change-color(black,$green:170); - c171: change-color(black,$green:171); - c172: change-color(black,$green:172); - c173: change-color(black,$green:173); - c174: change-color(black,$green:174); - c175: change-color(black,$green:175); - c176: change-color(black,$green:176); - c177: change-color(black,$green:177); - c178: change-color(black,$green:178); - c179: change-color(black,$green:179); - c180: change-color(black,$green:180); - c181: change-color(black,$green:181); - c182: change-color(black,$green:182); - c183: change-color(black,$green:183); - c184: change-color(black,$green:184); - c185: change-color(black,$green:185); - c186: change-color(black,$green:186); - c187: change-color(black,$green:187); - c188: change-color(black,$green:188); - c189: change-color(black,$green:189); - c190: change-color(black,$green:190); - c191: change-color(black,$green:191); - c192: change-color(black,$green:192); - c193: change-color(black,$green:193); - c194: change-color(black,$green:194); - c195: change-color(black,$green:195); - c196: change-color(black,$green:196); - c197: change-color(black,$green:197); - c198: change-color(black,$green:198); - c199: change-color(black,$green:199); - c200: change-color(black,$green:200); - c201: change-color(black,$green:201); - c202: change-color(black,$green:202); - c203: change-color(black,$green:203); - c204: change-color(black,$green:204); - c205: change-color(black,$green:205); - c206: change-color(black,$green:206); - c207: change-color(black,$green:207); - c208: change-color(black,$green:208); - c209: change-color(black,$green:209); - c210: change-color(black,$green:210); - c211: change-color(black,$green:211); - c212: change-color(black,$green:212); - c213: change-color(black,$green:213); - c214: change-color(black,$green:214); - c215: change-color(black,$green:215); - c216: change-color(black,$green:216); - c217: change-color(black,$green:217); - c218: change-color(black,$green:218); - c219: change-color(black,$green:219); - c220: change-color(black,$green:220); - c221: change-color(black,$green:221); - c222: change-color(black,$green:222); - c223: change-color(black,$green:223); - c224: change-color(black,$green:224); - c225: change-color(black,$green:225); - c226: change-color(black,$green:226); - c227: change-color(black,$green:227); - c228: change-color(black,$green:228); - c229: change-color(black,$green:229); - c230: change-color(black,$green:230); - c231: change-color(black,$green:231); - c232: change-color(black,$green:232); - c233: change-color(black,$green:233); - c234: change-color(black,$green:234); - c235: change-color(black,$green:235); - c236: change-color(black,$green:236); - c237: change-color(black,$green:237); - c238: change-color(black,$green:238); - c239: change-color(black,$green:239); - c240: change-color(black,$green:240); - c241: change-color(black,$green:241); - c242: change-color(black,$green:242); - c243: change-color(black,$green:243); - c244: change-color(black,$green:244); - c245: change-color(black,$green:245); - c246: change-color(black,$green:246); - c247: change-color(black,$green:247); - c248: change-color(black,$green:248); - c249: change-color(black,$green:249); - c250: change-color(black,$green:250); - c251: change-color(black,$green:251); - c252: change-color(black,$green:252); - c253: change-color(black,$green:253); - c254: change-color(black,$green:254); - c255: change-color(black,$green:255); + c0: color.change(black,$green:0); + c1: color.change(black,$green:1); + c2: color.change(black,$green:2); + c3: color.change(black,$green:3); + c4: color.change(black,$green:4); + c5: color.change(black,$green:5); + c6: color.change(black,$green:6); + c7: color.change(black,$green:7); + c8: color.change(black,$green:8); + c9: color.change(black,$green:9); + c10: color.change(black,$green:10); + c11: color.change(black,$green:11); + c12: color.change(black,$green:12); + c13: color.change(black,$green:13); + c14: color.change(black,$green:14); + c15: color.change(black,$green:15); + c16: color.change(black,$green:16); + c17: color.change(black,$green:17); + c18: color.change(black,$green:18); + c19: color.change(black,$green:19); + c20: color.change(black,$green:20); + c21: color.change(black,$green:21); + c22: color.change(black,$green:22); + c23: color.change(black,$green:23); + c24: color.change(black,$green:24); + c25: color.change(black,$green:25); + c26: color.change(black,$green:26); + c27: color.change(black,$green:27); + c28: color.change(black,$green:28); + c29: color.change(black,$green:29); + c30: color.change(black,$green:30); + c31: color.change(black,$green:31); + c32: color.change(black,$green:32); + c33: color.change(black,$green:33); + c34: color.change(black,$green:34); + c35: color.change(black,$green:35); + c36: color.change(black,$green:36); + c37: color.change(black,$green:37); + c38: color.change(black,$green:38); + c39: color.change(black,$green:39); + c40: color.change(black,$green:40); + c41: color.change(black,$green:41); + c42: color.change(black,$green:42); + c43: color.change(black,$green:43); + c44: color.change(black,$green:44); + c45: color.change(black,$green:45); + c46: color.change(black,$green:46); + c47: color.change(black,$green:47); + c48: color.change(black,$green:48); + c49: color.change(black,$green:49); + c50: color.change(black,$green:50); + c51: color.change(black,$green:51); + c52: color.change(black,$green:52); + c53: color.change(black,$green:53); + c54: color.change(black,$green:54); + c55: color.change(black,$green:55); + c56: color.change(black,$green:56); + c57: color.change(black,$green:57); + c58: color.change(black,$green:58); + c59: color.change(black,$green:59); + c60: color.change(black,$green:60); + c61: color.change(black,$green:61); + c62: color.change(black,$green:62); + c63: color.change(black,$green:63); + c64: color.change(black,$green:64); + c65: color.change(black,$green:65); + c66: color.change(black,$green:66); + c67: color.change(black,$green:67); + c68: color.change(black,$green:68); + c69: color.change(black,$green:69); + c70: color.change(black,$green:70); + c71: color.change(black,$green:71); + c72: color.change(black,$green:72); + c73: color.change(black,$green:73); + c74: color.change(black,$green:74); + c75: color.change(black,$green:75); + c76: color.change(black,$green:76); + c77: color.change(black,$green:77); + c78: color.change(black,$green:78); + c79: color.change(black,$green:79); + c80: color.change(black,$green:80); + c81: color.change(black,$green:81); + c82: color.change(black,$green:82); + c83: color.change(black,$green:83); + c84: color.change(black,$green:84); + c85: color.change(black,$green:85); + c86: color.change(black,$green:86); + c87: color.change(black,$green:87); + c88: color.change(black,$green:88); + c89: color.change(black,$green:89); + c90: color.change(black,$green:90); + c91: color.change(black,$green:91); + c92: color.change(black,$green:92); + c93: color.change(black,$green:93); + c94: color.change(black,$green:94); + c95: color.change(black,$green:95); + c96: color.change(black,$green:96); + c97: color.change(black,$green:97); + c98: color.change(black,$green:98); + c99: color.change(black,$green:99); + c100: color.change(black,$green:100); + c101: color.change(black,$green:101); + c102: color.change(black,$green:102); + c103: color.change(black,$green:103); + c104: color.change(black,$green:104); + c105: color.change(black,$green:105); + c106: color.change(black,$green:106); + c107: color.change(black,$green:107); + c108: color.change(black,$green:108); + c109: color.change(black,$green:109); + c110: color.change(black,$green:110); + c111: color.change(black,$green:111); + c112: color.change(black,$green:112); + c113: color.change(black,$green:113); + c114: color.change(black,$green:114); + c115: color.change(black,$green:115); + c116: color.change(black,$green:116); + c117: color.change(black,$green:117); + c118: color.change(black,$green:118); + c119: color.change(black,$green:119); + c120: color.change(black,$green:120); + c121: color.change(black,$green:121); + c122: color.change(black,$green:122); + c123: color.change(black,$green:123); + c124: color.change(black,$green:124); + c125: color.change(black,$green:125); + c126: color.change(black,$green:126); + c127: color.change(black,$green:127); + c128: color.change(black,$green:128); + c129: color.change(black,$green:129); + c130: color.change(black,$green:130); + c131: color.change(black,$green:131); + c132: color.change(black,$green:132); + c133: color.change(black,$green:133); + c134: color.change(black,$green:134); + c135: color.change(black,$green:135); + c136: color.change(black,$green:136); + c137: color.change(black,$green:137); + c138: color.change(black,$green:138); + c139: color.change(black,$green:139); + c140: color.change(black,$green:140); + c141: color.change(black,$green:141); + c142: color.change(black,$green:142); + c143: color.change(black,$green:143); + c144: color.change(black,$green:144); + c145: color.change(black,$green:145); + c146: color.change(black,$green:146); + c147: color.change(black,$green:147); + c148: color.change(black,$green:148); + c149: color.change(black,$green:149); + c150: color.change(black,$green:150); + c151: color.change(black,$green:151); + c152: color.change(black,$green:152); + c153: color.change(black,$green:153); + c154: color.change(black,$green:154); + c155: color.change(black,$green:155); + c156: color.change(black,$green:156); + c157: color.change(black,$green:157); + c158: color.change(black,$green:158); + c159: color.change(black,$green:159); + c160: color.change(black,$green:160); + c161: color.change(black,$green:161); + c162: color.change(black,$green:162); + c163: color.change(black,$green:163); + c164: color.change(black,$green:164); + c165: color.change(black,$green:165); + c166: color.change(black,$green:166); + c167: color.change(black,$green:167); + c168: color.change(black,$green:168); + c169: color.change(black,$green:169); + c170: color.change(black,$green:170); + c171: color.change(black,$green:171); + c172: color.change(black,$green:172); + c173: color.change(black,$green:173); + c174: color.change(black,$green:174); + c175: color.change(black,$green:175); + c176: color.change(black,$green:176); + c177: color.change(black,$green:177); + c178: color.change(black,$green:178); + c179: color.change(black,$green:179); + c180: color.change(black,$green:180); + c181: color.change(black,$green:181); + c182: color.change(black,$green:182); + c183: color.change(black,$green:183); + c184: color.change(black,$green:184); + c185: color.change(black,$green:185); + c186: color.change(black,$green:186); + c187: color.change(black,$green:187); + c188: color.change(black,$green:188); + c189: color.change(black,$green:189); + c190: color.change(black,$green:190); + c191: color.change(black,$green:191); + c192: color.change(black,$green:192); + c193: color.change(black,$green:193); + c194: color.change(black,$green:194); + c195: color.change(black,$green:195); + c196: color.change(black,$green:196); + c197: color.change(black,$green:197); + c198: color.change(black,$green:198); + c199: color.change(black,$green:199); + c200: color.change(black,$green:200); + c201: color.change(black,$green:201); + c202: color.change(black,$green:202); + c203: color.change(black,$green:203); + c204: color.change(black,$green:204); + c205: color.change(black,$green:205); + c206: color.change(black,$green:206); + c207: color.change(black,$green:207); + c208: color.change(black,$green:208); + c209: color.change(black,$green:209); + c210: color.change(black,$green:210); + c211: color.change(black,$green:211); + c212: color.change(black,$green:212); + c213: color.change(black,$green:213); + c214: color.change(black,$green:214); + c215: color.change(black,$green:215); + c216: color.change(black,$green:216); + c217: color.change(black,$green:217); + c218: color.change(black,$green:218); + c219: color.change(black,$green:219); + c220: color.change(black,$green:220); + c221: color.change(black,$green:221); + c222: color.change(black,$green:222); + c223: color.change(black,$green:223); + c224: color.change(black,$green:224); + c225: color.change(black,$green:225); + c226: color.change(black,$green:226); + c227: color.change(black,$green:227); + c228: color.change(black,$green:228); + c229: color.change(black,$green:229); + c230: color.change(black,$green:230); + c231: color.change(black,$green:231); + c232: color.change(black,$green:232); + c233: color.change(black,$green:233); + c234: color.change(black,$green:234); + c235: color.change(black,$green:235); + c236: color.change(black,$green:236); + c237: color.change(black,$green:237); + c238: color.change(black,$green:238); + c239: color.change(black,$green:239); + c240: color.change(black,$green:240); + c241: color.change(black,$green:241); + c242: color.change(black,$green:242); + c243: color.change(black,$green:243); + c244: color.change(black,$green:244); + c245: color.change(black,$green:245); + c246: color.change(black,$green:246); + c247: color.change(black,$green:247); + c248: color.change(black,$green:248); + c249: color.change(black,$green:249); + c250: color.change(black,$green:250); + c251: color.change(black,$green:251); + c252: color.change(black,$green:252); + c253: color.change(black,$green:253); + c254: color.change(black,$green:254); + c255: color.change(black,$green:255); // c256: change-color(black,$green:256); } diff --git a/spec/libsass/color-functions/other/change-color/h.hrx b/spec/libsass/color-functions/other/change-color/h.hrx index c13c5f14c4..a27b47e8f1 100644 --- a/spec/libsass/color-functions/other/change-color/h.hrx +++ b/spec/libsass/color-functions/other/change-color/h.hrx @@ -1,367 +1,368 @@ <===> input.scss +@use "sass:color"; foo { - c-1: change-color(red,$hue:-1); - c0: change-color(red,$hue:0); - c1: change-color(red,$hue:1); - c2: change-color(red,$hue:2); - c3: change-color(red,$hue:3); - c4: change-color(red,$hue:4); - c5: change-color(red,$hue:5); - c6: change-color(red,$hue:6); - c7: change-color(red,$hue:7); - c8: change-color(red,$hue:8); - c9: change-color(red,$hue:9); - c10: change-color(red,$hue:10); - c11: change-color(red,$hue:11); - c12: change-color(red,$hue:12); - c13: change-color(red,$hue:13); - c14: change-color(red,$hue:14); - c15: change-color(red,$hue:15); - c16: change-color(red,$hue:16); - c17: change-color(red,$hue:17); - c18: change-color(red,$hue:18); - c19: change-color(red,$hue:19); - c20: change-color(red,$hue:20); - c21: change-color(red,$hue:21); - c22: change-color(red,$hue:22); - c23: change-color(red,$hue:23); - c24: change-color(red,$hue:24); - c25: change-color(red,$hue:25); - c26: change-color(red,$hue:26); - c27: change-color(red,$hue:27); - c28: change-color(red,$hue:28); - c29: change-color(red,$hue:29); - c30: change-color(red,$hue:30); - c31: change-color(red,$hue:31); - c32: change-color(red,$hue:32); - c33: change-color(red,$hue:33); - c34: change-color(red,$hue:34); - c35: change-color(red,$hue:35); - c36: change-color(red,$hue:36); - c37: change-color(red,$hue:37); - c38: change-color(red,$hue:38); - c39: change-color(red,$hue:39); - c40: change-color(red,$hue:40); - c41: change-color(red,$hue:41); - c42: change-color(red,$hue:42); - c43: change-color(red,$hue:43); - c44: change-color(red,$hue:44); - c45: change-color(red,$hue:45); - c46: change-color(red,$hue:46); - c47: change-color(red,$hue:47); - c48: change-color(red,$hue:48); - c49: change-color(red,$hue:49); - c50: change-color(red,$hue:50); - c51: change-color(red,$hue:51); - c52: change-color(red,$hue:52); - c53: change-color(red,$hue:53); - c54: change-color(red,$hue:54); - c55: change-color(red,$hue:55); - c56: change-color(red,$hue:56); - c57: change-color(red,$hue:57); - c58: change-color(red,$hue:58); - c59: change-color(red,$hue:59); - c60: change-color(red,$hue:60); - c61: change-color(red,$hue:61); - c62: change-color(red,$hue:62); - c63: change-color(red,$hue:63); - c64: change-color(red,$hue:64); - c65: change-color(red,$hue:65); - c66: change-color(red,$hue:66); - c67: change-color(red,$hue:67); - c68: change-color(red,$hue:68); - c69: change-color(red,$hue:69); - c70: change-color(red,$hue:70); - c71: change-color(red,$hue:71); - c72: change-color(red,$hue:72); - c73: change-color(red,$hue:73); - c74: change-color(red,$hue:74); - c75: change-color(red,$hue:75); - c76: change-color(red,$hue:76); - c77: change-color(red,$hue:77); - c78: change-color(red,$hue:78); - c79: change-color(red,$hue:79); - c80: change-color(red,$hue:80); - c81: change-color(red,$hue:81); - c82: change-color(red,$hue:82); - c83: change-color(red,$hue:83); - c84: change-color(red,$hue:84); - c85: change-color(red,$hue:85); - c86: change-color(red,$hue:86); - c87: change-color(red,$hue:87); - c88: change-color(red,$hue:88); - c89: change-color(red,$hue:89); - c90: change-color(red,$hue:90); - c91: change-color(red,$hue:91); - c92: change-color(red,$hue:92); - c93: change-color(red,$hue:93); - c94: change-color(red,$hue:94); - c95: change-color(red,$hue:95); - c96: change-color(red,$hue:96); - c97: change-color(red,$hue:97); - c98: change-color(red,$hue:98); - c99: change-color(red,$hue:99); - c100: change-color(red,$hue:100); - c101: change-color(red,$hue:101); - c102: change-color(red,$hue:102); - c103: change-color(red,$hue:103); - c104: change-color(red,$hue:104); - c105: change-color(red,$hue:105); - c106: change-color(red,$hue:106); - c107: change-color(red,$hue:107); - c108: change-color(red,$hue:108); - c109: change-color(red,$hue:109); - c110: change-color(red,$hue:110); - c111: change-color(red,$hue:111); - c112: change-color(red,$hue:112); - c113: change-color(red,$hue:113); - c114: change-color(red,$hue:114); - c115: change-color(red,$hue:115); - c116: change-color(red,$hue:116); - c117: change-color(red,$hue:117); - c118: change-color(red,$hue:118); - c119: change-color(red,$hue:119); - c120: change-color(red,$hue:120); - c121: change-color(red,$hue:121); - c122: change-color(red,$hue:122); - c123: change-color(red,$hue:123); - c124: change-color(red,$hue:124); - c125: change-color(red,$hue:125); - c126: change-color(red,$hue:126); - c127: change-color(red,$hue:127); - c128: change-color(red,$hue:128); - c129: change-color(red,$hue:129); - c130: change-color(red,$hue:130); - c131: change-color(red,$hue:131); - c132: change-color(red,$hue:132); - c133: change-color(red,$hue:133); - c134: change-color(red,$hue:134); - c135: change-color(red,$hue:135); - c136: change-color(red,$hue:136); - c137: change-color(red,$hue:137); - c138: change-color(red,$hue:138); - c139: change-color(red,$hue:139); - c140: change-color(red,$hue:140); - c141: change-color(red,$hue:141); - c142: change-color(red,$hue:142); - c143: change-color(red,$hue:143); - c144: change-color(red,$hue:144); - c145: change-color(red,$hue:145); - c146: change-color(red,$hue:146); - c147: change-color(red,$hue:147); - c148: change-color(red,$hue:148); - c149: change-color(red,$hue:149); - c150: change-color(red,$hue:150); - c151: change-color(red,$hue:151); - c152: change-color(red,$hue:152); - c153: change-color(red,$hue:153); - c154: change-color(red,$hue:154); - c155: change-color(red,$hue:155); - c156: change-color(red,$hue:156); - c157: change-color(red,$hue:157); - c158: change-color(red,$hue:158); - c159: change-color(red,$hue:159); - c160: change-color(red,$hue:160); - c161: change-color(red,$hue:161); - c162: change-color(red,$hue:162); - c163: change-color(red,$hue:163); - c164: change-color(red,$hue:164); - c165: change-color(red,$hue:165); - c166: change-color(red,$hue:166); - c167: change-color(red,$hue:167); - c168: change-color(red,$hue:168); - c169: change-color(red,$hue:169); - c170: change-color(red,$hue:170); - c171: change-color(red,$hue:171); - c172: change-color(red,$hue:172); - c173: change-color(red,$hue:173); - c174: change-color(red,$hue:174); - c175: change-color(red,$hue:175); - c176: change-color(red,$hue:176); - c177: change-color(red,$hue:177); - c178: change-color(red,$hue:178); - c179: change-color(red,$hue:179); - c180: change-color(red,$hue:180); - c181: change-color(red,$hue:181); - c182: change-color(red,$hue:182); - c183: change-color(red,$hue:183); - c184: change-color(red,$hue:184); - c185: change-color(red,$hue:185); - c186: change-color(red,$hue:186); - c187: change-color(red,$hue:187); - c188: change-color(red,$hue:188); - c189: change-color(red,$hue:189); - c190: change-color(red,$hue:190); - c191: change-color(red,$hue:191); - c192: change-color(red,$hue:192); - c193: change-color(red,$hue:193); - c194: change-color(red,$hue:194); - c195: change-color(red,$hue:195); - c196: change-color(red,$hue:196); - c197: change-color(red,$hue:197); - c198: change-color(red,$hue:198); - c199: change-color(red,$hue:199); - c200: change-color(red,$hue:200); - c201: change-color(red,$hue:201); - c202: change-color(red,$hue:202); - c203: change-color(red,$hue:203); - c204: change-color(red,$hue:204); - c205: change-color(red,$hue:205); - c206: change-color(red,$hue:206); - c207: change-color(red,$hue:207); - c208: change-color(red,$hue:208); - c209: change-color(red,$hue:209); - c210: change-color(red,$hue:210); - c211: change-color(red,$hue:211); - c212: change-color(red,$hue:212); - c213: change-color(red,$hue:213); - c214: change-color(red,$hue:214); - c215: change-color(red,$hue:215); - c216: change-color(red,$hue:216); - c217: change-color(red,$hue:217); - c218: change-color(red,$hue:218); - c219: change-color(red,$hue:219); - c220: change-color(red,$hue:220); - c221: change-color(red,$hue:221); - c222: change-color(red,$hue:222); - c223: change-color(red,$hue:223); - c224: change-color(red,$hue:224); - c225: change-color(red,$hue:225); - c226: change-color(red,$hue:226); - c227: change-color(red,$hue:227); - c228: change-color(red,$hue:228); - c229: change-color(red,$hue:229); - c230: change-color(red,$hue:230); - c231: change-color(red,$hue:231); - c232: change-color(red,$hue:232); - c233: change-color(red,$hue:233); - c234: change-color(red,$hue:234); - c235: change-color(red,$hue:235); - c236: change-color(red,$hue:236); - c237: change-color(red,$hue:237); - c238: change-color(red,$hue:238); - c239: change-color(red,$hue:239); - c240: change-color(red,$hue:240); - c241: change-color(red,$hue:241); - c242: change-color(red,$hue:242); - c243: change-color(red,$hue:243); - c244: change-color(red,$hue:244); - c245: change-color(red,$hue:245); - c246: change-color(red,$hue:246); - c247: change-color(red,$hue:247); - c248: change-color(red,$hue:248); - c249: change-color(red,$hue:249); - c250: change-color(red,$hue:250); - c251: change-color(red,$hue:251); - c252: change-color(red,$hue:252); - c253: change-color(red,$hue:253); - c254: change-color(red,$hue:254); - c255: change-color(red,$hue:255); - c256: change-color(red,$hue:256); - c257: change-color(red,$hue:257); - c258: change-color(red,$hue:258); - c259: change-color(red,$hue:259); - c260: change-color(red,$hue:260); - c261: change-color(red,$hue:261); - c262: change-color(red,$hue:262); - c263: change-color(red,$hue:263); - c264: change-color(red,$hue:264); - c265: change-color(red,$hue:265); - c266: change-color(red,$hue:266); - c267: change-color(red,$hue:267); - c268: change-color(red,$hue:268); - c269: change-color(red,$hue:269); - c270: change-color(red,$hue:270); - c271: change-color(red,$hue:271); - c272: change-color(red,$hue:272); - c273: change-color(red,$hue:273); - c274: change-color(red,$hue:274); - c275: change-color(red,$hue:275); - c276: change-color(red,$hue:276); - c277: change-color(red,$hue:277); - c278: change-color(red,$hue:278); - c279: change-color(red,$hue:279); - c280: change-color(red,$hue:280); - c281: change-color(red,$hue:281); - c282: change-color(red,$hue:282); - c283: change-color(red,$hue:283); - c284: change-color(red,$hue:284); - c285: change-color(red,$hue:285); - c286: change-color(red,$hue:286); - c287: change-color(red,$hue:287); - c288: change-color(red,$hue:288); - c289: change-color(red,$hue:289); - c290: change-color(red,$hue:290); - c291: change-color(red,$hue:291); - c292: change-color(red,$hue:292); - c293: change-color(red,$hue:293); - c294: change-color(red,$hue:294); - c295: change-color(red,$hue:295); - c296: change-color(red,$hue:296); - c297: change-color(red,$hue:297); - c298: change-color(red,$hue:298); - c299: change-color(red,$hue:299); - c300: change-color(red,$hue:300); - c301: change-color(red,$hue:301); - c302: change-color(red,$hue:302); - c303: change-color(red,$hue:303); - c304: change-color(red,$hue:304); - c305: change-color(red,$hue:305); - c306: change-color(red,$hue:306); - c307: change-color(red,$hue:307); - c308: change-color(red,$hue:308); - c309: change-color(red,$hue:309); - c310: change-color(red,$hue:310); - c311: change-color(red,$hue:311); - c312: change-color(red,$hue:312); - c313: change-color(red,$hue:313); - c314: change-color(red,$hue:314); - c315: change-color(red,$hue:315); - c316: change-color(red,$hue:316); - c317: change-color(red,$hue:317); - c318: change-color(red,$hue:318); - c319: change-color(red,$hue:319); - c320: change-color(red,$hue:320); - c321: change-color(red,$hue:321); - c322: change-color(red,$hue:322); - c323: change-color(red,$hue:323); - c324: change-color(red,$hue:324); - c325: change-color(red,$hue:325); - c326: change-color(red,$hue:326); - c327: change-color(red,$hue:327); - c328: change-color(red,$hue:328); - c329: change-color(red,$hue:329); - c330: change-color(red,$hue:330); - c331: change-color(red,$hue:331); - c332: change-color(red,$hue:332); - c333: change-color(red,$hue:333); - c334: change-color(red,$hue:334); - c335: change-color(red,$hue:335); - c336: change-color(red,$hue:336); - c337: change-color(red,$hue:337); - c338: change-color(red,$hue:338); - c339: change-color(red,$hue:339); - c340: change-color(red,$hue:340); - c341: change-color(red,$hue:341); - c342: change-color(red,$hue:342); - c343: change-color(red,$hue:343); - c344: change-color(red,$hue:344); - c345: change-color(red,$hue:345); - c346: change-color(red,$hue:346); - c347: change-color(red,$hue:347); - c348: change-color(red,$hue:348); - c349: change-color(red,$hue:349); - c350: change-color(red,$hue:350); - c351: change-color(red,$hue:351); - c352: change-color(red,$hue:352); - c353: change-color(red,$hue:353); - c354: change-color(red,$hue:354); - c355: change-color(red,$hue:355); - c356: change-color(red,$hue:356); - c357: change-color(red,$hue:357); - c358: change-color(red,$hue:358); - c359: change-color(red,$hue:359); - c360: change-color(red,$hue:360); + c-1: color.change(red,$hue:-1); + c0: color.change(red,$hue:0); + c1: color.change(red,$hue:1); + c2: color.change(red,$hue:2); + c3: color.change(red,$hue:3); + c4: color.change(red,$hue:4); + c5: color.change(red,$hue:5); + c6: color.change(red,$hue:6); + c7: color.change(red,$hue:7); + c8: color.change(red,$hue:8); + c9: color.change(red,$hue:9); + c10: color.change(red,$hue:10); + c11: color.change(red,$hue:11); + c12: color.change(red,$hue:12); + c13: color.change(red,$hue:13); + c14: color.change(red,$hue:14); + c15: color.change(red,$hue:15); + c16: color.change(red,$hue:16); + c17: color.change(red,$hue:17); + c18: color.change(red,$hue:18); + c19: color.change(red,$hue:19); + c20: color.change(red,$hue:20); + c21: color.change(red,$hue:21); + c22: color.change(red,$hue:22); + c23: color.change(red,$hue:23); + c24: color.change(red,$hue:24); + c25: color.change(red,$hue:25); + c26: color.change(red,$hue:26); + c27: color.change(red,$hue:27); + c28: color.change(red,$hue:28); + c29: color.change(red,$hue:29); + c30: color.change(red,$hue:30); + c31: color.change(red,$hue:31); + c32: color.change(red,$hue:32); + c33: color.change(red,$hue:33); + c34: color.change(red,$hue:34); + c35: color.change(red,$hue:35); + c36: color.change(red,$hue:36); + c37: color.change(red,$hue:37); + c38: color.change(red,$hue:38); + c39: color.change(red,$hue:39); + c40: color.change(red,$hue:40); + c41: color.change(red,$hue:41); + c42: color.change(red,$hue:42); + c43: color.change(red,$hue:43); + c44: color.change(red,$hue:44); + c45: color.change(red,$hue:45); + c46: color.change(red,$hue:46); + c47: color.change(red,$hue:47); + c48: color.change(red,$hue:48); + c49: color.change(red,$hue:49); + c50: color.change(red,$hue:50); + c51: color.change(red,$hue:51); + c52: color.change(red,$hue:52); + c53: color.change(red,$hue:53); + c54: color.change(red,$hue:54); + c55: color.change(red,$hue:55); + c56: color.change(red,$hue:56); + c57: color.change(red,$hue:57); + c58: color.change(red,$hue:58); + c59: color.change(red,$hue:59); + c60: color.change(red,$hue:60); + c61: color.change(red,$hue:61); + c62: color.change(red,$hue:62); + c63: color.change(red,$hue:63); + c64: color.change(red,$hue:64); + c65: color.change(red,$hue:65); + c66: color.change(red,$hue:66); + c67: color.change(red,$hue:67); + c68: color.change(red,$hue:68); + c69: color.change(red,$hue:69); + c70: color.change(red,$hue:70); + c71: color.change(red,$hue:71); + c72: color.change(red,$hue:72); + c73: color.change(red,$hue:73); + c74: color.change(red,$hue:74); + c75: color.change(red,$hue:75); + c76: color.change(red,$hue:76); + c77: color.change(red,$hue:77); + c78: color.change(red,$hue:78); + c79: color.change(red,$hue:79); + c80: color.change(red,$hue:80); + c81: color.change(red,$hue:81); + c82: color.change(red,$hue:82); + c83: color.change(red,$hue:83); + c84: color.change(red,$hue:84); + c85: color.change(red,$hue:85); + c86: color.change(red,$hue:86); + c87: color.change(red,$hue:87); + c88: color.change(red,$hue:88); + c89: color.change(red,$hue:89); + c90: color.change(red,$hue:90); + c91: color.change(red,$hue:91); + c92: color.change(red,$hue:92); + c93: color.change(red,$hue:93); + c94: color.change(red,$hue:94); + c95: color.change(red,$hue:95); + c96: color.change(red,$hue:96); + c97: color.change(red,$hue:97); + c98: color.change(red,$hue:98); + c99: color.change(red,$hue:99); + c100: color.change(red,$hue:100); + c101: color.change(red,$hue:101); + c102: color.change(red,$hue:102); + c103: color.change(red,$hue:103); + c104: color.change(red,$hue:104); + c105: color.change(red,$hue:105); + c106: color.change(red,$hue:106); + c107: color.change(red,$hue:107); + c108: color.change(red,$hue:108); + c109: color.change(red,$hue:109); + c110: color.change(red,$hue:110); + c111: color.change(red,$hue:111); + c112: color.change(red,$hue:112); + c113: color.change(red,$hue:113); + c114: color.change(red,$hue:114); + c115: color.change(red,$hue:115); + c116: color.change(red,$hue:116); + c117: color.change(red,$hue:117); + c118: color.change(red,$hue:118); + c119: color.change(red,$hue:119); + c120: color.change(red,$hue:120); + c121: color.change(red,$hue:121); + c122: color.change(red,$hue:122); + c123: color.change(red,$hue:123); + c124: color.change(red,$hue:124); + c125: color.change(red,$hue:125); + c126: color.change(red,$hue:126); + c127: color.change(red,$hue:127); + c128: color.change(red,$hue:128); + c129: color.change(red,$hue:129); + c130: color.change(red,$hue:130); + c131: color.change(red,$hue:131); + c132: color.change(red,$hue:132); + c133: color.change(red,$hue:133); + c134: color.change(red,$hue:134); + c135: color.change(red,$hue:135); + c136: color.change(red,$hue:136); + c137: color.change(red,$hue:137); + c138: color.change(red,$hue:138); + c139: color.change(red,$hue:139); + c140: color.change(red,$hue:140); + c141: color.change(red,$hue:141); + c142: color.change(red,$hue:142); + c143: color.change(red,$hue:143); + c144: color.change(red,$hue:144); + c145: color.change(red,$hue:145); + c146: color.change(red,$hue:146); + c147: color.change(red,$hue:147); + c148: color.change(red,$hue:148); + c149: color.change(red,$hue:149); + c150: color.change(red,$hue:150); + c151: color.change(red,$hue:151); + c152: color.change(red,$hue:152); + c153: color.change(red,$hue:153); + c154: color.change(red,$hue:154); + c155: color.change(red,$hue:155); + c156: color.change(red,$hue:156); + c157: color.change(red,$hue:157); + c158: color.change(red,$hue:158); + c159: color.change(red,$hue:159); + c160: color.change(red,$hue:160); + c161: color.change(red,$hue:161); + c162: color.change(red,$hue:162); + c163: color.change(red,$hue:163); + c164: color.change(red,$hue:164); + c165: color.change(red,$hue:165); + c166: color.change(red,$hue:166); + c167: color.change(red,$hue:167); + c168: color.change(red,$hue:168); + c169: color.change(red,$hue:169); + c170: color.change(red,$hue:170); + c171: color.change(red,$hue:171); + c172: color.change(red,$hue:172); + c173: color.change(red,$hue:173); + c174: color.change(red,$hue:174); + c175: color.change(red,$hue:175); + c176: color.change(red,$hue:176); + c177: color.change(red,$hue:177); + c178: color.change(red,$hue:178); + c179: color.change(red,$hue:179); + c180: color.change(red,$hue:180); + c181: color.change(red,$hue:181); + c182: color.change(red,$hue:182); + c183: color.change(red,$hue:183); + c184: color.change(red,$hue:184); + c185: color.change(red,$hue:185); + c186: color.change(red,$hue:186); + c187: color.change(red,$hue:187); + c188: color.change(red,$hue:188); + c189: color.change(red,$hue:189); + c190: color.change(red,$hue:190); + c191: color.change(red,$hue:191); + c192: color.change(red,$hue:192); + c193: color.change(red,$hue:193); + c194: color.change(red,$hue:194); + c195: color.change(red,$hue:195); + c196: color.change(red,$hue:196); + c197: color.change(red,$hue:197); + c198: color.change(red,$hue:198); + c199: color.change(red,$hue:199); + c200: color.change(red,$hue:200); + c201: color.change(red,$hue:201); + c202: color.change(red,$hue:202); + c203: color.change(red,$hue:203); + c204: color.change(red,$hue:204); + c205: color.change(red,$hue:205); + c206: color.change(red,$hue:206); + c207: color.change(red,$hue:207); + c208: color.change(red,$hue:208); + c209: color.change(red,$hue:209); + c210: color.change(red,$hue:210); + c211: color.change(red,$hue:211); + c212: color.change(red,$hue:212); + c213: color.change(red,$hue:213); + c214: color.change(red,$hue:214); + c215: color.change(red,$hue:215); + c216: color.change(red,$hue:216); + c217: color.change(red,$hue:217); + c218: color.change(red,$hue:218); + c219: color.change(red,$hue:219); + c220: color.change(red,$hue:220); + c221: color.change(red,$hue:221); + c222: color.change(red,$hue:222); + c223: color.change(red,$hue:223); + c224: color.change(red,$hue:224); + c225: color.change(red,$hue:225); + c226: color.change(red,$hue:226); + c227: color.change(red,$hue:227); + c228: color.change(red,$hue:228); + c229: color.change(red,$hue:229); + c230: color.change(red,$hue:230); + c231: color.change(red,$hue:231); + c232: color.change(red,$hue:232); + c233: color.change(red,$hue:233); + c234: color.change(red,$hue:234); + c235: color.change(red,$hue:235); + c236: color.change(red,$hue:236); + c237: color.change(red,$hue:237); + c238: color.change(red,$hue:238); + c239: color.change(red,$hue:239); + c240: color.change(red,$hue:240); + c241: color.change(red,$hue:241); + c242: color.change(red,$hue:242); + c243: color.change(red,$hue:243); + c244: color.change(red,$hue:244); + c245: color.change(red,$hue:245); + c246: color.change(red,$hue:246); + c247: color.change(red,$hue:247); + c248: color.change(red,$hue:248); + c249: color.change(red,$hue:249); + c250: color.change(red,$hue:250); + c251: color.change(red,$hue:251); + c252: color.change(red,$hue:252); + c253: color.change(red,$hue:253); + c254: color.change(red,$hue:254); + c255: color.change(red,$hue:255); + c256: color.change(red,$hue:256); + c257: color.change(red,$hue:257); + c258: color.change(red,$hue:258); + c259: color.change(red,$hue:259); + c260: color.change(red,$hue:260); + c261: color.change(red,$hue:261); + c262: color.change(red,$hue:262); + c263: color.change(red,$hue:263); + c264: color.change(red,$hue:264); + c265: color.change(red,$hue:265); + c266: color.change(red,$hue:266); + c267: color.change(red,$hue:267); + c268: color.change(red,$hue:268); + c269: color.change(red,$hue:269); + c270: color.change(red,$hue:270); + c271: color.change(red,$hue:271); + c272: color.change(red,$hue:272); + c273: color.change(red,$hue:273); + c274: color.change(red,$hue:274); + c275: color.change(red,$hue:275); + c276: color.change(red,$hue:276); + c277: color.change(red,$hue:277); + c278: color.change(red,$hue:278); + c279: color.change(red,$hue:279); + c280: color.change(red,$hue:280); + c281: color.change(red,$hue:281); + c282: color.change(red,$hue:282); + c283: color.change(red,$hue:283); + c284: color.change(red,$hue:284); + c285: color.change(red,$hue:285); + c286: color.change(red,$hue:286); + c287: color.change(red,$hue:287); + c288: color.change(red,$hue:288); + c289: color.change(red,$hue:289); + c290: color.change(red,$hue:290); + c291: color.change(red,$hue:291); + c292: color.change(red,$hue:292); + c293: color.change(red,$hue:293); + c294: color.change(red,$hue:294); + c295: color.change(red,$hue:295); + c296: color.change(red,$hue:296); + c297: color.change(red,$hue:297); + c298: color.change(red,$hue:298); + c299: color.change(red,$hue:299); + c300: color.change(red,$hue:300); + c301: color.change(red,$hue:301); + c302: color.change(red,$hue:302); + c303: color.change(red,$hue:303); + c304: color.change(red,$hue:304); + c305: color.change(red,$hue:305); + c306: color.change(red,$hue:306); + c307: color.change(red,$hue:307); + c308: color.change(red,$hue:308); + c309: color.change(red,$hue:309); + c310: color.change(red,$hue:310); + c311: color.change(red,$hue:311); + c312: color.change(red,$hue:312); + c313: color.change(red,$hue:313); + c314: color.change(red,$hue:314); + c315: color.change(red,$hue:315); + c316: color.change(red,$hue:316); + c317: color.change(red,$hue:317); + c318: color.change(red,$hue:318); + c319: color.change(red,$hue:319); + c320: color.change(red,$hue:320); + c321: color.change(red,$hue:321); + c322: color.change(red,$hue:322); + c323: color.change(red,$hue:323); + c324: color.change(red,$hue:324); + c325: color.change(red,$hue:325); + c326: color.change(red,$hue:326); + c327: color.change(red,$hue:327); + c328: color.change(red,$hue:328); + c329: color.change(red,$hue:329); + c330: color.change(red,$hue:330); + c331: color.change(red,$hue:331); + c332: color.change(red,$hue:332); + c333: color.change(red,$hue:333); + c334: color.change(red,$hue:334); + c335: color.change(red,$hue:335); + c336: color.change(red,$hue:336); + c337: color.change(red,$hue:337); + c338: color.change(red,$hue:338); + c339: color.change(red,$hue:339); + c340: color.change(red,$hue:340); + c341: color.change(red,$hue:341); + c342: color.change(red,$hue:342); + c343: color.change(red,$hue:343); + c344: color.change(red,$hue:344); + c345: color.change(red,$hue:345); + c346: color.change(red,$hue:346); + c347: color.change(red,$hue:347); + c348: color.change(red,$hue:348); + c349: color.change(red,$hue:349); + c350: color.change(red,$hue:350); + c351: color.change(red,$hue:351); + c352: color.change(red,$hue:352); + c353: color.change(red,$hue:353); + c354: color.change(red,$hue:354); + c355: color.change(red,$hue:355); + c356: color.change(red,$hue:356); + c357: color.change(red,$hue:357); + c358: color.change(red,$hue:358); + c359: color.change(red,$hue:359); + c360: color.change(red,$hue:360); } <===> output.css diff --git a/spec/libsass/color-functions/other/change-color/l.hrx b/spec/libsass/color-functions/other/change-color/l.hrx index 445bc6b558..91cb56c512 100644 --- a/spec/libsass/color-functions/other/change-color/l.hrx +++ b/spec/libsass/color-functions/other/change-color/l.hrx @@ -1,106 +1,107 @@ <===> input.scss +@use "sass:color"; foo { // c-1: change-color(red,$lightness:-1%); - c0: change-color(red,$lightness:0%); - c1: change-color(red,$lightness:1%); - c2: change-color(red,$lightness:2%); - c3: change-color(red,$lightness:3%); - c4: change-color(red,$lightness:4%); - c5: change-color(red,$lightness:5%); - c6: change-color(red,$lightness:6%); - c7: change-color(red,$lightness:7%); - c8: change-color(red,$lightness:8%); - c9: change-color(red,$lightness:9%); - c10: change-color(red,$lightness:10%); - c11: change-color(red,$lightness:11%); - c12: change-color(red,$lightness:12%); - c13: change-color(red,$lightness:13%); - c14: change-color(red,$lightness:14%); - c15: change-color(red,$lightness:15%); - c16: change-color(red,$lightness:16%); - c17: change-color(red,$lightness:17%); - c18: change-color(red,$lightness:18%); - c19: change-color(red,$lightness:19%); - c20: change-color(red,$lightness:20%); - c21: change-color(red,$lightness:21%); - c22: change-color(red,$lightness:22%); - c23: change-color(red,$lightness:23%); - c24: change-color(red,$lightness:24%); - c25: change-color(red,$lightness:25%); - c26: change-color(red,$lightness:26%); - c27: change-color(red,$lightness:27%); - c28: change-color(red,$lightness:28%); - c29: change-color(red,$lightness:29%); - c30: change-color(red,$lightness:30%); - c31: change-color(red,$lightness:31%); - c32: change-color(red,$lightness:32%); - c33: change-color(red,$lightness:33%); - c34: change-color(red,$lightness:34%); - c35: change-color(red,$lightness:35%); - c36: change-color(red,$lightness:36%); - c37: change-color(red,$lightness:37%); - c38: change-color(red,$lightness:38%); - c39: change-color(red,$lightness:39%); - c40: change-color(red,$lightness:40%); - c41: change-color(red,$lightness:41%); - c42: change-color(red,$lightness:42%); - c43: change-color(red,$lightness:43%); - c44: change-color(red,$lightness:44%); - c45: change-color(red,$lightness:45%); - c46: change-color(red,$lightness:46%); - c47: change-color(red,$lightness:47%); - c48: change-color(red,$lightness:48%); - c49: change-color(red,$lightness:49%); - c50: change-color(red,$lightness:50%); - c51: change-color(red,$lightness:51%); - c52: change-color(red,$lightness:52%); - c53: change-color(red,$lightness:53%); - c54: change-color(red,$lightness:54%); - c55: change-color(red,$lightness:55%); - c56: change-color(red,$lightness:56%); - c57: change-color(red,$lightness:57%); - c58: change-color(red,$lightness:58%); - c59: change-color(red,$lightness:59%); - c60: change-color(red,$lightness:60%); - c61: change-color(red,$lightness:61%); - c62: change-color(red,$lightness:62%); - c63: change-color(red,$lightness:63%); - c64: change-color(red,$lightness:64%); - c65: change-color(red,$lightness:65%); - c66: change-color(red,$lightness:66%); - c67: change-color(red,$lightness:67%); - c68: change-color(red,$lightness:68%); - c69: change-color(red,$lightness:69%); - c70: change-color(red,$lightness:70%); - c71: change-color(red,$lightness:71%); - c72: change-color(red,$lightness:72%); - c73: change-color(red,$lightness:73%); - c74: change-color(red,$lightness:74%); - c75: change-color(red,$lightness:75%); - c76: change-color(red,$lightness:76%); - c77: change-color(red,$lightness:77%); - c78: change-color(red,$lightness:78%); - c79: change-color(red,$lightness:79%); - c80: change-color(red,$lightness:80%); - c81: change-color(red,$lightness:81%); - c82: change-color(red,$lightness:82%); - c83: change-color(red,$lightness:83%); - c84: change-color(red,$lightness:84%); - c85: change-color(red,$lightness:85%); - c86: change-color(red,$lightness:86%); - c87: change-color(red,$lightness:87%); - c88: change-color(red,$lightness:88%); - c89: change-color(red,$lightness:89%); - c90: change-color(red,$lightness:90%); - c91: change-color(red,$lightness:91%); - c92: change-color(red,$lightness:92%); - c93: change-color(red,$lightness:93%); - c94: change-color(red,$lightness:94%); - c95: change-color(red,$lightness:95%); - c96: change-color(red,$lightness:96%); - c97: change-color(red,$lightness:97%); - c98: change-color(red,$lightness:98%); - c99: change-color(red,$lightness:99%); + c0: color.change(red,$lightness:0%); + c1: color.change(red,$lightness:1%); + c2: color.change(red,$lightness:2%); + c3: color.change(red,$lightness:3%); + c4: color.change(red,$lightness:4%); + c5: color.change(red,$lightness:5%); + c6: color.change(red,$lightness:6%); + c7: color.change(red,$lightness:7%); + c8: color.change(red,$lightness:8%); + c9: color.change(red,$lightness:9%); + c10: color.change(red,$lightness:10%); + c11: color.change(red,$lightness:11%); + c12: color.change(red,$lightness:12%); + c13: color.change(red,$lightness:13%); + c14: color.change(red,$lightness:14%); + c15: color.change(red,$lightness:15%); + c16: color.change(red,$lightness:16%); + c17: color.change(red,$lightness:17%); + c18: color.change(red,$lightness:18%); + c19: color.change(red,$lightness:19%); + c20: color.change(red,$lightness:20%); + c21: color.change(red,$lightness:21%); + c22: color.change(red,$lightness:22%); + c23: color.change(red,$lightness:23%); + c24: color.change(red,$lightness:24%); + c25: color.change(red,$lightness:25%); + c26: color.change(red,$lightness:26%); + c27: color.change(red,$lightness:27%); + c28: color.change(red,$lightness:28%); + c29: color.change(red,$lightness:29%); + c30: color.change(red,$lightness:30%); + c31: color.change(red,$lightness:31%); + c32: color.change(red,$lightness:32%); + c33: color.change(red,$lightness:33%); + c34: color.change(red,$lightness:34%); + c35: color.change(red,$lightness:35%); + c36: color.change(red,$lightness:36%); + c37: color.change(red,$lightness:37%); + c38: color.change(red,$lightness:38%); + c39: color.change(red,$lightness:39%); + c40: color.change(red,$lightness:40%); + c41: color.change(red,$lightness:41%); + c42: color.change(red,$lightness:42%); + c43: color.change(red,$lightness:43%); + c44: color.change(red,$lightness:44%); + c45: color.change(red,$lightness:45%); + c46: color.change(red,$lightness:46%); + c47: color.change(red,$lightness:47%); + c48: color.change(red,$lightness:48%); + c49: color.change(red,$lightness:49%); + c50: color.change(red,$lightness:50%); + c51: color.change(red,$lightness:51%); + c52: color.change(red,$lightness:52%); + c53: color.change(red,$lightness:53%); + c54: color.change(red,$lightness:54%); + c55: color.change(red,$lightness:55%); + c56: color.change(red,$lightness:56%); + c57: color.change(red,$lightness:57%); + c58: color.change(red,$lightness:58%); + c59: color.change(red,$lightness:59%); + c60: color.change(red,$lightness:60%); + c61: color.change(red,$lightness:61%); + c62: color.change(red,$lightness:62%); + c63: color.change(red,$lightness:63%); + c64: color.change(red,$lightness:64%); + c65: color.change(red,$lightness:65%); + c66: color.change(red,$lightness:66%); + c67: color.change(red,$lightness:67%); + c68: color.change(red,$lightness:68%); + c69: color.change(red,$lightness:69%); + c70: color.change(red,$lightness:70%); + c71: color.change(red,$lightness:71%); + c72: color.change(red,$lightness:72%); + c73: color.change(red,$lightness:73%); + c74: color.change(red,$lightness:74%); + c75: color.change(red,$lightness:75%); + c76: color.change(red,$lightness:76%); + c77: color.change(red,$lightness:77%); + c78: color.change(red,$lightness:78%); + c79: color.change(red,$lightness:79%); + c80: color.change(red,$lightness:80%); + c81: color.change(red,$lightness:81%); + c82: color.change(red,$lightness:82%); + c83: color.change(red,$lightness:83%); + c84: color.change(red,$lightness:84%); + c85: color.change(red,$lightness:85%); + c86: color.change(red,$lightness:86%); + c87: color.change(red,$lightness:87%); + c88: color.change(red,$lightness:88%); + c89: color.change(red,$lightness:89%); + c90: color.change(red,$lightness:90%); + c91: color.change(red,$lightness:91%); + c92: color.change(red,$lightness:92%); + c93: color.change(red,$lightness:93%); + c94: color.change(red,$lightness:94%); + c95: color.change(red,$lightness:95%); + c96: color.change(red,$lightness:96%); + c97: color.change(red,$lightness:97%); + c98: color.change(red,$lightness:98%); + c99: color.change(red,$lightness:99%); // c100: change-color(red,$lightness:100%); } diff --git a/spec/libsass/color-functions/other/change-color/r.hrx b/spec/libsass/color-functions/other/change-color/r.hrx index e9c8284b7f..f31685afa9 100644 --- a/spec/libsass/color-functions/other/change-color/r.hrx +++ b/spec/libsass/color-functions/other/change-color/r.hrx @@ -1,262 +1,263 @@ <===> input.scss +@use "sass:color"; foo { // c-1: change-color(black,$red:-1); - c0: change-color(black,$red:0); - c1: change-color(black,$red:1); - c2: change-color(black,$red:2); - c3: change-color(black,$red:3); - c4: change-color(black,$red:4); - c5: change-color(black,$red:5); - c6: change-color(black,$red:6); - c7: change-color(black,$red:7); - c8: change-color(black,$red:8); - c9: change-color(black,$red:9); - c10: change-color(black,$red:10); - c11: change-color(black,$red:11); - c12: change-color(black,$red:12); - c13: change-color(black,$red:13); - c14: change-color(black,$red:14); - c15: change-color(black,$red:15); - c16: change-color(black,$red:16); - c17: change-color(black,$red:17); - c18: change-color(black,$red:18); - c19: change-color(black,$red:19); - c20: change-color(black,$red:20); - c21: change-color(black,$red:21); - c22: change-color(black,$red:22); - c23: change-color(black,$red:23); - c24: change-color(black,$red:24); - c25: change-color(black,$red:25); - c26: change-color(black,$red:26); - c27: change-color(black,$red:27); - c28: change-color(black,$red:28); - c29: change-color(black,$red:29); - c30: change-color(black,$red:30); - c31: change-color(black,$red:31); - c32: change-color(black,$red:32); - c33: change-color(black,$red:33); - c34: change-color(black,$red:34); - c35: change-color(black,$red:35); - c36: change-color(black,$red:36); - c37: change-color(black,$red:37); - c38: change-color(black,$red:38); - c39: change-color(black,$red:39); - c40: change-color(black,$red:40); - c41: change-color(black,$red:41); - c42: change-color(black,$red:42); - c43: change-color(black,$red:43); - c44: change-color(black,$red:44); - c45: change-color(black,$red:45); - c46: change-color(black,$red:46); - c47: change-color(black,$red:47); - c48: change-color(black,$red:48); - c49: change-color(black,$red:49); - c50: change-color(black,$red:50); - c51: change-color(black,$red:51); - c52: change-color(black,$red:52); - c53: change-color(black,$red:53); - c54: change-color(black,$red:54); - c55: change-color(black,$red:55); - c56: change-color(black,$red:56); - c57: change-color(black,$red:57); - c58: change-color(black,$red:58); - c59: change-color(black,$red:59); - c60: change-color(black,$red:60); - c61: change-color(black,$red:61); - c62: change-color(black,$red:62); - c63: change-color(black,$red:63); - c64: change-color(black,$red:64); - c65: change-color(black,$red:65); - c66: change-color(black,$red:66); - c67: change-color(black,$red:67); - c68: change-color(black,$red:68); - c69: change-color(black,$red:69); - c70: change-color(black,$red:70); - c71: change-color(black,$red:71); - c72: change-color(black,$red:72); - c73: change-color(black,$red:73); - c74: change-color(black,$red:74); - c75: change-color(black,$red:75); - c76: change-color(black,$red:76); - c77: change-color(black,$red:77); - c78: change-color(black,$red:78); - c79: change-color(black,$red:79); - c80: change-color(black,$red:80); - c81: change-color(black,$red:81); - c82: change-color(black,$red:82); - c83: change-color(black,$red:83); - c84: change-color(black,$red:84); - c85: change-color(black,$red:85); - c86: change-color(black,$red:86); - c87: change-color(black,$red:87); - c88: change-color(black,$red:88); - c89: change-color(black,$red:89); - c90: change-color(black,$red:90); - c91: change-color(black,$red:91); - c92: change-color(black,$red:92); - c93: change-color(black,$red:93); - c94: change-color(black,$red:94); - c95: change-color(black,$red:95); - c96: change-color(black,$red:96); - c97: change-color(black,$red:97); - c98: change-color(black,$red:98); - c99: change-color(black,$red:99); - c100: change-color(black,$red:100); - c101: change-color(black,$red:101); - c102: change-color(black,$red:102); - c103: change-color(black,$red:103); - c104: change-color(black,$red:104); - c105: change-color(black,$red:105); - c106: change-color(black,$red:106); - c107: change-color(black,$red:107); - c108: change-color(black,$red:108); - c109: change-color(black,$red:109); - c110: change-color(black,$red:110); - c111: change-color(black,$red:111); - c112: change-color(black,$red:112); - c113: change-color(black,$red:113); - c114: change-color(black,$red:114); - c115: change-color(black,$red:115); - c116: change-color(black,$red:116); - c117: change-color(black,$red:117); - c118: change-color(black,$red:118); - c119: change-color(black,$red:119); - c120: change-color(black,$red:120); - c121: change-color(black,$red:121); - c122: change-color(black,$red:122); - c123: change-color(black,$red:123); - c124: change-color(black,$red:124); - c125: change-color(black,$red:125); - c126: change-color(black,$red:126); - c127: change-color(black,$red:127); - c128: change-color(black,$red:128); - c129: change-color(black,$red:129); - c130: change-color(black,$red:130); - c131: change-color(black,$red:131); - c132: change-color(black,$red:132); - c133: change-color(black,$red:133); - c134: change-color(black,$red:134); - c135: change-color(black,$red:135); - c136: change-color(black,$red:136); - c137: change-color(black,$red:137); - c138: change-color(black,$red:138); - c139: change-color(black,$red:139); - c140: change-color(black,$red:140); - c141: change-color(black,$red:141); - c142: change-color(black,$red:142); - c143: change-color(black,$red:143); - c144: change-color(black,$red:144); - c145: change-color(black,$red:145); - c146: change-color(black,$red:146); - c147: change-color(black,$red:147); - c148: change-color(black,$red:148); - c149: change-color(black,$red:149); - c150: change-color(black,$red:150); - c151: change-color(black,$red:151); - c152: change-color(black,$red:152); - c153: change-color(black,$red:153); - c154: change-color(black,$red:154); - c155: change-color(black,$red:155); - c156: change-color(black,$red:156); - c157: change-color(black,$red:157); - c158: change-color(black,$red:158); - c159: change-color(black,$red:159); - c160: change-color(black,$red:160); - c161: change-color(black,$red:161); - c162: change-color(black,$red:162); - c163: change-color(black,$red:163); - c164: change-color(black,$red:164); - c165: change-color(black,$red:165); - c166: change-color(black,$red:166); - c167: change-color(black,$red:167); - c168: change-color(black,$red:168); - c169: change-color(black,$red:169); - c170: change-color(black,$red:170); - c171: change-color(black,$red:171); - c172: change-color(black,$red:172); - c173: change-color(black,$red:173); - c174: change-color(black,$red:174); - c175: change-color(black,$red:175); - c176: change-color(black,$red:176); - c177: change-color(black,$red:177); - c178: change-color(black,$red:178); - c179: change-color(black,$red:179); - c180: change-color(black,$red:180); - c181: change-color(black,$red:181); - c182: change-color(black,$red:182); - c183: change-color(black,$red:183); - c184: change-color(black,$red:184); - c185: change-color(black,$red:185); - c186: change-color(black,$red:186); - c187: change-color(black,$red:187); - c188: change-color(black,$red:188); - c189: change-color(black,$red:189); - c190: change-color(black,$red:190); - c191: change-color(black,$red:191); - c192: change-color(black,$red:192); - c193: change-color(black,$red:193); - c194: change-color(black,$red:194); - c195: change-color(black,$red:195); - c196: change-color(black,$red:196); - c197: change-color(black,$red:197); - c198: change-color(black,$red:198); - c199: change-color(black,$red:199); - c200: change-color(black,$red:200); - c201: change-color(black,$red:201); - c202: change-color(black,$red:202); - c203: change-color(black,$red:203); - c204: change-color(black,$red:204); - c205: change-color(black,$red:205); - c206: change-color(black,$red:206); - c207: change-color(black,$red:207); - c208: change-color(black,$red:208); - c209: change-color(black,$red:209); - c210: change-color(black,$red:210); - c211: change-color(black,$red:211); - c212: change-color(black,$red:212); - c213: change-color(black,$red:213); - c214: change-color(black,$red:214); - c215: change-color(black,$red:215); - c216: change-color(black,$red:216); - c217: change-color(black,$red:217); - c218: change-color(black,$red:218); - c219: change-color(black,$red:219); - c220: change-color(black,$red:220); - c221: change-color(black,$red:221); - c222: change-color(black,$red:222); - c223: change-color(black,$red:223); - c224: change-color(black,$red:224); - c225: change-color(black,$red:225); - c226: change-color(black,$red:226); - c227: change-color(black,$red:227); - c228: change-color(black,$red:228); - c229: change-color(black,$red:229); - c230: change-color(black,$red:230); - c231: change-color(black,$red:231); - c232: change-color(black,$red:232); - c233: change-color(black,$red:233); - c234: change-color(black,$red:234); - c235: change-color(black,$red:235); - c236: change-color(black,$red:236); - c237: change-color(black,$red:237); - c238: change-color(black,$red:238); - c239: change-color(black,$red:239); - c240: change-color(black,$red:240); - c241: change-color(black,$red:241); - c242: change-color(black,$red:242); - c243: change-color(black,$red:243); - c244: change-color(black,$red:244); - c245: change-color(black,$red:245); - c246: change-color(black,$red:246); - c247: change-color(black,$red:247); - c248: change-color(black,$red:248); - c249: change-color(black,$red:249); - c250: change-color(black,$red:250); - c251: change-color(black,$red:251); - c252: change-color(black,$red:252); - c253: change-color(black,$red:253); - c254: change-color(black,$red:254); - c255: change-color(black,$red:255); + c0: color.change(black,$red:0); + c1: color.change(black,$red:1); + c2: color.change(black,$red:2); + c3: color.change(black,$red:3); + c4: color.change(black,$red:4); + c5: color.change(black,$red:5); + c6: color.change(black,$red:6); + c7: color.change(black,$red:7); + c8: color.change(black,$red:8); + c9: color.change(black,$red:9); + c10: color.change(black,$red:10); + c11: color.change(black,$red:11); + c12: color.change(black,$red:12); + c13: color.change(black,$red:13); + c14: color.change(black,$red:14); + c15: color.change(black,$red:15); + c16: color.change(black,$red:16); + c17: color.change(black,$red:17); + c18: color.change(black,$red:18); + c19: color.change(black,$red:19); + c20: color.change(black,$red:20); + c21: color.change(black,$red:21); + c22: color.change(black,$red:22); + c23: color.change(black,$red:23); + c24: color.change(black,$red:24); + c25: color.change(black,$red:25); + c26: color.change(black,$red:26); + c27: color.change(black,$red:27); + c28: color.change(black,$red:28); + c29: color.change(black,$red:29); + c30: color.change(black,$red:30); + c31: color.change(black,$red:31); + c32: color.change(black,$red:32); + c33: color.change(black,$red:33); + c34: color.change(black,$red:34); + c35: color.change(black,$red:35); + c36: color.change(black,$red:36); + c37: color.change(black,$red:37); + c38: color.change(black,$red:38); + c39: color.change(black,$red:39); + c40: color.change(black,$red:40); + c41: color.change(black,$red:41); + c42: color.change(black,$red:42); + c43: color.change(black,$red:43); + c44: color.change(black,$red:44); + c45: color.change(black,$red:45); + c46: color.change(black,$red:46); + c47: color.change(black,$red:47); + c48: color.change(black,$red:48); + c49: color.change(black,$red:49); + c50: color.change(black,$red:50); + c51: color.change(black,$red:51); + c52: color.change(black,$red:52); + c53: color.change(black,$red:53); + c54: color.change(black,$red:54); + c55: color.change(black,$red:55); + c56: color.change(black,$red:56); + c57: color.change(black,$red:57); + c58: color.change(black,$red:58); + c59: color.change(black,$red:59); + c60: color.change(black,$red:60); + c61: color.change(black,$red:61); + c62: color.change(black,$red:62); + c63: color.change(black,$red:63); + c64: color.change(black,$red:64); + c65: color.change(black,$red:65); + c66: color.change(black,$red:66); + c67: color.change(black,$red:67); + c68: color.change(black,$red:68); + c69: color.change(black,$red:69); + c70: color.change(black,$red:70); + c71: color.change(black,$red:71); + c72: color.change(black,$red:72); + c73: color.change(black,$red:73); + c74: color.change(black,$red:74); + c75: color.change(black,$red:75); + c76: color.change(black,$red:76); + c77: color.change(black,$red:77); + c78: color.change(black,$red:78); + c79: color.change(black,$red:79); + c80: color.change(black,$red:80); + c81: color.change(black,$red:81); + c82: color.change(black,$red:82); + c83: color.change(black,$red:83); + c84: color.change(black,$red:84); + c85: color.change(black,$red:85); + c86: color.change(black,$red:86); + c87: color.change(black,$red:87); + c88: color.change(black,$red:88); + c89: color.change(black,$red:89); + c90: color.change(black,$red:90); + c91: color.change(black,$red:91); + c92: color.change(black,$red:92); + c93: color.change(black,$red:93); + c94: color.change(black,$red:94); + c95: color.change(black,$red:95); + c96: color.change(black,$red:96); + c97: color.change(black,$red:97); + c98: color.change(black,$red:98); + c99: color.change(black,$red:99); + c100: color.change(black,$red:100); + c101: color.change(black,$red:101); + c102: color.change(black,$red:102); + c103: color.change(black,$red:103); + c104: color.change(black,$red:104); + c105: color.change(black,$red:105); + c106: color.change(black,$red:106); + c107: color.change(black,$red:107); + c108: color.change(black,$red:108); + c109: color.change(black,$red:109); + c110: color.change(black,$red:110); + c111: color.change(black,$red:111); + c112: color.change(black,$red:112); + c113: color.change(black,$red:113); + c114: color.change(black,$red:114); + c115: color.change(black,$red:115); + c116: color.change(black,$red:116); + c117: color.change(black,$red:117); + c118: color.change(black,$red:118); + c119: color.change(black,$red:119); + c120: color.change(black,$red:120); + c121: color.change(black,$red:121); + c122: color.change(black,$red:122); + c123: color.change(black,$red:123); + c124: color.change(black,$red:124); + c125: color.change(black,$red:125); + c126: color.change(black,$red:126); + c127: color.change(black,$red:127); + c128: color.change(black,$red:128); + c129: color.change(black,$red:129); + c130: color.change(black,$red:130); + c131: color.change(black,$red:131); + c132: color.change(black,$red:132); + c133: color.change(black,$red:133); + c134: color.change(black,$red:134); + c135: color.change(black,$red:135); + c136: color.change(black,$red:136); + c137: color.change(black,$red:137); + c138: color.change(black,$red:138); + c139: color.change(black,$red:139); + c140: color.change(black,$red:140); + c141: color.change(black,$red:141); + c142: color.change(black,$red:142); + c143: color.change(black,$red:143); + c144: color.change(black,$red:144); + c145: color.change(black,$red:145); + c146: color.change(black,$red:146); + c147: color.change(black,$red:147); + c148: color.change(black,$red:148); + c149: color.change(black,$red:149); + c150: color.change(black,$red:150); + c151: color.change(black,$red:151); + c152: color.change(black,$red:152); + c153: color.change(black,$red:153); + c154: color.change(black,$red:154); + c155: color.change(black,$red:155); + c156: color.change(black,$red:156); + c157: color.change(black,$red:157); + c158: color.change(black,$red:158); + c159: color.change(black,$red:159); + c160: color.change(black,$red:160); + c161: color.change(black,$red:161); + c162: color.change(black,$red:162); + c163: color.change(black,$red:163); + c164: color.change(black,$red:164); + c165: color.change(black,$red:165); + c166: color.change(black,$red:166); + c167: color.change(black,$red:167); + c168: color.change(black,$red:168); + c169: color.change(black,$red:169); + c170: color.change(black,$red:170); + c171: color.change(black,$red:171); + c172: color.change(black,$red:172); + c173: color.change(black,$red:173); + c174: color.change(black,$red:174); + c175: color.change(black,$red:175); + c176: color.change(black,$red:176); + c177: color.change(black,$red:177); + c178: color.change(black,$red:178); + c179: color.change(black,$red:179); + c180: color.change(black,$red:180); + c181: color.change(black,$red:181); + c182: color.change(black,$red:182); + c183: color.change(black,$red:183); + c184: color.change(black,$red:184); + c185: color.change(black,$red:185); + c186: color.change(black,$red:186); + c187: color.change(black,$red:187); + c188: color.change(black,$red:188); + c189: color.change(black,$red:189); + c190: color.change(black,$red:190); + c191: color.change(black,$red:191); + c192: color.change(black,$red:192); + c193: color.change(black,$red:193); + c194: color.change(black,$red:194); + c195: color.change(black,$red:195); + c196: color.change(black,$red:196); + c197: color.change(black,$red:197); + c198: color.change(black,$red:198); + c199: color.change(black,$red:199); + c200: color.change(black,$red:200); + c201: color.change(black,$red:201); + c202: color.change(black,$red:202); + c203: color.change(black,$red:203); + c204: color.change(black,$red:204); + c205: color.change(black,$red:205); + c206: color.change(black,$red:206); + c207: color.change(black,$red:207); + c208: color.change(black,$red:208); + c209: color.change(black,$red:209); + c210: color.change(black,$red:210); + c211: color.change(black,$red:211); + c212: color.change(black,$red:212); + c213: color.change(black,$red:213); + c214: color.change(black,$red:214); + c215: color.change(black,$red:215); + c216: color.change(black,$red:216); + c217: color.change(black,$red:217); + c218: color.change(black,$red:218); + c219: color.change(black,$red:219); + c220: color.change(black,$red:220); + c221: color.change(black,$red:221); + c222: color.change(black,$red:222); + c223: color.change(black,$red:223); + c224: color.change(black,$red:224); + c225: color.change(black,$red:225); + c226: color.change(black,$red:226); + c227: color.change(black,$red:227); + c228: color.change(black,$red:228); + c229: color.change(black,$red:229); + c230: color.change(black,$red:230); + c231: color.change(black,$red:231); + c232: color.change(black,$red:232); + c233: color.change(black,$red:233); + c234: color.change(black,$red:234); + c235: color.change(black,$red:235); + c236: color.change(black,$red:236); + c237: color.change(black,$red:237); + c238: color.change(black,$red:238); + c239: color.change(black,$red:239); + c240: color.change(black,$red:240); + c241: color.change(black,$red:241); + c242: color.change(black,$red:242); + c243: color.change(black,$red:243); + c244: color.change(black,$red:244); + c245: color.change(black,$red:245); + c246: color.change(black,$red:246); + c247: color.change(black,$red:247); + c248: color.change(black,$red:248); + c249: color.change(black,$red:249); + c250: color.change(black,$red:250); + c251: color.change(black,$red:251); + c252: color.change(black,$red:252); + c253: color.change(black,$red:253); + c254: color.change(black,$red:254); + c255: color.change(black,$red:255); // c256: change-color(black,$red:256); } diff --git a/spec/libsass/color-functions/other/change-color/s.hrx b/spec/libsass/color-functions/other/change-color/s.hrx index 6be178c555..b67b43d755 100644 --- a/spec/libsass/color-functions/other/change-color/s.hrx +++ b/spec/libsass/color-functions/other/change-color/s.hrx @@ -1,107 +1,108 @@ <===> input.scss +@use "sass:color"; foo { // c-1: change-color(red,$saturation:-1%); - c0: change-color(red,$saturation:0%); - c1: change-color(red,$saturation:1%); - c2: change-color(red,$saturation:2%); - c3: change-color(red,$saturation:3%); - c4: change-color(red,$saturation:4%); - c5: change-color(red,$saturation:5%); - c6: change-color(red,$saturation:6%); - c7: change-color(red,$saturation:7%); - c8: change-color(red,$saturation:8%); - c9: change-color(red,$saturation:9%); - c10: change-color(red,$saturation:10%); - c11: change-color(red,$saturation:11%); - c12: change-color(red,$saturation:12%); - c13: change-color(red,$saturation:13%); - c14: change-color(red,$saturation:14%); - c15: change-color(red,$saturation:15%); - c16: change-color(red,$saturation:16%); - c17: change-color(red,$saturation:17%); - c18: change-color(red,$saturation:18%); - c19: change-color(red,$saturation:19%); - c20: change-color(red,$saturation:20%); - c21: change-color(red,$saturation:21%); - c22: change-color(red,$saturation:22%); - c23: change-color(red,$saturation:23%); - c24: change-color(red,$saturation:24%); - c25: change-color(red,$saturation:25%); - c26: change-color(red,$saturation:26%); - c27: change-color(red,$saturation:27%); - c28: change-color(red,$saturation:28%); - c29: change-color(red,$saturation:29%); - c30: change-color(red,$saturation:30%); - c31: change-color(red,$saturation:31%); - c32: change-color(red,$saturation:32%); - c33: change-color(red,$saturation:33%); - c34: change-color(red,$saturation:34%); - c35: change-color(red,$saturation:35%); - c36: change-color(red,$saturation:36%); - c37: change-color(red,$saturation:37%); - c38: change-color(red,$saturation:38%); - c39: change-color(red,$saturation:39%); - c40: change-color(red,$saturation:40%); - c41: change-color(red,$saturation:41%); - c42: change-color(red,$saturation:42%); - c43: change-color(red,$saturation:43%); - c44: change-color(red,$saturation:44%); - c45: change-color(red,$saturation:45%); - c46: change-color(red,$saturation:46%); - c47: change-color(red,$saturation:47%); - c48: change-color(red,$saturation:48%); - c49: change-color(red,$saturation:49%); - c50: change-color(red,$saturation:50%); - c51: change-color(red,$saturation:51%); - c52: change-color(red,$saturation:52%); - c53: change-color(red,$saturation:53%); - c54: change-color(red,$saturation:54%); - c55: change-color(red,$saturation:55%); - c56: change-color(red,$saturation:56%); - c57: change-color(red,$saturation:57%); - c58: change-color(red,$saturation:58%); - c59: change-color(red,$saturation:59%); - c60: change-color(red,$saturation:60%); - c61: change-color(red,$saturation:61%); - c62: change-color(red,$saturation:62%); - c63: change-color(red,$saturation:63%); - c64: change-color(red,$saturation:64%); - c65: change-color(red,$saturation:65%); - c66: change-color(red,$saturation:66%); - c67: change-color(red,$saturation:67%); - c68: change-color(red,$saturation:68%); - c69: change-color(red,$saturation:69%); - c70: change-color(red,$saturation:70%); - c71: change-color(red,$saturation:71%); - c72: change-color(red,$saturation:72%); - c73: change-color(red,$saturation:73%); - c74: change-color(red,$saturation:74%); - c75: change-color(red,$saturation:75%); - c76: change-color(red,$saturation:76%); - c77: change-color(red,$saturation:77%); - c78: change-color(red,$saturation:78%); - c79: change-color(red,$saturation:79%); - c80: change-color(red,$saturation:80%); - c81: change-color(red,$saturation:81%); - c82: change-color(red,$saturation:82%); - c83: change-color(red,$saturation:83%); - c84: change-color(red,$saturation:84%); - c85: change-color(red,$saturation:85%); - c86: change-color(red,$saturation:86%); - c87: change-color(red,$saturation:87%); - c88: change-color(red,$saturation:88%); - c89: change-color(red,$saturation:89%); - c90: change-color(red,$saturation:90%); - c91: change-color(red,$saturation:91%); - c92: change-color(red,$saturation:92%); - c93: change-color(red,$saturation:93%); - c94: change-color(red,$saturation:94%); - c95: change-color(red,$saturation:95%); - c96: change-color(red,$saturation:96%); - c97: change-color(red,$saturation:97%); - c98: change-color(red,$saturation:98%); - c99: change-color(red,$saturation:99%); - c100: change-color(red,$saturation:100%); + c0: color.change(red,$saturation:0%); + c1: color.change(red,$saturation:1%); + c2: color.change(red,$saturation:2%); + c3: color.change(red,$saturation:3%); + c4: color.change(red,$saturation:4%); + c5: color.change(red,$saturation:5%); + c6: color.change(red,$saturation:6%); + c7: color.change(red,$saturation:7%); + c8: color.change(red,$saturation:8%); + c9: color.change(red,$saturation:9%); + c10: color.change(red,$saturation:10%); + c11: color.change(red,$saturation:11%); + c12: color.change(red,$saturation:12%); + c13: color.change(red,$saturation:13%); + c14: color.change(red,$saturation:14%); + c15: color.change(red,$saturation:15%); + c16: color.change(red,$saturation:16%); + c17: color.change(red,$saturation:17%); + c18: color.change(red,$saturation:18%); + c19: color.change(red,$saturation:19%); + c20: color.change(red,$saturation:20%); + c21: color.change(red,$saturation:21%); + c22: color.change(red,$saturation:22%); + c23: color.change(red,$saturation:23%); + c24: color.change(red,$saturation:24%); + c25: color.change(red,$saturation:25%); + c26: color.change(red,$saturation:26%); + c27: color.change(red,$saturation:27%); + c28: color.change(red,$saturation:28%); + c29: color.change(red,$saturation:29%); + c30: color.change(red,$saturation:30%); + c31: color.change(red,$saturation:31%); + c32: color.change(red,$saturation:32%); + c33: color.change(red,$saturation:33%); + c34: color.change(red,$saturation:34%); + c35: color.change(red,$saturation:35%); + c36: color.change(red,$saturation:36%); + c37: color.change(red,$saturation:37%); + c38: color.change(red,$saturation:38%); + c39: color.change(red,$saturation:39%); + c40: color.change(red,$saturation:40%); + c41: color.change(red,$saturation:41%); + c42: color.change(red,$saturation:42%); + c43: color.change(red,$saturation:43%); + c44: color.change(red,$saturation:44%); + c45: color.change(red,$saturation:45%); + c46: color.change(red,$saturation:46%); + c47: color.change(red,$saturation:47%); + c48: color.change(red,$saturation:48%); + c49: color.change(red,$saturation:49%); + c50: color.change(red,$saturation:50%); + c51: color.change(red,$saturation:51%); + c52: color.change(red,$saturation:52%); + c53: color.change(red,$saturation:53%); + c54: color.change(red,$saturation:54%); + c55: color.change(red,$saturation:55%); + c56: color.change(red,$saturation:56%); + c57: color.change(red,$saturation:57%); + c58: color.change(red,$saturation:58%); + c59: color.change(red,$saturation:59%); + c60: color.change(red,$saturation:60%); + c61: color.change(red,$saturation:61%); + c62: color.change(red,$saturation:62%); + c63: color.change(red,$saturation:63%); + c64: color.change(red,$saturation:64%); + c65: color.change(red,$saturation:65%); + c66: color.change(red,$saturation:66%); + c67: color.change(red,$saturation:67%); + c68: color.change(red,$saturation:68%); + c69: color.change(red,$saturation:69%); + c70: color.change(red,$saturation:70%); + c71: color.change(red,$saturation:71%); + c72: color.change(red,$saturation:72%); + c73: color.change(red,$saturation:73%); + c74: color.change(red,$saturation:74%); + c75: color.change(red,$saturation:75%); + c76: color.change(red,$saturation:76%); + c77: color.change(red,$saturation:77%); + c78: color.change(red,$saturation:78%); + c79: color.change(red,$saturation:79%); + c80: color.change(red,$saturation:80%); + c81: color.change(red,$saturation:81%); + c82: color.change(red,$saturation:82%); + c83: color.change(red,$saturation:83%); + c84: color.change(red,$saturation:84%); + c85: color.change(red,$saturation:85%); + c86: color.change(red,$saturation:86%); + c87: color.change(red,$saturation:87%); + c88: color.change(red,$saturation:88%); + c89: color.change(red,$saturation:89%); + c90: color.change(red,$saturation:90%); + c91: color.change(red,$saturation:91%); + c92: color.change(red,$saturation:92%); + c93: color.change(red,$saturation:93%); + c94: color.change(red,$saturation:94%); + c95: color.change(red,$saturation:95%); + c96: color.change(red,$saturation:96%); + c97: color.change(red,$saturation:97%); + c98: color.change(red,$saturation:98%); + c99: color.change(red,$saturation:99%); + c100: color.change(red,$saturation:100%); // c101: change-color(red,$saturation:101%); } diff --git a/spec/libsass/color-functions/saturate.hrx b/spec/libsass/color-functions/saturate.hrx index 167059777d..0cb809f77f 100644 --- a/spec/libsass/color-functions/saturate.hrx +++ b/spec/libsass/color-functions/saturate.hrx @@ -1,106 +1,107 @@ <===> input.scss +@use "sass:color"; foo { - c0: saturate(hsl(100, 0%, 50%), 0%); - c1: saturate(hsl(100, 0%, 50%), 1%); - c2: saturate(hsl(100, 0%, 50%), 2%); - c3: saturate(hsl(100, 0%, 50%), 3%); - c4: saturate(hsl(100, 0%, 50%), 4%); - c5: saturate(hsl(100, 0%, 50%), 5%); - c6: saturate(hsl(100, 0%, 50%), 6%); - c7: saturate(hsl(100, 0%, 50%), 7%); - c8: saturate(hsl(100, 0%, 50%), 8%); - c9: saturate(hsl(100, 0%, 50%), 9%); - c10: saturate(hsl(100, 0%, 50%), 10%); - c11: saturate(hsl(100, 0%, 50%), 11%); - c12: saturate(hsl(100, 0%, 50%), 12%); - c13: saturate(hsl(100, 0%, 50%), 13%); - c14: saturate(hsl(100, 0%, 50%), 14%); - c15: saturate(hsl(100, 0%, 50%), 15%); - c16: saturate(hsl(100, 0%, 50%), 16%); - c17: saturate(hsl(100, 0%, 50%), 17%); - c18: saturate(hsl(100, 0%, 50%), 18%); - c19: saturate(hsl(100, 0%, 50%), 19%); - c20: saturate(hsl(100, 0%, 50%), 20%); - c21: saturate(hsl(100, 0%, 50%), 21%); - c22: saturate(hsl(100, 0%, 50%), 22%); - c23: saturate(hsl(100, 0%, 50%), 23%); - c24: saturate(hsl(100, 0%, 50%), 24%); - c25: saturate(hsl(100, 0%, 50%), 25%); - c26: saturate(hsl(100, 0%, 50%), 26%); - c27: saturate(hsl(100, 0%, 50%), 27%); - c28: saturate(hsl(100, 0%, 50%), 28%); - c29: saturate(hsl(100, 0%, 50%), 29%); - c30: saturate(hsl(100, 0%, 50%), 30%); - c31: saturate(hsl(100, 0%, 50%), 31%); - c32: saturate(hsl(100, 0%, 50%), 32%); - c33: saturate(hsl(100, 0%, 50%), 33%); - c34: saturate(hsl(100, 0%, 50%), 34%); - c35: saturate(hsl(100, 0%, 50%), 35%); - c36: saturate(hsl(100, 0%, 50%), 36%); - c37: saturate(hsl(100, 0%, 50%), 37%); - c38: saturate(hsl(100, 0%, 50%), 38%); - c39: saturate(hsl(100, 0%, 50%), 39%); + c0: color.adjust(hsl(100, 0%, 50%), $saturation: 0%); + c1: color.adjust(hsl(100, 0%, 50%), $saturation: 1%); + c2: color.adjust(hsl(100, 0%, 50%), $saturation: 2%); + c3: color.adjust(hsl(100, 0%, 50%), $saturation: 3%); + c4: color.adjust(hsl(100, 0%, 50%), $saturation: 4%); + c5: color.adjust(hsl(100, 0%, 50%), $saturation: 5%); + c6: color.adjust(hsl(100, 0%, 50%), $saturation: 6%); + c7: color.adjust(hsl(100, 0%, 50%), $saturation: 7%); + c8: color.adjust(hsl(100, 0%, 50%), $saturation: 8%); + c9: color.adjust(hsl(100, 0%, 50%), $saturation: 9%); + c10: color.adjust(hsl(100, 0%, 50%), $saturation: 10%); + c11: color.adjust(hsl(100, 0%, 50%), $saturation: 11%); + c12: color.adjust(hsl(100, 0%, 50%), $saturation: 12%); + c13: color.adjust(hsl(100, 0%, 50%), $saturation: 13%); + c14: color.adjust(hsl(100, 0%, 50%), $saturation: 14%); + c15: color.adjust(hsl(100, 0%, 50%), $saturation: 15%); + c16: color.adjust(hsl(100, 0%, 50%), $saturation: 16%); + c17: color.adjust(hsl(100, 0%, 50%), $saturation: 17%); + c18: color.adjust(hsl(100, 0%, 50%), $saturation: 18%); + c19: color.adjust(hsl(100, 0%, 50%), $saturation: 19%); + c20: color.adjust(hsl(100, 0%, 50%), $saturation: 20%); + c21: color.adjust(hsl(100, 0%, 50%), $saturation: 21%); + c22: color.adjust(hsl(100, 0%, 50%), $saturation: 22%); + c23: color.adjust(hsl(100, 0%, 50%), $saturation: 23%); + c24: color.adjust(hsl(100, 0%, 50%), $saturation: 24%); + c25: color.adjust(hsl(100, 0%, 50%), $saturation: 25%); + c26: color.adjust(hsl(100, 0%, 50%), $saturation: 26%); + c27: color.adjust(hsl(100, 0%, 50%), $saturation: 27%); + c28: color.adjust(hsl(100, 0%, 50%), $saturation: 28%); + c29: color.adjust(hsl(100, 0%, 50%), $saturation: 29%); + c30: color.adjust(hsl(100, 0%, 50%), $saturation: 30%); + c31: color.adjust(hsl(100, 0%, 50%), $saturation: 31%); + c32: color.adjust(hsl(100, 0%, 50%), $saturation: 32%); + c33: color.adjust(hsl(100, 0%, 50%), $saturation: 33%); + c34: color.adjust(hsl(100, 0%, 50%), $saturation: 34%); + c35: color.adjust(hsl(100, 0%, 50%), $saturation: 35%); + c36: color.adjust(hsl(100, 0%, 50%), $saturation: 36%); + c37: color.adjust(hsl(100, 0%, 50%), $saturation: 37%); + c38: color.adjust(hsl(100, 0%, 50%), $saturation: 38%); + c39: color.adjust(hsl(100, 0%, 50%), $saturation: 39%); // c40: saturate(hsl(100, 0%, 50%), 40%); - c41: saturate(hsl(100, 0%, 50%), 41%); - c42: saturate(hsl(100, 0%, 50%), 42%); - c43: saturate(hsl(100, 0%, 50%), 43%); - c44: saturate(hsl(100, 0%, 50%), 44%); - c45: saturate(hsl(100, 0%, 50%), 45%); - c46: saturate(hsl(100, 0%, 50%), 46%); - c47: saturate(hsl(100, 0%, 50%), 47%); - c48: saturate(hsl(100, 0%, 50%), 48%); - c49: saturate(hsl(100, 0%, 50%), 49%); - c50: saturate(hsl(100, 0%, 50%), 50%); - c51: saturate(hsl(100, 0%, 50%), 51%); - c52: saturate(hsl(100, 0%, 50%), 52%); - c53: saturate(hsl(100, 0%, 50%), 53%); - c54: saturate(hsl(100, 0%, 50%), 54%); - c55: saturate(hsl(100, 0%, 50%), 55%); - c56: saturate(hsl(100, 0%, 50%), 56%); - c57: saturate(hsl(100, 0%, 50%), 57%); - c58: saturate(hsl(100, 0%, 50%), 58%); - c59: saturate(hsl(100, 0%, 50%), 59%); - c60: saturate(hsl(100, 0%, 50%), 60%); - c61: saturate(hsl(100, 0%, 50%), 61%); - c62: saturate(hsl(100, 0%, 50%), 62%); - c63: saturate(hsl(100, 0%, 50%), 63%); - c64: saturate(hsl(100, 0%, 50%), 64%); - c65: saturate(hsl(100, 0%, 50%), 65%); - c66: saturate(hsl(100, 0%, 50%), 66%); - c67: saturate(hsl(100, 0%, 50%), 67%); - c68: saturate(hsl(100, 0%, 50%), 68%); - c69: saturate(hsl(100, 0%, 50%), 69%); - c70: saturate(hsl(100, 0%, 50%), 70%); - c71: saturate(hsl(100, 0%, 50%), 71%); - c72: saturate(hsl(100, 0%, 50%), 72%); - c73: saturate(hsl(100, 0%, 50%), 73%); - c74: saturate(hsl(100, 0%, 50%), 74%); - c75: saturate(hsl(100, 0%, 50%), 75%); - c76: saturate(hsl(100, 0%, 50%), 76%); - c77: saturate(hsl(100, 0%, 50%), 77%); - c78: saturate(hsl(100, 0%, 50%), 78%); - c79: saturate(hsl(100, 0%, 50%), 79%); + c41: color.adjust(hsl(100, 0%, 50%), $saturation: 41%); + c42: color.adjust(hsl(100, 0%, 50%), $saturation: 42%); + c43: color.adjust(hsl(100, 0%, 50%), $saturation: 43%); + c44: color.adjust(hsl(100, 0%, 50%), $saturation: 44%); + c45: color.adjust(hsl(100, 0%, 50%), $saturation: 45%); + c46: color.adjust(hsl(100, 0%, 50%), $saturation: 46%); + c47: color.adjust(hsl(100, 0%, 50%), $saturation: 47%); + c48: color.adjust(hsl(100, 0%, 50%), $saturation: 48%); + c49: color.adjust(hsl(100, 0%, 50%), $saturation: 49%); + c50: color.adjust(hsl(100, 0%, 50%), $saturation: 50%); + c51: color.adjust(hsl(100, 0%, 50%), $saturation: 51%); + c52: color.adjust(hsl(100, 0%, 50%), $saturation: 52%); + c53: color.adjust(hsl(100, 0%, 50%), $saturation: 53%); + c54: color.adjust(hsl(100, 0%, 50%), $saturation: 54%); + c55: color.adjust(hsl(100, 0%, 50%), $saturation: 55%); + c56: color.adjust(hsl(100, 0%, 50%), $saturation: 56%); + c57: color.adjust(hsl(100, 0%, 50%), $saturation: 57%); + c58: color.adjust(hsl(100, 0%, 50%), $saturation: 58%); + c59: color.adjust(hsl(100, 0%, 50%), $saturation: 59%); + c60: color.adjust(hsl(100, 0%, 50%), $saturation: 60%); + c61: color.adjust(hsl(100, 0%, 50%), $saturation: 61%); + c62: color.adjust(hsl(100, 0%, 50%), $saturation: 62%); + c63: color.adjust(hsl(100, 0%, 50%), $saturation: 63%); + c64: color.adjust(hsl(100, 0%, 50%), $saturation: 64%); + c65: color.adjust(hsl(100, 0%, 50%), $saturation: 65%); + c66: color.adjust(hsl(100, 0%, 50%), $saturation: 66%); + c67: color.adjust(hsl(100, 0%, 50%), $saturation: 67%); + c68: color.adjust(hsl(100, 0%, 50%), $saturation: 68%); + c69: color.adjust(hsl(100, 0%, 50%), $saturation: 69%); + c70: color.adjust(hsl(100, 0%, 50%), $saturation: 70%); + c71: color.adjust(hsl(100, 0%, 50%), $saturation: 71%); + c72: color.adjust(hsl(100, 0%, 50%), $saturation: 72%); + c73: color.adjust(hsl(100, 0%, 50%), $saturation: 73%); + c74: color.adjust(hsl(100, 0%, 50%), $saturation: 74%); + c75: color.adjust(hsl(100, 0%, 50%), $saturation: 75%); + c76: color.adjust(hsl(100, 0%, 50%), $saturation: 76%); + c77: color.adjust(hsl(100, 0%, 50%), $saturation: 77%); + c78: color.adjust(hsl(100, 0%, 50%), $saturation: 78%); + c79: color.adjust(hsl(100, 0%, 50%), $saturation: 79%); // c80: saturate(hsl(100, 0%, 50%), 80%); - c81: saturate(hsl(100, 0%, 50%), 81%); - c82: saturate(hsl(100, 0%, 50%), 82%); - c83: saturate(hsl(100, 0%, 50%), 83%); - c84: saturate(hsl(100, 0%, 50%), 84%); - c85: saturate(hsl(100, 0%, 50%), 85%); - c86: saturate(hsl(100, 0%, 50%), 86%); - c87: saturate(hsl(100, 0%, 50%), 87%); - c88: saturate(hsl(100, 0%, 50%), 88%); - c89: saturate(hsl(100, 0%, 50%), 89%); - c90: saturate(hsl(100, 0%, 50%), 90%); - c91: saturate(hsl(100, 0%, 50%), 91%); - c92: saturate(hsl(100, 0%, 50%), 92%); - c93: saturate(hsl(100, 0%, 50%), 93%); - c94: saturate(hsl(100, 0%, 50%), 94%); - c95: saturate(hsl(100, 0%, 50%), 95%); - c96: saturate(hsl(100, 0%, 50%), 96%); - c97: saturate(hsl(100, 0%, 50%), 97%); - c98: saturate(hsl(100, 0%, 50%), 98%); - c99: saturate(hsl(100, 0%, 50%), 99%); - c100: saturate(hsl(100, 0%, 50%), 100%); + c81: color.adjust(hsl(100, 0%, 50%), $saturation: 81%); + c82: color.adjust(hsl(100, 0%, 50%), $saturation: 82%); + c83: color.adjust(hsl(100, 0%, 50%), $saturation: 83%); + c84: color.adjust(hsl(100, 0%, 50%), $saturation: 84%); + c85: color.adjust(hsl(100, 0%, 50%), $saturation: 85%); + c86: color.adjust(hsl(100, 0%, 50%), $saturation: 86%); + c87: color.adjust(hsl(100, 0%, 50%), $saturation: 87%); + c88: color.adjust(hsl(100, 0%, 50%), $saturation: 88%); + c89: color.adjust(hsl(100, 0%, 50%), $saturation: 89%); + c90: color.adjust(hsl(100, 0%, 50%), $saturation: 90%); + c91: color.adjust(hsl(100, 0%, 50%), $saturation: 91%); + c92: color.adjust(hsl(100, 0%, 50%), $saturation: 92%); + c93: color.adjust(hsl(100, 0%, 50%), $saturation: 93%); + c94: color.adjust(hsl(100, 0%, 50%), $saturation: 94%); + c95: color.adjust(hsl(100, 0%, 50%), $saturation: 95%); + c96: color.adjust(hsl(100, 0%, 50%), $saturation: 96%); + c97: color.adjust(hsl(100, 0%, 50%), $saturation: 97%); + c98: color.adjust(hsl(100, 0%, 50%), $saturation: 98%); + c99: color.adjust(hsl(100, 0%, 50%), $saturation: 99%); + c100: color.adjust(hsl(100, 0%, 50%), $saturation: 100%); } <===> output.css diff --git a/spec/libsass/delayed.hrx b/spec/libsass/delayed.hrx index d3d60244a2..95116a1843 100644 --- a/spec/libsass/delayed.hrx +++ b/spec/libsass/delayed.hrx @@ -1,4 +1,5 @@ <===> input.scss +@use "sass:list"; $x: a 3/4 b; $y: hey; @@ -8,10 +9,10 @@ $y: hey; div { hoo: 3/4; - goo: nth($x, 2); - foo: 15 / nth($x, 2); - foo: .25 + nth($x, 2); - coo: 2/3 / nth($x, 2); + goo: list.nth($x, 2); + foo: 15 / list.nth($x, 2); + foo: .25 + list.nth($x, 2); + coo: 2/3 / list.nth($x, 2); bar: $y and true; bar: false and true; bar: (false) and true; @@ -20,7 +21,7 @@ div { } bloo: foo(); @warn 2/3; - blix: "hey #{nth($x, 2)} ho"; + blix: "hey #{list.nth($x, 2)} ho"; } @media screen and (hux: 3/4) { @@ -32,7 +33,7 @@ div { @warn "blah blah"; div { - blah: "ho #{nth($x, 2) } ho"; + blah: "ho #{list.nth($x, 2) } ho"; } span { @@ -76,10 +77,10 @@ Recommendation: math.div(3, 4) More info and automated migrator: https://sass-lang.com/d/slash-div , -10 | goo: nth($x, 2); - | ^^^^^^^^^^ +11 | goo: list.nth($x, 2); + | ^^^^^^^^^^^^^^^ ' - input.scss 10:8 root stylesheet + input.scss 11:8 root stylesheet DEPRECATION WARNING: Using / for division is deprecated and will be removed in Dart Sass 2.0.0. @@ -88,22 +89,22 @@ Recommendation: math.div(3, 4) More info and automated migrator: https://sass-lang.com/d/slash-div , -11 | foo: 15 / nth($x, 2); - | ^^^^^^^^^^ +12 | foo: 15 / list.nth($x, 2); + | ^^^^^^^^^^^^^^^ ' - input.scss 11:13 root stylesheet + input.scss 12:13 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. -Recommendation: math.div(15, nth($x, 2)) or calc(15 / nth($x, 2)) +Recommendation: math.div(15, list.nth($x, 2)) or calc(15 / list.nth($x, 2)) More info and automated migrator: https://sass-lang.com/d/slash-div , -11 | foo: 15 / nth($x, 2); - | ^^^^^^^^^^^^^^^ +12 | foo: 15 / list.nth($x, 2); + | ^^^^^^^^^^^^^^^^^^^^ ' - input.scss 11:8 root stylesheet + input.scss 12:8 root stylesheet DEPRECATION WARNING: Using / for division is deprecated and will be removed in Dart Sass 2.0.0. @@ -112,10 +113,10 @@ Recommendation: math.div(3, 4) More info and automated migrator: https://sass-lang.com/d/slash-div , -12 | foo: .25 + nth($x, 2); - | ^^^^^^^^^^ +13 | foo: .25 + list.nth($x, 2); + | ^^^^^^^^^^^^^^^ ' - input.scss 12:14 root stylesheet + input.scss 13:14 root stylesheet DEPRECATION WARNING: Using / for division is deprecated and will be removed in Dart Sass 2.0.0. @@ -124,22 +125,22 @@ Recommendation: math.div(3, 4) More info and automated migrator: https://sass-lang.com/d/slash-div , -13 | coo: 2/3 / nth($x, 2); - | ^^^^^^^^^^ +14 | coo: 2/3 / list.nth($x, 2); + | ^^^^^^^^^^^^^^^ ' - input.scss 13:14 root stylesheet + input.scss 14:14 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. -Recommendation: math.div(math.div(2, 3), nth($x, 2)) or calc(2 / 3 / nth($x, 2)) +Recommendation: math.div(math.div(2, 3), list.nth($x, 2)) or calc(2 / 3 / list.nth($x, 2)) More info and automated migrator: https://sass-lang.com/d/slash-div , -13 | coo: 2/3 / nth($x, 2); - | ^^^^^^^^^^^^^^^^ +14 | coo: 2/3 / list.nth($x, 2); + | ^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 13:8 root stylesheet + input.scss 14:8 root stylesheet DEPRECATION WARNING: Using / for division is deprecated and will be removed in Dart Sass 2.0.0. @@ -148,10 +149,10 @@ Recommendation: math.div(3, 4) More info and automated migrator: https://sass-lang.com/d/slash-div , -1 | $x: a 3/4 b; +2 | $x: a 3/4 b; | ^^^^^^^ ' - input.scss 1:5 root stylesheet + input.scss 2:5 root stylesheet DEPRECATION WARNING: Using / for division is deprecated and will be removed in Dart Sass 2.0.0. @@ -160,14 +161,14 @@ Recommendation: math.div(3, 4) More info and automated migrator: https://sass-lang.com/d/slash-div , -5 | @return 3/4; +6 | @return 3/4; | ^^^ ' - input.scss 5:11 foo() - input.scss 20:9 root stylesheet + input.scss 6:11 foo() + input.scss 21:9 root stylesheet WARNING: 2/3 - input.scss 21:3 root stylesheet + input.scss 22:3 root stylesheet DEPRECATION WARNING: Using / for division is deprecated and will be removed in Dart Sass 2.0.0. @@ -176,13 +177,13 @@ Recommendation: math.div(3, 4) More info and automated migrator: https://sass-lang.com/d/slash-div , -22 | blix: "hey #{nth($x, 2)} ho"; - | ^^^^^^^^^^ +23 | blix: "hey #{list.nth($x, 2)} ho"; + | ^^^^^^^^^^^^^^^ ' - input.scss 22:16 root stylesheet + input.scss 23:16 root stylesheet WARNING: blah blah - input.scss 31:1 root stylesheet + input.scss 32:1 root stylesheet DEPRECATION WARNING: Using / for division is deprecated and will be removed in Dart Sass 2.0.0. @@ -191,10 +192,10 @@ Recommendation: math.div(3, 4) More info and automated migrator: https://sass-lang.com/d/slash-div , -34 | blah: "ho #{nth($x, 2) } ho"; - | ^^^^^^^^^^ +35 | blah: "ho #{list.nth($x, 2) } ho"; + | ^^^^^^^^^^^^^^^ ' - input.scss 34:15 root stylesheet + input.scss 35:15 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -203,7 +204,7 @@ Recommendation: math.div(3, 4) or calc(3 / 4) More info and automated migrator: https://sass-lang.com/d/slash-div , -38 | fludge: (true and 3/4); +39 | fludge: (true and 3/4); | ^^^ ' - input.scss 38:21 root stylesheet + input.scss 39:21 root stylesheet diff --git a/spec/libsass/div.hrx b/spec/libsass/div.hrx index 22ba6bbfcc..e1ff67b9fe 100644 --- a/spec/libsass/div.hrx +++ b/spec/libsass/div.hrx @@ -1,4 +1,6 @@ <===> input.scss +@use "sass:list"; +@use "sass:meta"; $x: 3/4; $xs: hey 3/4 ho; @@ -8,9 +10,9 @@ div { b: hey $x ho; /* $xs: hey 3/4 ho */ c: $xs; - d: nth($xs, 2); - e: nth($xs, 2) == 0.75; - f: type-of(nth($xs, 2)); + d: list.nth($xs, 2); + e: list.nth($xs, 2) == 0.75; + f: meta.type-of(list.nth($xs, 2)); } <===> output.css div { @@ -32,10 +34,10 @@ Recommendation: math.div(3, 4) More info and automated migrator: https://sass-lang.com/d/slash-div , -1 | $x: 3/4; +3 | $x: 3/4; | ^^^ ' - input.scss 1:5 root stylesheet + input.scss 3:5 root stylesheet DEPRECATION WARNING: Using / for division is deprecated and will be removed in Dart Sass 2.0.0. @@ -44,10 +46,10 @@ Recommendation: math.div(3, 4) More info and automated migrator: https://sass-lang.com/d/slash-div , -10 | d: nth($xs, 2); - | ^^^^^^^^^^^ +12 | d: list.nth($xs, 2); + | ^^^^^^^^^^^^^^^^ ' - input.scss 10:6 root stylesheet + input.scss 12:6 root stylesheet DEPRECATION WARNING: Using / for division is deprecated and will be removed in Dart Sass 2.0.0. @@ -56,10 +58,10 @@ Recommendation: math.div(3, 4) More info and automated migrator: https://sass-lang.com/d/slash-div , -11 | e: nth($xs, 2) == 0.75; - | ^^^^^^^^^^^ +13 | e: list.nth($xs, 2) == 0.75; + | ^^^^^^^^^^^^^^^^ ' - input.scss 11:6 root stylesheet + input.scss 13:6 root stylesheet DEPRECATION WARNING: Using / for division is deprecated and will be removed in Dart Sass 2.0.0. @@ -68,7 +70,7 @@ Recommendation: math.div(3, 4) More info and automated migrator: https://sass-lang.com/d/slash-div , -12 | f: type-of(nth($xs, 2)); - | ^^^^^^^^^^^ +14 | f: meta.type-of(list.nth($xs, 2)); + | ^^^^^^^^^^^^^^^^ ' - input.scss 12:14 root stylesheet + input.scss 14:19 root stylesheet diff --git a/spec/libsass/list-evaluation.hrx b/spec/libsass/list-evaluation.hrx index 2792a41d1a..fa96c0472a 100644 --- a/spec/libsass/list-evaluation.hrx +++ b/spec/libsass/list-evaluation.hrx @@ -1,10 +1,12 @@ <===> input.scss +@use "sass:list"; +@use "sass:meta"; div { $things: red 2/3 blue; content: $things; - content: nth($things, 2); - content: type-of(nth($things, 2)); - content: type-of(nth($things, 3)); + content: list.nth($things, 2); + content: meta.type-of(list.nth($things, 2)); + content: meta.type-of(list.nth($things, 3)); /**** #{2+2} ****/ content: (1 / 2 3 / 4) + (5/6 7/8); content: (1/2 3/4), (5/6 7/8); @@ -46,10 +48,10 @@ Recommendation: math.div(2, 3) More info and automated migrator: https://sass-lang.com/d/slash-div , -4 | content: nth($things, 2); - | ^^^^^^^^^^^^^^^ +6 | content: list.nth($things, 2); + | ^^^^^^^^^^^^^^^^^^^^ ' - input.scss 4:12 root stylesheet + input.scss 6:12 root stylesheet DEPRECATION WARNING: Using / for division is deprecated and will be removed in Dart Sass 2.0.0. @@ -58,10 +60,10 @@ Recommendation: math.div(2, 3) More info and automated migrator: https://sass-lang.com/d/slash-div , -5 | content: type-of(nth($things, 2)); - | ^^^^^^^^^^^^^^^ +7 | content: meta.type-of(list.nth($things, 2)); + | ^^^^^^^^^^^^^^^^^^^^ ' - input.scss 5:20 root stylesheet + input.scss 7:25 root stylesheet DEPRECATION WARNING: Using / for division is deprecated and will be removed in Dart Sass 2.0.0. @@ -70,10 +72,10 @@ Recommendation: math.div(3, 4) More info and automated migrator: https://sass-lang.com/d/slash-div , -11 | @each $x in 1 2 3/4 { +13 | @each $x in 1 2 3/4 { | ^^^^^^^ ' - input.scss 11:15 root stylesheet + input.scss 13:15 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -82,10 +84,10 @@ Recommendation: math.div(1 + 2, 3) or calc((1 + 2) / 3) More info and automated migrator: https://sass-lang.com/d/slash-div , -17 | stuff: ((1 + 2)/3/4); +19 | stuff: ((1 + 2)/3/4); | ^^^^^^^^^ ' - input.scss 17:11 root stylesheet + input.scss 19:11 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -94,7 +96,7 @@ Recommendation: math.div(math.div(1 + 2, 3), 4) or calc((1 + 2) / 3 / 4) More info and automated migrator: https://sass-lang.com/d/slash-div , -17 | stuff: ((1 + 2)/3/4); +19 | stuff: ((1 + 2)/3/4); | ^^^^^^^^^^^ ' - input.scss 17:11 root stylesheet + input.scss 19:11 root stylesheet diff --git a/spec/libsass/lists.hrx b/spec/libsass/lists.hrx index e46466a8ad..e8f43d74fd 100644 --- a/spec/libsass/lists.hrx +++ b/spec/libsass/lists.hrx @@ -1,27 +1,29 @@ <===> input.scss +@use "sass:list"; +@use "sass:meta"; div { - $list: append(1/2 3, 4); + $list: list.append(1/2 3, 4); content: (1 2 3) == (1, 2, 3); content: (1 2 3) == (1 2 3); content: var $list; content: lit (1/2 3 4); content: (1/2 3 4) == $list; - a: length((1/2 3 4)), length($list); - b: nth((1/2 3 4), 1), nth($list, 1); + a: list.length((1/2 3 4)), list.length($list); + b: list.nth((1/2 3 4), 1), list.nth($list, 1); content: (1/2 3 4) == (1/2 3 4); /***/ - content: length($list); - content: type-of(nth($list, 1)); - content: nth($list, 1); - content: nth(1/2 3 4, 1); + content: list.length($list); + content: meta.type-of(list.nth($list, 1)); + content: list.nth($list, 1); + content: list.nth(1/2 3 4, 1); $a: 1 2 3; $b: (1 2 3); content: $a == $b; content: 1 2 () 3; color: red == #ff0000; $color-list : fudge red blue; - color: nth($color-list, 2) == #ff0000; - color: nth($color-list, 2) == red; + color: list.nth($color-list, 2) == #ff0000; + color: list.nth($color-list, 2) == red; } <===> output.css div { @@ -52,11 +54,11 @@ Recommendation: math.div(1, 2) More info and automated migrator: https://sass-lang.com/d/slash-div - , -9 | b: nth((1/2 3 4), 1), nth($list, 1); - | ^^^^^^^^^^^^^^^^^ - ' - input.scss 9:6 root stylesheet + , +11 | b: list.nth((1/2 3 4), 1), list.nth($list, 1); + | ^^^^^^^^^^^^^^^^^^^^^^ + ' + input.scss 11:6 root stylesheet DEPRECATION WARNING: Using / for division is deprecated and will be removed in Dart Sass 2.0.0. @@ -64,11 +66,11 @@ Recommendation: math.div(1, 2) More info and automated migrator: https://sass-lang.com/d/slash-div - , -9 | b: nth((1/2 3 4), 1), nth($list, 1); - | ^^^^^^^^^^^^^ - ' - input.scss 9:25 root stylesheet + , +11 | b: list.nth((1/2 3 4), 1), list.nth($list, 1); + | ^^^^^^^^^^^^^^^^^^ + ' + input.scss 11:30 root stylesheet DEPRECATION WARNING: Using / for division is deprecated and will be removed in Dart Sass 2.0.0. @@ -77,10 +79,10 @@ Recommendation: math.div(1, 2) More info and automated migrator: https://sass-lang.com/d/slash-div , -13 | content: type-of(nth($list, 1)); - | ^^^^^^^^^^^^^ +15 | content: meta.type-of(list.nth($list, 1)); + | ^^^^^^^^^^^^^^^^^^ ' - input.scss 13:20 root stylesheet + input.scss 15:25 root stylesheet DEPRECATION WARNING: Using / for division is deprecated and will be removed in Dart Sass 2.0.0. @@ -89,10 +91,10 @@ Recommendation: math.div(1, 2) More info and automated migrator: https://sass-lang.com/d/slash-div , -14 | content: nth($list, 1); - | ^^^^^^^^^^^^^ +16 | content: list.nth($list, 1); + | ^^^^^^^^^^^^^^^^^^ ' - input.scss 14:12 root stylesheet + input.scss 16:12 root stylesheet DEPRECATION WARNING: Using / for division is deprecated and will be removed in Dart Sass 2.0.0. @@ -101,7 +103,7 @@ Recommendation: math.div(1, 2) More info and automated migrator: https://sass-lang.com/d/slash-div , -15 | content: nth(1/2 3 4, 1); - | ^^^^^^^^^^^^^^^ +17 | content: list.nth(1/2 3 4, 1); + | ^^^^^^^^^^^^^^^^^^^^ ' - input.scss 15:12 root stylesheet + input.scss 17:12 root stylesheet diff --git a/spec/libsass/mixin.hrx b/spec/libsass/mixin.hrx index 8c109d8249..11c438f00f 100644 --- a/spec/libsass/mixin.hrx +++ b/spec/libsass/mixin.hrx @@ -1,11 +1,14 @@ <===> input.scss +@use "sass:list"; +@use "sass:math"; +@use "sass:string"; // @charset "UTF-8"; @mixin background-image-retina($file, $type, $width, $height) { - background-image: unquote(image-url("#{$file}.#{$type}", true)); - hey: length(a b c d); - ho: unquote("hello"); - hee: unquote(unit(10fudge)); + background-image: string.unquote(image-url("#{$file}.#{$type}", true)); + hey: list.length(a b c d); + ho: string.unquote("hello"); + hee: string.unquote(math.unit(10fudge)); @media (-webkit-min-device-pixel-ratio: 2), (-moz-min-device-pixel-ratio: 2) { & { @@ -49,7 +52,7 @@ div { @include bar(1); @include bar($x: n1, $y: n2); @include bar($x: n1); - blah: unquote("hello"); + blah: string.unquote("hello"); } <===> output.css div { @@ -99,15 +102,15 @@ rule. To opt into the new behavior, wrap the declaration in `& {}`. More info: https://sass-lang.com/d/mixed-decls , -9 | / @media (-webkit-min-device-pixel-ratio: 2), (-moz-min-device-pixel-ratio: 2) { -10 | | & { -11 | | background-image: image-url("#{$file}@2x.#{$type}"); -12 | | -webkit-background-size: $width $height; -13 | | } -14 | | } +12 | / @media (-webkit-min-device-pixel-ratio: 2), (-moz-min-device-pixel-ratio: 2) { +13 | | & { +14 | | background-image: image-url("#{$file}@2x.#{$type}"); +15 | | -webkit-background-size: $width $height; +16 | | } +17 | | } | '--- nested rule ... | -22 | fudge: walnut; +25 | fudge: walnut; | ^^^^^^^^^^^^^ declaration ' - input.scss 22:3 root stylesheet + input.scss 25:3 root stylesheet diff --git a/spec/libsass/parent-selector/missing.hrx b/spec/libsass/parent-selector/missing.hrx index 9022c10acf..19051d33c1 100644 --- a/spec/libsass/parent-selector/missing.hrx +++ b/spec/libsass/parent-selector/missing.hrx @@ -1,4 +1,5 @@ <===> input.scss +@use "sass:map"; $tablet-portrait: 768px; $tablet-landscape: 980px; $desk-normal: 1120px; @@ -26,7 +27,7 @@ $grid-breakpoints-immobile: ( } } -@each $name in map-keys($grid-breakpoints-immobile) { +@each $name in map.keys($grid-breakpoints-immobile) { @include grid-media-query($name, $grid-breakpoints-immobile) { body.immobile & { margin-bottom: 0; @@ -37,9 +38,9 @@ $grid-breakpoints-immobile: ( <===> error Error: Top-level selectors may not contain the parent selector "&". , -30 | body.immobile & { +31 | body.immobile & { | ^ ' - input.scss 30:19 @content - input.scss 22:9 grid-media-query() - input.scss 29:3 root stylesheet + input.scss 31:19 @content + input.scss 23:9 grid-media-query() + input.scss 30:3 root stylesheet diff --git a/spec/libsass/precision/default.hrx b/spec/libsass/precision/default.hrx index 5b782743e0..4fb913b8ac 100644 --- a/spec/libsass/precision/default.hrx +++ b/spec/libsass/precision/default.hrx @@ -1,9 +1,10 @@ <===> input.scss +@use "sass:math"; test { - foo: 0.4999 round(0.4999); - bar: 0.49999 round(0.49999); - baz: 0.499999 round(0.499999); - baz: 0.49999999999 round(0.49999999999); + foo: 0.4999 math.round(0.4999); + bar: 0.49999 math.round(0.49999); + baz: 0.499999 math.round(0.499999); + baz: 0.49999999999 math.round(0.49999999999); } <===> output.css diff --git a/spec/libsass/precision/higher.hrx b/spec/libsass/precision/higher.hrx index 8eec79dee9..37df1f0103 100644 --- a/spec/libsass/precision/higher.hrx +++ b/spec/libsass/precision/higher.hrx @@ -3,10 +3,11 @@ :precision: 6 <===> input.scss +@use "sass:math"; test { - foo: 0.4999 round(0.4999); - bar: 0.49999 round(0.49999); - baz: 0.499999 round(0.499999); + foo: 0.4999 math.round(0.4999); + bar: 0.49999 math.round(0.49999); + baz: 0.499999 math.round(0.499999); } <===> output.css test { diff --git a/spec/libsass/precision/lower.hrx b/spec/libsass/precision/lower.hrx index 96fad466d9..a5e334afd0 100644 --- a/spec/libsass/precision/lower.hrx +++ b/spec/libsass/precision/lower.hrx @@ -3,10 +3,11 @@ :precision: 4 <===> input.scss +@use "sass:math"; test { - foo: 0.4999 round(0.4999); - bar: 0.49999 round(0.49999); - baz: 0.499999 round(0.499999); + foo: 0.4999 math.round(0.4999); + bar: 0.49999 math.round(0.49999); + baz: 0.499999 math.round(0.499999); } <===> output.css test { diff --git a/spec/libsass/selector-functions/selector-length.hrx b/spec/libsass/selector-functions/selector-length.hrx index 715c900a3e..230e99b5b0 100644 --- a/spec/libsass/selector-functions/selector-length.hrx +++ b/spec/libsass/selector-functions/selector-length.hrx @@ -1,8 +1,9 @@ <===> input.scss +@use "sass:list"; foo.bar.baz asd.qwe xyz, second { - length: length(&); - length: length(nth(&, 1)); - length: length(nth(nth(&, 1), 1)); + length: list.length(&); + length: list.length(list.nth(&, 1)); + length: list.length(list.nth(list.nth(&, 1), 1)); } <===> output.css foo.bar.baz asd.qwe xyz, second { diff --git a/spec/libsass/selector-functions/simple-selector.hrx b/spec/libsass/selector-functions/simple-selector.hrx index bf40e8d875..835c09503d 100644 --- a/spec/libsass/selector-functions/simple-selector.hrx +++ b/spec/libsass/selector-functions/simple-selector.hrx @@ -1,7 +1,8 @@ <===> input.scss +@use "sass:selector"; foo { - test-01: simple-selectors(".foo.bar"); - test-02: simple-selectors(".foo.bar.baz"); + test-01: selector.simple-selectors(".foo.bar"); + test-02: selector.simple-selectors(".foo.bar.baz"); } <===> output.css foo { diff --git a/spec/libsass/selectors/function-argument.hrx b/spec/libsass/selectors/function-argument.hrx index aa40a534f1..5ef8d7fb09 100644 --- a/spec/libsass/selectors/function-argument.hrx +++ b/spec/libsass/selectors/function-argument.hrx @@ -1,27 +1,28 @@ <===> input.scss +@use "sass:list"; $Selectors: (); ////////////////////////////// // Add selectors of various depths and makeups ////////////////////////////// .foo { - $Selectors: append($Selectors, &) !global; + $Selectors: list.append($Selectors, &) !global; } .bar a { - $Selectors: append($Selectors, &) !global; + $Selectors: list.append($Selectors, &) !global; } .bar, .baz { - $Selectors: append($Selectors, &) !global; + $Selectors: list.append($Selectors, &) !global; } .qux { &.waldo { .where & { .final { - $Selectors: append($Selectors, &) !global; + $Selectors: list.append($Selectors, &) !global; } } } @@ -31,12 +32,12 @@ $Selectors: (); // Display Results ////////////////////////////// .result { - length: length($Selectors); + length: list.length($Selectors); content: $Selectors; - @for $i from 1 through length($Selectors) { + @for $i from 1 through list.length($Selectors) { index: $i; - length: length(nth($Selectors, $i)); - content: nth($Selectors, $i); + length: list.length(list.nth($Selectors, $i)); + content: list.nth($Selectors, $i); } } <===> output.css diff --git a/spec/libsass/selectors/mixin-argument.hrx b/spec/libsass/selectors/mixin-argument.hrx index 9f1a73ca71..ab85f17c8b 100644 --- a/spec/libsass/selectors/mixin-argument.hrx +++ b/spec/libsass/selectors/mixin-argument.hrx @@ -1,13 +1,15 @@ <===> input.scss +@use "sass:list"; +@use "sass:meta"; @mixin selector-info($selector) { - type: type-of($selector); - length: length($selector); + type: meta.type-of($selector); + length: list.length($selector); content: $selector; - @for $i from 1 through length($selector) { + @for $i from 1 through list.length($selector) { index: $i; - length: length(nth($selector, $i)); - type: type-of(nth($selector, $i)); - content: nth($selector, $i); + length: list.length(list.nth($selector, $i)); + type: meta.type-of(list.nth($selector, $i)); + content: list.nth($selector, $i); } } diff --git a/spec/libsass/test.hrx b/spec/libsass/test.hrx index 066e162bee..92c50ef91b 100644 --- a/spec/libsass/test.hrx +++ b/spec/libsass/test.hrx @@ -1,4 +1,7 @@ <===> input.scss +@use "sass:color"; +@use "sass:list"; +@use "sass:math"; $x: 3; div { @@ -21,13 +24,13 @@ span { a: rgba(100, 20, 0, 1); b: rgba(#abc, 1); c: compact(hello, my, false, name, is, false, aaron, false, false); - d: join(1 2 3, 4 5 6, comma); - e: join(a b c, d e f); - f: change-color(#102030, $blue: 5); - g: change-color(#102030, $red: 120, $blue: 5); + d: list.join(1 2 3, 4 5 6, comma); + e: list.join(a b c, d e f); + f: color.change(#102030, $blue: 5); + g: color.change(#102030, $red: 120, $blue: 5); h: hsl(25, 100%, 80%); - h: change-color(#ffc499, $alpha: 0.8, $lightness: 40%); - h: change-color(hsl(25, 100%, 80%), $alpha: 0.8, $lightness: 40%); + h: color.change(#ffc499, $alpha: 0.8, $lightness: 40%); + h: color.change(hsl(25, 100%, 80%), $alpha: 0.8, $lightness: 40%); i: hsla(25, 100%, 40%, 0.8); foo: url("http://blah/flah/grah"); foo: url(http://foo/bar/buzz.css); @@ -44,11 +47,11 @@ span { div { flug: url(bug.mug); - krug: nth(1 2 3, 2px); - blug: nth(a b c d, 3); - flig: comparable(34, 22px) comparable(1%, 3) comparable(2, 1) comparable(4cm, 1in); - flug: comparable(1px, 2.3in) comparable(1%, 2pt); - flib: comparable(3ex, 2px) comparable(3em, 2cm); + krug: list.nth(1 2 3, 2px); + blug: list.nth(a b c d, 3); + flig: math.compatible(34, 22px) math.compatible(1%, 3) math.compatible(2, 1) math.compatible(4cm, 1in); + flug: math.compatible(1px, 2.3in) math.compatible(1%, 2pt); + flib: math.compatible(3ex, 2px) math.compatible(3em, 2cm); glib: not(fudge) not(false) not(0) not(red); trib: if(red, yellow, not taken); trub: if(not(fudge), not taken, here we are); @@ -157,7 +160,7 @@ To preserve current behavior: calc($n / 1px) More info: https://sass-lang.com/d/function-units , -46 | krug: nth(1 2 3, 2px); - | ^^^^^^^^^^^^^^^ +49 | krug: list.nth(1 2 3, 2px); + | ^^^^^^^^^^^^^^^^^^^^ ' - input.scss 46:9 root stylesheet + input.scss 49:9 root stylesheet diff --git a/spec/libsass/unary-ops.hrx b/spec/libsass/unary-ops.hrx index 15ecd4eac0..3b1dfd88cb 100644 --- a/spec/libsass/unary-ops.hrx +++ b/spec/libsass/unary-ops.hrx @@ -1,4 +1,5 @@ <===> input.scss +@use "sass:meta"; $x: 20%; div { @@ -11,7 +12,7 @@ div { g: -hello; h: +hello; i: + hello; - j: type-of(+ hello); + j: meta.type-of(+ hello); } <===> output.css div { diff --git a/spec/libsass/units/feature-test.hrx b/spec/libsass/units/feature-test.hrx index 6dbf81295e..ba99f2e140 100644 --- a/spec/libsass/units/feature-test.hrx +++ b/spec/libsass/units/feature-test.hrx @@ -1,5 +1,6 @@ <===> input.scss -@if feature-exists(units-level-3) { +@use "sass:meta"; +@if meta.feature-exists(units-level-3) { div { feature: true; } diff --git a/spec/libsass/units/simple.hrx b/spec/libsass/units/simple.hrx index cebc600dc1..7e8e61b448 100644 --- a/spec/libsass/units/simple.hrx +++ b/spec/libsass/units/simple.hrx @@ -1,9 +1,10 @@ <===> input.scss +@use "sass:math"; div { hey: ((5in + 3cm) * 10px * 100pt * 10fu / 2px / 2fu / 3pt); ho: (23in/2fu) > (23cm/2fu); - hoo: unit((23px/2fu/12emu/1.2gnu)); - hee: unit((2in/3cm/4cm)); + hoo: math.unit((23px/2fu/12emu/1.2gnu)); + hee: math.unit((2in/3cm/4cm)); } <===> output.css div { @@ -21,10 +22,10 @@ Recommendation: math.div((5in + 3cm) * 10px * 100pt * 10fu, 2px) or calc((5in + More info and automated migrator: https://sass-lang.com/d/slash-div , -2 | hey: ((5in + 3cm) * 10px * 100pt * 10fu / 2px / 2fu / 3pt); +3 | hey: ((5in + 3cm) * 10px * 100pt * 10fu / 2px / 2fu / 3pt); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 2:9 root stylesheet + input.scss 3:9 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -33,10 +34,10 @@ Recommendation: math.div(math.div((5in + 3cm) * 10px * 100pt * 10fu, 2px), 2fu) More info and automated migrator: https://sass-lang.com/d/slash-div , -2 | hey: ((5in + 3cm) * 10px * 100pt * 10fu / 2px / 2fu / 3pt); +3 | hey: ((5in + 3cm) * 10px * 100pt * 10fu / 2px / 2fu / 3pt); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 2:9 root stylesheet + input.scss 3:9 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -45,10 +46,10 @@ Recommendation: math.div(math.div(math.div((5in + 3cm) * 10px * 100pt * 10fu, 2p More info and automated migrator: https://sass-lang.com/d/slash-div , -2 | hey: ((5in + 3cm) * 10px * 100pt * 10fu / 2px / 2fu / 3pt); +3 | hey: ((5in + 3cm) * 10px * 100pt * 10fu / 2px / 2fu / 3pt); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 2:9 root stylesheet + input.scss 3:9 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -57,10 +58,10 @@ Recommendation: math.div(23in, 2fu) or calc(23in / 2fu) More info and automated migrator: https://sass-lang.com/d/slash-div , -3 | ho: (23in/2fu) > (23cm/2fu); +4 | ho: (23in/2fu) > (23cm/2fu); | ^^^^^^^^ ' - input.scss 3:8 root stylesheet + input.scss 4:8 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -69,10 +70,10 @@ Recommendation: math.div(23cm, 2fu) or calc(23cm / 2fu) More info and automated migrator: https://sass-lang.com/d/slash-div , -3 | ho: (23in/2fu) > (23cm/2fu); +4 | ho: (23in/2fu) > (23cm/2fu); | ^^^^^^^^ ' - input.scss 3:21 root stylesheet + input.scss 4:21 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -81,10 +82,10 @@ Recommendation: math.div(23px, 2fu) or calc(23px / 2fu) More info and automated migrator: https://sass-lang.com/d/slash-div , -4 | hoo: unit((23px/2fu/12emu/1.2gnu)); - | ^^^^^^^^ +5 | hoo: math.unit((23px/2fu/12emu/1.2gnu)); + | ^^^^^^^^ ' - input.scss 4:14 root stylesheet + input.scss 5:19 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -93,10 +94,10 @@ Recommendation: math.div(math.div(23px, 2fu), 12emu) or calc(23px / 2fu / 12emu) More info and automated migrator: https://sass-lang.com/d/slash-div , -4 | hoo: unit((23px/2fu/12emu/1.2gnu)); - | ^^^^^^^^^^^^^^ +5 | hoo: math.unit((23px/2fu/12emu/1.2gnu)); + | ^^^^^^^^^^^^^^ ' - input.scss 4:14 root stylesheet + input.scss 5:19 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -105,10 +106,10 @@ Recommendation: math.div(math.div(math.div(23px, 2fu), 12emu), 1.2gnu) or calc(2 More info and automated migrator: https://sass-lang.com/d/slash-div , -4 | hoo: unit((23px/2fu/12emu/1.2gnu)); - | ^^^^^^^^^^^^^^^^^^^^^ +5 | hoo: math.unit((23px/2fu/12emu/1.2gnu)); + | ^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 4:14 root stylesheet + input.scss 5:19 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -117,10 +118,10 @@ Recommendation: math.div(2in, 3cm) or calc(2in / 3cm) More info and automated migrator: https://sass-lang.com/d/slash-div , -5 | hee: unit((2in/3cm/4cm)); - | ^^^^^^^ +6 | hee: math.unit((2in/3cm/4cm)); + | ^^^^^^^ ' - input.scss 5:14 root stylesheet + input.scss 6:19 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -129,7 +130,7 @@ Recommendation: math.div(math.div(2in, 3cm), 4cm) or calc(2in / 3cm / 4cm) More info and automated migrator: https://sass-lang.com/d/slash-div , -5 | hee: unit((2in/3cm/4cm)); - | ^^^^^^^^^^^ +6 | hee: math.unit((2in/3cm/4cm)); + | ^^^^^^^^^^^ ' - input.scss 5:14 root stylesheet + input.scss 6:19 root stylesheet diff --git a/spec/libsass/variable-scoping/blead-global/expanding/at-root.hrx b/spec/libsass/variable-scoping/blead-global/expanding/at-root.hrx index b86887fbd3..fb94fe3b61 100644 --- a/spec/libsass/variable-scoping/blead-global/expanding/at-root.hrx +++ b/spec/libsass/variable-scoping/blead-global/expanding/at-root.hrx @@ -1,4 +1,5 @@ <===> input.scss +@use "sass:meta"; $root_default: initial; $root_implicit: initial; $root_explicit: initial !global; @@ -24,13 +25,13 @@ result { root_default: $root_default; root_implicit: $root_implicit; root_explicit: $root_explicit; - @if variable-exists(local_default) { + @if meta.variable-exists(local_default) { local_default: $local_default; } - @if variable-exists(local_implicit) { + @if meta.variable-exists(local_implicit) { local_implicit: $local_implicit; } - @if variable-exists(local_explicit) { + @if meta.variable-exists(local_explicit) { local_explicit: $local_explicit; } } @@ -50,17 +51,17 @@ Since this assignment is at the root of the stylesheet, the !global flag is unnecessary and can safely be removed. , -3 | $root_explicit: initial !global; +4 | $root_explicit: initial !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 3:1 root stylesheet + input.scss 4:1 root stylesheet DEPRECATION WARNING: As of Dart Sass 2.0.0, !global assignments won't be able to declare new variables. Recommendation: add `$local_explicit: null` at the stylesheet root. , -10 | $local_explicit: outer !global; +11 | $local_explicit: outer !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 10:3 root stylesheet + input.scss 11:3 root stylesheet diff --git a/spec/libsass/variable-scoping/blead-global/expanding/each.hrx b/spec/libsass/variable-scoping/blead-global/expanding/each.hrx index cfd674c13f..a6499b2f10 100644 --- a/spec/libsass/variable-scoping/blead-global/expanding/each.hrx +++ b/spec/libsass/variable-scoping/blead-global/expanding/each.hrx @@ -1,4 +1,5 @@ <===> input.scss +@use "sass:meta"; $root_default: initial; $root_implicit: initial; $root_explicit: initial !global; @@ -21,22 +22,22 @@ $root_explicit: initial !global; } result { - @if variable-exists(outer) { + @if meta.variable-exists(outer) { outer: $outer; } - @if variable-exists(inner) { + @if meta.variable-exists(inner) { inner: $inner; } root_default: $root_default; root_implicit: $root_implicit; root_explicit: $root_explicit; - @if variable-exists(local_default) { + @if meta.variable-exists(local_default) { local_default: $local_default; } - @if variable-exists(local_implicit) { + @if meta.variable-exists(local_implicit) { local_implicit: $local_implicit; } - @if variable-exists(local_explicit) { + @if meta.variable-exists(local_explicit) { local_explicit: $local_explicit; } } @@ -56,17 +57,17 @@ Since this assignment is at the root of the stylesheet, the !global flag is unnecessary and can safely be removed. , -3 | $root_explicit: initial !global; +4 | $root_explicit: initial !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 3:1 root stylesheet + input.scss 4:1 root stylesheet DEPRECATION WARNING: As of Dart Sass 2.0.0, !global assignments won't be able to declare new variables. Recommendation: add `$local_explicit: null` at the stylesheet root. , -10 | $local_explicit: outer !global; +11 | $local_explicit: outer !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 10:3 root stylesheet + input.scss 11:3 root stylesheet diff --git a/spec/libsass/variable-scoping/blead-global/expanding/else.hrx b/spec/libsass/variable-scoping/blead-global/expanding/else.hrx index f47a669f0a..eb3e2c1e86 100644 --- a/spec/libsass/variable-scoping/blead-global/expanding/else.hrx +++ b/spec/libsass/variable-scoping/blead-global/expanding/else.hrx @@ -1,4 +1,5 @@ <===> input.scss +@use "sass:meta"; $root_default: initial; $root_implicit: initial; $root_explicit: initial !global; @@ -30,13 +31,13 @@ result { root_default: $root_default; root_implicit: $root_implicit; root_explicit: $root_explicit; - @if variable-exists(local_default) { + @if meta.variable-exists(local_default) { local_default: $local_default; } - @if variable-exists(local_implicit) { + @if meta.variable-exists(local_implicit) { local_implicit: $local_implicit; } - @if variable-exists(local_explicit) { + @if meta.variable-exists(local_explicit) { local_explicit: $local_explicit; } } @@ -56,17 +57,17 @@ Since this assignment is at the root of the stylesheet, the !global flag is unnecessary and can safely be removed. , -3 | $root_explicit: initial !global; +4 | $root_explicit: initial !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 3:1 root stylesheet + input.scss 4:1 root stylesheet DEPRECATION WARNING: As of Dart Sass 2.0.0, !global assignments won't be able to declare new variables. Recommendation: add `$local_explicit: null` at the stylesheet root. , -13 | $local_explicit: outer !global; +14 | $local_explicit: outer !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 13:3 root stylesheet + input.scss 14:3 root stylesheet diff --git a/spec/libsass/variable-scoping/blead-global/expanding/elseif.hrx b/spec/libsass/variable-scoping/blead-global/expanding/elseif.hrx index 17360156fb..0a241ce8b0 100644 --- a/spec/libsass/variable-scoping/blead-global/expanding/elseif.hrx +++ b/spec/libsass/variable-scoping/blead-global/expanding/elseif.hrx @@ -1,4 +1,5 @@ <===> input.scss +@use "sass:meta"; $root_default: initial; $root_implicit: initial; $root_explicit: initial !global; @@ -30,13 +31,13 @@ result { root_default: $root_default; root_implicit: $root_implicit; root_explicit: $root_explicit; - @if variable-exists(local_default) { + @if meta.variable-exists(local_default) { local_default: $local_default; } - @if variable-exists(local_implicit) { + @if meta.variable-exists(local_implicit) { local_implicit: $local_implicit; } - @if variable-exists(local_explicit) { + @if meta.variable-exists(local_explicit) { local_explicit: $local_explicit; } } @@ -56,17 +57,17 @@ Since this assignment is at the root of the stylesheet, the !global flag is unnecessary and can safely be removed. , -3 | $root_explicit: initial !global; +4 | $root_explicit: initial !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 3:1 root stylesheet + input.scss 4:1 root stylesheet DEPRECATION WARNING: As of Dart Sass 2.0.0, !global assignments won't be able to declare new variables. Recommendation: add `$local_explicit: null` at the stylesheet root. , -13 | $local_explicit: outer !global; +14 | $local_explicit: outer !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 13:3 root stylesheet + input.scss 14:3 root stylesheet diff --git a/spec/libsass/variable-scoping/blead-global/expanding/for.hrx b/spec/libsass/variable-scoping/blead-global/expanding/for.hrx index fa8f74d2bf..58d14e16d4 100644 --- a/spec/libsass/variable-scoping/blead-global/expanding/for.hrx +++ b/spec/libsass/variable-scoping/blead-global/expanding/for.hrx @@ -1,4 +1,5 @@ <===> input.scss +@use "sass:meta"; $continue: true; $root_default: initial; $root_implicit: initial; @@ -22,22 +23,22 @@ $root_explicit: initial !global; } result { - @if variable-exists(outer) { + @if meta.variable-exists(outer) { outer: $outer; } - @if variable-exists(inner) { + @if meta.variable-exists(inner) { inner: $inner; } root_default: $root_default; root_implicit: $root_implicit; root_explicit: $root_explicit; - @if variable-exists(local_default) { + @if meta.variable-exists(local_default) { local_default: $local_default; } - @if variable-exists(local_implicit) { + @if meta.variable-exists(local_implicit) { local_implicit: $local_implicit; } - @if variable-exists(local_explicit) { + @if meta.variable-exists(local_explicit) { local_explicit: $local_explicit; } } @@ -57,17 +58,17 @@ Since this assignment is at the root of the stylesheet, the !global flag is unnecessary and can safely be removed. , -4 | $root_explicit: initial !global; +5 | $root_explicit: initial !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 4:1 root stylesheet + input.scss 5:1 root stylesheet DEPRECATION WARNING: As of Dart Sass 2.0.0, !global assignments won't be able to declare new variables. Recommendation: add `$local_explicit: null` at the stylesheet root. , -11 | $local_explicit: outer !global; +12 | $local_explicit: outer !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 11:3 root stylesheet + input.scss 12:3 root stylesheet diff --git a/spec/libsass/variable-scoping/blead-global/expanding/function.hrx b/spec/libsass/variable-scoping/blead-global/expanding/function.hrx index 27d9215b7d..8efe333caf 100644 --- a/spec/libsass/variable-scoping/blead-global/expanding/function.hrx +++ b/spec/libsass/variable-scoping/blead-global/expanding/function.hrx @@ -1,4 +1,5 @@ <===> input.scss +@use "sass:meta"; $continue_inner: true; $continue_outer: true; $root_default: initial; @@ -27,22 +28,22 @@ $root_explicit: initial !global; result { fn: fn(); - @if variable-exists(continue_outer) { + @if meta.variable-exists(continue_outer) { continue_outer: $continue_outer; } - @if variable-exists(continue_inner) { + @if meta.variable-exists(continue_inner) { continue_inner: $continue_inner; } root_default: $root_default; root_implicit: $root_implicit; root_explicit: $root_explicit; - @if variable-exists(local_default) { + @if meta.variable-exists(local_default) { local_default: $local_default; } - @if variable-exists(local_implicit) { + @if meta.variable-exists(local_implicit) { local_implicit: $local_implicit; } - @if variable-exists(local_explicit) { + @if meta.variable-exists(local_explicit) { local_explicit: $local_explicit; } } @@ -64,18 +65,18 @@ Since this assignment is at the root of the stylesheet, the !global flag is unnecessary and can safely be removed. , -5 | $root_explicit: initial !global; +6 | $root_explicit: initial !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 5:1 root stylesheet + input.scss 6:1 root stylesheet DEPRECATION WARNING: As of Dart Sass 2.0.0, !global assignments won't be able to declare new variables. Recommendation: add `$local_explicit: null` at the stylesheet root. , -12 | $local_explicit: outer !global; +13 | $local_explicit: outer !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 12:3 fn() - input.scss 28:7 root stylesheet + input.scss 13:3 fn() + input.scss 29:7 root stylesheet diff --git a/spec/libsass/variable-scoping/blead-global/expanding/if.hrx b/spec/libsass/variable-scoping/blead-global/expanding/if.hrx index 982e4086cb..43a9f54e65 100644 --- a/spec/libsass/variable-scoping/blead-global/expanding/if.hrx +++ b/spec/libsass/variable-scoping/blead-global/expanding/if.hrx @@ -1,4 +1,5 @@ <===> input.scss +@use "sass:meta"; $root_default: initial; $root_implicit: initial; $root_explicit: initial !global; @@ -24,13 +25,13 @@ result { root_default: $root_default; root_implicit: $root_implicit; root_explicit: $root_explicit; - @if variable-exists(local_default) { + @if meta.variable-exists(local_default) { local_default: $local_default; } - @if variable-exists(local_implicit) { + @if meta.variable-exists(local_implicit) { local_implicit: $local_implicit; } - @if variable-exists(local_explicit) { + @if meta.variable-exists(local_explicit) { local_explicit: $local_explicit; } } @@ -50,17 +51,17 @@ Since this assignment is at the root of the stylesheet, the !global flag is unnecessary and can safely be removed. , -3 | $root_explicit: initial !global; +4 | $root_explicit: initial !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 3:1 root stylesheet + input.scss 4:1 root stylesheet DEPRECATION WARNING: As of Dart Sass 2.0.0, !global assignments won't be able to declare new variables. Recommendation: add `$local_explicit: null` at the stylesheet root. , -10 | $local_explicit: outer !global; +11 | $local_explicit: outer !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 10:3 root stylesheet + input.scss 11:3 root stylesheet diff --git a/spec/libsass/variable-scoping/blead-global/expanding/mixin.hrx b/spec/libsass/variable-scoping/blead-global/expanding/mixin.hrx index 9bc75c9b19..597c026d9e 100644 --- a/spec/libsass/variable-scoping/blead-global/expanding/mixin.hrx +++ b/spec/libsass/variable-scoping/blead-global/expanding/mixin.hrx @@ -1,4 +1,5 @@ <===> input.scss +@use "sass:meta"; $root_default: initial; $root_implicit: initial; $root_explicit: initial !global; @@ -28,13 +29,13 @@ result { root_default: $root_default; root_implicit: $root_implicit; root_explicit: $root_explicit; - @if variable-exists(local_default) { + @if meta.variable-exists(local_default) { local_default: $local_default; } - @if variable-exists(local_implicit) { + @if meta.variable-exists(local_implicit) { local_implicit: $local_implicit; } - @if variable-exists(local_explicit) { + @if meta.variable-exists(local_explicit) { local_explicit: $local_explicit; } } @@ -54,18 +55,18 @@ Since this assignment is at the root of the stylesheet, the !global flag is unnecessary and can safely be removed. , -3 | $root_explicit: initial !global; +4 | $root_explicit: initial !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 3:1 root stylesheet + input.scss 4:1 root stylesheet DEPRECATION WARNING: As of Dart Sass 2.0.0, !global assignments won't be able to declare new variables. Recommendation: add `$local_explicit: null` at the stylesheet root. , -19 | $local_explicit: outer !global; +20 | $local_explicit: outer !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 19:3 set-variable-outer() - input.scss 24:1 root stylesheet + input.scss 20:3 set-variable-outer() + input.scss 25:1 root stylesheet diff --git a/spec/libsass/variable-scoping/blead-global/expanding/ruleset.hrx b/spec/libsass/variable-scoping/blead-global/expanding/ruleset.hrx index 93a9e14499..dee6efcf3d 100644 --- a/spec/libsass/variable-scoping/blead-global/expanding/ruleset.hrx +++ b/spec/libsass/variable-scoping/blead-global/expanding/ruleset.hrx @@ -1,4 +1,5 @@ <===> input.scss +@use "sass:meta"; $root_default: initial; $root_implicit: initial; $root_explicit: initial !global; @@ -24,13 +25,13 @@ result { root_default: $root_default; root_implicit: $root_implicit; root_explicit: $root_explicit; - @if variable-exists(local_default) { + @if meta.variable-exists(local_default) { local_default: $local_default; } - @if variable-exists(local_implicit) { + @if meta.variable-exists(local_implicit) { local_implicit: $local_implicit; } - @if variable-exists(local_explicit) { + @if meta.variable-exists(local_explicit) { local_explicit: $local_explicit; } } @@ -50,17 +51,17 @@ Since this assignment is at the root of the stylesheet, the !global flag is unnecessary and can safely be removed. , -3 | $root_explicit: initial !global; +4 | $root_explicit: initial !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 3:1 root stylesheet + input.scss 4:1 root stylesheet DEPRECATION WARNING: As of Dart Sass 2.0.0, !global assignments won't be able to declare new variables. Recommendation: add `$local_explicit: null` at the stylesheet root. , -10 | $local_explicit: outer !global; +11 | $local_explicit: outer !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 10:3 root stylesheet + input.scss 11:3 root stylesheet diff --git a/spec/libsass/variable-scoping/blead-global/expanding/while.hrx b/spec/libsass/variable-scoping/blead-global/expanding/while.hrx index 0b46b58c92..96691cb5fb 100644 --- a/spec/libsass/variable-scoping/blead-global/expanding/while.hrx +++ b/spec/libsass/variable-scoping/blead-global/expanding/while.hrx @@ -1,4 +1,5 @@ <===> input.scss +@use "sass:meta"; $continue_inner: true; $continue_outer: true; $root_default: initial; @@ -25,22 +26,22 @@ $root_explicit: initial !global; } result { - @if variable-exists(continue_outer) { + @if meta.variable-exists(continue_outer) { continue_outer: $continue_outer; } - @if variable-exists(continue_inner) { + @if meta.variable-exists(continue_inner) { continue_inner: $continue_inner; } root_default: $root_default; root_implicit: $root_implicit; root_explicit: $root_explicit; - @if variable-exists(local_default) { + @if meta.variable-exists(local_default) { local_default: $local_default; } - @if variable-exists(local_implicit) { + @if meta.variable-exists(local_implicit) { local_implicit: $local_implicit; } - @if variable-exists(local_explicit) { + @if meta.variable-exists(local_explicit) { local_explicit: $local_explicit; } } @@ -62,17 +63,17 @@ Since this assignment is at the root of the stylesheet, the !global flag is unnecessary and can safely be removed. , -5 | $root_explicit: initial !global; +6 | $root_explicit: initial !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 5:1 root stylesheet + input.scss 6:1 root stylesheet DEPRECATION WARNING: As of Dart Sass 2.0.0, !global assignments won't be able to declare new variables. Recommendation: add `$local_explicit: null` at the stylesheet root. , -12 | $local_explicit: outer !global; +13 | $local_explicit: outer !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 12:3 root stylesheet + input.scss 13:3 root stylesheet diff --git a/spec/libsass/variable-scoping/blead-global/functional/each.hrx b/spec/libsass/variable-scoping/blead-global/functional/each.hrx index 9f6ddbff31..896f588451 100644 --- a/spec/libsass/variable-scoping/blead-global/functional/each.hrx +++ b/spec/libsass/variable-scoping/blead-global/functional/each.hrx @@ -1,4 +1,5 @@ <===> input.scss +@use "sass:meta"; $root_default: initial; $root_implicit: initial; $root_explicit: initial !global; @@ -28,31 +29,31 @@ $root_explicit: initial !global; result { fn: fn(); - @if variable-exists(outer) { + @if meta.variable-exists(outer) { outer: $outer; } - @if variable-exists(inner) { + @if meta.variable-exists(inner) { inner: $inner; } - @if variable-exists(check_implicit) { + @if meta.variable-exists(check_implicit) { check_implicit: $check_implicit; } - @if variable-exists(check_explicit) { + @if meta.variable-exists(check_explicit) { check_explicit: $check_explicit; } - @if variable-exists(check_default) { + @if meta.variable-exists(check_default) { check_default: $check_default; } root_default: $root_default; root_implicit: $root_implicit; root_explicit: $root_explicit; - @if variable-exists(local_default) { + @if meta.variable-exists(local_default) { local_default: $local_default; } - @if variable-exists(local_implicit) { + @if meta.variable-exists(local_implicit) { local_implicit: $local_implicit; } - @if variable-exists(local_explicit) { + @if meta.variable-exists(local_explicit) { local_explicit: $local_explicit; } } @@ -75,51 +76,51 @@ Since this assignment is at the root of the stylesheet, the !global flag is unnecessary and can safely be removed. , -3 | $root_explicit: initial !global; +4 | $root_explicit: initial !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 3:1 root stylesheet + input.scss 4:1 root stylesheet DEPRECATION WARNING: As of Dart Sass 2.0.0, !global assignments won't be able to declare new variables. Recommendation: add `$local_explicit: null` at the stylesheet root. , -11 | $local_explicit: outer !global; +12 | $local_explicit: outer !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 11:5 fn() - input.scss 29:7 root stylesheet + input.scss 12:5 fn() + input.scss 30:7 root stylesheet DEPRECATION WARNING: As of Dart Sass 2.0.0, !global assignments won't be able to declare new variables. Recommendation: add `$check_implicit: null` at the stylesheet root. , -22 | $check_implicit: $root_implicit !global; +23 | $check_implicit: $root_implicit !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 22:3 fn() - input.scss 29:7 root stylesheet + input.scss 23:3 fn() + input.scss 30:7 root stylesheet DEPRECATION WARNING: As of Dart Sass 2.0.0, !global assignments won't be able to declare new variables. Recommendation: add `$check_explicit: null` at the stylesheet root. , -23 | $check_explicit: $root_explicit !global; +24 | $check_explicit: $root_explicit !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 23:3 fn() - input.scss 29:7 root stylesheet + input.scss 24:3 fn() + input.scss 30:7 root stylesheet DEPRECATION WARNING: As of Dart Sass 2.0.0, !global assignments won't be able to declare new variables. Recommendation: add `$check_default: null` at the stylesheet root. , -24 | $check_default: $root_default !global; +25 | $check_default: $root_default !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 24:3 fn() - input.scss 29:7 root stylesheet + input.scss 25:3 fn() + input.scss 30:7 root stylesheet diff --git a/spec/libsass/variable-scoping/blead-global/functional/else.hrx b/spec/libsass/variable-scoping/blead-global/functional/else.hrx index 82a88983e2..db098b78d4 100644 --- a/spec/libsass/variable-scoping/blead-global/functional/else.hrx +++ b/spec/libsass/variable-scoping/blead-global/functional/else.hrx @@ -1,4 +1,5 @@ <===> input.scss +@use "sass:meta"; $root_default: initial; $root_implicit: initial; $root_explicit: initial !global; @@ -34,31 +35,31 @@ $root_explicit: initial !global; result { fn: fn(); - @if variable-exists(outer) { + @if meta.variable-exists(outer) { outer: $outer; } - @if variable-exists(inner) { + @if meta.variable-exists(inner) { inner: $inner; } - @if variable-exists(check_implicit) { + @if meta.variable-exists(check_implicit) { check_implicit: $check_implicit; } - @if variable-exists(check_explicit) { + @if meta.variable-exists(check_explicit) { check_explicit: $check_explicit; } - @if variable-exists(check_default) { + @if meta.variable-exists(check_default) { check_default: $check_default; } root_default: $root_default; root_implicit: $root_implicit; root_explicit: $root_explicit; - @if variable-exists(local_default) { + @if meta.variable-exists(local_default) { local_default: $local_default; } - @if variable-exists(local_implicit) { + @if meta.variable-exists(local_implicit) { local_implicit: $local_implicit; } - @if variable-exists(local_explicit) { + @if meta.variable-exists(local_explicit) { local_explicit: $local_explicit; } } @@ -81,51 +82,51 @@ Since this assignment is at the root of the stylesheet, the !global flag is unnecessary and can safely be removed. , -3 | $root_explicit: initial !global; +4 | $root_explicit: initial !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 3:1 root stylesheet + input.scss 4:1 root stylesheet DEPRECATION WARNING: As of Dart Sass 2.0.0, !global assignments won't be able to declare new variables. Recommendation: add `$local_explicit: null` at the stylesheet root. , -14 | $local_explicit: outer !global; +15 | $local_explicit: outer !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 14:5 fn() - input.scss 35:7 root stylesheet + input.scss 15:5 fn() + input.scss 36:7 root stylesheet DEPRECATION WARNING: As of Dart Sass 2.0.0, !global assignments won't be able to declare new variables. Recommendation: add `$check_implicit: null` at the stylesheet root. , -28 | $check_implicit: $root_implicit !global; +29 | $check_implicit: $root_implicit !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 28:3 fn() - input.scss 35:7 root stylesheet + input.scss 29:3 fn() + input.scss 36:7 root stylesheet DEPRECATION WARNING: As of Dart Sass 2.0.0, !global assignments won't be able to declare new variables. Recommendation: add `$check_explicit: null` at the stylesheet root. , -29 | $check_explicit: $root_explicit !global; +30 | $check_explicit: $root_explicit !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 29:3 fn() - input.scss 35:7 root stylesheet + input.scss 30:3 fn() + input.scss 36:7 root stylesheet DEPRECATION WARNING: As of Dart Sass 2.0.0, !global assignments won't be able to declare new variables. Recommendation: add `$check_default: null` at the stylesheet root. , -30 | $check_default: $root_default !global; +31 | $check_default: $root_default !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 30:3 fn() - input.scss 35:7 root stylesheet + input.scss 31:3 fn() + input.scss 36:7 root stylesheet diff --git a/spec/libsass/variable-scoping/blead-global/functional/elseif.hrx b/spec/libsass/variable-scoping/blead-global/functional/elseif.hrx index 25148d28e1..666b9a479d 100644 --- a/spec/libsass/variable-scoping/blead-global/functional/elseif.hrx +++ b/spec/libsass/variable-scoping/blead-global/functional/elseif.hrx @@ -1,4 +1,5 @@ <===> input.scss +@use "sass:meta"; $root_default: initial; $root_implicit: initial; $root_explicit: initial !global; @@ -34,31 +35,31 @@ $root_explicit: initial !global; result { fn: fn(); - @if variable-exists(outer) { + @if meta.variable-exists(outer) { outer: $outer; } - @if variable-exists(inner) { + @if meta.variable-exists(inner) { inner: $inner; } - @if variable-exists(check_implicit) { + @if meta.variable-exists(check_implicit) { check_implicit: $check_implicit; } - @if variable-exists(check_explicit) { + @if meta.variable-exists(check_explicit) { check_explicit: $check_explicit; } - @if variable-exists(check_default) { + @if meta.variable-exists(check_default) { check_default: $check_default; } root_default: $root_default; root_implicit: $root_implicit; root_explicit: $root_explicit; - @if variable-exists(local_default) { + @if meta.variable-exists(local_default) { local_default: $local_default; } - @if variable-exists(local_implicit) { + @if meta.variable-exists(local_implicit) { local_implicit: $local_implicit; } - @if variable-exists(local_explicit) { + @if meta.variable-exists(local_explicit) { local_explicit: $local_explicit; } } @@ -81,51 +82,51 @@ Since this assignment is at the root of the stylesheet, the !global flag is unnecessary and can safely be removed. , -3 | $root_explicit: initial !global; +4 | $root_explicit: initial !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 3:1 root stylesheet + input.scss 4:1 root stylesheet DEPRECATION WARNING: As of Dart Sass 2.0.0, !global assignments won't be able to declare new variables. Recommendation: add `$local_explicit: null` at the stylesheet root. , -14 | $local_explicit: outer !global; +15 | $local_explicit: outer !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 14:5 fn() - input.scss 35:7 root stylesheet + input.scss 15:5 fn() + input.scss 36:7 root stylesheet DEPRECATION WARNING: As of Dart Sass 2.0.0, !global assignments won't be able to declare new variables. Recommendation: add `$check_implicit: null` at the stylesheet root. , -28 | $check_implicit: $root_implicit !global; +29 | $check_implicit: $root_implicit !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 28:3 fn() - input.scss 35:7 root stylesheet + input.scss 29:3 fn() + input.scss 36:7 root stylesheet DEPRECATION WARNING: As of Dart Sass 2.0.0, !global assignments won't be able to declare new variables. Recommendation: add `$check_explicit: null` at the stylesheet root. , -29 | $check_explicit: $root_explicit !global; +30 | $check_explicit: $root_explicit !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 29:3 fn() - input.scss 35:7 root stylesheet + input.scss 30:3 fn() + input.scss 36:7 root stylesheet DEPRECATION WARNING: As of Dart Sass 2.0.0, !global assignments won't be able to declare new variables. Recommendation: add `$check_default: null` at the stylesheet root. , -30 | $check_default: $root_default !global; +31 | $check_default: $root_default !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 30:3 fn() - input.scss 35:7 root stylesheet + input.scss 31:3 fn() + input.scss 36:7 root stylesheet diff --git a/spec/libsass/variable-scoping/blead-global/functional/for.hrx b/spec/libsass/variable-scoping/blead-global/functional/for.hrx index 82eae81a66..f15fdb3581 100644 --- a/spec/libsass/variable-scoping/blead-global/functional/for.hrx +++ b/spec/libsass/variable-scoping/blead-global/functional/for.hrx @@ -1,4 +1,5 @@ <===> input.scss +@use "sass:meta"; $root_default: initial; $root_implicit: initial; $root_explicit: initial !global; @@ -28,31 +29,31 @@ $root_explicit: initial !global; result { fn: fn(); - @if variable-exists(outer) { + @if meta.variable-exists(outer) { outer: $outer; } - @if variable-exists(inner) { + @if meta.variable-exists(inner) { inner: $inner; } - @if variable-exists(check_implicit) { + @if meta.variable-exists(check_implicit) { check_implicit: $check_implicit; } - @if variable-exists(check_explicit) { + @if meta.variable-exists(check_explicit) { check_explicit: $check_explicit; } - @if variable-exists(check_default) { + @if meta.variable-exists(check_default) { check_default: $check_default; } root_default: $root_default; root_implicit: $root_implicit; root_explicit: $root_explicit; - @if variable-exists(local_default) { + @if meta.variable-exists(local_default) { local_default: $local_default; } - @if variable-exists(local_implicit) { + @if meta.variable-exists(local_implicit) { local_implicit: $local_implicit; } - @if variable-exists(local_explicit) { + @if meta.variable-exists(local_explicit) { local_explicit: $local_explicit; } } @@ -75,51 +76,51 @@ Since this assignment is at the root of the stylesheet, the !global flag is unnecessary and can safely be removed. , -3 | $root_explicit: initial !global; +4 | $root_explicit: initial !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 3:1 root stylesheet + input.scss 4:1 root stylesheet DEPRECATION WARNING: As of Dart Sass 2.0.0, !global assignments won't be able to declare new variables. Recommendation: add `$local_explicit: null` at the stylesheet root. , -11 | $local_explicit: outer !global; +12 | $local_explicit: outer !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 11:5 fn() - input.scss 29:7 root stylesheet + input.scss 12:5 fn() + input.scss 30:7 root stylesheet DEPRECATION WARNING: As of Dart Sass 2.0.0, !global assignments won't be able to declare new variables. Recommendation: add `$check_implicit: null` at the stylesheet root. , -22 | $check_implicit: $root_implicit !global; +23 | $check_implicit: $root_implicit !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 22:3 fn() - input.scss 29:7 root stylesheet + input.scss 23:3 fn() + input.scss 30:7 root stylesheet DEPRECATION WARNING: As of Dart Sass 2.0.0, !global assignments won't be able to declare new variables. Recommendation: add `$check_explicit: null` at the stylesheet root. , -23 | $check_explicit: $root_explicit !global; +24 | $check_explicit: $root_explicit !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 23:3 fn() - input.scss 29:7 root stylesheet + input.scss 24:3 fn() + input.scss 30:7 root stylesheet DEPRECATION WARNING: As of Dart Sass 2.0.0, !global assignments won't be able to declare new variables. Recommendation: add `$check_default: null` at the stylesheet root. , -24 | $check_default: $root_default !global; +25 | $check_default: $root_default !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 24:3 fn() - input.scss 29:7 root stylesheet + input.scss 25:3 fn() + input.scss 30:7 root stylesheet diff --git a/spec/libsass/variable-scoping/blead-global/functional/if.hrx b/spec/libsass/variable-scoping/blead-global/functional/if.hrx index d718766e4a..8a8d586a22 100644 --- a/spec/libsass/variable-scoping/blead-global/functional/if.hrx +++ b/spec/libsass/variable-scoping/blead-global/functional/if.hrx @@ -1,4 +1,5 @@ <===> input.scss +@use "sass:meta"; $root_default: initial; $root_implicit: initial; $root_explicit: initial !global; @@ -28,31 +29,31 @@ $root_explicit: initial !global; result { fn: fn(); - @if variable-exists(outer) { + @if meta.variable-exists(outer) { outer: $outer; } - @if variable-exists(inner) { + @if meta.variable-exists(inner) { inner: $inner; } - @if variable-exists(check_implicit) { + @if meta.variable-exists(check_implicit) { check_implicit: $check_implicit; } - @if variable-exists(check_explicit) { + @if meta.variable-exists(check_explicit) { check_explicit: $check_explicit; } - @if variable-exists(check_default) { + @if meta.variable-exists(check_default) { check_default: $check_default; } root_default: $root_default; root_implicit: $root_implicit; root_explicit: $root_explicit; - @if variable-exists(local_default) { + @if meta.variable-exists(local_default) { local_default: $local_default; } - @if variable-exists(local_implicit) { + @if meta.variable-exists(local_implicit) { local_implicit: $local_implicit; } - @if variable-exists(local_explicit) { + @if meta.variable-exists(local_explicit) { local_explicit: $local_explicit; } } @@ -75,51 +76,51 @@ Since this assignment is at the root of the stylesheet, the !global flag is unnecessary and can safely be removed. , -3 | $root_explicit: initial !global; +4 | $root_explicit: initial !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 3:1 root stylesheet + input.scss 4:1 root stylesheet DEPRECATION WARNING: As of Dart Sass 2.0.0, !global assignments won't be able to declare new variables. Recommendation: add `$local_explicit: null` at the stylesheet root. , -11 | $local_explicit: outer !global; +12 | $local_explicit: outer !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 11:5 fn() - input.scss 29:7 root stylesheet + input.scss 12:5 fn() + input.scss 30:7 root stylesheet DEPRECATION WARNING: As of Dart Sass 2.0.0, !global assignments won't be able to declare new variables. Recommendation: add `$check_implicit: null` at the stylesheet root. , -22 | $check_implicit: $root_implicit !global; +23 | $check_implicit: $root_implicit !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 22:3 fn() - input.scss 29:7 root stylesheet + input.scss 23:3 fn() + input.scss 30:7 root stylesheet DEPRECATION WARNING: As of Dart Sass 2.0.0, !global assignments won't be able to declare new variables. Recommendation: add `$check_explicit: null` at the stylesheet root. , -23 | $check_explicit: $root_explicit !global; +24 | $check_explicit: $root_explicit !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 23:3 fn() - input.scss 29:7 root stylesheet + input.scss 24:3 fn() + input.scss 30:7 root stylesheet DEPRECATION WARNING: As of Dart Sass 2.0.0, !global assignments won't be able to declare new variables. Recommendation: add `$check_default: null` at the stylesheet root. , -24 | $check_default: $root_default !global; +25 | $check_default: $root_default !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 24:3 fn() - input.scss 29:7 root stylesheet + input.scss 25:3 fn() + input.scss 30:7 root stylesheet diff --git a/spec/libsass/variable-scoping/blead-global/functional/while.hrx b/spec/libsass/variable-scoping/blead-global/functional/while.hrx index 948f75d0fc..a4728f1ea3 100644 --- a/spec/libsass/variable-scoping/blead-global/functional/while.hrx +++ b/spec/libsass/variable-scoping/blead-global/functional/while.hrx @@ -1,4 +1,5 @@ <===> input.scss +@use "sass:meta"; $continue_inner: true; $continue_outer: true; $root_default: initial; @@ -32,31 +33,31 @@ $root_explicit: initial !global; result { fn: fn(); - @if variable-exists(continue_outer) { + @if meta.variable-exists(continue_outer) { continue_outer: $continue_outer; } - @if variable-exists(continue_inner) { + @if meta.variable-exists(continue_inner) { continue_inner: $continue_inner; } - @if variable-exists(check_implicit) { + @if meta.variable-exists(check_implicit) { check_implicit: $check_implicit; } - @if variable-exists(check_explicit) { + @if meta.variable-exists(check_explicit) { check_explicit: $check_explicit; } - @if variable-exists(check_default) { + @if meta.variable-exists(check_default) { check_default: $check_default; } root_default: $root_default; root_implicit: $root_implicit; root_explicit: $root_explicit; - @if variable-exists(local_default) { + @if meta.variable-exists(local_default) { local_default: $local_default; } - @if variable-exists(local_implicit) { + @if meta.variable-exists(local_implicit) { local_implicit: $local_implicit; } - @if variable-exists(local_explicit) { + @if meta.variable-exists(local_explicit) { local_explicit: $local_explicit; } } @@ -81,51 +82,51 @@ Since this assignment is at the root of the stylesheet, the !global flag is unnecessary and can safely be removed. , -5 | $root_explicit: initial !global; +6 | $root_explicit: initial !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 5:1 root stylesheet + input.scss 6:1 root stylesheet DEPRECATION WARNING: As of Dart Sass 2.0.0, !global assignments won't be able to declare new variables. Recommendation: add `$local_explicit: null` at the stylesheet root. , -13 | $local_explicit: outer !global; +14 | $local_explicit: outer !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 13:5 fn() - input.scss 33:7 root stylesheet + input.scss 14:5 fn() + input.scss 34:7 root stylesheet DEPRECATION WARNING: As of Dart Sass 2.0.0, !global assignments won't be able to declare new variables. Recommendation: add `$check_implicit: null` at the stylesheet root. , -26 | $check_implicit: $root_implicit !global; +27 | $check_implicit: $root_implicit !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 26:3 fn() - input.scss 33:7 root stylesheet + input.scss 27:3 fn() + input.scss 34:7 root stylesheet DEPRECATION WARNING: As of Dart Sass 2.0.0, !global assignments won't be able to declare new variables. Recommendation: add `$check_explicit: null` at the stylesheet root. , -27 | $check_explicit: $root_explicit !global; +28 | $check_explicit: $root_explicit !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 27:3 fn() - input.scss 33:7 root stylesheet + input.scss 28:3 fn() + input.scss 34:7 root stylesheet DEPRECATION WARNING: As of Dart Sass 2.0.0, !global assignments won't be able to declare new variables. Recommendation: add `$check_default: null` at the stylesheet root. , -28 | $check_default: $root_default !global; +29 | $check_default: $root_default !global; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 28:3 fn() - input.scss 33:7 root stylesheet + input.scss 29:3 fn() + input.scss 34:7 root stylesheet diff --git a/spec/libsass/variable-scoping/feature-test.hrx b/spec/libsass/variable-scoping/feature-test.hrx index b387b1af3b..47881aebe2 100644 --- a/spec/libsass/variable-scoping/feature-test.hrx +++ b/spec/libsass/variable-scoping/feature-test.hrx @@ -1,5 +1,6 @@ <===> input.scss -@if feature-exists(global-variable-shadowing) { +@use "sass:meta"; +@if meta.feature-exists(global-variable-shadowing) { div { feature: true; } From 86cd57a38bdd98b2e52918876de82ad81b34a811 Mon Sep 17 00:00:00 2001 From: Jennifer Thakar Date: Fri, 12 Jul 2024 14:51:58 -0700 Subject: [PATCH 05/10] libsass-closed-issues global functions --- migrate.ts | 4 +- spec/libsass-closed-issues/issue-2640.hrx | 3 +- spec/libsass-closed-issues/issue_100.hrx | 3 +- spec/libsass-closed-issues/issue_1075.hrx | 9 +- spec/libsass-closed-issues/issue_1101.hrx | 3 +- spec/libsass-closed-issues/issue_1106.hrx | 19 ++--- spec/libsass-closed-issues/issue_1127.hrx | 61 ++++++------- spec/libsass-closed-issues/issue_1132.hrx | 3 +- .../issue_1133/normal.hrx | 9 +- .../issue_1133/vararg.hrx | 9 +- spec/libsass-closed-issues/issue_1171.hrx | 9 +- spec/libsass-closed-issues/issue_1192.hrx | 2 +- spec/libsass-closed-issues/issue_1207.hrx | 5 +- spec/libsass-closed-issues/issue_1240.hrx | 9 +- spec/libsass-closed-issues/issue_1255.hrx | 5 +- spec/libsass-closed-issues/issue_1257.hrx | 3 +- spec/libsass-closed-issues/issue_1258.hrx | 5 +- spec/libsass-closed-issues/issue_1260.hrx | 3 +- spec/libsass-closed-issues/issue_1266/max.hrx | 15 ++-- spec/libsass-closed-issues/issue_1266/min.hrx | 15 ++-- spec/libsass-closed-issues/issue_1271.hrx | 5 +- spec/libsass-closed-issues/issue_1279.hrx | 9 +- spec/libsass-closed-issues/issue_1281.hrx | 9 +- spec/libsass-closed-issues/issue_1285.hrx | 3 +- spec/libsass-closed-issues/issue_1291.hrx | 5 +- spec/libsass-closed-issues/issue_1303.hrx | 3 +- spec/libsass-closed-issues/issue_1305.hrx | 9 +- spec/libsass-closed-issues/issue_1331.hrx | 19 +++-- spec/libsass-closed-issues/issue_1404.hrx | 5 +- spec/libsass-closed-issues/issue_1405.hrx | 19 +++-- spec/libsass-closed-issues/issue_1413.hrx | 46 +++++----- spec/libsass-closed-issues/issue_1417.hrx | 72 ++++++++-------- .../issue_1418/dynamic.hrx | 15 ++-- .../issue_1419/quoted.hrx | 3 +- .../issue_1419/unquoted.hrx | 3 +- .../issue_1432/selector-extend.hrx | 7 +- .../issue_1432/selector-nest.hrx | 7 +- .../issue_1432/selector-replace.hrx | 7 +- .../issue_1432/selector-unify.hrx | 7 +- .../issue_1432/simple-selectors.hrx | 9 +- spec/libsass-closed-issues/issue_1434.hrx | 13 +-- spec/libsass-closed-issues/issue_1488.hrx | 73 ++++++++-------- spec/libsass-closed-issues/issue_151.hrx | 19 +++-- spec/libsass-closed-issues/issue_1535.hrx | 3 +- spec/libsass-closed-issues/issue_1566.hrx | 13 +-- spec/libsass-closed-issues/issue_1579.hrx | 11 +-- spec/libsass-closed-issues/issue_1583.hrx | 4 +- spec/libsass-closed-issues/issue_1622.hrx | 14 +-- spec/libsass-closed-issues/issue_1634.hrx | 14 +-- .../issue_1644/complex.hrx | 11 +-- spec/libsass-closed-issues/issue_1645.hrx | 14 +-- .../issue_1647/selectors.hrx | 10 ++- spec/libsass-closed-issues/issue_1667.hrx | 9 +- spec/libsass-closed-issues/issue_1709.hrx | 3 +- spec/libsass-closed-issues/issue_1722.hrx | 3 +- spec/libsass-closed-issues/issue_1723.hrx | 5 +- .../libsass-closed-issues/issue_1757/each.hrx | 9 +- spec/libsass-closed-issues/issue_1757/for.hrx | 17 ++-- spec/libsass-closed-issues/issue_1796.hrx | 5 +- spec/libsass-closed-issues/issue_1819.hrx | 4 +- .../libsass-closed-issues/issue_185/mixin.hrx | 11 +-- spec/libsass-closed-issues/issue_1926.hrx | 17 ++-- spec/libsass-closed-issues/issue_1940.hrx | 9 +- spec/libsass-closed-issues/issue_1947.hrx | 3 +- spec/libsass-closed-issues/issue_1969.hrx | 3 +- spec/libsass-closed-issues/issue_2020.hrx | 5 +- .../issue_2031/extended-not.hrx | 3 +- spec/libsass-closed-issues/issue_2112.hrx | 7 +- .../issue_2156/debug.hrx | 13 +-- .../issue_2156/error.hrx | 9 +- .../libsass-closed-issues/issue_2156/warn.hrx | 13 +-- spec/libsass-closed-issues/issue_224.hrx | 9 +- spec/libsass-closed-issues/issue_2246.hrx | 3 +- spec/libsass-closed-issues/issue_2309.hrx | 28 +++--- spec/libsass-closed-issues/issue_2374.hrx | 67 ++++++++------- spec/libsass-closed-issues/issue_2394.hrx | 8 +- spec/libsass-closed-issues/issue_2462.hrx | 3 +- spec/libsass-closed-issues/issue_2520.hrx | 85 ++++++++++--------- spec/libsass-closed-issues/issue_2633.hrx | 7 +- spec/libsass-closed-issues/issue_2779.hrx | 7 +- spec/libsass-closed-issues/issue_2808.hrx | 3 +- spec/libsass-closed-issues/issue_2863.hrx | 13 +-- spec/libsass-closed-issues/issue_2980.hrx | 5 +- spec/libsass-closed-issues/issue_338.hrx | 3 +- spec/libsass-closed-issues/issue_394.hrx | 3 +- spec/libsass-closed-issues/issue_435.hrx | 9 +- spec/libsass-closed-issues/issue_439.hrx | 9 +- spec/libsass-closed-issues/issue_506.hrx | 7 +- spec/libsass-closed-issues/issue_509.hrx | 15 ++-- spec/libsass-closed-issues/issue_510.hrx | 3 +- spec/libsass-closed-issues/issue_512.hrx | 6 +- spec/libsass-closed-issues/issue_534.hrx | 7 +- spec/libsass-closed-issues/issue_54.hrx | 3 +- spec/libsass-closed-issues/issue_555.hrx | 9 +- spec/libsass-closed-issues/issue_557.hrx | 3 +- spec/libsass-closed-issues/issue_574.hrx | 3 +- spec/libsass-closed-issues/issue_577.hrx | 3 +- spec/libsass-closed-issues/issue_578.hrx | 5 +- spec/libsass-closed-issues/issue_643.hrx | 3 +- spec/libsass-closed-issues/issue_652.hrx | 7 +- spec/libsass-closed-issues/issue_672.hrx | 3 +- spec/libsass-closed-issues/issue_699.hrx | 3 +- spec/libsass-closed-issues/issue_700.hrx | 3 +- spec/libsass-closed-issues/issue_702.hrx | 5 +- spec/libsass-closed-issues/issue_760.hrx | 5 +- spec/libsass-closed-issues/issue_763.hrx | 15 ++-- spec/libsass-closed-issues/issue_815.hrx | 5 +- spec/libsass-closed-issues/issue_857.hrx | 3 +- spec/libsass-closed-issues/issue_86.hrx | 15 ++-- spec/libsass-closed-issues/issue_864.hrx | 3 +- spec/libsass-closed-issues/issue_877.hrx | 57 +++++++------ spec/libsass-closed-issues/issue_980.hrx | 5 +- spec/libsass-closed-issues/issue_988.hrx | 7 +- 113 files changed, 695 insertions(+), 573 deletions(-) diff --git a/migrate.ts b/migrate.ts index 5d46b023d0..2d326b61d7 100644 --- a/migrate.ts +++ b/migrate.ts @@ -17,7 +17,9 @@ async function migrate() { await rootDir.forEachTest( async testDir => { - const files = (await testDir.listFiles()).filter( + const allFiles = await testDir.listFiles(); + if (allFiles.includes('error')) return; + const files = allFiles.filter( file => file.endsWith('.scss') || file.endsWith('.sass') ); console.log(testDir.relPath()); diff --git a/spec/libsass-closed-issues/issue-2640.hrx b/spec/libsass-closed-issues/issue-2640.hrx index eb660bafe7..c20eaceb67 100644 --- a/spec/libsass-closed-issues/issue-2640.hrx +++ b/spec/libsass-closed-issues/issue-2640.hrx @@ -1,11 +1,12 @@ <===> input.scss +@use "sass:selector"; .theme1, .theme2 { .something { /* nothing */ } } -$sel: selector-nest('.theme1, .theme2', '.something'); +$sel: selector.nest('.theme1, .theme2', '.something'); #{$sel} { /* nothing */ diff --git a/spec/libsass-closed-issues/issue_100.hrx b/spec/libsass-closed-issues/issue_100.hrx index c758b7247e..d5eee41d59 100644 --- a/spec/libsass-closed-issues/issue_100.hrx +++ b/spec/libsass-closed-issues/issue_100.hrx @@ -1,7 +1,8 @@ <===> input.scss +@use "sass:color"; $endColor: red; test { - background-color: darken($endColor, 10%) \9; + background-color: color.adjust($endColor, $lightness: -10%) \9; } <===> output.css test { diff --git a/spec/libsass-closed-issues/issue_1075.hrx b/spec/libsass-closed-issues/issue_1075.hrx index 10896961d9..7f4ba9e0ac 100644 --- a/spec/libsass-closed-issues/issue_1075.hrx +++ b/spec/libsass-closed-issues/issue_1075.hrx @@ -1,8 +1,9 @@ <===> input.scss +@use "sass:meta"; $name: "lighten"; $args: ("color": #ff0000, "amount": 10%); foo { - bar: call($name, $args...); + bar: meta.call($name, $args...); } <===> output.css @@ -16,7 +17,7 @@ DEPRECATION WARNING: Passing a string to call() is deprecated and will be illega Recommendation: call(get-function("lighten")) , -4 | bar: call($name, $args...); - | ^^^^^^^^^^^^^^^^^^^^^ +5 | bar: meta.call($name, $args...); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 4:8 root stylesheet + input.scss 5:8 root stylesheet diff --git a/spec/libsass-closed-issues/issue_1101.hrx b/spec/libsass-closed-issues/issue_1101.hrx index 0439c858c4..d739f9334f 100644 --- a/spec/libsass-closed-issues/issue_1101.hrx +++ b/spec/libsass-closed-issues/issue_1101.hrx @@ -1,7 +1,8 @@ <===> input.scss +@use "sass:color"; $foo: white; foo { - bar: adjust-color($foo, $hue: -6deg, $lightness: -16%, $saturation: -7%); + bar: color.adjust($foo, $hue: -6deg, $lightness: -16%, $saturation: -7%); } <===> output.css foo { diff --git a/spec/libsass-closed-issues/issue_1106.hrx b/spec/libsass-closed-issues/issue_1106.hrx index cf5e4c507a..00989b935d 100644 --- a/spec/libsass-closed-issues/issue_1106.hrx +++ b/spec/libsass-closed-issues/issue_1106.hrx @@ -1,31 +1,24 @@ <===> input.scss +@use "sass:string"; @function foo() { @return null; } $foo: null; a { foo: bar; variable: $foo; function: foo(); - unquote: unquote($foo); + unquote: string.unquote($foo); } b { variable: $foo; function: foo(); - unquote: unquote($foo); + unquote: string.unquote($foo); } -<===> warning -DEPRECATION WARNING: Passing null, a non-string value, to unquote() -will be an error in future versions of Sass. - on line 7 of input.scss -DEPRECATION WARNING: Passing null, a non-string value, to unquote() -will be an error in future versions of Sass. - on line 13 of input.scss - <===> error Error: $string: null is not a string. , -7 | unquote: unquote($foo); - | ^^^^^^^^^^^^^ +8 | unquote: string.unquote($foo); + | ^^^^^^^^^^^^^^^^^^^^ ' - input.scss 7:14 root stylesheet + input.scss 8:14 root stylesheet diff --git a/spec/libsass-closed-issues/issue_1127.hrx b/spec/libsass-closed-issues/issue_1127.hrx index 4a68b42c60..bd5e6f0817 100644 --- a/spec/libsass-closed-issues/issue_1127.hrx +++ b/spec/libsass-closed-issues/issue_1127.hrx @@ -1,7 +1,8 @@ <===> input.scss -$a: to-upper-case('abcd'); -$b: to-upper-case("abcd"); -$c: to-upper-case(abcd); +@use "sass:string"; +$a: string.to-upper-case('abcd'); +$b: string.to-upper-case("abcd"); +$c: string.to-upper-case(abcd); foo { content: #{$a}; @@ -14,35 +15,35 @@ foo { content: "#{$b}"; content: "#{$c}"; - content: #{unquote($a)}; - content: #{unquote($b)}; - content: #{unquote($c)}; - content: '#{unquote($a)}'; - content: '#{unquote($b)}'; - content: '#{unquote($c)}'; - content: "#{unquote($a)}"; - content: "#{unquote($b)}"; - content: "#{unquote($c)}"; + content: #{string.unquote($a)}; + content: #{string.unquote($b)}; + content: #{string.unquote($c)}; + content: '#{string.unquote($a)}'; + content: '#{string.unquote($b)}'; + content: '#{string.unquote($c)}'; + content: "#{string.unquote($a)}"; + content: "#{string.unquote($b)}"; + content: "#{string.unquote($c)}"; - content: #{$a + unquote("efg")}; - content: #{$b + unquote("efg")}; - content: #{$c + unquote("efg")}; - content: '#{$a + unquote("efg")}'; - content: '#{$b + unquote("efg")}'; - content: '#{$c + unquote("efg")}'; - content: "#{$a + unquote("efg")}"; - content: "#{$b + unquote("efg")}"; - content: "#{$c + unquote("efg")}"; + content: #{$a + string.unquote("efg")}; + content: #{$b + string.unquote("efg")}; + content: #{$c + string.unquote("efg")}; + content: '#{$a + string.unquote("efg")}'; + content: '#{$b + string.unquote("efg")}'; + content: '#{$c + string.unquote("efg")}'; + content: "#{$a + string.unquote("efg")}"; + content: "#{$b + string.unquote("efg")}"; + content: "#{$c + string.unquote("efg")}"; - content: #{$a + unquote("")}; - content: #{$b + unquote("")}; - content: #{$c + unquote("")}; - content: '#{$a + unquote("")}'; - content: '#{$b + unquote("")}'; - content: '#{$c + unquote("")}'; - content: "#{$a + unquote("")}"; - content: "#{$b + unquote("")}"; - content: "#{$c + unquote("")}"; + content: #{$a + string.unquote("")}; + content: #{$b + string.unquote("")}; + content: #{$c + string.unquote("")}; + content: '#{$a + string.unquote("")}'; + content: '#{$b + string.unquote("")}'; + content: '#{$c + string.unquote("")}'; + content: "#{$a + string.unquote("")}"; + content: "#{$b + string.unquote("")}"; + content: "#{$c + string.unquote("")}"; } <===> output.css diff --git a/spec/libsass-closed-issues/issue_1132.hrx b/spec/libsass-closed-issues/issue_1132.hrx index 41bde3ffbb..96ceb265d3 100644 --- a/spec/libsass-closed-issues/issue_1132.hrx +++ b/spec/libsass-closed-issues/issue_1132.hrx @@ -1,7 +1,8 @@ <===> input.scss +@use "sass:color"; foo { @for $i from 0 through 360 { - i#{$i}: hue(hsl($i, 10%, 20%)); + i#{$i}: color.hue(hsl($i, 10%, 20%)); } } diff --git a/spec/libsass-closed-issues/issue_1133/normal.hrx b/spec/libsass-closed-issues/issue_1133/normal.hrx index 6ca187dee9..f2a64973f7 100644 --- a/spec/libsass-closed-issues/issue_1133/normal.hrx +++ b/spec/libsass-closed-issues/issue_1133/normal.hrx @@ -1,4 +1,5 @@ <===> input.scss +@use "sass:meta"; @function foo($map) { @return $map; } @@ -11,7 +12,7 @@ a { } b { - $map: call("foo", (this: is, my: map)); + $map: meta.call("foo", (this: is, my: map)); @each $k, $v in $map { #{$k}: $v; } @@ -34,7 +35,7 @@ DEPRECATION WARNING: Passing a string to call() is deprecated and will be illega Recommendation: call(get-function("foo")) , -13 | $map: call("foo", (this: is, my: map)); - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +14 | $map: meta.call("foo", (this: is, my: map)); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 13:11 root stylesheet + input.scss 14:11 root stylesheet diff --git a/spec/libsass-closed-issues/issue_1133/vararg.hrx b/spec/libsass-closed-issues/issue_1133/vararg.hrx index 9a38193dcf..5acbd9a9ca 100644 --- a/spec/libsass-closed-issues/issue_1133/vararg.hrx +++ b/spec/libsass-closed-issues/issue_1133/vararg.hrx @@ -1,4 +1,5 @@ <===> input.scss +@use "sass:meta"; @function foo($this, $my) { @return (this: $this, my: $my); } @@ -11,7 +12,7 @@ a { } b { - $map: call("foo", (this: is, my: map)...); + $map: meta.call("foo", (this: is, my: map)...); @each $k, $v in $map { #{$k}: $v; } @@ -34,7 +35,7 @@ DEPRECATION WARNING: Passing a string to call() is deprecated and will be illega Recommendation: call(get-function("foo")) , -13 | $map: call("foo", (this: is, my: map)...); - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +14 | $map: meta.call("foo", (this: is, my: map)...); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 13:9 root stylesheet + input.scss 14:9 root stylesheet diff --git a/spec/libsass-closed-issues/issue_1171.hrx b/spec/libsass-closed-issues/issue_1171.hrx index f2a77ff89a..c7a1ca73d9 100644 --- a/spec/libsass-closed-issues/issue_1171.hrx +++ b/spec/libsass-closed-issues/issue_1171.hrx @@ -1,18 +1,19 @@ <===> input.scss +@use "sass:list"; @function foo($initial, $args...) { - $args: append($args, 3); + $args: list.append($args, 3); @return bar($initial, $args...); } @function bar($args...) { - @return length($args); + @return list.length($args); } @function baz($initial, $args...) { - $args: append($args, 3); + $args: list.append($args, 3); - @return nth($args, 1); + @return list.nth($args, 1); } .test { diff --git a/spec/libsass-closed-issues/issue_1192.hrx b/spec/libsass-closed-issues/issue_1192.hrx index 33fcef5cc2..512642df9a 100644 --- a/spec/libsass-closed-issues/issue_1192.hrx +++ b/spec/libsass-closed-issues/issue_1192.hrx @@ -4,7 +4,7 @@ $keyword: foobar; @mixin test($arglist...){ - $map: keywords($arglist); + $map: meta.keywords($arglist); /*#{meta.inspect($map)}*/ /*#{meta.inspect($arglist)}*/ } diff --git a/spec/libsass-closed-issues/issue_1207.hrx b/spec/libsass-closed-issues/issue_1207.hrx index 0067100c83..064bc406c7 100644 --- a/spec/libsass-closed-issues/issue_1207.hrx +++ b/spec/libsass-closed-issues/issue_1207.hrx @@ -1,11 +1,12 @@ <===> input.scss +@use "sass:string"; @function test($pos) { @return test-#{$pos}; } .foo { - content: test(str-slice('scale-0', 7)); // Nope - content: test-#{str-slice('scale-0', 7)}; // Yep + content: test(string.slice('scale-0', 7)); // Nope + content: test-#{string.slice('scale-0', 7)}; // Yep } <===> output.css .foo { diff --git a/spec/libsass-closed-issues/issue_1240.hrx b/spec/libsass-closed-issues/issue_1240.hrx index 051ad6855b..789837fa1b 100644 --- a/spec/libsass-closed-issues/issue_1240.hrx +++ b/spec/libsass-closed-issues/issue_1240.hrx @@ -1,7 +1,8 @@ <===> input.scss +@use "sass:list"; $var: 1; $list: 2, 3; -$new-list: append($var, $list); +$new-list: list.append($var, $list); $nested-list: $var $list; @debug($var); @debug($list); @@ -22,7 +23,7 @@ div { } <===> warning -input.scss:5 DEBUG: 1 -input.scss:6 DEBUG: 2, 3 -input.scss:7 DEBUG: 1 (2, 3) +input.scss:6 DEBUG: 1 +input.scss:7 DEBUG: 2, 3 input.scss:8 DEBUG: 1 (2, 3) +input.scss:9 DEBUG: 1 (2, 3) diff --git a/spec/libsass-closed-issues/issue_1255.hrx b/spec/libsass-closed-issues/issue_1255.hrx index 09894f53fa..dc14088e40 100644 --- a/spec/libsass-closed-issues/issue_1255.hrx +++ b/spec/libsass-closed-issues/issue_1255.hrx @@ -1,11 +1,12 @@ <===> input.scss +@use "sass:list"; @function double($value) { @return $value * 2; } @mixin dummy-bug($args...) { - @for $i from 1 through length($args) { - $args: set-nth($args, $i, double(nth($args, $i))); + @for $i from 1 through list.length($args) { + $args: list.set-nth($args, $i, double(list.nth($args, $i))); } content: $args; diff --git a/spec/libsass-closed-issues/issue_1257.hrx b/spec/libsass-closed-issues/issue_1257.hrx index e7713a4bd0..e44203e336 100644 --- a/spec/libsass-closed-issues/issue_1257.hrx +++ b/spec/libsass-closed-issues/issue_1257.hrx @@ -1,6 +1,7 @@ <===> input.scss +@use "sass:color"; .foo { - color: invert(red...); + color: color.invert(red...); } <===> output.css .foo { diff --git a/spec/libsass-closed-issues/issue_1258.hrx b/spec/libsass-closed-issues/issue_1258.hrx index c8076fb1b2..16b7eece03 100644 --- a/spec/libsass-closed-issues/issue_1258.hrx +++ b/spec/libsass-closed-issues/issue_1258.hrx @@ -4,13 +4,14 @@ - dart-sass <===> input.scss +@use "sass:string"; $list: '(-webkit-min-device-pixel-ratio: 2)', '(min-resolution: 192dpi)'; $string: '(-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi)'; .foo { // I should not unquote a list, I know. But still. - content: unquote($list); - content: unquote($string); + content: string.unquote($list); + content: string.unquote($string); } <===> output.css .foo { diff --git a/spec/libsass-closed-issues/issue_1260.hrx b/spec/libsass-closed-issues/issue_1260.hrx index fbc0033da9..e935177d80 100644 --- a/spec/libsass-closed-issues/issue_1260.hrx +++ b/spec/libsass-closed-issues/issue_1260.hrx @@ -1,8 +1,9 @@ <===> input.scss +@use "sass:list"; $EQ-Selectors: (); .el { - $EQ-Selectors: append($EQ-Selectors, &, 'comma') !global; + $EQ-Selectors: list.append($EQ-Selectors, &, 'comma') !global; } html:before { diff --git a/spec/libsass-closed-issues/issue_1266/max.hrx b/spec/libsass-closed-issues/issue_1266/max.hrx index ee467ac31d..037543aef1 100644 --- a/spec/libsass-closed-issues/issue_1266/max.hrx +++ b/spec/libsass-closed-issues/issue_1266/max.hrx @@ -1,7 +1,8 @@ <===> input.scss +@use "sass:meta"; $foo: 1 2 3 blah 4; foo { - bar: call(max, $foo...); + bar: meta.call(max, $foo...); } <===> error @@ -10,14 +11,14 @@ DEPRECATION WARNING: Passing a string to call() is deprecated and will be illega Recommendation: call(get-function(max)) , -3 | bar: call(max, $foo...); - | ^^^^^^^^^^^^^^^^^^ +4 | bar: meta.call(max, $foo...); + | ^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 3:8 root stylesheet + input.scss 4:8 root stylesheet Error: blah is not a number. , -3 | bar: call(max, $foo...); - | ^^^^^^^^^^^^^^^^^^ +4 | bar: meta.call(max, $foo...); + | ^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 3:8 root stylesheet + input.scss 4:8 root stylesheet diff --git a/spec/libsass-closed-issues/issue_1266/min.hrx b/spec/libsass-closed-issues/issue_1266/min.hrx index 2d5c8791d8..ceb02582e5 100644 --- a/spec/libsass-closed-issues/issue_1266/min.hrx +++ b/spec/libsass-closed-issues/issue_1266/min.hrx @@ -1,7 +1,8 @@ <===> input.scss +@use "sass:meta"; $foo: 1 2 3 blah 4; foo { - bar: call(min, $foo...); + bar: meta.call(min, $foo...); } <===> error @@ -10,14 +11,14 @@ DEPRECATION WARNING: Passing a string to call() is deprecated and will be illega Recommendation: call(get-function(min)) , -3 | bar: call(min, $foo...); - | ^^^^^^^^^^^^^^^^^^ +4 | bar: meta.call(min, $foo...); + | ^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 3:8 root stylesheet + input.scss 4:8 root stylesheet Error: blah is not a number. , -3 | bar: call(min, $foo...); - | ^^^^^^^^^^^^^^^^^^ +4 | bar: meta.call(min, $foo...); + | ^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 3:8 root stylesheet + input.scss 4:8 root stylesheet diff --git a/spec/libsass-closed-issues/issue_1271.hrx b/spec/libsass-closed-issues/issue_1271.hrx index 31e16b55de..b03b48571f 100644 --- a/spec/libsass-closed-issues/issue_1271.hrx +++ b/spec/libsass-closed-issues/issue_1271.hrx @@ -1,4 +1,5 @@ <===> input.scss +@use "sass:string"; $character-code: f102; test { @@ -6,10 +7,10 @@ test { /* Expected: "\f102" */ /* Sass 3.4 */ - content: unquote("\"\\#{$character-code}\""); + content: string.unquote("\"\\#{$character-code}\""); /* Sass 3.3 */ - content: str-slice("\x", 1, 1) + $character-code; + content: string.slice("\x", 1, 1) + $character-code; } <===> output.css diff --git a/spec/libsass-closed-issues/issue_1279.hrx b/spec/libsass-closed-issues/issue_1279.hrx index 0a6fd73d0c..b8719947c8 100644 --- a/spec/libsass-closed-issues/issue_1279.hrx +++ b/spec/libsass-closed-issues/issue_1279.hrx @@ -1,13 +1,14 @@ <===> input.scss +@use "sass:string"; @function noop($string) { @return $string; } .foo { - upper: to-upper-case('f') + str-slice('foo', 2); - lower: to-lower-case('f') + str-slice('foo', 2); - user-upper: to-upper-case('f') + noop('oo'); - user-lower: to-lower-case('f') + noop('oo'); + upper: string.to-upper-case('f') + string.slice('foo', 2); + lower: string.to-lower-case('f') + string.slice('foo', 2); + user-upper: string.to-upper-case('f') + noop('oo'); + user-lower: string.to-lower-case('f') + noop('oo'); } <===> output.css diff --git a/spec/libsass-closed-issues/issue_1281.hrx b/spec/libsass-closed-issues/issue_1281.hrx index c10d538315..1bc3dc3939 100644 --- a/spec/libsass-closed-issues/issue_1281.hrx +++ b/spec/libsass-closed-issues/issue_1281.hrx @@ -1,12 +1,13 @@ <===> input.scss +@use "sass:meta"; $quoted: "green"; $unquoted: green; .test { - string: type-of($quoted); - color: type-of($unquoted); - string: type-of("green"); - color: type-of(green); + string: meta.type-of($quoted); + color: meta.type-of($unquoted); + string: meta.type-of("green"); + color: meta.type-of(green); } <===> output.css diff --git a/spec/libsass-closed-issues/issue_1285.hrx b/spec/libsass-closed-issues/issue_1285.hrx index a327dc4405..d728197a1e 100644 --- a/spec/libsass-closed-issues/issue_1285.hrx +++ b/spec/libsass-closed-issues/issue_1285.hrx @@ -1,8 +1,9 @@ <===> input.scss +@use "sass:color"; .container { @for $i from 1 through 3 { @at-root .box-#{$i} { - color: darken(red,($i * 5)); + color: color.adjust(red,$lightness: -($i * 5%)); } } diff --git a/spec/libsass-closed-issues/issue_1291.hrx b/spec/libsass-closed-issues/issue_1291.hrx index 7f52db5722..ebaee0635d 100644 --- a/spec/libsass-closed-issues/issue_1291.hrx +++ b/spec/libsass-closed-issues/issue_1291.hrx @@ -4,13 +4,14 @@ - dart-sass <===> input.scss +@use "sass:string"; @mixin spec1($decimal) { - $decimal: unquote($decimal) * -1; + $decimal: string.unquote($decimal) * -1; value: $decimal; } @mixin spec2($decimal) { - $decimal: -1 * unquote($decimal); + $decimal: -1 * string.unquote($decimal); value: $decimal; } diff --git a/spec/libsass-closed-issues/issue_1303.hrx b/spec/libsass-closed-issues/issue_1303.hrx index 20d72f0b16..eed3f30157 100644 --- a/spec/libsass-closed-issues/issue_1303.hrx +++ b/spec/libsass-closed-issues/issue_1303.hrx @@ -1,6 +1,7 @@ <===> input.scss +@use "sass:selector"; .simple { - a: selector-replace('foo.bar', 'foo', 'foo[baz]'); + a: selector.replace('foo.bar', 'foo', 'foo[baz]'); } <===> output.css diff --git a/spec/libsass-closed-issues/issue_1305.hrx b/spec/libsass-closed-issues/issue_1305.hrx index cfafc19ae5..29e885c9f3 100644 --- a/spec/libsass-closed-issues/issue_1305.hrx +++ b/spec/libsass-closed-issues/issue_1305.hrx @@ -1,6 +1,7 @@ <===> input.scss +@use "sass:meta"; .foo { - content: call('unquote', 'foo', ()...); + content: meta.call('unquote', 'foo', ()...); } <===> output.css @@ -14,7 +15,7 @@ DEPRECATION WARNING: Passing a string to call() is deprecated and will be illega Recommendation: call(get-function("unquote")) , -2 | content: call('unquote', 'foo', ()...); - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +3 | content: meta.call('unquote', 'foo', ()...); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 2:14 root stylesheet + input.scss 3:14 root stylesheet diff --git a/spec/libsass-closed-issues/issue_1331.hrx b/spec/libsass-closed-issues/issue_1331.hrx index 1f969b176e..d43e35ff32 100644 --- a/spec/libsass-closed-issues/issue_1331.hrx +++ b/spec/libsass-closed-issues/issue_1331.hrx @@ -1,17 +1,18 @@ <===> input.scss +@use "sass:map"; $m: (foo: 1px, null: 2px, false: 3px, true: 4px); @debug $m; -@debug map-get($m, foo); -@debug map-get($m, null); -@debug map-get($m, false); -@debug map-get($m, true); +@debug map.get($m, foo); +@debug map.get($m, null); +@debug map.get($m, false); +@debug map.get($m, true); <===> output.css <===> warning -input.scss:3 DEBUG: (foo: 1px, null: 2px, false: 3px, true: 4px) -input.scss:4 DEBUG: 1px -input.scss:5 DEBUG: 2px -input.scss:6 DEBUG: 3px -input.scss:7 DEBUG: 4px +input.scss:4 DEBUG: (foo: 1px, null: 2px, false: 3px, true: 4px) +input.scss:5 DEBUG: 1px +input.scss:6 DEBUG: 2px +input.scss:7 DEBUG: 3px +input.scss:8 DEBUG: 4px diff --git a/spec/libsass-closed-issues/issue_1404.hrx b/spec/libsass-closed-issues/issue_1404.hrx index dc527eefae..2dc83a1408 100644 --- a/spec/libsass-closed-issues/issue_1404.hrx +++ b/spec/libsass-closed-issues/issue_1404.hrx @@ -1,8 +1,9 @@ <===> input.scss +@use "sass:meta"; .test { color: #aaabbb--1-2-a; - color: type-of(#aaabbb--1-2-a); - color: type-of(#aaabbb--1-2); + color: meta.type-of(#aaabbb--1-2-a); + color: meta.type-of(#aaabbb--1-2); } <===> output.css .test { diff --git a/spec/libsass-closed-issues/issue_1405.hrx b/spec/libsass-closed-issues/issue_1405.hrx index 3149d38154..18ffb39c54 100644 --- a/spec/libsass-closed-issues/issue_1405.hrx +++ b/spec/libsass-closed-issues/issue_1405.hrx @@ -1,10 +1,13 @@ <===> input.scss +@use "sass:list"; +@use "sass:math"; +@use "sass:meta"; div { foo: (1a2b3c); - length-1: length(1a2b3c); + length-1: list.length(1a2b3c); - unit-1: unit(1a2b3c); + unit-1: math.unit(1a2b3c); result-1: 1em-.75em; result-2: 2em-1em; @@ -12,12 +15,12 @@ div { result-4: 1.5em-1em; result-5: 2em-1.5em; - type-1: type-of(1em-.75em); - type-2: type-of(2em-1em); - type-3: type-of(2em-0.75em); - type-4: type-of(1.5em-1em); - type-5: type-of(2em-1.5em); - type-6: type-of(1a2b3c); + type-1: meta.type-of(1em-.75em); + type-2: meta.type-of(2em-1em); + type-3: meta.type-of(2em-0.75em); + type-4: meta.type-of(1.5em-1em); + type-5: meta.type-of(2em-1.5em); + type-6: meta.type-of(1a2b3c); test-1: (1-em-2-em); test-1: (1-em - 2-em); diff --git a/spec/libsass-closed-issues/issue_1413.hrx b/spec/libsass-closed-issues/issue_1413.hrx index 076899aa85..10a2d0be86 100644 --- a/spec/libsass-closed-issues/issue_1413.hrx +++ b/spec/libsass-closed-issues/issue_1413.hrx @@ -1,4 +1,6 @@ <===> input.scss +@use "sass:list"; +@use "sass:meta"; div { foo: 'A'#{B}; foo: #{A}'B'; @@ -14,31 +16,31 @@ div { } div { - foo: type-of('A'#{B}); - foo: type-of(#{A}'B'); - foo: type-of('A'#{B}'C'); - foo: type-of(#{A}'B'#{C}); - foo: type-of(A#{B}'C'); - foo: type-of('A'#{B}C); - foo: type-of(#{A}B'C'); - foo: type-of('A'#{B}C'D'); - foo: type-of('A'B#{C}D'E'); - foo: type-of(A'B'#{C}D'E'); - foo: type-of(#{A}'B'C'D''E'); + foo: meta.type-of('A'#{B}); + foo: meta.type-of(#{A}'B'); + foo: meta.type-of('A'#{B}'C'); + foo: meta.type-of(#{A}'B'#{C}); + foo: meta.type-of(A#{B}'C'); + foo: meta.type-of('A'#{B}C); + foo: meta.type-of(#{A}B'C'); + foo: meta.type-of('A'#{B}C'D'); + foo: meta.type-of('A'B#{C}D'E'); + foo: meta.type-of(A'B'#{C}D'E'); + foo: meta.type-of(#{A}'B'C'D''E'); } div { - foo: length('A'#{B}); - foo: length(#{A}'B'); - foo: length('A'#{B}'C'); - foo: length(#{A}'B'#{C}); - foo: length(A#{B}'C'); - foo: length('A'#{B}C); - foo: length(#{A}B'C'); - foo: length('A'#{B}C'D'); - foo: length('A'B#{C}D'E'); - foo: length(A'B'#{C}D'E'); - foo: length(#{A}'B'C'D''E'); + foo: list.length('A'#{B}); + foo: list.length(#{A}'B'); + foo: list.length('A'#{B}'C'); + foo: list.length(#{A}'B'#{C}); + foo: list.length(A#{B}'C'); + foo: list.length('A'#{B}C); + foo: list.length(#{A}B'C'); + foo: list.length('A'#{B}C'D'); + foo: list.length('A'B#{C}D'E'); + foo: list.length(A'B'#{C}D'E'); + foo: list.length(#{A}'B'C'D''E'); } <===> output.css div { diff --git a/spec/libsass-closed-issues/issue_1417.hrx b/spec/libsass-closed-issues/issue_1417.hrx index 3fe92774a3..4d0287c4fb 100644 --- a/spec/libsass-closed-issues/issue_1417.hrx +++ b/spec/libsass-closed-issues/issue_1417.hrx @@ -1,14 +1,16 @@ <===> input.scss +@use "sass:math"; +@use "sass:meta"; @function foo($a, $b) { @return ($a $b); } foo { foo: 1px / 2px; - foo: 1px / round(1.5); - foo: foo(1px / 2px, 1px / round(1.5)); - foo: missing(1px / 2px, 1px / round(1.5)); - foo: call(missing, 1px / 2px, 1px / round(1.5)); + foo: 1px / math.round(1.5); + foo: foo(1px / 2px, 1px / math.round(1.5)); + foo: missing(1px / 2px, 1px / math.round(1.5)); + foo: meta.call(missing, 1px / 2px, 1px / math.round(1.5)); } <===> output.css @@ -23,15 +25,15 @@ foo { <===> warning DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. -Recommendation: math.div(1px, round(1.5)) or calc(1px / round(1.5)) +Recommendation: math.div(1px, math.round(1.5)) or calc(1px / math.round(1.5)) More info and automated migrator: https://sass-lang.com/d/slash-div , -7 | foo: 1px / round(1.5); - | ^^^^^^^^^^^^^^^^ +9 | foo: 1px / math.round(1.5); + | ^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 7:8 root stylesheet + input.scss 9:8 root stylesheet DEPRECATION WARNING: Using / for division is deprecated and will be removed in Dart Sass 2.0.0. @@ -39,35 +41,35 @@ Recommendation: math.div(1px, 2px) More info and automated migrator: https://sass-lang.com/d/slash-div - , -8 | foo: foo(1px / 2px, 1px / round(1.5)); - | ^^^^^^^^^ - ' - input.scss 8:12 root stylesheet + , +10 | foo: foo(1px / 2px, 1px / math.round(1.5)); + | ^^^^^^^^^ + ' + input.scss 10:12 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. -Recommendation: math.div(1px, round(1.5)) or calc(1px / round(1.5)) +Recommendation: math.div(1px, math.round(1.5)) or calc(1px / math.round(1.5)) More info and automated migrator: https://sass-lang.com/d/slash-div - , -8 | foo: foo(1px / 2px, 1px / round(1.5)); - | ^^^^^^^^^^^^^^^^ - ' - input.scss 8:23 root stylesheet + , +10 | foo: foo(1px / 2px, 1px / math.round(1.5)); + | ^^^^^^^^^^^^^^^^^^^^^ + ' + input.scss 10:23 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. -Recommendation: math.div(1px, round(1.5)) or calc(1px / round(1.5)) +Recommendation: math.div(1px, math.round(1.5)) or calc(1px / math.round(1.5)) More info and automated migrator: https://sass-lang.com/d/slash-div - , -9 | foo: missing(1px / 2px, 1px / round(1.5)); - | ^^^^^^^^^^^^^^^^ - ' - input.scss 9:27 root stylesheet + , +11 | foo: missing(1px / 2px, 1px / math.round(1.5)); + | ^^^^^^^^^^^^^^^^^^^^^ + ' + input.scss 11:27 root stylesheet DEPRECATION WARNING: Using / for division is deprecated and will be removed in Dart Sass 2.0.0. @@ -76,29 +78,29 @@ Recommendation: math.div(1px, 2px) More info and automated migrator: https://sass-lang.com/d/slash-div , -10 | foo: call(missing, 1px / 2px, 1px / round(1.5)); - | ^^^^^^^^^ +12 | foo: meta.call(missing, 1px / 2px, 1px / math.round(1.5)); + | ^^^^^^^^^ ' - input.scss 10:22 root stylesheet + input.scss 12:27 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. -Recommendation: math.div(1px, round(1.5)) or calc(1px / round(1.5)) +Recommendation: math.div(1px, math.round(1.5)) or calc(1px / math.round(1.5)) More info and automated migrator: https://sass-lang.com/d/slash-div , -10 | foo: call(missing, 1px / 2px, 1px / round(1.5)); - | ^^^^^^^^^^^^^^^^ +12 | foo: meta.call(missing, 1px / 2px, 1px / math.round(1.5)); + | ^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 10:33 root stylesheet + input.scss 12:38 root stylesheet DEPRECATION WARNING: Passing a string to call() is deprecated and will be illegal in Dart Sass 2.0.0. Recommendation: call(get-function(missing)) , -10 | foo: call(missing, 1px / 2px, 1px / round(1.5)); - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +12 | foo: meta.call(missing, 1px / 2px, 1px / math.round(1.5)); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 10:8 root stylesheet + input.scss 12:8 root stylesheet diff --git a/spec/libsass-closed-issues/issue_1418/dynamic.hrx b/spec/libsass-closed-issues/issue_1418/dynamic.hrx index 8e136e80ef..14038c155d 100644 --- a/spec/libsass-closed-issues/issue_1418/dynamic.hrx +++ b/spec/libsass-closed-issues/issue_1418/dynamic.hrx @@ -1,6 +1,7 @@ <===> input.scss +@use "sass:meta"; foo { - color: call(missing, $a: b); + color: meta.call(missing, $a: b); } <===> error @@ -9,14 +10,14 @@ DEPRECATION WARNING: Passing a string to call() is deprecated and will be illega Recommendation: call(get-function(missing)) , -2 | color: call(missing, $a: b); - | ^^^^^^^^^^^^^^^^^^^^ +3 | color: meta.call(missing, $a: b); + | ^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 2:12 root stylesheet + input.scss 3:12 root stylesheet Error: Plain CSS functions don't support keyword arguments. , -2 | color: call(missing, $a: b); - | ^^^^^^^^^^^^^^^^^^^^ +3 | color: meta.call(missing, $a: b); + | ^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 2:12 root stylesheet + input.scss 3:12 root stylesheet diff --git a/spec/libsass-closed-issues/issue_1419/quoted.hrx b/spec/libsass-closed-issues/issue_1419/quoted.hrx index b6ab559eed..01474103f3 100644 --- a/spec/libsass-closed-issues/issue_1419/quoted.hrx +++ b/spec/libsass-closed-issues/issue_1419/quoted.hrx @@ -1,6 +1,7 @@ <===> input.scss +@use "sass:string"; foo { - foo: to-upper-case("ab\63 d"); + foo: string.to-upper-case("ab\63 d"); } <===> output.css diff --git a/spec/libsass-closed-issues/issue_1419/unquoted.hrx b/spec/libsass-closed-issues/issue_1419/unquoted.hrx index c02a9a065e..835fc19d5b 100644 --- a/spec/libsass-closed-issues/issue_1419/unquoted.hrx +++ b/spec/libsass-closed-issues/issue_1419/unquoted.hrx @@ -1,6 +1,7 @@ <===> input.scss +@use "sass:string"; foo { - foo: to-upper-case(ab\63 d); + foo: string.to-upper-case(ab\63 d); } <===> output.css diff --git a/spec/libsass-closed-issues/issue_1432/selector-extend.hrx b/spec/libsass-closed-issues/issue_1432/selector-extend.hrx index 2b9596971a..4f59130145 100644 --- a/spec/libsass-closed-issues/issue_1432/selector-extend.hrx +++ b/spec/libsass-closed-issues/issue_1432/selector-extend.hrx @@ -1,11 +1,12 @@ <===> input.scss -@debug(selector-extend(".a .b", ".b", null)); +@use "sass:selector"; +@debug(selector.extend(".a .b", ".b", null)); <===> error Error: $extender: null is not a valid selector: it must be a string, a list of strings, or a list of lists of strings. , -1 | @debug(selector-extend(".a .b", ".b", null)); +2 | @debug(selector.extend(".a .b", ".b", null)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:8 root stylesheet + input.scss 2:8 root stylesheet diff --git a/spec/libsass-closed-issues/issue_1432/selector-nest.hrx b/spec/libsass-closed-issues/issue_1432/selector-nest.hrx index 946fad6010..1e1be94f26 100644 --- a/spec/libsass-closed-issues/issue_1432/selector-nest.hrx +++ b/spec/libsass-closed-issues/issue_1432/selector-nest.hrx @@ -1,11 +1,12 @@ <===> input.scss -@debug(selector-nest("foo", null)); +@use "sass:selector"; +@debug(selector.nest("foo", null)); <===> error Error: null is not a valid selector: it must be a string, a list of strings, or a list of lists of strings. , -1 | @debug(selector-nest("foo", null)); +2 | @debug(selector.nest("foo", null)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:8 root stylesheet + input.scss 2:8 root stylesheet diff --git a/spec/libsass-closed-issues/issue_1432/selector-replace.hrx b/spec/libsass-closed-issues/issue_1432/selector-replace.hrx index 479c1606f8..d9739f9a4e 100644 --- a/spec/libsass-closed-issues/issue_1432/selector-replace.hrx +++ b/spec/libsass-closed-issues/issue_1432/selector-replace.hrx @@ -1,11 +1,12 @@ <===> input.scss -@debug(selector-replace("foo", "bar", null)); +@use "sass:selector"; +@debug(selector.replace("foo", "bar", null)); <===> error Error: $replacement: null is not a valid selector: it must be a string, a list of strings, or a list of lists of strings. , -1 | @debug(selector-replace("foo", "bar", null)); +2 | @debug(selector.replace("foo", "bar", null)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:8 root stylesheet + input.scss 2:8 root stylesheet diff --git a/spec/libsass-closed-issues/issue_1432/selector-unify.hrx b/spec/libsass-closed-issues/issue_1432/selector-unify.hrx index 9dca21cd35..858405d076 100644 --- a/spec/libsass-closed-issues/issue_1432/selector-unify.hrx +++ b/spec/libsass-closed-issues/issue_1432/selector-unify.hrx @@ -1,11 +1,12 @@ <===> input.scss -@debug(selector-unify("foo", null)); +@use "sass:selector"; +@debug(selector.unify("foo", null)); <===> error Error: $selector2: null is not a valid selector: it must be a string, a list of strings, or a list of lists of strings. , -1 | @debug(selector-unify("foo", null)); +2 | @debug(selector.unify("foo", null)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:8 root stylesheet + input.scss 2:8 root stylesheet diff --git a/spec/libsass-closed-issues/issue_1432/simple-selectors.hrx b/spec/libsass-closed-issues/issue_1432/simple-selectors.hrx index 41eb93ddcc..2fe9d96238 100644 --- a/spec/libsass-closed-issues/issue_1432/simple-selectors.hrx +++ b/spec/libsass-closed-issues/issue_1432/simple-selectors.hrx @@ -1,11 +1,12 @@ <===> input.scss -@debug(simple-selectors(null)); +@use "sass:selector"; +@debug(selector.simple-selectors(null)); <===> error Error: $selector: null is not a valid selector: it must be a string, a list of strings, or a list of lists of strings. , -1 | @debug(simple-selectors(null)); - | ^^^^^^^^^^^^^^^^^^^^^^ +2 | @debug(selector.simple-selectors(null)); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:8 root stylesheet + input.scss 2:8 root stylesheet diff --git a/spec/libsass-closed-issues/issue_1434.hrx b/spec/libsass-closed-issues/issue_1434.hrx index b66a1ebc5c..8db2f39fd7 100644 --- a/spec/libsass-closed-issues/issue_1434.hrx +++ b/spec/libsass-closed-issues/issue_1434.hrx @@ -1,11 +1,12 @@ <===> input.scss +@use "sass:selector"; .foo { - a: selector-nest('.foo', '.bar > .baz'); - b: selector-nest('.foo', '.bar ~ .baz'); - c: selector-nest('.foo', '.bar + .baz'); - d: selector-nest('.foo > .bar', '.baz'); - e: selector-nest('.foo ~ .bar', '.baz'); - f: selector-nest('.foo + .bar', '.baz'); + a: selector.nest('.foo', '.bar > .baz'); + b: selector.nest('.foo', '.bar ~ .baz'); + c: selector.nest('.foo', '.bar + .baz'); + d: selector.nest('.foo > .bar', '.baz'); + e: selector.nest('.foo ~ .bar', '.baz'); + f: selector.nest('.foo + .bar', '.baz'); } <===> output.css diff --git a/spec/libsass-closed-issues/issue_1488.hrx b/spec/libsass-closed-issues/issue_1488.hrx index e4b04e5654..455c76be02 100644 --- a/spec/libsass-closed-issues/issue_1488.hrx +++ b/spec/libsass-closed-issues/issue_1488.hrx @@ -1,18 +1,19 @@ <===> input.scss +@use "sass:meta"; @function foo($arg2) { - @return type-of($arg2); + @return meta.type-of($arg2); } @function foo_($arg2...) { - @return type-of($arg2); + @return meta.type-of($arg2); } @function bar($arg1, $arg2) { - @return type-of($arg1) + "::" + type-of($arg2); + @return meta.type-of($arg1) + "::" + meta.type-of($arg2); } @function bar_($arg1, $arg2...) { - @return type-of($arg1) + "::" + type-of($arg2); + @return meta.type-of($arg1) + "::" + meta.type-of($arg2); } foo { @@ -20,10 +21,10 @@ foo { foo: foo(one...); bar: bar(one, two); bar: bar(one, two...); - foo: call('foo', one); - foo: call('foo', one...); - bar: call('bar', one, two); - bar: call('bar', one, two...); + foo: meta.call('foo', one); + foo: meta.call('foo', one...); + bar: meta.call('bar', one, two); + bar: meta.call('bar', one, two...); } bar { @@ -31,10 +32,10 @@ bar { foo: foo_(one...); bar: bar_(one, two); bar: bar_(one, two...); - foo: call('foo_', one); - foo: call('foo_', one...); - bar: call('bar_', one, two); - bar: call('bar_', one, two...); + foo: meta.call('foo_', one); + foo: meta.call('foo_', one...); + bar: meta.call('bar_', one, two); + bar: meta.call('bar_', one, two...); } <===> output.css foo { @@ -65,77 +66,77 @@ DEPRECATION WARNING: Passing a string to call() is deprecated and will be illega Recommendation: call(get-function("foo")) , -22 | foo: call('foo', one); - | ^^^^^^^^^^^^^^^^ +23 | foo: meta.call('foo', one); + | ^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 22:8 root stylesheet + input.scss 23:8 root stylesheet DEPRECATION WARNING: Passing a string to call() is deprecated and will be illegal in Dart Sass 2.0.0. Recommendation: call(get-function("foo")) , -23 | foo: call('foo', one...); - | ^^^^^^^^^^^^^^^^^^^ +24 | foo: meta.call('foo', one...); + | ^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 23:8 root stylesheet + input.scss 24:8 root stylesheet DEPRECATION WARNING: Passing a string to call() is deprecated and will be illegal in Dart Sass 2.0.0. Recommendation: call(get-function("bar")) , -24 | bar: call('bar', one, two); - | ^^^^^^^^^^^^^^^^^^^^^ +25 | bar: meta.call('bar', one, two); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 24:8 root stylesheet + input.scss 25:8 root stylesheet DEPRECATION WARNING: Passing a string to call() is deprecated and will be illegal in Dart Sass 2.0.0. Recommendation: call(get-function("bar")) , -25 | bar: call('bar', one, two...); - | ^^^^^^^^^^^^^^^^^^^^^^^^ +26 | bar: meta.call('bar', one, two...); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 25:8 root stylesheet + input.scss 26:8 root stylesheet DEPRECATION WARNING: Passing a string to call() is deprecated and will be illegal in Dart Sass 2.0.0. Recommendation: call(get-function("foo_")) , -33 | foo: call('foo_', one); - | ^^^^^^^^^^^^^^^^^ +34 | foo: meta.call('foo_', one); + | ^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 33:8 root stylesheet + input.scss 34:8 root stylesheet DEPRECATION WARNING: Passing a string to call() is deprecated and will be illegal in Dart Sass 2.0.0. Recommendation: call(get-function("foo_")) , -34 | foo: call('foo_', one...); - | ^^^^^^^^^^^^^^^^^^^^ +35 | foo: meta.call('foo_', one...); + | ^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 34:8 root stylesheet + input.scss 35:8 root stylesheet DEPRECATION WARNING: Passing a string to call() is deprecated and will be illegal in Dart Sass 2.0.0. Recommendation: call(get-function("bar_")) , -35 | bar: call('bar_', one, two); - | ^^^^^^^^^^^^^^^^^^^^^^ +36 | bar: meta.call('bar_', one, two); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 35:8 root stylesheet + input.scss 36:8 root stylesheet DEPRECATION WARNING: Passing a string to call() is deprecated and will be illegal in Dart Sass 2.0.0. Recommendation: call(get-function("bar_")) , -36 | bar: call('bar_', one, two...); - | ^^^^^^^^^^^^^^^^^^^^^^^^^ +37 | bar: meta.call('bar_', one, two...); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 36:8 root stylesheet + input.scss 37:8 root stylesheet diff --git a/spec/libsass-closed-issues/issue_151.hrx b/spec/libsass-closed-issues/issue_151.hrx index fd7a280980..93d8043096 100644 --- a/spec/libsass-closed-issues/issue_151.hrx +++ b/spec/libsass-closed-issues/issue_151.hrx @@ -1,14 +1,15 @@ <===> input.scss +@use "sass:color"; div.colors { - background: grayscale(red); + background: color.grayscale(red); background: saturate(red); - background: invert(red); - background: alpha(red); - color: grayscale(#369); + background: color.invert(red); + background: color.alpha(red); + color: color.grayscale(#369); color: saturate(#369); - color: saturate(#369, 20%); - color: invert(#369); - color: alpha(#369); + color: color.adjust(#369, $saturation: 20%); + color: color.invert(#369); + color: color.alpha(#369); } div.numbers { @@ -23,7 +24,7 @@ div.numbers { <===> error Error: $amount: red is not a number. , -3 | background: saturate(red); +4 | background: saturate(red); | ^^^^^^^^^^^^^ ' - input.scss 3:15 root stylesheet + input.scss 4:15 root stylesheet diff --git a/spec/libsass-closed-issues/issue_1535.hrx b/spec/libsass-closed-issues/issue_1535.hrx index 961fb2fea7..13e8906572 100644 --- a/spec/libsass-closed-issues/issue_1535.hrx +++ b/spec/libsass-closed-issues/issue_1535.hrx @@ -1,6 +1,7 @@ <===> input.scss +@use "sass:meta"; foo { - test: type-of(1--em); + test: meta.type-of(1--em); test: (1--em-2--em); test: (1--em- 2--em); test: (1--em -2--em); diff --git a/spec/libsass-closed-issues/issue_1566.hrx b/spec/libsass-closed-issues/issue_1566.hrx index 10012c6ab2..e32b053dcd 100644 --- a/spec/libsass-closed-issues/issue_1566.hrx +++ b/spec/libsass-closed-issues/issue_1566.hrx @@ -1,10 +1,11 @@ <===> input.scss +@use "sass:meta"; @function foo($predicate) { - @return call('bar', $predicate); + @return meta.call('bar', $predicate); } @function bar($predicate) { - @return type-of($predicate); + @return meta.type-of($predicate); } test { @@ -22,8 +23,8 @@ DEPRECATION WARNING: Passing a string to call() is deprecated and will be illega Recommendation: call(get-function("bar")) , -2 | @return call('bar', $predicate); - | ^^^^^^^^^^^^^^^^^^^^^^^ +3 | @return meta.call('bar', $predicate); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 2:11 foo() - input.scss 10:9 root stylesheet + input.scss 3:11 foo() + input.scss 11:9 root stylesheet diff --git a/spec/libsass-closed-issues/issue_1579.hrx b/spec/libsass-closed-issues/issue_1579.hrx index 888f34cf48..76f1faeca8 100644 --- a/spec/libsass-closed-issues/issue_1579.hrx +++ b/spec/libsass-closed-issues/issue_1579.hrx @@ -1,10 +1,11 @@ <===> input.scss +@use "sass:meta"; @function foo($a, $b: null, $c: false) { @return $c; } @function bar($args...) { - @return call(foo, $args...); + @return meta.call(foo, $args...); } test { @@ -22,8 +23,8 @@ DEPRECATION WARNING: Passing a string to call() is deprecated and will be illega Recommendation: call(get-function(foo)) , -6 | @return call(foo, $args...); - | ^^^^^^^^^^^^^^^^^^^ +7 | @return meta.call(foo, $args...); + | ^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 6:11 bar() - input.scss 10:9 root stylesheet + input.scss 7:11 bar() + input.scss 11:9 root stylesheet diff --git a/spec/libsass-closed-issues/issue_1583.hrx b/spec/libsass-closed-issues/issue_1583.hrx index 51a18f23a7..dd5e3d75e8 100644 --- a/spec/libsass-closed-issues/issue_1583.hrx +++ b/spec/libsass-closed-issues/issue_1583.hrx @@ -19,8 +19,8 @@ bar { foo { string: meta.inspect(&); - str-length: str-length(meta.inspect(&)); - list-length: length(&); + str-length: string.length(meta.inspect(&)); + list-length: list.length(&); } foo, bar { diff --git a/spec/libsass-closed-issues/issue_1622.hrx b/spec/libsass-closed-issues/issue_1622.hrx index 7094833663..ed30e49dd5 100644 --- a/spec/libsass-closed-issues/issue_1622.hrx +++ b/spec/libsass-closed-issues/issue_1622.hrx @@ -1,10 +1,12 @@ <===> input.scss +@use "sass:list"; +@use "sass:meta"; @function foo($list) { - @return call(bar, $list); + @return meta.call(bar, $list); } @function bar($list, $args...) { - @return length($list); + @return list.length($list); } test { @@ -22,8 +24,8 @@ DEPRECATION WARNING: Passing a string to call() is deprecated and will be illega Recommendation: call(get-function(bar)) , -2 | @return call(bar, $list); - | ^^^^^^^^^^^^^^^^ +4 | @return meta.call(bar, $list); + | ^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 2:13 foo() - input.scss 10:9 root stylesheet + input.scss 4:13 foo() + input.scss 12:9 root stylesheet diff --git a/spec/libsass-closed-issues/issue_1634.hrx b/spec/libsass-closed-issues/issue_1634.hrx index 81f5a76548..bc6dec9f9f 100644 --- a/spec/libsass-closed-issues/issue_1634.hrx +++ b/spec/libsass-closed-issues/issue_1634.hrx @@ -1,12 +1,14 @@ <===> input.scss +@use "sass:list"; +@use "sass:meta"; $empty-list: (); @function foo($args...) { - @return call(bar, $args...); + @return meta.call(bar, $args...); } @function bar($list) { - @return length($list); + @return list.length($list); } test { @@ -23,8 +25,8 @@ DEPRECATION WARNING: Passing a string to call() is deprecated and will be illega Recommendation: call(get-function(bar)) , -4 | @return call(bar, $args...); - | ^^^^^^^^^^^^^^^^^^^ +6 | @return meta.call(bar, $args...); + | ^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 4:13 foo() - input.scss 12:9 root stylesheet + input.scss 6:13 foo() + input.scss 14:9 root stylesheet diff --git a/spec/libsass-closed-issues/issue_1644/complex.hrx b/spec/libsass-closed-issues/issue_1644/complex.hrx index 9022c10acf..19051d33c1 100644 --- a/spec/libsass-closed-issues/issue_1644/complex.hrx +++ b/spec/libsass-closed-issues/issue_1644/complex.hrx @@ -1,4 +1,5 @@ <===> input.scss +@use "sass:map"; $tablet-portrait: 768px; $tablet-landscape: 980px; $desk-normal: 1120px; @@ -26,7 +27,7 @@ $grid-breakpoints-immobile: ( } } -@each $name in map-keys($grid-breakpoints-immobile) { +@each $name in map.keys($grid-breakpoints-immobile) { @include grid-media-query($name, $grid-breakpoints-immobile) { body.immobile & { margin-bottom: 0; @@ -37,9 +38,9 @@ $grid-breakpoints-immobile: ( <===> error Error: Top-level selectors may not contain the parent selector "&". , -30 | body.immobile & { +31 | body.immobile & { | ^ ' - input.scss 30:19 @content - input.scss 22:9 grid-media-query() - input.scss 29:3 root stylesheet + input.scss 31:19 @content + input.scss 23:9 grid-media-query() + input.scss 30:3 root stylesheet diff --git a/spec/libsass-closed-issues/issue_1645.hrx b/spec/libsass-closed-issues/issue_1645.hrx index 50b4d6b7e8..97c6d854fb 100644 --- a/spec/libsass-closed-issues/issue_1645.hrx +++ b/spec/libsass-closed-issues/issue_1645.hrx @@ -1,10 +1,12 @@ <===> input.scss +@use "sass:list"; +@use "sass:meta"; @function foo($a, $should-be-empty...) { - @return length($should-be-empty); + @return list.length($should-be-empty); } @function bar($args...) { - @return call(foo, $args...); + @return meta.call(foo, $args...); } @function args($args...) { @@ -28,8 +30,8 @@ DEPRECATION WARNING: Passing a string to call() is deprecated and will be illega Recommendation: call(get-function(foo)) , -6 | @return call(foo, $args...); - | ^^^^^^^^^^^^^^^^^^^ +8 | @return meta.call(foo, $args...); + | ^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 6:11 bar() - input.scss 16:9 root stylesheet + input.scss 8:11 bar() + input.scss 18:9 root stylesheet diff --git a/spec/libsass-closed-issues/issue_1647/selectors.hrx b/spec/libsass-closed-issues/issue_1647/selectors.hrx index 0a6f1e321a..cdb15f1739 100644 --- a/spec/libsass-closed-issues/issue_1647/selectors.hrx +++ b/spec/libsass-closed-issues/issue_1647/selectors.hrx @@ -1,20 +1,22 @@ <===> input.scss +@use "sass:list"; +@use "sass:map"; $map: (foo: 'b', bar: c); $list: ('d', e); a { - #{map-get($map, foo)} & { + #{map.get($map, foo)} & { foo: bar; } - #{map-get($map, bar)} & { + #{map.get($map, bar)} & { foo: bar; } - #{nth($list, 1)} & { + #{list.nth($list, 1)} & { foo: bar; } - #{nth($list, 2)} & { + #{list.nth($list, 2)} & { foo: bar; } } diff --git a/spec/libsass-closed-issues/issue_1667.hrx b/spec/libsass-closed-issues/issue_1667.hrx index 7b58ce9104..53c1f06f05 100644 --- a/spec/libsass-closed-issues/issue_1667.hrx +++ b/spec/libsass-closed-issues/issue_1667.hrx @@ -1,12 +1,13 @@ <===> input.scss +@use "sass:map"; $map: ( 1: 1, 1px: 1px ); foo { - a: map-get($map, 1); - b: map-get($map, 1px); + a: map.get($map, 1); + b: map.get($map, 1px); } $type-scale: ( @@ -41,8 +42,8 @@ $type-scale: ( ); @function get-size($size) { - @if map-has-key($type-scale, $size) { - @return map-get($type-scale, $size); + @if map.has-key($type-scale, $size) { + @return map.get($type-scale, $size); } @warn "Not a valid size."; diff --git a/spec/libsass-closed-issues/issue_1709.hrx b/spec/libsass-closed-issues/issue_1709.hrx index 13eb585d2f..176dcaf518 100644 --- a/spec/libsass-closed-issues/issue_1709.hrx +++ b/spec/libsass-closed-issues/issue_1709.hrx @@ -1,9 +1,10 @@ <===> input.scss +@use "sass:string"; @use "sass:meta"; @mixin transition( $prefix_properties, $transitions... ) { - @if not str-index( meta.inspect( $transitions ), ',') { + @if not string.index( meta.inspect( $transitions ), ',') { $transitions: ( $transitions ); } diff --git a/spec/libsass-closed-issues/issue_1722.hrx b/spec/libsass-closed-issues/issue_1722.hrx index a047f0c8b2..16b8f64e7f 100644 --- a/spec/libsass-closed-issues/issue_1722.hrx +++ b/spec/libsass-closed-issues/issue_1722.hrx @@ -1,7 +1,8 @@ <===> input.scss +@use "sass:map"; $score: (item-height: 1.12em); .test { - background-position: 0 -#{map-get($score, item-height)}; + background-position: 0 -#{map.get($score, item-height)}; } diff --git a/spec/libsass-closed-issues/issue_1723.hrx b/spec/libsass-closed-issues/issue_1723.hrx index 564d040d06..9d92a98d50 100644 --- a/spec/libsass-closed-issues/issue_1723.hrx +++ b/spec/libsass-closed-issues/issue_1723.hrx @@ -1,4 +1,5 @@ <===> input.scss +@use "sass:list"; @use "sass:meta"; test-1 test-2 test-3 test-4 test-5, @@ -14,8 +15,8 @@ test-6 test-7 test-8 test-9 test-10 { test-1 test-2 test-3 test-4 test-5, test-6 test-7 test-8 test-9 test-10 { - @for $i from 1 through length(&) { - $set: nth(&, $i); + @for $i from 1 through list.length(&) { + $set: list.nth(&, $i); set: meta.inspect($set); @each $selector in $set { diff --git a/spec/libsass-closed-issues/issue_1757/each.hrx b/spec/libsass-closed-issues/issue_1757/each.hrx index 68243fc49c..40e2a73f64 100644 --- a/spec/libsass-closed-issues/issue_1757/each.hrx +++ b/spec/libsass-closed-issues/issue_1757/each.hrx @@ -1,17 +1,18 @@ <===> input.scss +@use "sass:list"; .test .nest { - length: length(&); + length: list.length(&); @each $list in & { list: $list; - length: length($list); + length: list.length($list); } } .test, .other { - length: length(&); + length: list.length(&); @each $list in & { list: $list; - length: length($list); + length: list.length($list); } } diff --git a/spec/libsass-closed-issues/issue_1757/for.hrx b/spec/libsass-closed-issues/issue_1757/for.hrx index 0f835bbe35..4647736465 100644 --- a/spec/libsass-closed-issues/issue_1757/for.hrx +++ b/spec/libsass-closed-issues/issue_1757/for.hrx @@ -1,19 +1,20 @@ <===> input.scss +@use "sass:list"; .test .nest { - length: length(&); - @for $i from 1 through length(&) { - $list: nth(&, $i); + length: list.length(&); + @for $i from 1 through list.length(&) { + $list: list.nth(&, $i); list: $list; - length: length($list); + length: list.length($list); } } .test, .other { - length: length(&); - @for $i from 1 through length(&) { - $list: nth(&, $i); + length: list.length(&); + @for $i from 1 through list.length(&) { + $list: list.nth(&, $i); list: $list; - length: length($list); + length: list.length($list); } } diff --git a/spec/libsass-closed-issues/issue_1796.hrx b/spec/libsass-closed-issues/issue_1796.hrx index f3377afb25..77d40bd7ab 100644 --- a/spec/libsass-closed-issues/issue_1796.hrx +++ b/spec/libsass-closed-issues/issue_1796.hrx @@ -1,4 +1,5 @@ <===> input.scss +@use "sass:list"; .parent { .brother, .sister, .cousin { color: green; @@ -6,8 +7,8 @@ $new-sel: (); @each $s in & { - $last: nth($s, -1); - $new-sel: append($new-sel, $s #{'+'} $last, comma); + $last: list.nth($s, -1); + $new-sel: list.append($new-sel, $s #{'+'} $last, comma); x: $new-sel; } @at-root #{$new-sel} { diff --git a/spec/libsass-closed-issues/issue_1819.hrx b/spec/libsass-closed-issues/issue_1819.hrx index 7de5394ef0..170e106d61 100644 --- a/spec/libsass-closed-issues/issue_1819.hrx +++ b/spec/libsass-closed-issues/issue_1819.hrx @@ -1,6 +1,8 @@ <===> input.scss +@use "sass:meta"; +@use "sass:selector"; foo { - bar: type-of(selector-unify('p', 'a')); + bar: meta.type-of(selector.unify('p', 'a')); } <===> output.css foo { diff --git a/spec/libsass-closed-issues/issue_185/mixin.hrx b/spec/libsass-closed-issues/issue_185/mixin.hrx index c970ee9bb9..7682d5523d 100644 --- a/spec/libsass-closed-issues/issue_185/mixin.hrx +++ b/spec/libsass-closed-issues/issue_185/mixin.hrx @@ -1,19 +1,20 @@ <===> input.scss +@use "sass:list"; @function shift($list) { - @if length($list) == 1 { @return (); } + @if list.length($list) == 1 { @return (); } $new: (); - @for $i from 2 through length($list) { - $new: append($new, nth($list, $i)); + @for $i from 2 through list.length($list) { + $new: list.append($new, list.nth($list, $i)); } @return $new; } @mixin media($medias...) { - @if length($medias) == 0 { + @if list.length($medias) == 0 { @content; } @else { - @media #{nth($medias, 1)} { + @media #{list.nth($medias, 1)} { @include media(shift($medias)...) { @content; } diff --git a/spec/libsass-closed-issues/issue_1926.hrx b/spec/libsass-closed-issues/issue_1926.hrx index da5bb588b5..d21ff415e4 100644 --- a/spec/libsass-closed-issues/issue_1926.hrx +++ b/spec/libsass-closed-issues/issue_1926.hrx @@ -1,4 +1,5 @@ <===> input.sass +@use "sass:list" // The amount of the column of a single row. $columnAmount: 16 @@ -7,10 +8,10 @@ $columnName : one two three four five six seven eight nine ten eleven twelve th =column-generator @for $i from 1 through $columnAmount - [class*="#{nth($columnName, $i)} wide"] + [class*="#{list.nth($columnName, $i)} wide"] width: 100% / $columnAmount * $i - &[class*="#{nth($columnName, $i)} column"], & .row[class*="#{nth($columnName, $i)} column"] + &[class*="#{list.nth($columnName, $i)} column"], & .row[class*="#{list.nth($columnName, $i)} column"] > .column:not(.row) width : 100% / $columnAmount * $i !important @@ -122,11 +123,11 @@ Recommendation: math.div(100%, $columnAmount) or calc(100% / $columnAmount) More info and automated migrator: https://sass-lang.com/d/slash-div , -10 | width: 100% / $columnAmount * $i +11 | width: 100% / $columnAmount * $i | ^^^^^^^^^^^^^^^^^^^^ ' - input.sass 10:14 column-generator() - input.sass 17:3 root stylesheet + input.sass 11:14 column-generator() + input.sass 18:3 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -135,8 +136,8 @@ Recommendation: math.div(100%, $columnAmount) or calc(100% / $columnAmount) More info and automated migrator: https://sass-lang.com/d/slash-div , -14 | width : 100% / $columnAmount * $i !important +15 | width : 100% / $columnAmount * $i !important | ^^^^^^^^^^^^^^^^^^^^ ' - input.sass 14:18 column-generator() - input.sass 17:3 root stylesheet + input.sass 15:18 column-generator() + input.sass 18:3 root stylesheet diff --git a/spec/libsass-closed-issues/issue_1940.hrx b/spec/libsass-closed-issues/issue_1940.hrx index 6ff0b5b7c8..8fb2bdd9d4 100644 --- a/spec/libsass-closed-issues/issue_1940.hrx +++ b/spec/libsass-closed-issues/issue_1940.hrx @@ -1,4 +1,5 @@ <===> input.scss +@use "sass:map"; // ---- // libsass (v3.3.2) // ---- @@ -8,17 +9,17 @@ $prefix:( bar: #bar ); -#{map-get($prefix, foo)} { +#{map.get($prefix, foo)} { color: red; } -#{map-get($prefix, bar)} { +#{map.get($prefix, bar)} { color: red; } -#{map-get($prefix, foo)} .baz { +#{map.get($prefix, foo)} .baz { color: red; } -#{map-get($prefix, bar)} .baz { +#{map.get($prefix, bar)} .baz { color: red; } <===> output.css diff --git a/spec/libsass-closed-issues/issue_1947.hrx b/spec/libsass-closed-issues/issue_1947.hrx index 7c449864ad..b52e607e3e 100644 --- a/spec/libsass-closed-issues/issue_1947.hrx +++ b/spec/libsass-closed-issues/issue_1947.hrx @@ -1,5 +1,6 @@ <===> input.scss -.a-#{quote('' + b)} { +@use "sass:string"; +.a-#{string.quote('' + b)} { c: d; } diff --git a/spec/libsass-closed-issues/issue_1969.hrx b/spec/libsass-closed-issues/issue_1969.hrx index 23f1193028..97286453fc 100644 --- a/spec/libsass-closed-issues/issue_1969.hrx +++ b/spec/libsass-closed-issues/issue_1969.hrx @@ -1,4 +1,5 @@ <===> input.scss +@use "sass:color"; $base-text-color: #666; @function calcNavbarTextColor ($base-text-color) { @@ -8,7 +9,7 @@ $base-text-color: #666; $header-text-color: calcNavbarTextColor($base-text-color); .test_class { - color: lighten($header-text-color, 20%); + color: color.adjust($header-text-color, $lightness: 20%); } <===> output.css .test_class { diff --git a/spec/libsass-closed-issues/issue_2020.hrx b/spec/libsass-closed-issues/issue_2020.hrx index 12f1736e99..faa5029424 100644 --- a/spec/libsass-closed-issues/issue_2020.hrx +++ b/spec/libsass-closed-issues/issue_2020.hrx @@ -1,10 +1,11 @@ <===> input.scss +@use "sass:list"; @use "sass:meta"; form { - $selector: nth(&, 1); + $selector: list.nth(&, 1); sel: meta.inspect($selector); - $selector: nth($selector, 1); + $selector: list.nth($selector, 1); sel: meta.inspect($selector); } <===> output.css diff --git a/spec/libsass-closed-issues/issue_2031/extended-not.hrx b/spec/libsass-closed-issues/issue_2031/extended-not.hrx index 30b455dbb3..9775d183d2 100644 --- a/spec/libsass-closed-issues/issue_2031/extended-not.hrx +++ b/spec/libsass-closed-issues/issue_2031/extended-not.hrx @@ -1,4 +1,5 @@ <===> input.scss +@use "sass:selector"; :not(.foo) { content: test; } @@ -7,7 +8,7 @@ } test { - content: selector-extend(":not(.foo)", ".foo", ".bar"); + content: selector.extend(":not(.foo)", ".foo", ".bar"); } <===> output.css :not(.foo):not(.bar):not(.baz) { diff --git a/spec/libsass-closed-issues/issue_2112.hrx b/spec/libsass-closed-issues/issue_2112.hrx index b232140170..824e99e404 100644 --- a/spec/libsass-closed-issues/issue_2112.hrx +++ b/spec/libsass-closed-issues/issue_2112.hrx @@ -1,10 +1,11 @@ <===> input.scss +@use "sass:color"; $color: #1caf9a; body { - test-01: change-color($color, $hue: -240); - test-03: change-color($color, $hue: 120); - test-02: change-color($color, $hue: 480); + test-01: color.change($color, $hue: -240); + test-03: color.change($color, $hue: 120); + test-02: color.change($color, $hue: 480); } <===> output.css body { diff --git a/spec/libsass-closed-issues/issue_2156/debug.hrx b/spec/libsass-closed-issues/issue_2156/debug.hrx index f4def9b25d..3148e4d76d 100644 --- a/spec/libsass-closed-issues/issue_2156/debug.hrx +++ b/spec/libsass-closed-issues/issue_2156/debug.hrx @@ -1,15 +1,16 @@ <===> input.scss +@use "sass:string"; @debug "\"foo\"" + ""; @debug "" + "\"foo\""; @debug "" + "\"foo"; @debug "\"foo\"" + "bar"; -@debug unquote("\"foo\" and \"bar\""); +@debug string.unquote("\"foo\" and \"bar\""); <===> output.css <===> warning -/sass/spec/libsass-issues/issue_2156/input.scss:1 DEBUG: "foo" -/sass/spec/libsass-issues/issue_2156/input.scss:2 DEBUG: "foo" -/sass/spec/libsass-issues/issue_2156/input.scss:3 DEBUG: "foo -/sass/spec/libsass-issues/issue_2156/input.scss:4 DEBUG: "foo"bar -/sass/spec/libsass-issues/issue_2156/input.scss:5 DEBUG: "foo" and "bar" +input.scss:2 DEBUG: "foo" +input.scss:3 DEBUG: "foo" +input.scss:4 DEBUG: "foo +input.scss:5 DEBUG: "foo"bar +input.scss:6 DEBUG: "foo" and "bar" diff --git a/spec/libsass-closed-issues/issue_2156/error.hrx b/spec/libsass-closed-issues/issue_2156/error.hrx index b7e54bd8db..91fc1da540 100644 --- a/spec/libsass-closed-issues/issue_2156/error.hrx +++ b/spec/libsass-closed-issues/issue_2156/error.hrx @@ -1,10 +1,11 @@ <===> input.scss -@error unquote("\"foo\" and \"bar\""); +@use "sass:string"; +@error string.unquote("\"foo\" and \"bar\""); <===> error Error: "foo" and "bar" , -1 | @error unquote("\"foo\" and \"bar\""); - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2 | @error string.unquote("\"foo\" and \"bar\""); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:1 root stylesheet + input.scss 2:1 root stylesheet diff --git a/spec/libsass-closed-issues/issue_2156/warn.hrx b/spec/libsass-closed-issues/issue_2156/warn.hrx index def10d7cbc..03becaeda5 100644 --- a/spec/libsass-closed-issues/issue_2156/warn.hrx +++ b/spec/libsass-closed-issues/issue_2156/warn.hrx @@ -1,24 +1,25 @@ <===> input.scss +@use "sass:string"; @warn "\"foo\"" + ""; @warn "" + "\"foo\""; @warn "" + "\"foo"; @warn "\"foo\"" + "bar"; -@warn unquote("\"foo\" and \"bar\""); +@warn string.unquote("\"foo\" and \"bar\""); <===> output.css <===> warning WARNING: "foo" - input.scss 1:1 root stylesheet + input.scss 2:1 root stylesheet WARNING: "foo" - input.scss 2:1 root stylesheet + input.scss 3:1 root stylesheet WARNING: "foo - input.scss 3:1 root stylesheet + input.scss 4:1 root stylesheet WARNING: "foo"bar - input.scss 4:1 root stylesheet + input.scss 5:1 root stylesheet WARNING: "foo" and "bar" - input.scss 5:1 root stylesheet + input.scss 6:1 root stylesheet diff --git a/spec/libsass-closed-issues/issue_224.hrx b/spec/libsass-closed-issues/issue_224.hrx index 3f3d0491dd..97fe8e940c 100644 --- a/spec/libsass-closed-issues/issue_224.hrx +++ b/spec/libsass-closed-issues/issue_224.hrx @@ -1,11 +1,12 @@ <===> input.scss +@use "sass:list"; $list: ("a", "b", "c"); test { - content: nth($list, -1); - content: nth($list, -2); - content: nth($list, -3); - content: nth($list, -1) == nth($list, length($list)); + content: list.nth($list, -1); + content: list.nth($list, -2); + content: list.nth($list, -3); + content: list.nth($list, -1) == list.nth($list, list.length($list)); } <===> output.css diff --git a/spec/libsass-closed-issues/issue_2246.hrx b/spec/libsass-closed-issues/issue_2246.hrx index 0636fa9549..f582cec8d7 100644 --- a/spec/libsass-closed-issues/issue_2246.hrx +++ b/spec/libsass-closed-issues/issue_2246.hrx @@ -1,7 +1,8 @@ <===> input.scss +@use "sass:math"; @mixin foo($option: 'foo') { // Create a unique, random placeholder to store styles - $placeholder : $option + random(9999); + $placeholder : $option + math.random(9999); // Store the styles in the placeholder @at-root %#{$placeholder} { diff --git a/spec/libsass-closed-issues/issue_2309.hrx b/spec/libsass-closed-issues/issue_2309.hrx index 0e0bd7d8e5..b144a984d8 100644 --- a/spec/libsass-closed-issues/issue_2309.hrx +++ b/spec/libsass-closed-issues/issue_2309.hrx @@ -1,4 +1,6 @@ <===> input.scss +@use "sass:list"; +@use "sass:map"; $button-sizes: ( 'xs': ( 'line-height': 16 / 12, @@ -15,10 +17,10 @@ $button-sizes: ( ); @each $size in $button-sizes { - $size-metrics: nth($size, 2); + $size-metrics: list.nth($size, 2); .c-button__icon { - min-height: map-get($size-metrics, 'line-height') * 1em; + min-height: map.get($size-metrics, 'line-height') * 1em; } } <===> output.css @@ -46,10 +48,10 @@ Recommendation: math.div(16, 12) or calc(16 / 12) More info and automated migrator: https://sass-lang.com/d/slash-div , -3 | 'line-height': 16 / 12, +5 | 'line-height': 16 / 12, | ^^^^^^^ ' - input.scss 3:20 root stylesheet + input.scss 5:20 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -58,10 +60,10 @@ Recommendation: math.div(18, 14) or calc(18 / 14) More info and automated migrator: https://sass-lang.com/d/slash-div , -6 | 'line-height': 18 / 14, +8 | 'line-height': 18 / 14, | ^^^^^^^ ' - input.scss 6:20 root stylesheet + input.scss 8:20 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -69,11 +71,11 @@ Recommendation: math.div(18, 14) or calc(18 / 14) More info and automated migrator: https://sass-lang.com/d/slash-div - , -9 | 'line-height': 18 / 14, - | ^^^^^^^ - ' - input.scss 9:20 root stylesheet + , +11 | 'line-height': 18 / 14, + | ^^^^^^^ + ' + input.scss 11:20 root stylesheet DEPRECATION WARNING: Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0. @@ -82,7 +84,7 @@ Recommendation: math.div(22, 16) or calc(22 / 16) More info and automated migrator: https://sass-lang.com/d/slash-div , -12 | 'line-height': 22 / 16, +14 | 'line-height': 22 / 16, | ^^^^^^^ ' - input.scss 12:20 root stylesheet + input.scss 14:20 root stylesheet diff --git a/spec/libsass-closed-issues/issue_2374.hrx b/spec/libsass-closed-issues/issue_2374.hrx index 07983f39a1..5d0b4629e2 100644 --- a/spec/libsass-closed-issues/issue_2374.hrx +++ b/spec/libsass-closed-issues/issue_2374.hrx @@ -1,29 +1,30 @@ <===> input.scss -$colors: ( - yellow: #ffeb3b -); -@each $name, $color in $colors { - $amount: 40; - @for $i from 0 through 9 { - .#{$name}-#{($i*100)} { background-color: lighten($color, $amount) }; - $amount: $amount - 2; - } -} - -$colors: ( - yellow: yellow, - red: red, - blue: blue, - -); -@each $name, $color in $colors { - @for $i from 0 through 2 { - .#{$name}-#{($i*100)} { - background-color: lighten($color, 10) - }; - } -} - +@use "sass:color"; +$colors: ( + yellow: #ffeb3b +); +@each $name, $color in $colors { + $amount: 40%; + @for $i from 0 through 9 { + .#{$name}-#{($i*100)} { background-color: color.adjust($color, $lightness: $amount) }; + $amount: $amount - 2; + } +} + +$colors: ( + yellow: yellow, + red: red, + blue: blue, + +); +@each $name, $color in $colors { + @for $i from 0 through 2 { + .#{$name}-#{($i*100)} { + background-color: color.adjust($color, $lightness: 10%) + }; + } +} + <===> output.css .yellow-0 { @@ -109,10 +110,10 @@ Always quote color names when using them as strings or map keys (for example, "y If you really want to use the color value here, use '"" + $name'. , -7 | .#{$name}-#{($i*100)} { background-color: lighten($color, $amount) }; +8 | .#{$name}-#{($i*100)} { background-color: color.adjust($color, $lightness: $amount) }; | ^^^^^ ' - input.scss 7:12 root stylesheet + input.scss 8:12 root stylesheet WARNING: You probably don't mean to use the color value yellow in interpolation here. It may end up represented as yellow, which will likely produce invalid CSS. @@ -120,10 +121,10 @@ Always quote color names when using them as strings or map keys (for example, "y If you really want to use the color value here, use '"" + $name'. , -20 | .#{$name}-#{($i*100)} { +21 | .#{$name}-#{($i*100)} { | ^^^^^ ' - input.scss 20:12 root stylesheet + input.scss 21:12 root stylesheet WARNING: You probably don't mean to use the color value red in interpolation here. It may end up represented as red, which will likely produce invalid CSS. @@ -131,10 +132,10 @@ Always quote color names when using them as strings or map keys (for example, "r If you really want to use the color value here, use '"" + $name'. , -20 | .#{$name}-#{($i*100)} { +21 | .#{$name}-#{($i*100)} { | ^^^^^ ' - input.scss 20:12 root stylesheet + input.scss 21:12 root stylesheet WARNING: You probably don't mean to use the color value blue in interpolation here. It may end up represented as blue, which will likely produce invalid CSS. @@ -142,7 +143,7 @@ Always quote color names when using them as strings or map keys (for example, "b If you really want to use the color value here, use '"" + $name'. , -20 | .#{$name}-#{($i*100)} { +21 | .#{$name}-#{($i*100)} { | ^^^^^ ' - input.scss 20:12 root stylesheet + input.scss 21:12 root stylesheet diff --git a/spec/libsass-closed-issues/issue_2394.hrx b/spec/libsass-closed-issues/issue_2394.hrx index 52540e0e61..430d3fd0ff 100644 --- a/spec/libsass-closed-issues/issue_2394.hrx +++ b/spec/libsass-closed-issues/issue_2394.hrx @@ -1,6 +1,8 @@ <===> input.scss +@use "sass:map"; +@use "sass:meta"; @mixin brokenTest($color: red, $variableArguments...) { - $width: map-get(keywords($variableArguments), width); + $width: map.get(meta.keywords($variableArguments), width); a { width: $width; color: $color; @@ -8,8 +10,8 @@ } @mixin workingTest($variableArguments...) { - $width: map-get(keywords($variableArguments), width); - $color: map-get(keywords($variableArguments), color); + $width: map.get(meta.keywords($variableArguments), width); + $color: map.get(meta.keywords($variableArguments), color); a { width: $width; color: $color; diff --git a/spec/libsass-closed-issues/issue_2462.hrx b/spec/libsass-closed-issues/issue_2462.hrx index 5352dfeaa5..2cbb857090 100644 --- a/spec/libsass-closed-issues/issue_2462.hrx +++ b/spec/libsass-closed-issues/issue_2462.hrx @@ -1,6 +1,7 @@ <===> input.scss +@use "sass:color"; b { - color: lighten(Crimson, 10%); + color: color.adjust(Crimson, $lightness: 10%); } <===> output.css diff --git a/spec/libsass-closed-issues/issue_2520.hrx b/spec/libsass-closed-issues/issue_2520.hrx index 1014ed0545..42d7d15ce5 100644 --- a/spec/libsass-closed-issues/issue_2520.hrx +++ b/spec/libsass-closed-issues/issue_2520.hrx @@ -4,6 +4,11 @@ - dart-sass <===> input.scss +@use "sass:list"; +@use "sass:map"; +@use "sass:meta"; +@use "sass:selector"; +@use "sass:string"; // ---- // Sass (v3.4.21) // Compass (v1.0.3) @@ -11,20 +16,20 @@ @function remove-modifiers($selector) { // convert selector to a string - $selector: inspect(nth($selector, 1)); + $selector: meta.inspect(list.nth($selector, 1)); $modifier: ''; // Find out where the first modifier starts - $modifier-index: str-index($selector, '"--'); + $modifier-index: string.index($selector, '"--'); @if $modifier-index { // Strip the first part of the selector up until the first modifier - $modifier: str-slice($selector, $modifier-index); + $modifier: string.slice($selector, $modifier-index); // Find out where the modifier ends - $modifier-end: str-index($modifier, '"]'); + $modifier-end: string.index($modifier, '"]'); // Isolate the modifier - $modifier: str-slice($modifier, 0, $modifier-end); + $modifier: string.slice($modifier, 0, $modifier-end); // Remove the modifier from the selector $selector: str-replace($selector, $modifier, ''); // Remove junk characters @@ -40,12 +45,12 @@ $result: (); @each $item in $list { - @if not index($result, $item) { - @if length($item) > 1 and $recursive { - $result: append($result, remove-duplicates($item, $recursive)); + @if not list.index($result, $item) { + @if list.length($item) > 1 and $recursive { + $result: list.append($result, remove-duplicates($item, $recursive)); } @else { - $result: append($result, $item); + $result: list.append($result, $item); } } } @@ -54,11 +59,11 @@ } @function str-replace($string, $search, $replace) { - $index: str-index($string, $search); + $index: string.index($string, $search); @if $index { - @return str-slice($string, 1, $index - 1) + $replace + str-replace( - str-slice($string, $index + str-length($search)), $search, $replace + @return string.slice($string, 1, $index - 1) + $replace + str-replace( + string.slice($string, $index + string.length($search)), $search, $replace ); } @@ -80,7 +85,7 @@ // Spoof our modules into a list $selectors: str-replace($selectors, ' ', ', '); - $selectors: selector-parse($selectors); + $selectors: selector.parse($selectors); @return $selectors; } @@ -88,11 +93,11 @@ @function list-remove($list, $value, $recursive: false) { $result: (); - @for $i from 1 through length($list) { - @if type-of(nth($list, $i)) == list and $recursive { - $result: append($result, list-remove(nth($list, $i), $value, $recursive), comma); - } @else if nth($list, $i) != $value { - $result: append($result, nth($list, $i), comma); + @for $i from 1 through list.length($list) { + @if meta.type-of(list.nth($list, $i)) == list and $recursive { + $result: list.append($result, list-remove(list.nth($list, $i), $value, $recursive), comma); + } @else if list.nth($list, $i) != $value { + $result: list.append($result, list.nth($list, $i), comma); } } @@ -100,13 +105,13 @@ } @function this($options...) { - $value: map-get($config, $options...); + $value: map.get($config, $options...); $debug: true; $this: &; - @if length($this) > 0 { - @if str-index(inspect(nth($this, 1)), '%') == 1 { + @if list.length($this) > 0 { + @if string.index(meta.inspect(list.nth($this, 1)), '%') == 1 { $debug: false; } } @@ -120,7 +125,7 @@ @function config($map-old, $map-new) { // Merge default and custom options - $map-merged: map-merge($map-old, $map-new); + $map-merged: map.merge($map-old, $map-new); // Store config in global variable $config: $map-merged !global; @@ -139,8 +144,8 @@ $selectors: (); @each $item in $module { - $selectors: join($selectors, '.#{$module}', comma); - $selectors: join($selectors, '[class*="#{$module}--"]', comma); + $selectors: list.join($selectors, '.#{$module}', comma); + $selectors: list.join($selectors, '[class*="#{$module}--"]', comma); } #{$selectors} { @@ -152,13 +157,13 @@ $selectors: '[class*="#{$module}#{$glue}"]'; $this: &; $tree: module-tree($this); - $namespace: nth($tree, length($tree)); + $namespace: list.nth($tree, list.length($tree)); @if $components { $selectors: (); @each $component in $components { - $selectors: join( + $selectors: list.join( $selectors, '.#{$namespace}#{$glue}#{$component}, [class*="#{$namespace}#{$glue}#{$component}-"]', comma @@ -170,29 +175,29 @@ @each $selector in & { // spoof the selector into a list - $selector: str-replace(inspect($selector), ' ', ', '); - $selector: selector-parse($selector); + $selector: str-replace(meta.inspect($selector), ' ', ', '); + $selector: selector.parse($selector); // if the last item isn't a modifier, remove it - @if not str-index(inspect(nth($selector, length($selector))), '[class*="--') { - $selector: list-remove($selector, nth($selector, length($selector))); + @if not string.index(meta.inspect(list.nth($selector, list.length($selector))), '[class*="--') { + $selector: list-remove($selector, list.nth($selector, list.length($selector))); } // convert the selector back into a string - @if length($selector) == 1 { - $selector: nth($selector, 1); + @if list.length($selector) == 1 { + $selector: list.nth($selector, 1); } - $selector: str-replace(inspect($selector), ', ', ' '); + $selector: str-replace(meta.inspect($selector), ', ', ' '); // Re-build the parent selector - $parents: append($parents, $selector, comma); + $parents: list.append($parents, $selector, comma); } // remove duplicate selectors $parents: remove-duplicates($parents); - @if length($parents) == 1 { - $parents: nth($parents, 1); + @if list.length($parents) == 1 { + $parents: list.nth($parents, 1); } @if ($parents == '()') { @@ -212,12 +217,12 @@ @mixin modifier($modifier) { $selectors: &; - @if str-index(inspect(&), '.#{$module}') { + @if string.index(meta.inspect(&), '.#{$module}') { $selectors: (); - @for $i from 1 through length(&) { + @for $i from 1 through list.length(&) { @if $i % 2 == 0 { - $selectors: append($selectors, nth(&, $i), comma); + $selectors: list.append($selectors, list.nth(&, $i), comma); } } } @@ -226,7 +231,7 @@ $modifier-selectors: (); @each $item in $modifier { - $modifier-selectors: join( + $modifier-selectors: list.join( $modifier-selectors, '&[class*="--#{$modifier}"]', comma ); } diff --git a/spec/libsass-closed-issues/issue_2633.hrx b/spec/libsass-closed-issues/issue_2633.hrx index 3e0577e0ab..dad70ea88d 100644 --- a/spec/libsass-closed-issues/issue_2633.hrx +++ b/spec/libsass-closed-issues/issue_2633.hrx @@ -1,7 +1,8 @@ <===> input.scss +@use "sass:selector"; $sel1: '.something__child + .something__child--mod1'; $sel2: '.something__child ~ .something__child--mod2'; -$result1: selector-unify($sel1, $sel2); +$result1: selector.unify($sel1, $sel2); #{$result1} { /* nothing */ @@ -10,7 +11,7 @@ $result1: selector-unify($sel1, $sel2); .a { color: blue; & > * { - @at-root #{selector-unify(&, '.b')} { + @at-root #{selector.unify(&, '.b')} { color: red; } } @@ -19,7 +20,7 @@ $result1: selector-unify($sel1, $sel2); .a, .b { color: blue; & > * { - @at-root #{selector-unify(&, '.c, .d')} { + @at-root #{selector.unify(&, '.c, .d')} { color: red; } } diff --git a/spec/libsass-closed-issues/issue_2779.hrx b/spec/libsass-closed-issues/issue_2779.hrx index 3eb71d045c..6e3e175c23 100644 --- a/spec/libsass-closed-issues/issue_2779.hrx +++ b/spec/libsass-closed-issues/issue_2779.hrx @@ -1,5 +1,6 @@ <===> input.scss -@debug(selector-extend(".a .b", "&b", ndll)); +@use "sass:selector"; +@debug(selector.extend(".a .b", "&b", ndll)); <===> error Error: $extendee: Parent selectors aren't allowed here. @@ -9,7 +10,7 @@ Error: $extendee: Parent selectors aren't allowed here. ' - 1:1 root stylesheet , -1 | @debug(selector-extend(".a .b", "&b", ndll)); +2 | @debug(selector.extend(".a .b", "&b", ndll)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ' - input.scss 1:8 root stylesheet + input.scss 2:8 root stylesheet diff --git a/spec/libsass-closed-issues/issue_2808.hrx b/spec/libsass-closed-issues/issue_2808.hrx index 9b7917dd4a..df38460c6d 100644 --- a/spec/libsass-closed-issues/issue_2808.hrx +++ b/spec/libsass-closed-issues/issue_2808.hrx @@ -1,6 +1,7 @@ <===> input.scss +@use "sass:string"; test { - content: str-slice(abcdef, -10, 2) + content: string.slice(abcdef, -10, 2) } <===> output.css diff --git a/spec/libsass-closed-issues/issue_2863.hrx b/spec/libsass-closed-issues/issue_2863.hrx index dfdb3d98e1..cd810c438d 100644 --- a/spec/libsass-closed-issues/issue_2863.hrx +++ b/spec/libsass-closed-issues/issue_2863.hrx @@ -1,14 +1,15 @@ <===> input.scss +@use "sass:string"; $squoted: "'dquoted'"; $dquoted: "\"squoted\""; test { - str-slice-single: str-slice( $squoted, 1, 2 ); - str-slice-double: str-slice( $dquoted, 1, 2 ); - str-index-single: str-index( $squoted, "q" ); - str-index-double: str-index( $dquoted, "q" ); - str-insert-single: str-insert( $squoted, "p", 2 ); - str-insert-double: str-insert( $dquoted, "p", 2 ); + str-slice-single: string.slice( $squoted, 1, 2 ); + str-slice-double: string.slice( $dquoted, 1, 2 ); + str-index-single: string.index( $squoted, "q" ); + str-index-double: string.index( $dquoted, "q" ); + str-insert-single: string.insert( $squoted, "p", 2 ); + str-insert-double: string.insert( $dquoted, "p", 2 ); } <===> output.css diff --git a/spec/libsass-closed-issues/issue_2980.hrx b/spec/libsass-closed-issues/issue_2980.hrx index b02d5ef770..e17b91ceac 100644 --- a/spec/libsass-closed-issues/issue_2980.hrx +++ b/spec/libsass-closed-issues/issue_2980.hrx @@ -1,4 +1,5 @@ <===> input.scss +@use "sass:map"; $config: ( phone: ( break-point-width:0px, @@ -19,8 +20,8 @@ $config: ( ); @each $key, $map in $config { - $break-point-width: map_get($map, break-point-width); - $break-point-name: map_get($map, break-point-name); + $break-point-width: map.get($map, break-point-width); + $break-point-name: map.get($map, break-point-name); $infix: if($break-point-width == 0px, null, -$break-point-name); .foo#{$infix} { content: '#{$break-point-name}'; diff --git a/spec/libsass-closed-issues/issue_338.hrx b/spec/libsass-closed-issues/issue_338.hrx index cf027995bd..942717548e 100644 --- a/spec/libsass-closed-issues/issue_338.hrx +++ b/spec/libsass-closed-issues/issue_338.hrx @@ -1,8 +1,9 @@ <===> input.scss +@use "sass:list"; $list: ("a", "b"); test { - content: if( length($list) > 2, nth($list, 3), nth($list, 1) ); + content: if( list.length($list) > 2, list.nth($list, 3), list.nth($list, 1) ); } <===> output.css diff --git a/spec/libsass-closed-issues/issue_394.hrx b/spec/libsass-closed-issues/issue_394.hrx index 79f3e2400e..de0034b0ed 100644 --- a/spec/libsass-closed-issues/issue_394.hrx +++ b/spec/libsass-closed-issues/issue_394.hrx @@ -1,11 +1,12 @@ <===> input.scss +@use "sass:list"; $list1: alpha beta gamma; $list2: one two three; $map: (alpha: one, beta: two, gamma: three); .ma-list { - @each $item1, $item2 in zip($list1, $list2) { + @each $item1, $item2 in list.zip($list1, $list2) { #{$item1}: $item2; } } diff --git a/spec/libsass-closed-issues/issue_435.hrx b/spec/libsass-closed-issues/issue_435.hrx index 0fc6783057..ee480a095f 100644 --- a/spec/libsass-closed-issues/issue_435.hrx +++ b/spec/libsass-closed-issues/issue_435.hrx @@ -1,11 +1,12 @@ <===> input.scss +@use "sass:string"; $skin-name: "CMS_Black"; -$QUOTE: unquote('"'); -$EMPTY_STRING: unquote( "" ); -$SLASH: unquote("/"); +$QUOTE: string.unquote('"'); +$EMPTY_STRING: string.unquote( "" ); +$SLASH: string.unquote("/"); -$SKINS_PATH: unquote("/CMS/Skins"); +$SKINS_PATH: string.unquote("/CMS/Skins"); $URL_SEPARATOR: $SLASH; $URL_PREFIX: $EMPTY_STRING; $URL_SUFFIX: $EMPTY_STRING; diff --git a/spec/libsass-closed-issues/issue_439.hrx b/spec/libsass-closed-issues/issue_439.hrx index e3615d4eab..e465a6d335 100644 --- a/spec/libsass-closed-issues/issue_439.hrx +++ b/spec/libsass-closed-issues/issue_439.hrx @@ -1,7 +1,8 @@ <===> input.scss +@use "sass:string"; @mixin odd( $selector, $n) { $selector: "& + " + $selector + " + " + $selector; - $placeholder: unique_id(); + $placeholder: string.unique_id(); %#{$placeholder} { @content; } #{$selector}:first-child { #{$selector} { @extend %#{$placeholder}; } @@ -21,9 +22,9 @@ This will be an error in Dart Sass 2.0.0. More info: https://sass-lang.com/d/bogus-combinators , -6 | #{$selector} { @extend %#{$placeholder}; } +7 | #{$selector} { @extend %#{$placeholder}; } | ^^^^^^^^^^^^ invalid selector | ======================== @extend rule ' - input.scss 6:5 odd() - input.scss 11:3 root stylesheet + input.scss 7:5 odd() + input.scss 12:3 root stylesheet diff --git a/spec/libsass-closed-issues/issue_506.hrx b/spec/libsass-closed-issues/issue_506.hrx index b57a9fb59c..5ee3f93760 100644 --- a/spec/libsass-closed-issues/issue_506.hrx +++ b/spec/libsass-closed-issues/issue_506.hrx @@ -1,12 +1,13 @@ <===> input.scss +@use "sass:list"; $list: foo bar baz; $list--comma: foo, bar, baz; $single: foo; div { - _list-space: list-separator($list); - _list-comma: list-separator($list--comma); - _single-item: list-separator($single); + _list-space: list.separator($list); + _list-comma: list.separator($list--comma); + _single-item: list.separator($single); } <===> output.css div { diff --git a/spec/libsass-closed-issues/issue_509.hrx b/spec/libsass-closed-issues/issue_509.hrx index 509f9db920..02db78d956 100644 --- a/spec/libsass-closed-issues/issue_509.hrx +++ b/spec/libsass-closed-issues/issue_509.hrx @@ -1,4 +1,5 @@ <===> input.scss +@use "sass:map"; $foo: ( (key1): (value-1-0), key2: value-2-0, @@ -11,13 +12,13 @@ $foo: ( ); div { - foo: map-get((foo: 1, bar: 2), foo); - foo: map-get((foo: 1, bar: 2), bar); - foo: map-get((foo: 1, bar: 2), baz); - foo: map-get((), foo); - foo: map-get($foo, (key-5-0: value-5-1)); - foo: map-get($foo, (key2)); - foo: map-get($foo, (key-3-0 key-3-1 key-3-2)); + foo: map.get((foo: 1, bar: 2), foo); + foo: map.get((foo: 1, bar: 2), bar); + foo: map.get((foo: 1, bar: 2), baz); + foo: map.get((), foo); + foo: map.get($foo, (key-5-0: value-5-1)); + foo: map.get($foo, (key2)); + foo: map.get($foo, (key-3-0 key-3-1 key-3-2)); } <===> output.css diff --git a/spec/libsass-closed-issues/issue_510.hrx b/spec/libsass-closed-issues/issue_510.hrx index 51c870db9f..1cc411cb93 100644 --- a/spec/libsass-closed-issues/issue_510.hrx +++ b/spec/libsass-closed-issues/issue_510.hrx @@ -1,5 +1,6 @@ <===> input.scss -$before: map-remove((foo: 1, bar: 2, baz: 3, burp: 4), bar, baz); +@use "sass:map"; +$before: map.remove((foo: 1, bar: 2, baz: 3, burp: 4), bar, baz); $after: (foo: 1, burp: 4); div { diff --git a/spec/libsass-closed-issues/issue_512.hrx b/spec/libsass-closed-issues/issue_512.hrx index 2e76e63de4..92eada2ab4 100644 --- a/spec/libsass-closed-issues/issue_512.hrx +++ b/spec/libsass-closed-issues/issue_512.hrx @@ -1,9 +1,11 @@ <===> input.scss +@use "sass:list"; +@use "sass:meta"; $list: a b c; .css { - debug: index($list, a); + debug: list.index($list, a); - @if type-of(index($list, 2)) == "null" { + @if meta.type-of(list.index($list, 2)) == "null" { debug: foo; } } diff --git a/spec/libsass-closed-issues/issue_534.hrx b/spec/libsass-closed-issues/issue_534.hrx index 6513ab768f..6b7b707cc2 100644 --- a/spec/libsass-closed-issues/issue_534.hrx +++ b/spec/libsass-closed-issues/issue_534.hrx @@ -1,4 +1,5 @@ <===> input.scss +@use "sass:map"; $foo: ( 1: foo1 bar1, 10: foo2 bar2, @@ -6,9 +7,9 @@ $foo: ( ); div { - foo: map-get($foo, 1); - foo: map-get($foo, 10); - foo: map-get($foo, 100); + foo: map.get($foo, 1); + foo: map.get($foo, 10); + foo: map.get($foo, 100); } <===> output.css diff --git a/spec/libsass-closed-issues/issue_54.hrx b/spec/libsass-closed-issues/issue_54.hrx index c1dc17f99d..724345ced7 100644 --- a/spec/libsass-closed-issues/issue_54.hrx +++ b/spec/libsass-closed-issues/issue_54.hrx @@ -4,8 +4,9 @@ - dart-sass <===> input.scss +@use "sass:color"; @mixin opacity($percent) { - foo { test: opacity($percent); } + foo { test: color.opacity($percent); } } @-webkit-keyframes uiDelayedFadeIn { diff --git a/spec/libsass-closed-issues/issue_555.hrx b/spec/libsass-closed-issues/issue_555.hrx index 419330596b..8e2e3f82b5 100644 --- a/spec/libsass-closed-issues/issue_555.hrx +++ b/spec/libsass-closed-issues/issue_555.hrx @@ -1,4 +1,5 @@ <===> input.scss +@use "sass:map"; @function hello($name) { @return $name; @@ -11,10 +12,10 @@ $foo: ( ); a { - foo: map-get($foo, "bar()"); - foo: map-get($foo, "bar(\"foo\")"); - foo: map-get($foo, 'bar("foo")'); - foo: map-get($foo, "bob"); + foo: map.get($foo, "bar()"); + foo: map.get($foo, "bar(\"foo\")"); + foo: map.get($foo, 'bar("foo")'); + foo: map.get($foo, "bob"); } <===> output.css diff --git a/spec/libsass-closed-issues/issue_557.hrx b/spec/libsass-closed-issues/issue_557.hrx index 5ef09a6af3..7aa66980a7 100644 --- a/spec/libsass-closed-issues/issue_557.hrx +++ b/spec/libsass-closed-issues/issue_557.hrx @@ -1,7 +1,8 @@ <===> input.scss +@use "sass:map"; a { - foo: map-get((foo: 1, bar: 2), "bar"); + foo: map.get((foo: 1, bar: 2), "bar"); } <===> output.css diff --git a/spec/libsass-closed-issues/issue_574.hrx b/spec/libsass-closed-issues/issue_574.hrx index 69723bc62e..71ea7409bc 100644 --- a/spec/libsass-closed-issues/issue_574.hrx +++ b/spec/libsass-closed-issues/issue_574.hrx @@ -1,4 +1,5 @@ <===> input.scss +@use "sass:map"; $flow: left; $map: ( @@ -7,7 +8,7 @@ $map: ( ); .test { - margin-left: map-get($map, margin-left); + margin-left: map.get($map, margin-left); } <===> output.css diff --git a/spec/libsass-closed-issues/issue_577.hrx b/spec/libsass-closed-issues/issue_577.hrx index d774598667..7bda78fbf3 100644 --- a/spec/libsass-closed-issues/issue_577.hrx +++ b/spec/libsass-closed-issues/issue_577.hrx @@ -1,9 +1,10 @@ <===> input.scss +@use "sass:list"; @function map-each($map) { $values: (); @each $key, $value in $map { - $values: append($values, $value); + $values: list.append($values, $value); } @return $values; diff --git a/spec/libsass-closed-issues/issue_578.hrx b/spec/libsass-closed-issues/issue_578.hrx index 3f5c192f6d..a594e22b1e 100644 --- a/spec/libsass-closed-issues/issue_578.hrx +++ b/spec/libsass-closed-issues/issue_578.hrx @@ -1,7 +1,8 @@ <===> input.scss +@use "sass:list"; $list: one foo three bar six seven; -$pos: set-nth($list, 2, two); -$neg: set-nth($pos, -3, four five); +$pos: list.set-nth($list, 2, two); +$neg: list.set-nth($pos, -3, four five); .test { -positive: $pos; diff --git a/spec/libsass-closed-issues/issue_643.hrx b/spec/libsass-closed-issues/issue_643.hrx index 5e28dfc109..03cd175fb1 100644 --- a/spec/libsass-closed-issues/issue_643.hrx +++ b/spec/libsass-closed-issues/issue_643.hrx @@ -1,8 +1,9 @@ <===> input.scss +@use "sass:list"; $map: (foo: bar, bar: baz); foo { - a: nth($map, 2); + a: list.nth($map, 2); } <===> output.css diff --git a/spec/libsass-closed-issues/issue_652.hrx b/spec/libsass-closed-issues/issue_652.hrx index 3bd8c4768e..db2bd1d7f7 100644 --- a/spec/libsass-closed-issues/issue_652.hrx +++ b/spec/libsass-closed-issues/issue_652.hrx @@ -1,4 +1,5 @@ <===> input.scss +@use "sass:map"; $map: ( purple: foo, rgba(1,2,3,1): bar, @@ -6,9 +7,9 @@ $map: ( ); a { - name: map-get($map, purple) == foo; - func: map-get($map, rgba(1,2,3,1)) == bar; - hex: map-get($map, #ffffff) == baz; + name: map.get($map, purple) == foo; + func: map.get($map, rgba(1,2,3,1)) == bar; + hex: map.get($map, #ffffff) == baz; } <===> output.css diff --git a/spec/libsass-closed-issues/issue_672.hrx b/spec/libsass-closed-issues/issue_672.hrx index 17bee8718d..f337528f61 100644 --- a/spec/libsass-closed-issues/issue_672.hrx +++ b/spec/libsass-closed-issues/issue_672.hrx @@ -1,6 +1,7 @@ <===> input.scss +@use "sass:meta"; @mixin test($arglist...) { - $map: keywords($arglist); + $map: meta.keywords($arglist); answer: if($map, "Yep", "Nope"); } diff --git a/spec/libsass-closed-issues/issue_699.hrx b/spec/libsass-closed-issues/issue_699.hrx index 0230a7b5c3..f4d2555e76 100644 --- a/spec/libsass-closed-issues/issue_699.hrx +++ b/spec/libsass-closed-issues/issue_699.hrx @@ -1,6 +1,7 @@ <===> input.scss +@use "sass:color"; .selector { - color: invert(rebeccapurple); + color: color.invert(rebeccapurple); } <===> output.css .selector { diff --git a/spec/libsass-closed-issues/issue_700.hrx b/spec/libsass-closed-issues/issue_700.hrx index 181b37ccc5..bf87188309 100644 --- a/spec/libsass-closed-issues/issue_700.hrx +++ b/spec/libsass-closed-issues/issue_700.hrx @@ -1,6 +1,7 @@ <===> input.scss +@use "sass:color"; .selector { - color: invert(transparent); + color: color.invert(transparent); } <===> output.css .selector { diff --git a/spec/libsass-closed-issues/issue_702.hrx b/spec/libsass-closed-issues/issue_702.hrx index 77625a2821..bf4cf7a34a 100644 --- a/spec/libsass-closed-issues/issue_702.hrx +++ b/spec/libsass-closed-issues/issue_702.hrx @@ -1,7 +1,8 @@ <===> input.scss +@use "sass:meta"; .foo { - content: function-exists("feature-exists"); - content: feature-exists("foo"); + content: meta.function-exists("feature-exists"); + content: meta.feature-exists("foo"); } <===> output.css diff --git a/spec/libsass-closed-issues/issue_760.hrx b/spec/libsass-closed-issues/issue_760.hrx index 430168a010..7dc650ee63 100644 --- a/spec/libsass-closed-issues/issue_760.hrx +++ b/spec/libsass-closed-issues/issue_760.hrx @@ -1,7 +1,8 @@ <===> input.scss +@use "sass:string"; foo { - quoted: str-slice("abcd", 1, 0); - unquoted: str-slice(abcd, 1, 0); + quoted: string.slice("abcd", 1, 0); + unquoted: string.slice(abcd, 1, 0); } <===> output.css diff --git a/spec/libsass-closed-issues/issue_763.hrx b/spec/libsass-closed-issues/issue_763.hrx index 0accb9d610..81a4e4fe8d 100644 --- a/spec/libsass-closed-issues/issue_763.hrx +++ b/spec/libsass-closed-issues/issue_763.hrx @@ -1,13 +1,14 @@ <===> input.scss +@use "sass:string"; foo { - a: str-slice("abcd", 1, 1); - b: str-slice('abcd', 1, 1); - c: str-slice(abcd, 1, 1); + a: string.slice("abcd", 1, 1); + b: string.slice('abcd', 1, 1); + c: string.slice(abcd, 1, 1); - d: str-insert("abcd", "X", 1); - e: str-insert("abcd", 'X', 1); - f: str-insert('abcd', "X", 1); - g: str-insert('abcd', 'X', 1); + d: string.insert("abcd", "X", 1); + e: string.insert("abcd", 'X', 1); + f: string.insert('abcd', "X", 1); + g: string.insert('abcd', 'X', 1); } <===> output.css diff --git a/spec/libsass-closed-issues/issue_815.hrx b/spec/libsass-closed-issues/issue_815.hrx index 4059e613c1..b21cda5822 100644 --- a/spec/libsass-closed-issues/issue_815.hrx +++ b/spec/libsass-closed-issues/issue_815.hrx @@ -1,7 +1,8 @@ <===> input.scss +@use "sass:string"; foo { - foo: str-slice("bar", 1, 2); - bar: str-slice("bar", 3); + foo: string.slice("bar", 1, 2); + bar: string.slice("bar", 3); } <===> output.css diff --git a/spec/libsass-closed-issues/issue_857.hrx b/spec/libsass-closed-issues/issue_857.hrx index d289ae5cce..b63fc79ed9 100644 --- a/spec/libsass-closed-issues/issue_857.hrx +++ b/spec/libsass-closed-issues/issue_857.hrx @@ -1,8 +1,9 @@ <===> input.scss +@use "sass:list"; $list: "item-1" "item-2" "item-3"; #hello { - @if length($list) % 2 == 0 { + @if list.length($list) % 2 == 0 { color: blue; } diff --git a/spec/libsass-closed-issues/issue_86.hrx b/spec/libsass-closed-issues/issue_86.hrx index 236eb4c69d..88e8572340 100644 --- a/spec/libsass-closed-issues/issue_86.hrx +++ b/spec/libsass-closed-issues/issue_86.hrx @@ -1,12 +1,15 @@ <===> input.scss +@use "sass:color"; +@use "sass:math"; +@use "sass:meta"; .color-functions { $color: red; - hue: hue($color); - hue-type: type-of(hue($color)); - hue-unit: unit(hue($color)); - hue-comparable: comparable(hue($color), hue($color)); - test-1: comparable(lightness(red), 1%); - test-2: comparable(saturation(red), 1%); + hue: color.hue($color); + hue-type: meta.type-of(color.hue($color)); + hue-unit: math.unit(color.hue($color)); + hue-comparable: math.compatible(color.hue($color), color.hue($color)); + test-1: math.compatible(color.lightness(red), 1%); + test-2: math.compatible(color.saturation(red), 1%); } <===> output.css .color-functions { diff --git a/spec/libsass-closed-issues/issue_864.hrx b/spec/libsass-closed-issues/issue_864.hrx index b19547d21b..d6c78efb54 100644 --- a/spec/libsass-closed-issues/issue_864.hrx +++ b/spec/libsass-closed-issues/issue_864.hrx @@ -1,5 +1,6 @@ <===> input.scss -div { color: desaturate(#999, 50%); } +@use "sass:color"; +div { color: color.adjust(#999, $saturation: -50%); } <===> output.css div { color: #999999; diff --git a/spec/libsass-closed-issues/issue_877.hrx b/spec/libsass-closed-issues/issue_877.hrx index 1f5034e39f..4c3cb8c7fa 100644 --- a/spec/libsass-closed-issues/issue_877.hrx +++ b/spec/libsass-closed-issues/issue_877.hrx @@ -1,4 +1,5 @@ <===> input.scss +@use "sass:meta"; @function _test1() { @return 'hello'; } @@ -28,34 +29,34 @@ $_test2: true; $test: true; .test { - function: function-exists('_test1'); - function: function-exists('-test1'); - function: function-exists('_test2'); - function: function-exists('-test2'); - function: function-exists('test1'); - function: function-exists('test2'); - function: function-exists('test'); - mixin: mixin-exists('_test1'); - mixin: mixin-exists('-test1'); - mixin: mixin-exists('_test2'); - mixin: mixin-exists('-test2'); - mixin: mixin-exists('test1'); - mixin: mixin-exists('test2'); - mixin: mixin-exists('test'); - variable: variable-exists('_test1'); - variable: variable-exists('-test1'); - variable: variable-exists('_test2'); - variable: variable-exists('-test2'); - variable: variable-exists('test1'); - variable: variable-exists('test2'); - variable: variable-exists('test'); - global-variable: global-variable-exists('_test1'); - global-variable: global-variable-exists('-test1'); - global-variable: global-variable-exists('_test2'); - global-variable: global-variable-exists('-test2'); - global-variable: global-variable-exists('test1'); - global-variable: global-variable-exists('test2'); - global-variable: global-variable-exists('test'); + function: meta.function-exists('_test1'); + function: meta.function-exists('-test1'); + function: meta.function-exists('_test2'); + function: meta.function-exists('-test2'); + function: meta.function-exists('test1'); + function: meta.function-exists('test2'); + function: meta.function-exists('test'); + mixin: meta.mixin-exists('_test1'); + mixin: meta.mixin-exists('-test1'); + mixin: meta.mixin-exists('_test2'); + mixin: meta.mixin-exists('-test2'); + mixin: meta.mixin-exists('test1'); + mixin: meta.mixin-exists('test2'); + mixin: meta.mixin-exists('test'); + variable: meta.variable-exists('_test1'); + variable: meta.variable-exists('-test1'); + variable: meta.variable-exists('_test2'); + variable: meta.variable-exists('-test2'); + variable: meta.variable-exists('test1'); + variable: meta.variable-exists('test2'); + variable: meta.variable-exists('test'); + global-variable: meta.global-variable-exists('_test1'); + global-variable: meta.global-variable-exists('-test1'); + global-variable: meta.global-variable-exists('_test2'); + global-variable: meta.global-variable-exists('-test2'); + global-variable: meta.global-variable-exists('test1'); + global-variable: meta.global-variable-exists('test2'); + global-variable: meta.global-variable-exists('test'); } <===> output.css diff --git a/spec/libsass-closed-issues/issue_980.hrx b/spec/libsass-closed-issues/issue_980.hrx index f85114d8b8..7ee8c6761a 100644 --- a/spec/libsass-closed-issues/issue_980.hrx +++ b/spec/libsass-closed-issues/issue_980.hrx @@ -1,8 +1,9 @@ <===> input.scss +@use "sass:list"; @function foo($value, $default: 13, $args...) { $res: $value + $default; - @if length($args) != 0 { - $res: $res + nth($args, 1); + @if list.length($args) != 0 { + $res: $res + list.nth($args, 1); } @return $res; } diff --git a/spec/libsass-closed-issues/issue_988.hrx b/spec/libsass-closed-issues/issue_988.hrx index 3b67605f0e..f5900bba06 100644 --- a/spec/libsass-closed-issues/issue_988.hrx +++ b/spec/libsass-closed-issues/issue_988.hrx @@ -1,9 +1,10 @@ <===> input.scss +@use "sass:string"; @function str-replace($string, $search, $replace: '') { - $index: str-index($string, $search); + $index: string.index($string, $search); @if $index { - @return str-slice($string, 1, $index - 1) + $replace + - str-replace(str-slice($string, $index + str-length($search)), $search, $replace); + @return string.slice($string, 1, $index - 1) + $replace + + str-replace(string.slice($string, $index + string.length($search)), $search, $replace); } @return $string; } From 261914c08483c9fb3aa4a0961f95040865169748 Mon Sep 17 00:00:00 2001 From: Jennifer Thakar Date: Fri, 12 Jul 2024 15:00:08 -0700 Subject: [PATCH 06/10] Migrate remaining global functions --- spec/libsass-todo-issues/issue_2818.hrx | 4 +++- .../non_conformant/mixin/content/arguments/receiving.hrx | 8 ++++---- spec/values/calculation/calc/parens.hrx | 3 ++- spec/values/calculation/calc/space.hrx | 9 ++++++--- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/spec/libsass-todo-issues/issue_2818.hrx b/spec/libsass-todo-issues/issue_2818.hrx index 893fcdcff4..3df4c64f11 100644 --- a/spec/libsass-todo-issues/issue_2818.hrx +++ b/spec/libsass-todo-issues/issue_2818.hrx @@ -1,6 +1,8 @@ <===> input.scss +@use "sass:color"; +@use "sass:meta"; $map: ("lightness": 10%, "saturation": 10%); -$base: call(get-function('scale-color'), #dedede, $map...); +$base: meta.call(meta.get-function('scale', $module: 'color'), #dedede, $map...); test { color: $base; } <===> output.css diff --git a/spec/non_conformant/mixin/content/arguments/receiving.hrx b/spec/non_conformant/mixin/content/arguments/receiving.hrx index 48897de76c..b617026b18 100644 --- a/spec/non_conformant/mixin/content/arguments/receiving.hrx +++ b/spec/non_conformant/mixin/content/arguments/receiving.hrx @@ -46,7 +46,7 @@ with-splat { @include mixin using ($args...) { positional: meta.inspect($args); - keywords: meta.inspect(keywords($args)); + keywords: meta.inspect(meta.keywords($args)); } } @@ -57,7 +57,7 @@ with-splat { @include mixin using ($args...) { positional: meta.inspect($args); - keywords: meta.inspect(keywords($args)); + keywords: meta.inspect(meta.keywords($args)); } } @@ -68,7 +68,7 @@ with-splat { @include mixin using ($args...) { positional: meta.inspect($args); - keywords: meta.inspect(keywords($args)); + keywords: meta.inspect(meta.keywords($args)); } } @@ -79,7 +79,7 @@ with-splat { @include mixin using ($args...) { positional: meta.inspect($args); - keywords: meta.inspect(keywords($args)); + keywords: meta.inspect(meta.keywords($args)); } } } diff --git a/spec/values/calculation/calc/parens.hrx b/spec/values/calculation/calc/parens.hrx index cebd45919d..92db3f28a0 100644 --- a/spec/values/calculation/calc/parens.hrx +++ b/spec/values/calculation/calc/parens.hrx @@ -50,7 +50,8 @@ a { <===> ================================================================================ <===> variable/input.scss -$c: unquote("1 + 2"); +@use "sass:string"; +$c: string.unquote("1 + 2"); a {b: calc(($c))} <===> variable/output.css diff --git a/spec/values/calculation/calc/space.hrx b/spec/values/calculation/calc/space.hrx index 714a775582..78c9d6a15b 100644 --- a/spec/values/calculation/calc/space.hrx +++ b/spec/values/calculation/calc/space.hrx @@ -29,7 +29,8 @@ a { <===> ================================================================================ <===> variable/before/input.scss -$c: unquote("1 +"); +@use "sass:string"; +$c: string.unquote("1 +"); a {b: calc($c 2)} <===> variable/before/output.css @@ -40,7 +41,8 @@ a { <===> ================================================================================ <===> variable/after/input.scss -$c: unquote("+ 2"); +@use "sass:string"; +$c: string.unquote("+ 2"); a {b: calc(1 $c)} <===> variable/after/output.css @@ -51,7 +53,8 @@ a { <===> ================================================================================ <===> variable/between/input.scss -$c: unquote("+ 2 +"); +@use "sass:string"; +$c: string.unquote("+ 2 +"); a {b: calc(1 $c 3)} <===> variable/between/output.css From 42de29cf608895f20d19711ae03881afeef20589 Mon Sep 17 00:00:00 2001 From: Jennifer Thakar Date: Fri, 12 Jul 2024 16:01:17 -0700 Subject: [PATCH 07/10] Migrate plain CSS tests to module system --- spec/css/plain/boolean_operations.hrx | 2 +- spec/css/plain/custom_properties.hrx | 8 +- spec/css/plain/error/expression/function.hrx | 18 +-- .../plain/error/expression/interpolation.hrx | 24 ++-- spec/css/plain/error/expression/list.hrx | 12 +- spec/css/plain/error/expression/map.hrx | 6 +- spec/css/plain/error/expression/operation.hrx | 60 ++++----- .../error/expression/parent_selector.hrx | 6 +- .../plain/error/expression/parentheses.hrx | 6 +- spec/css/plain/error/expression/variable.hrx | 12 +- spec/css/plain/error/media.hrx | 114 +++++++++--------- spec/css/plain/error/statement/at_rule.hrx | 106 ++++++++-------- .../plain/error/statement/silent_comment.hrx | 6 +- spec/css/plain/error/statement/style_rule.hrx | 36 +++--- spec/css/plain/extend.hrx | 2 +- spec/css/plain/functions.hrx | 30 ++--- spec/css/plain/hacks.hrx | 2 +- spec/css/plain/media.hrx | 26 ++-- spec/css/plain/null.hrx | 2 +- spec/css/plain/single_equals.hrx | 2 +- spec/css/plain/slash.hrx | 6 +- 21 files changed, 243 insertions(+), 243 deletions(-) diff --git a/spec/css/plain/boolean_operations.hrx b/spec/css/plain/boolean_operations.hrx index 11a64b38ad..896d9d468a 100644 --- a/spec/css/plain/boolean_operations.hrx +++ b/spec/css/plain/boolean_operations.hrx @@ -1,5 +1,5 @@ <===> input.scss -@import "plain"; +@use "plain"; <===> plain.css a { diff --git a/spec/css/plain/custom_properties.hrx b/spec/css/plain/custom_properties.hrx index 2173495b39..bf5a7bd569 100644 --- a/spec/css/plain/custom_properties.hrx +++ b/spec/css/plain/custom_properties.hrx @@ -4,7 +4,7 @@ Regression tests for sass/dart-sass#1104. <===> ================================================================================ <===> identifier/input.scss -@import "plain"; +@use "plain"; <===> identifier/plain.css a {--b: c} @@ -17,7 +17,7 @@ a { <===> ================================================================================ <===> color/input.scss -@import "plain"; +@use "plain"; <===> color/plain.css a {--b: #ff0000} @@ -30,7 +30,7 @@ a { <===> ================================================================================ <===> nested/input.scss -@import "plain"; +@use "plain"; <===> nested/plain.css a {--b: {c: d}} @@ -43,7 +43,7 @@ a { <===> ================================================================================ <===> arbitrary_tokens/input.scss -@import "plain"; +@use "plain"; <===> arbitrary_tokens/plain.css a {--b: `~@#$%^&*()_-+={[]}|?/><} diff --git a/spec/css/plain/error/expression/function.hrx b/spec/css/plain/error/expression/function.hrx index 6293888f5f..a2569f5f12 100644 --- a/spec/css/plain/error/expression/function.hrx +++ b/spec/css/plain/error/expression/function.hrx @@ -1,5 +1,5 @@ <===> built_in/input.scss -@import 'plain' +@use 'plain' <===> built_in/plain.css a { x: index(1 2 3, 1); @@ -11,13 +11,13 @@ Error: This function isn't allowed in plain CSS. 2 | x: index(1 2 3, 1); | ^^^^^^^^^^^^^^^ ' - plain.css 2:6 @import - input.scss 1:9 root stylesheet + plain.css 2:6 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> variable_arguments/input.scss -@import 'plain' +@use 'plain' <===> variable_arguments/plain.css a { x: hsl(0, 100%, 50%...); @@ -29,13 +29,13 @@ Error: expected ")". 2 | x: hsl(0, 100%, 50%...); | ^ ' - plain.css 2:22 @import - input.scss 1:9 root stylesheet + plain.css 2:22 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> keyword_arguments/input.scss -@import 'plain' +@use 'plain' <===> keyword_arguments/plain.css a { x: hsl(0, 100%, $lightness: 50%); @@ -47,5 +47,5 @@ Error: Sass variables aren't allowed in plain CSS. 2 | x: hsl(0, 100%, $lightness: 50%); | ^^^^^^^^^^ ' - plain.css 2:19 @import - input.scss 1:9 root stylesheet + plain.css 2:19 @use + input.scss 1:1 root stylesheet diff --git a/spec/css/plain/error/expression/interpolation.hrx b/spec/css/plain/error/expression/interpolation.hrx index ac4f6fa8e8..469a2a818f 100644 --- a/spec/css/plain/error/expression/interpolation.hrx +++ b/spec/css/plain/error/expression/interpolation.hrx @@ -1,5 +1,5 @@ <===> calc/input.scss -@import 'plain' +@use 'plain' <===> calc/plain.css a { w: calc(#{1px} + 10%); @@ -11,13 +11,13 @@ Error: Interpolation isn't allowed in plain CSS. 2 | w: calc(#{1px} + 10%); | ^^^^^^ ' - plain.css 2:11 @import - input.scss 1:9 root stylesheet + plain.css 2:11 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> identifier/input.scss -@import 'plain' +@use 'plain' <===> identifier/plain.css a { w: x#{y}z; @@ -29,13 +29,13 @@ Error: Interpolation isn't allowed in plain CSS. 2 | w: x#{y}z; | ^^^^ ' - plain.css 2:7 @import - input.scss 1:9 root stylesheet + plain.css 2:7 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> quoted_string/input.scss -@import 'plain' +@use 'plain' <===> quoted_string/plain.css a { w: "x#{y}z"; @@ -47,13 +47,13 @@ Error: Interpolation isn't allowed in plain CSS. 2 | w: "x#{y}z"; | ^^^^ ' - plain.css 2:8 @import - input.scss 1:9 root stylesheet + plain.css 2:8 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> standalone/input.scss -@import 'plain' +@use 'plain' <===> standalone/plain.css a { w: #{x}; @@ -65,5 +65,5 @@ Error: Interpolation isn't allowed in plain CSS. 2 | w: #{x}; | ^^^^ ' - plain.css 2:6 @import - input.scss 1:9 root stylesheet + plain.css 2:6 @use + input.scss 1:1 root stylesheet diff --git a/spec/css/plain/error/expression/list.hrx b/spec/css/plain/error/expression/list.hrx index 283ce7e5c2..6a22365f88 100644 --- a/spec/css/plain/error/expression/list.hrx +++ b/spec/css/plain/error/expression/list.hrx @@ -1,5 +1,5 @@ <===> empty/input.scss -@import 'plain' +@use 'plain' <===> empty/plain.css a { x: (); @@ -11,13 +11,13 @@ Error: Expected expression. 2 | x: (); | ^ ' - plain.css 2:7 @import - input.scss 1:9 root stylesheet + plain.css 2:7 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> empty_comma/input.scss -@import 'plain' +@use 'plain' <===> empty_comma/plain.css a { x: (,); @@ -29,5 +29,5 @@ Error: Expected expression. 2 | x: (,); | ^ ' - plain.css 2:7 @import - input.scss 1:9 root stylesheet + plain.css 2:7 @use + input.scss 1:1 root stylesheet diff --git a/spec/css/plain/error/expression/map.hrx b/spec/css/plain/error/expression/map.hrx index 3939ea085e..157e438e36 100644 --- a/spec/css/plain/error/expression/map.hrx +++ b/spec/css/plain/error/expression/map.hrx @@ -1,5 +1,5 @@ <===> input.scss -@import 'plain' +@use 'plain' <===> plain.css a { x: (y: z); @@ -11,5 +11,5 @@ Error: expected ")". 2 | x: (y: z); | ^ ' - plain.css 2:8 @import - input.scss 1:9 root stylesheet + plain.css 2:8 @use + input.scss 1:1 root stylesheet diff --git a/spec/css/plain/error/expression/operation.hrx b/spec/css/plain/error/expression/operation.hrx index 06c27fbb58..2e99545f9f 100644 --- a/spec/css/plain/error/expression/operation.hrx +++ b/spec/css/plain/error/expression/operation.hrx @@ -1,5 +1,5 @@ <===> addition/input.scss -@import 'plain' +@use 'plain' <===> addition/plain.css a { x: y + z; @@ -11,13 +11,13 @@ Error: Operators aren't allowed in plain CSS. 2 | x: y + z; | ^ ' - plain.css 2:8 @import - input.scss 1:9 root stylesheet + plain.css 2:8 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> subtraction/input.scss -@import 'plain' +@use 'plain' <===> subtraction/plain.css a { x: y - z; @@ -29,13 +29,13 @@ Error: Operators aren't allowed in plain CSS. 2 | x: y - z; | ^ ' - plain.css 2:8 @import - input.scss 1:9 root stylesheet + plain.css 2:8 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> multiplication/input.scss -@import 'plain' +@use 'plain' <===> multiplication/plain.css a { x: y * z; @@ -47,13 +47,13 @@ Error: Operators aren't allowed in plain CSS. 2 | x: y * z; | ^ ' - plain.css 2:8 @import - input.scss 1:9 root stylesheet + plain.css 2:8 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> modulo/input.scss -@import 'plain' +@use 'plain' <===> modulo/plain.css a { x: y % z; @@ -65,13 +65,13 @@ Error: Operators aren't allowed in plain CSS. 2 | x: y % z; | ^ ' - plain.css 2:8 @import - input.scss 1:9 root stylesheet + plain.css 2:8 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> less_than/input.scss -@import 'plain' +@use 'plain' <===> less_than/plain.css a { x: y < z; @@ -83,13 +83,13 @@ Error: Operators aren't allowed in plain CSS. 2 | x: y < z; | ^ ' - plain.css 2:8 @import - input.scss 1:9 root stylesheet + plain.css 2:8 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> less_than_or_equal/input.scss -@import 'plain' +@use 'plain' <===> less_than_or_equal/plain.css a { x: y <= z; @@ -101,13 +101,13 @@ Error: Operators aren't allowed in plain CSS. 2 | x: y <= z; | ^^ ' - plain.css 2:8 @import - input.scss 1:9 root stylesheet + plain.css 2:8 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> greater_than/input.scss -@import 'plain' +@use 'plain' <===> greater_than/plain.css a { x: y > z; @@ -119,13 +119,13 @@ Error: Operators aren't allowed in plain CSS. 2 | x: y > z; | ^ ' - plain.css 2:8 @import - input.scss 1:9 root stylesheet + plain.css 2:8 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> greater_than_or_equal/input.scss -@import 'plain' +@use 'plain' <===> greater_than_or_equal/plain.css a { x: y >= z; @@ -137,13 +137,13 @@ Error: Operators aren't allowed in plain CSS. 2 | x: y >= z; | ^^ ' - plain.css 2:8 @import - input.scss 1:9 root stylesheet + plain.css 2:8 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> equals/input.scss -@import 'plain' +@use 'plain' <===> equals/plain.css a { x: y == z; @@ -155,13 +155,13 @@ Error: Operators aren't allowed in plain CSS. 2 | x: y == z; | ^^ ' - plain.css 2:8 @import - input.scss 1:9 root stylesheet + plain.css 2:8 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> not_equals/input.scss -@import 'plain' +@use 'plain' <===> not_equals/plain.css a { x: y != z; @@ -173,5 +173,5 @@ Error: Operators aren't allowed in plain CSS. 2 | x: y != z; | ^^ ' - plain.css 2:8 @import - input.scss 1:9 root stylesheet + plain.css 2:8 @use + input.scss 1:1 root stylesheet diff --git a/spec/css/plain/error/expression/parent_selector.hrx b/spec/css/plain/error/expression/parent_selector.hrx index 338be921e0..fa4be9b847 100644 --- a/spec/css/plain/error/expression/parent_selector.hrx +++ b/spec/css/plain/error/expression/parent_selector.hrx @@ -1,5 +1,5 @@ <===> input.scss -@import 'plain' +@use 'plain' <===> plain.css a { x: &; @@ -11,5 +11,5 @@ Error: The parent selector isn't allowed in plain CSS. 2 | x: &; | ^ ' - plain.css 2:6 @import - input.scss 1:9 root stylesheet + plain.css 2:6 @use + input.scss 1:1 root stylesheet diff --git a/spec/css/plain/error/expression/parentheses.hrx b/spec/css/plain/error/expression/parentheses.hrx index 3dc81f4164..aba78126d7 100644 --- a/spec/css/plain/error/expression/parentheses.hrx +++ b/spec/css/plain/error/expression/parentheses.hrx @@ -1,5 +1,5 @@ <===> input.scss -@import 'plain' +@use 'plain' <===> plain.css a { x: (y); @@ -11,5 +11,5 @@ Error: Parentheses aren't allowed in plain CSS. 2 | x: (y); | ^^^ ' - plain.css 2:6 @import - input.scss 1:9 root stylesheet + plain.css 2:6 @use + input.scss 1:1 root stylesheet diff --git a/spec/css/plain/error/expression/variable.hrx b/spec/css/plain/error/expression/variable.hrx index 0a1876d64e..b0d0a0837d 100644 --- a/spec/css/plain/error/expression/variable.hrx +++ b/spec/css/plain/error/expression/variable.hrx @@ -1,5 +1,5 @@ <===> use/input.scss -@import 'plain' +@use 'plain' <===> use/plain.css a { x: $var; @@ -11,13 +11,13 @@ Error: Sass variables aren't allowed in plain CSS. 2 | x: $var; | ^^^^ ' - plain.css 2:6 @import - input.scss 1:9 root stylesheet + plain.css 2:6 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> declaration/input.scss -@import 'plain' +@use 'plain' <===> declaration/plain.css $var: value; @@ -27,5 +27,5 @@ Error: Sass variables aren't allowed in plain CSS. 1 | $var: value; | ^^^^ ' - plain.css 1:1 @import - input.scss 1:9 root stylesheet + plain.css 1:1 @use + input.scss 1:1 root stylesheet diff --git a/spec/css/plain/error/media.hrx b/spec/css/plain/error/media.hrx index 9e2983cb15..999e910015 100644 --- a/spec/css/plain/error/media.hrx +++ b/spec/css/plain/error/media.hrx @@ -1,5 +1,5 @@ <===> logic/and_after/type_and_not/input.scss -@import 'plain'; +@use 'plain'; <===> logic/and_after/type_and_not/plain.css @media a and not (b) and (c) {x {y: z}} @@ -10,13 +10,13 @@ Error: expected "{". 1 | @media a and not (b) and (c) {x {y: z}} | ^ ' - plain.css 1:22 @import - input.scss 1:9 root stylesheet + plain.css 1:22 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> logic/and_after/or/input.scss -@import 'plain'; +@use 'plain'; <===> logic/and_after/or/plain.css @media (a) or (b) and (c) {x {y: z}} @@ -27,13 +27,13 @@ Error: expected "{". 1 | @media (a) or (b) and (c) {x {y: z}} | ^ ' - plain.css 1:19 @import - input.scss 1:9 root stylesheet + plain.css 1:19 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> logic/or_after/type/input.scss -@import 'plain'; +@use 'plain'; <===> logic/or_after/type/plain.css @media a or (b) {x {y: z}} @@ -44,13 +44,13 @@ Error: expected "{". 1 | @media a or (b) {x {y: z}} | ^ ' - plain.css 1:13 @import - input.scss 1:9 root stylesheet + plain.css 1:13 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> logic/or_after/type_and_not/input.scss -@import 'plain'; +@use 'plain'; <===> logic/or_after/type_and_not/plain.css @media a and not (b) or (c) {x {y: z}} @@ -61,13 +61,13 @@ Error: expected "{". 1 | @media a and not (b) or (c) {x {y: z}} | ^ ' - plain.css 1:22 @import - input.scss 1:9 root stylesheet + plain.css 1:22 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> logic/or_after/and/input.scss -@import 'plain'; +@use 'plain'; <===> logic/or_after/and/plain.css @media (a) and (b) or (c) {x {y: z}} @@ -78,13 +78,13 @@ Error: expected "{". 1 | @media (a) and (b) or (c) {x {y: z}} | ^ ' - plain.css 1:20 @import - input.scss 1:9 root stylesheet + plain.css 1:20 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> logic/or_after/type_then_and/input.scss -@import 'plain'; +@use 'plain'; <===> logic/or_after/type_then_and/plain.css @media a and (b) or (c) {x {y: z}} @@ -95,13 +95,13 @@ Error: expected "{". 1 | @media a and (b) or (c) {x {y: z}} | ^ ' - plain.css 1:18 @import - input.scss 1:9 root stylesheet + plain.css 1:18 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> logic/nothing_after/not/input.scss -@import 'plain'; +@use 'plain'; <===> logic/nothing_after/not/plain.css @media not {x {y: z}} @@ -112,13 +112,13 @@ Error: expected media condition in parentheses. 1 | @media not {x {y: z}} | ^ ' - plain.css 1:12 @import - input.scss 1:9 root stylesheet + plain.css 1:12 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> logic/nothing_after/and_not/input.scss -@import 'plain'; +@use 'plain'; <===> logic/nothing_after/and_not/plain.css @media a and not {x {y: z}} @@ -129,13 +129,13 @@ Error: expected media condition in parentheses. 1 | @media a and not {x {y: z}} | ^ ' - plain.css 1:18 @import - input.scss 1:9 root stylesheet + plain.css 1:18 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> logic/nothing_after/and/after_type/input.scss -@import 'plain'; +@use 'plain'; <===> logic/nothing_after/and/after_type/plain.css @media a and {x {y: z}} @@ -146,13 +146,13 @@ Error: expected media condition in parentheses. 1 | @media a and {x {y: z}} | ^ ' - plain.css 1:14 @import - input.scss 1:9 root stylesheet + plain.css 1:14 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> logic/nothing_after/and/after_paren/input.scss -@import 'plain'; +@use 'plain'; <===> logic/nothing_after/and/after_paren/plain.css @media (a) and {x {y: z}} @@ -163,13 +163,13 @@ Error: expected media condition in parentheses. 1 | @media (a) and {x {y: z}} | ^ ' - plain.css 1:16 @import - input.scss 1:9 root stylesheet + plain.css 1:16 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> logic/nothing_after/or/input.scss -@import 'plain'; +@use 'plain'; <===> logic/nothing_after/or/plain.css @media (a) or {x {y: z}} @@ -180,13 +180,13 @@ Error: expected media condition in parentheses. 1 | @media (a) or {x {y: z}} | ^ ' - plain.css 1:15 @import - input.scss 1:9 root stylesheet + plain.css 1:15 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> missing_whitespace/not/input.scss -@import 'plain'; +@use 'plain'; <===> missing_whitespace/not/plain.css @media not(a) {x {y: z}} @@ -197,13 +197,13 @@ Error: Expected whitespace. 1 | @media not(a) {x {y: z}} | ^ ' - plain.css 1:11 @import - input.scss 1:9 root stylesheet + plain.css 1:11 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> missing_whitespace/and_not/type/input.scss -@import 'plain'; +@use 'plain'; <===> missing_whitespace/and_not/type/plain.css @media a and not(b) {x {y: z}} @@ -214,13 +214,13 @@ Error: Expected whitespace. 1 | @media a and not(b) {x {y: z}} | ^ ' - plain.css 1:17 @import - input.scss 1:9 root stylesheet + plain.css 1:17 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> missing_whitespace/and_not/type_and_modifier/input.scss -@import 'plain'; +@use 'plain'; <===> missing_whitespace/and_not/type_and_modifier/plain.css @media only a and not(b) {x {y: z}} @@ -231,13 +231,13 @@ Error: Expected whitespace. 1 | @media only a and not(b) {x {y: z}} | ^ ' - plain.css 1:22 @import - input.scss 1:9 root stylesheet + plain.css 1:22 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> missing_whitespace/and/after_type/input.scss -@import 'plain'; +@use 'plain'; <===> missing_whitespace/and/after_type/plain.css @media a and(b) {x {y: z}} @@ -248,13 +248,13 @@ Error: Expected whitespace. 1 | @media a and(b) {x {y: z}} | ^ ' - plain.css 1:13 @import - input.scss 1:9 root stylesheet + plain.css 1:13 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> missing_whitespace/and/first/input.scss -@import 'plain'; +@use 'plain'; <===> missing_whitespace/and/first/plain.css @media (a) and(b) {x {y: z}} @@ -265,13 +265,13 @@ Error: Expected whitespace. 1 | @media (a) and(b) {x {y: z}} | ^ ' - plain.css 1:15 @import - input.scss 1:9 root stylesheet + plain.css 1:15 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> missing_whitespace/and/later/input.scss -@import 'plain'; +@use 'plain'; <===> missing_whitespace/and/later/plain.css @media (a) and (b) and(c) {x {y: z}} @@ -282,13 +282,13 @@ Error: Expected whitespace. 1 | @media (a) and (b) and(c) {x {y: z}} | ^ ' - plain.css 1:23 @import - input.scss 1:9 root stylesheet + plain.css 1:23 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> missing_whitespace/or/first/input.scss -@import 'plain'; +@use 'plain'; <===> missing_whitespace/or/first/plain.css @media (a) or(b) {x {y: z}} @@ -299,13 +299,13 @@ Error: Expected whitespace. 1 | @media (a) or(b) {x {y: z}} | ^ ' - plain.css 1:14 @import - input.scss 1:9 root stylesheet + plain.css 1:14 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> missing_whitespace/or/later/input.scss -@import 'plain'; +@use 'plain'; <===> missing_whitespace/or/later/plain.css @media (a) or (b) or(c) {x {y: z}} @@ -316,5 +316,5 @@ Error: Expected whitespace. 1 | @media (a) or (b) or(c) {x {y: z}} | ^ ' - plain.css 1:21 @import - input.scss 1:9 root stylesheet + plain.css 1:21 @use + input.scss 1:1 root stylesheet diff --git a/spec/css/plain/error/statement/at_rule.hrx b/spec/css/plain/error/statement/at_rule.hrx index 6c0287aca2..c150bc4449 100644 --- a/spec/css/plain/error/statement/at_rule.hrx +++ b/spec/css/plain/error/statement/at_rule.hrx @@ -1,5 +1,5 @@ <===> at_root/input.scss -@import 'plain' +@use 'plain' <===> at_root/plain.css a { @at-root b { @@ -13,13 +13,13 @@ Error: This at-rule isn't allowed in plain CSS. 2 | @at-root b { | ^^^^^^^^^^^ ' - plain.css 2:3 @import - input.scss 1:9 root stylesheet + plain.css 2:3 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> content/input.scss -@import 'plain' +@use 'plain' <===> content/plain.css @content; @@ -29,13 +29,13 @@ Error: This at-rule isn't allowed in plain CSS. 1 | @content; | ^^^^^^^^ ' - plain.css 1:1 @import - input.scss 1:9 root stylesheet + plain.css 1:1 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> debug/input.scss -@import 'plain' +@use 'plain' <===> debug/plain.css @debug foo; @@ -45,13 +45,13 @@ Error: This at-rule isn't allowed in plain CSS. 1 | @debug foo; | ^^^^^^^^^^ ' - plain.css 1:1 @import - input.scss 1:9 root stylesheet + plain.css 1:1 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> each/input.scss -@import 'plain' +@use 'plain' <===> each/plain.css @each $i in 1 2 3 { a { @@ -65,13 +65,13 @@ Error: This at-rule isn't allowed in plain CSS. 1 | @each $i in 1 2 3 { | ^^^^^^^^^^^^^^^^^^ ' - plain.css 1:1 @import - input.scss 1:9 root stylesheet + plain.css 1:1 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> error/input.scss -@import 'plain' +@use 'plain' <===> error/plain.css @error foo; @@ -81,13 +81,13 @@ Error: This at-rule isn't allowed in plain CSS. 1 | @error foo; | ^^^^^^^^^^ ' - plain.css 1:1 @import - input.scss 1:9 root stylesheet + plain.css 1:1 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> extend/input.scss -@import 'plain' +@use 'plain' <===> extend/plain.css a { @extend b; @@ -99,13 +99,13 @@ Error: This at-rule isn't allowed in plain CSS. 2 | @extend b; | ^^^^^^^^^ ' - plain.css 2:3 @import - input.scss 1:9 root stylesheet + plain.css 2:3 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> for/input.scss -@import 'plain' +@use 'plain' <===> for/plain.css @for $i from 1 to 5 { a { @@ -119,13 +119,13 @@ Error: This at-rule isn't allowed in plain CSS. 1 | @for $i from 1 to 5 { | ^^^^^^^^^^^^^^^^^^^^ ' - plain.css 1:1 @import - input.scss 1:9 root stylesheet + plain.css 1:1 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> function/input.scss -@import 'plain' +@use 'plain' <===> function/plain.css @function foo() { @return 1; @@ -137,13 +137,13 @@ Error: This at-rule isn't allowed in plain CSS. 1 | @function foo() { | ^^^^^^^^^^^^^^^^ ' - plain.css 1:1 @import - input.scss 1:9 root stylesheet + plain.css 1:1 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> if/input.scss -@import 'plain' +@use 'plain' <===> if/plain.css @if true { a { @@ -157,13 +157,13 @@ Error: This at-rule isn't allowed in plain CSS. 1 | @if true { | ^^^^^^^^^ ' - plain.css 1:1 @import - input.scss 1:9 root stylesheet + plain.css 1:1 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> import/interpolated/input.scss -@import 'plain' +@use 'plain' <===> import/interpolated/plain.css @import url("foo#{bar}baz"); @@ -173,13 +173,13 @@ Error: Interpolation isn't allowed in plain CSS. 1 | @import url("foo#{bar}baz"); | ^^^^^^ ' - plain.css 1:17 @import - input.scss 1:9 root stylesheet + plain.css 1:17 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> import/nested/input.scss -@import 'plain' +@use 'plain' <===> import/nested/plain.css a { @import "foo"; @@ -193,7 +193,7 @@ a { <===> ================================================================================ <===> import/multi/input.scss -@import 'plain' +@use 'plain' <===> import/multi/plain.css @import "foo", "bar"; @@ -203,13 +203,13 @@ Error: expected ";". 1 | @import "foo", "bar"; | ^ ' - plain.css 1:14 @import - input.scss 1:9 root stylesheet + plain.css 1:14 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> include/input.scss -@import 'plain' +@use 'plain' <===> include/plain.css @include foo; @@ -219,18 +219,18 @@ Error: This at-rule isn't allowed in plain CSS. 1 | @include foo; | ^^^^^^^^^^^^ ' - plain.css 1:1 @import - input.scss 1:9 root stylesheet + plain.css 1:1 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> mixin/input.scss -@import 'plain' +@use 'plain' <===> mixin/plain.css @mixin foo { a { x: y; - } + } } <===> mixin/error @@ -239,13 +239,13 @@ Error: This at-rule isn't allowed in plain CSS. 1 | @mixin foo { | ^^^^^^^^^^^ ' - plain.css 1:1 @import - input.scss 1:9 root stylesheet + plain.css 1:1 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> return/input.scss -@import 'plain' +@use 'plain' <===> return/plain.css @return foo; @@ -255,13 +255,13 @@ Error: This at-rule isn't allowed in plain CSS. 1 | @return foo; | ^^^^^^^^^^^ ' - plain.css 1:1 @import - input.scss 1:9 root stylesheet + plain.css 1:1 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> warn/input.scss -@import 'plain' +@use 'plain' <===> warn/plain.css @warn foo; @@ -271,13 +271,13 @@ Error: This at-rule isn't allowed in plain CSS. 1 | @warn foo; | ^^^^^^^^^ ' - plain.css 1:1 @import - input.scss 1:9 root stylesheet + plain.css 1:1 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> while/input.scss -@import 'plain' +@use 'plain' <===> while/plain.css @while false { a { @@ -291,13 +291,13 @@ Error: This at-rule isn't allowed in plain CSS. 1 | @while false { | ^^^^^^^^^^^^^ ' - plain.css 1:1 @import - input.scss 1:9 root stylesheet + plain.css 1:1 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> interpolation/input.scss -@import 'plain' +@use 'plain' <===> interpolation/plain.css @foo a#{b}c; @@ -307,5 +307,5 @@ Error: Interpolation isn't allowed in plain CSS. 1 | @foo a#{b}c; | ^^^^ ' - plain.css 1:7 @import - input.scss 1:9 root stylesheet + plain.css 1:7 @use + input.scss 1:1 root stylesheet diff --git a/spec/css/plain/error/statement/silent_comment.hrx b/spec/css/plain/error/statement/silent_comment.hrx index 6c852fccaf..ddfde96cb9 100644 --- a/spec/css/plain/error/statement/silent_comment.hrx +++ b/spec/css/plain/error/statement/silent_comment.hrx @@ -1,5 +1,5 @@ <===> input.scss -@import 'plain' +@use 'plain' <===> plain.css // silent @@ -10,5 +10,5 @@ Error: Silent comments aren't allowed in plain CSS. 1 | // silent | ^^^^^^^^^ ' - plain.css 1:1 @import - input.scss 1:9 root stylesheet + plain.css 1:1 @use + input.scss 1:1 root stylesheet diff --git a/spec/css/plain/error/statement/style_rule.hrx b/spec/css/plain/error/statement/style_rule.hrx index e6e4815259..89a50f02fd 100644 --- a/spec/css/plain/error/statement/style_rule.hrx +++ b/spec/css/plain/error/statement/style_rule.hrx @@ -1,5 +1,5 @@ <===> nested_property/no_value/input.scss -@import 'plain' +@use 'plain' <===> nested_property/no_value/plain.css a { x: { @@ -13,13 +13,13 @@ Error: Nested declarations aren't allowed in plain CSS. 2 | x: { | ^ ' - plain.css 2:6 @import - input.scss 1:9 root stylesheet + plain.css 2:6 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> nested_property/value/input.scss -@import 'plain' +@use 'plain' <===> nested_property/value/plain.css a { @@ -34,8 +34,8 @@ Error: Nested declarations aren't allowed in plain CSS. 2 | b: c { | ^ ' - plain.css 2:8 @import - input.scss 1:9 root stylesheet + plain.css 2:8 @use + input.scss 1:1 root stylesheet <===> ================================================================================ @@ -144,7 +144,7 @@ Error: Top-level leading combinators aren't allowed in plain CSS. <===> ================================================================================ <===> placeholder_selector/input.scss -@import 'plain' +@use 'plain' <===> placeholder_selector/plain.css %foo { x: y; @@ -156,13 +156,13 @@ Error: Placeholder selectors aren't allowed in plain CSS. 1 | %foo { | ^^^^ ' - plain.css 1:1 @import - input.scss 1:9 root stylesheet + plain.css 1:1 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> interpolation/selector/input.scss -@import 'plain' +@use 'plain' <===> interpolation/selector/plain.css a#{b}c { x: y; @@ -174,13 +174,13 @@ Error: Interpolation isn't allowed in plain CSS. 1 | a#{b}c { | ^^^^ ' - plain.css 1:2 @import - input.scss 1:9 root stylesheet + plain.css 1:2 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> interpolation/declaration/input.scss -@import 'plain' +@use 'plain' <===> interpolation/declaration/plain.css a { w#{x}y: z; @@ -192,13 +192,13 @@ Error: Interpolation isn't allowed in plain CSS. 2 | w#{x}y: z; | ^^^^ ' - plain.css 2:4 @import - input.scss 1:9 root stylesheet + plain.css 2:4 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> interpolation/custom_property/input.scss -@import 'plain' +@use 'plain' <===> interpolation/custom_property/plain.css a { --b: #{c}; @@ -210,5 +210,5 @@ Error: Interpolation isn't allowed in plain CSS. 2 | --b: #{c}; | ^^^^ ' - plain.css 2:8 @import - input.scss 1:9 root stylesheet + plain.css 2:8 @use + input.scss 1:1 root stylesheet diff --git a/spec/css/plain/extend.hrx b/spec/css/plain/extend.hrx index ee30a3a8eb..eee3a9b09a 100644 --- a/spec/css/plain/extend.hrx +++ b/spec/css/plain/extend.hrx @@ -1,5 +1,5 @@ <===> input.scss -@import "plain"; +@use "plain"; a {@extend b} diff --git a/spec/css/plain/functions.hrx b/spec/css/plain/functions.hrx index 75f2c4faa4..e779334323 100644 --- a/spec/css/plain/functions.hrx +++ b/spec/css/plain/functions.hrx @@ -14,7 +14,7 @@ c { <===> ================================================================================ <===> hsl/input.scss -@import "plain"; +@use "plain"; <===> hsl/plain.css a {b: hsl(0, 100%, 50%)} @@ -27,7 +27,7 @@ a { <===> ================================================================================ <===> hsla/input.scss -@import "plain"; +@use "plain"; <===> hsla/plain.css a {b: hsla(0, 100%, 50%, 0.5)} @@ -40,7 +40,7 @@ a { <===> ================================================================================ <===> rgb/input.scss -@import "plain"; +@use "plain"; <===> rgb/plain.css a {b: rgb(10, 20, 30)} @@ -53,7 +53,7 @@ a { <===> ================================================================================ <===> rgba/input.scss -@import "plain"; +@use "plain"; <===> rgba/plain.css a {b: rgba(10, 20, 30, 0.5)} @@ -66,7 +66,7 @@ a { <===> ================================================================================ <===> grayscale/input.scss -@import "plain"; +@use "plain"; <===> grayscale/plain.css a {b: grayscale(0.1)} @@ -79,7 +79,7 @@ a { <===> ================================================================================ <===> invert/input.scss -@import "plain"; +@use "plain"; <===> invert/plain.css a {b: invert(0.1)} @@ -92,7 +92,7 @@ a { <===> ================================================================================ <===> alpha/input.scss -@import "plain"; +@use "plain"; <===> alpha/plain.css a {b: alpha(0.1)} @@ -105,7 +105,7 @@ a { <===> ================================================================================ <===> saturate/input.scss -@import "plain"; +@use "plain"; <===> saturate/plain.css a {b: saturate(0.1)} @@ -118,7 +118,7 @@ a { <===> ================================================================================ <===> empty_fallback_var/input.scss -@import "plain"; +@use "plain"; <===> empty_fallback_var/plain.css a {b: var(--c, )} @@ -131,7 +131,7 @@ a { <===> ================================================================================ <===> error/empty_fallback_var/invalid_second_arg_syntax/input.scss -@import "plain"; +@use "plain"; <===> error/empty_fallback_var/invalid_second_arg_syntax/plain.css a {b: var(--c, {})} @@ -142,13 +142,13 @@ Error: Expected expression. 1 | a {b: var(--c, {})} | ^ ' - plain.css 1:16 @import - input.scss 1:9 root stylesheet + plain.css 1:16 @use + input.scss 1:1 root stylesheet <===> ================================================================================ <===> error/empty_fallback_var/empty_second_before_third/input.scss -@import "plain"; +@use "plain"; <===> error/empty_fallback_var/empty_second_before_third/plain.css a {b: var(--c, , d)} @@ -159,5 +159,5 @@ Error: Expected expression. 1 | a {b: var(--c, , d)} | ^ ' - plain.css 1:16 @import - input.scss 1:9 root stylesheet + plain.css 1:16 @use + input.scss 1:1 root stylesheet diff --git a/spec/css/plain/hacks.hrx b/spec/css/plain/hacks.hrx index e8e5be66fd..4525cb059e 100644 --- a/spec/css/plain/hacks.hrx +++ b/spec/css/plain/hacks.hrx @@ -1,5 +1,5 @@ <===> input.scss -@import "plain"; +@use "plain"; <===> plain.css .hacks { diff --git a/spec/css/plain/media.hrx b/spec/css/plain/media.hrx index a711c3f2b8..a15d9c03e3 100644 --- a/spec/css/plain/media.hrx +++ b/spec/css/plain/media.hrx @@ -1,5 +1,5 @@ <===> logic/and_not/lowercase/input.scss -@import 'plain'; +@use 'plain'; <===> logic/and_not/lowercase/plain.css @media a and not (b) {x {y: z}} @@ -14,7 +14,7 @@ <===> ================================================================================ <===> logic/and_not/mixed_case/input.scss -@import 'plain'; +@use 'plain'; <===> logic/and_not/mixed_case/plain.css @media a AnD nOt (b) {x {y: z}} @@ -29,7 +29,7 @@ <===> ================================================================================ <===> logic/and_not/after_type_and_modifier/input.scss -@import 'plain'; +@use 'plain'; <===> logic/and_not/after_type_and_modifier/plain.css @media only a and not (b) {x {y: z}} @@ -44,7 +44,7 @@ <===> ================================================================================ <===> logic/and/one/input.scss -@import 'plain'; +@use 'plain'; <===> logic/and/one/plain.css @media (a) and (b) {x {y: z}} @@ -59,7 +59,7 @@ <===> ================================================================================ <===> logic/and/no_whitespace_before/input.scss -@import 'plain'; +@use 'plain'; <===> logic/and/no_whitespace_before/plain.css @media (a)and (b) {x {y: z}} @@ -74,7 +74,7 @@ <===> ================================================================================ <===> logic/and/multiple/input.scss -@import 'plain'; +@use 'plain'; <===> logic/and/multiple/plain.css @media (a) and (b) and (c) and (d) {x {y: z}} @@ -89,7 +89,7 @@ <===> ================================================================================ <===> logic/and/mixed_case/input.scss -@import 'plain'; +@use 'plain'; <===> logic/and/mixed_case/plain.css @media (a) AnD (b) {x {y: z}} @@ -104,7 +104,7 @@ <===> ================================================================================ <===> logic/or/one/input.scss -@import 'plain'; +@use 'plain'; <===> logic/or/one/plain.css @media (a) or (b) {x {y: z}} @@ -119,7 +119,7 @@ <===> ================================================================================ <===> logic/or/no_whitespace_before/input.scss -@import 'plain'; +@use 'plain'; <===> logic/or/no_whitespace_before/plain.css @media (a)or (b) {x {y: z}} @@ -134,7 +134,7 @@ <===> ================================================================================ <===> logic/or/multiple/input.scss -@import 'plain'; +@use 'plain'; <===> logic/or/multiple/plain.css @media (a) or (b) or (c) or (d) {x {y: z}} @@ -149,7 +149,7 @@ <===> ================================================================================ <===> logic/or/mixed_case/input.scss -@import 'plain'; +@use 'plain'; <===> logic/or/mixed_case/plain.css @media (a) oR (b) {x {y: z}} @@ -164,7 +164,7 @@ <===> ================================================================================ <===> logic/not/lowercase/input.scss -@import 'plain'; +@use 'plain'; <===> logic/not/lowercase/plain.css @media not (a) {x {y: z}} @@ -179,7 +179,7 @@ <===> ================================================================================ <===> logic/not/mixed_case/input.scss -@import 'plain'; +@use 'plain'; <===> logic/not/mixed_case/plain.css @media NoT (a) {x {y: z}} diff --git a/spec/css/plain/null.hrx b/spec/css/plain/null.hrx index 8f40e329b5..32c1f20782 100644 --- a/spec/css/plain/null.hrx +++ b/spec/css/plain/null.hrx @@ -1,5 +1,5 @@ <===> input.scss -@import "plain"; +@use "plain"; <===> plain.css a { diff --git a/spec/css/plain/single_equals.hrx b/spec/css/plain/single_equals.hrx index 6823adac04..5d82612ed3 100644 --- a/spec/css/plain/single_equals.hrx +++ b/spec/css/plain/single_equals.hrx @@ -1,5 +1,5 @@ <===> input.scss -@import "plain"; +@use "plain"; <===> plain.css a { diff --git a/spec/css/plain/slash.hrx b/spec/css/plain/slash.hrx index 3e8516c1a6..c9442756a8 100644 --- a/spec/css/plain/slash.hrx +++ b/spec/css/plain/slash.hrx @@ -1,5 +1,5 @@ <===> with_intermediate/input.scss -@import "plain"; +@use "plain"; <===> with_intermediate/plain.css a {b: 1/2/foo/bar} @@ -12,7 +12,7 @@ a { <===> ================================================================================ <===> without_intermediate/whitespace/input.scss -@import "plain"; +@use "plain"; <===> without_intermediate/whitespace/plain.css a {b: 1/ / /bar} @@ -25,7 +25,7 @@ a { <===> ================================================================================ <===> without_intermediate/no_whitespace/input.scss -@import "plain"; +@use "plain"; <===> without_intermediate/no_whitespace/plain.css a {b: 1///bar} From 992d1d18a1762af7a8a98c0ab62bf9f1f1c0c217 Mon Sep 17 00:00:00 2001 From: Jennifer Thakar Date: Fri, 19 Jul 2024 09:33:07 -0700 Subject: [PATCH 08/10] Migrate js-api-spec tests --- js-api-spec/compile.node.test.ts | 6 +- js-api-spec/compiler.node.test.ts | 8 +- js-api-spec/compiler.test.ts | 14 ++- js-api-spec/deprecations.test.ts | 1 + js-api-spec/importer.node.test.ts | 54 +++++---- js-api-spec/importer.test.ts | 85 +++++++------ js-api-spec/legacy/importer.node.test.ts | 134 ++++++++++----------- js-api-spec/legacy/render.node.test.ts | 22 ++-- js-api-spec/legacy/source-map.node.test.ts | 12 +- 9 files changed, 176 insertions(+), 160 deletions(-) diff --git a/js-api-spec/compile.node.test.ts b/js-api-spec/compile.node.test.ts index 4f174a2124..4e9d5a7822 100644 --- a/js-api-spec/compile.node.test.ts +++ b/js-api-spec/compile.node.test.ts @@ -82,7 +82,11 @@ describe('compileString', () => { '_upstream.scss': 'a {b: c}', }); expect( - compileString('@import "left"; @import "right"', {url}).loadedUrls + compileString('@import "left"; @import "right"', { + url, + // TODO(jathak): Add this once import deprecation is active + // silenceDeprecations: ['import'], + }).loadedUrls ).toEqual([ url, dir.url('_left.scss'), diff --git a/js-api-spec/compiler.node.test.ts b/js-api-spec/compiler.node.test.ts index 8af5c13b8f..90e274b102 100644 --- a/js-api-spec/compiler.node.test.ts +++ b/js-api-spec/compiler.node.test.ts @@ -30,7 +30,7 @@ describe('Compiler', () => { it('performs complete compilations', () => sandbox(dir => { const logger = getLogger(); - dir.write({'input.scss': '@import "bar"; .fn {value: foo(bar)}'}); + dir.write({'input.scss': '@use "bar"; .fn {value: foo(bar)}'}); const result = compiler.compile(dir('input.scss'), { importers, functions, @@ -52,7 +52,7 @@ describe('Compiler', () => { syntax: 'scss', }), }; - dir.write({'input.scss': '@import "nested"; a {b: c}'}); + dir.write({'input.scss': '@use "nested"; a {b: c}'}); const result = compiler.compile(dir('input.scss'), { importers: [nestedImporter], }); @@ -91,7 +91,7 @@ describe('AsyncCompiler', () => { .map((_, i) => { const filename = `input-${i}.scss`; dir.write({ - [filename]: `@import "${i}"; .fn {value: foo(${i})}`, + [filename]: `@use "${i}" as _; .fn {value: foo(${i})}`, }); return compiler.compileAsync(dir(filename), { importers: asyncImporters, @@ -121,7 +121,7 @@ describe('AsyncCompiler', () => { it('waits for compilations to finish before disposing', () => sandbox(async dir => { let completed = false; - dir.write({'input.scss': '@import "slow"'}); + dir.write({'input.scss': '@use "slow"'}); const {importer, triggerComplete} = getTriggeredImporter( () => (completed = true) ); diff --git a/js-api-spec/compiler.test.ts b/js-api-spec/compiler.test.ts index 065f3e7e49..713e50c6d5 100644 --- a/js-api-spec/compiler.test.ts +++ b/js-api-spec/compiler.test.ts @@ -73,7 +73,7 @@ describe('Compiler', () => { it('performs complete compilations', () => { const logger = getLogger(); const result = compiler.compileString( - '@import "bar"; .fn {value: foo(baz)}', + '@use "bar"; .fn {value: foo(baz)}', {importers, functions, logger} ); expect(result.css).toEqualIgnoringWhitespace( @@ -90,7 +90,7 @@ describe('Compiler', () => { syntax: 'scss', }), }; - const result = compiler.compileString('@import "nested"; a {b: c}', { + const result = compiler.compileString('@use "nested"; a {b: c}', { importers: [nestedImporter], }); expect(result.css).toEqualIgnoringWhitespace('x {y: z;} a {b: c;}'); @@ -139,8 +139,12 @@ describe('AsyncCompiler', () => { .fill(0) .map((_, i) => compiler.compileStringAsync( - `@import "${i}"; .fn {value: foo(${i})}`, - {importers: asyncImporters, functions, logger} + `@use "${i}" as _; .fn {value: foo(${i})}`, + { + importers: asyncImporters, + functions, + logger, + } ) ); Array.from(await Promise.all(compilations)) @@ -165,7 +169,7 @@ describe('AsyncCompiler', () => { const {importer, triggerComplete} = getTriggeredImporter( () => (completed = true) ); - const compilation = compiler.compileStringAsync('@import "slow"', { + const compilation = compiler.compileStringAsync('@use "slow"', { importers: [importer], }); diff --git a/js-api-spec/deprecations.test.ts b/js-api-spec/deprecations.test.ts index 852c068f88..b50222e745 100644 --- a/js-api-spec/deprecations.test.ts +++ b/js-api-spec/deprecations.test.ts @@ -131,6 +131,7 @@ describe('an error', () => { }); }); +// TODO(jathak): Disable these tests when there aren't any future deprecations. describe('for a future deprecation,', () => { let importer: Importer; beforeEach(() => { diff --git a/js-api-spec/importer.node.test.ts b/js-api-spec/importer.node.test.ts index e03ad18fb9..b85fb08bcc 100644 --- a/js-api-spec/importer.node.test.ts +++ b/js-api-spec/importer.node.test.ts @@ -18,7 +18,7 @@ it('avoids importer when canonicalize() returns null', () => sandbox(dir => { dir.write({'dir/_other.scss': 'a {from: dir}'}); - const result = compileString('@import "other";', { + const result = compileString('@use "other";', { importers: [ { canonicalize: () => null, @@ -37,7 +37,7 @@ it('fails to import when load() returns null', () => dir.write({'dir/_other.scss': 'a {from: dir}'}); expect(() => { - compileString('@import "other";', { + compileString('@use "other";', { importers: [ { canonicalize: (url: string) => new URL(`u:${url}`), @@ -52,7 +52,7 @@ it('fails to import when load() returns null', () => it('prefers a relative file load to an importer', () => sandbox(dir => { dir.write({ - 'input.scss': '@import "other"', + 'input.scss': '@use "other"', '_other.scss': 'a {from: relative}', }); @@ -74,7 +74,7 @@ it('prefers a relative file load to an importer', () => it('prefers an importer to a load path', () => sandbox(dir => { dir.write({ - 'input.scss': '@import "other"', + 'input.scss': '@use "other"', 'dir/_other.scss': 'a {from: load-path}', }); @@ -95,7 +95,7 @@ describe('FileImporter', () => { sandbox(dir => { dir.write({'_other.scss': 'a {b: c}'}); - const result = compileString('@import "other";', { + const result = compileString('@use "other";', { importers: [{findFileUrl: () => dir.url('_other.scss')}], }); expect(result.css).toBe('a {\n b: c;\n}'); @@ -105,7 +105,7 @@ describe('FileImporter', () => { sandbox(dir => { dir.write({'other/_index.scss': 'a {b: c}'}); - const result = compileString('@import "other";', { + const result = compileString('@use "other";', { importers: [{findFileUrl: () => dir.url('other')}], }); expect(result.css).toBe('a {\n b: c;\n}'); @@ -115,7 +115,7 @@ describe('FileImporter', () => { sandbox(dir => { dir.write({'_other.scss': 'a {from: dir}'}); - const result = compileString('@import "other";', { + const result = compileString('@use "other";', { importers: [{findFileUrl: () => null}], loadPaths: [dir.root], }); @@ -126,7 +126,7 @@ describe('FileImporter', () => { sandbox(dir => { dir.write({'_other.scss': 'a {from: dir}'}); - const result = compileString('@import "other";', { + const result = compileString('@use "other";', { importers: [{findFileUrl: () => dir.url('nonexistent/other')}], loadPaths: [dir.root], }); @@ -137,7 +137,7 @@ describe('FileImporter', () => { sandbox(dir => { dir.write({'dir/_other.scss': 'a {b: c}'}); - const result = compileString('@import "u:other";', { + const result = compileString('@use "u:other";', { importers: [ { findFileUrl(url: string) { @@ -154,7 +154,7 @@ describe('FileImporter', () => { sandbox(dir => { dir.write({'_other.scss': 'a {b: c}'}); - const result = compileString(`@import "${dir.url('other')}";`, { + const result = compileString(`@use "${dir.url('other')}";`, { importers: [ { findFileUrl() { @@ -168,11 +168,11 @@ describe('FileImporter', () => { it("doesn't pass relative loads to the importer", () => sandbox(dir => { - dir.write({'_midstream.scss': '@import "upstream"'}); + dir.write({'_midstream.scss': '@use "upstream"'}); dir.write({'_upstream.scss': 'a {b: c}'}); let count = 0; - const result = compileString('@import "midstream";', { + const result = compileString('@use "midstream";', { importers: [ { findFileUrl() { @@ -191,7 +191,7 @@ describe('FileImporter', () => { it('wraps an error', () => { expect(() => { - compileString('@import "other";', { + compileString('@use "other";', { importers: [ { findFileUrl() { @@ -205,7 +205,7 @@ describe('FileImporter', () => { it('rejects a non-file URL', () => { expect(() => { - compileString('@import "other";', { + compileString('@use "other";', { importers: [{findFileUrl: () => new URL('u:other.scss')}], }); }).toThrowSassException({line: 0}); @@ -215,7 +215,7 @@ describe('FileImporter', () => { it('.scss, parses it as SCSS', () => sandbox(dir => { dir.write({'_other.scss': '$a: value; b {c: $a}'}); - const result = compileString('@import "other";', { + const result = compileString('@use "other";', { importers: [{findFileUrl: () => dir.url('other')}], }); expect(result.css).toBe('b {\n c: value;\n}'); @@ -224,7 +224,7 @@ describe('FileImporter', () => { it('.sass, parses it as the indented syntax', () => sandbox(dir => { dir.write({'_other.sass': '$a: value\nb\n c: $a'}); - const result = compileString('@import "other";', { + const result = compileString('@use "other";', { importers: [{findFileUrl: () => dir.url('other')}], }); expect(result.css).toBe('b {\n c: value;\n}'); @@ -233,7 +233,7 @@ describe('FileImporter', () => { it('.css, allows plain CSS', () => sandbox(dir => { dir.write({'_other.css': 'a {b: c}'}); - const result = compileString('@import "other";', { + const result = compileString('@use "other";', { importers: [{findFileUrl: () => dir.url('other')}], }); expect(result.css).toBe('a {\n b: c;\n}'); @@ -243,7 +243,7 @@ describe('FileImporter', () => { sandbox(dir => { dir.write({'_other.css': '$a: value; b {c: $a}'}); expect(() => { - compileString('@import "other";', { + compileString('@use "other";', { importers: [{findFileUrl: () => dir.url('other')}], }); }).toThrowSassException({ @@ -266,6 +266,8 @@ describe('FileImporter', () => { }, }, ], + // TODO(jathak): Add this once import deprecation is active + // silenceDeprecations: ['import'], }); })); @@ -289,7 +291,7 @@ describe('FileImporter', () => { it('set for a relative URL', () => sandbox(dir => { dir.write({'_other.css': 'a {b: c}'}); - const result = compileString('@import "other";', { + const result = compileString('@use "other";', { importers: [ { findFileUrl: (url: string, context: CanonicalizeContext) => { @@ -308,7 +310,7 @@ describe('FileImporter', () => { it('set for an absolute URL', () => sandbox(dir => { dir.write({'_other.css': 'a {b: c}'}); - const result = compileString('@import "u:other";', { + const result = compileString('@use "u:other";', { importers: [ { findFileUrl: (url: string, context: CanonicalizeContext) => { @@ -327,7 +329,7 @@ describe('FileImporter', () => { it('unset when the URL is unavailable', () => sandbox(dir => { dir.write({'_other.css': 'a {b: c}'}); - const result = compileString('@import "u:other";', { + const result = compileString('@use "u:other";', { importers: [ { findFileUrl: (url: string, context: CanonicalizeContext) => { @@ -342,7 +344,7 @@ describe('FileImporter', () => { }); describe('async', () => { - it('resolves an @import', async () => + it('resolves an @use', async () => sandbox(async dir => { dir.write({'_other.scss': 'a {b: c}'}); const result = await compileStringAsync('@use "other"', { @@ -357,7 +359,7 @@ describe('FileImporter', () => { it('wraps an error', async () => { await expectAsync(() => - compileStringAsync('@import "other";', { + compileStringAsync('@use "other";', { importers: [ { findFileUrl: () => Promise.reject('this import is bad actually'), @@ -376,10 +378,10 @@ describe('FileImporter', () => { }); dir.write({ - 'main.scss': '@import "sub1/test"; @import "sub1/sub2/test"', - 'sub1/test.scss': '@import "y"', + 'main.scss': '@use "sub1/test"; @use "sub1/sub2/test" as test2', + 'sub1/test.scss': '@use "y"', 'sub1/x.scss': 'x { from: sub1; }', - 'sub1/sub2/test.scss': '@import "y"', + 'sub1/sub2/test.scss': '@use "y"', 'sub1/sub2/x.scss': 'x { from: sub2; }', }); diff --git a/js-api-spec/importer.test.ts b/js-api-spec/importer.test.ts index a9658b2c82..73805af409 100644 --- a/js-api-spec/importer.test.ts +++ b/js-api-spec/importer.test.ts @@ -12,8 +12,8 @@ import { import {sassImpl, runOnlyForImpl, URL} from './utils'; -it('uses an importer to resolve an @import', () => { - const result = compileString('@import "orange";', { +it('uses an importer to resolve a @use', () => { + const result = compileString('@use "orange";', { importers: [ { canonicalize: (url: string) => new URL(`u:${url}`), @@ -29,7 +29,7 @@ it('uses an importer to resolve an @import', () => { }); it('passes the canonicalized URL to the importer', () => { - const result = compileString('@import "orange";', { + const result = compileString('@use "orange";', { importers: [ { canonicalize: () => new URL('u:blue'), @@ -60,6 +60,7 @@ it('only invokes the importer once for a given canonicalization', () => { }, }, ], + silenceDeprecations: ['import'], } ); @@ -75,7 +76,7 @@ it('only invokes the importer once for a given canonicalization', () => { describe('the imported URL', () => { // Regression test for sass/dart-sass#1137. it("isn't changed if it's root-relative", () => { - const result = compileString('@import "/orange";', { + const result = compileString('@use "/orange";', { importers: [ { canonicalize(url: string) { @@ -109,7 +110,7 @@ describe('the imported URL', () => { describe('the containing URL', () => { it('is null for a potentially canonical scheme', () => { - const result = compileString('@import "u:orange"', { + const result = compileString('@use "u:orange"', { importers: [ { canonicalize: (url: string, context: CanonicalizeContext) => { @@ -127,7 +128,7 @@ describe('the containing URL', () => { describe('for a non-canonical scheme', () => { describe('in a list', () => { it('is set to the original URL', () => { - const result = compileString('@import "u:orange"', { + const result = compileString('@use "u:orange"', { importers: [ { canonicalize: (url: string, context: CanonicalizeContext) => { @@ -147,7 +148,7 @@ describe('the containing URL', () => { }); it('is null if the original URL is null', () => { - const result = compileString('@import "u:orange"', { + const result = compileString('@use "u:orange"', { importers: [ { canonicalize: (url: string, context: CanonicalizeContext) => { @@ -166,7 +167,7 @@ describe('the containing URL', () => { describe('as a string', () => { it('is set to the original URL', () => { - const result = compileString('@import "u:orange"', { + const result = compileString('@use "u:orange"', { importers: [ { canonicalize: (url: string, context: CanonicalizeContext) => { @@ -186,7 +187,7 @@ describe('the containing URL', () => { }); it('is null if the original URL is null', () => { - const result = compileString('@import "u:orange"', { + const result = compileString('@use "u:orange"', { importers: [ { canonicalize: (url: string, context: CanonicalizeContext) => { @@ -206,7 +207,7 @@ describe('the containing URL', () => { describe('for a schemeless load', () => { it('is set to the original URL', () => { - const result = compileString('@import "orange"', { + const result = compileString('@use "orange"', { importers: [ { canonicalize: (url: string, context: CanonicalizeContext) => { @@ -223,7 +224,7 @@ describe('the containing URL', () => { }); it('is null if the original URL is null', () => { - const result = compileString('@import "orange"', { + const result = compileString('@use "orange"', { importers: [ { canonicalize: (url: string, context: CanonicalizeContext) => { @@ -246,7 +247,7 @@ describe( () => { it('set as a list', () => expect(() => - compileString('@import "orange"', { + compileString('@use "orange"', { importers: [ { canonicalize: (url: string) => { @@ -261,7 +262,7 @@ describe( it('set as a string', () => expect(() => - compileString('@import "orange"', { + compileString('@use "orange"', { importers: [ { canonicalize: (url: string) => { @@ -318,7 +319,7 @@ describe('throws an error for an invalid scheme:', () => { }); it("uses an importer's source map URL", () => { - const result = compileString('@import "orange";', { + const result = compileString('@use "orange";', { importers: [ { canonicalize: (url: string) => new URL(`u:${url}`), @@ -340,7 +341,7 @@ it("uses an importer's source map URL", () => { it('wraps an error in canonicalize()', () => { expect(() => { - compileString('@import "orange";', { + compileString('@use "orange";', { importers: [ { canonicalize() { @@ -357,7 +358,7 @@ it('wraps an error in canonicalize()', () => { it('wraps an error in load()', () => { expect(() => { - compileString('@import "orange";', { + compileString('@use "orange";', { importers: [ { canonicalize: (url: string) => new URL(`u:${url}`), @@ -372,7 +373,7 @@ it('wraps an error in load()', () => { it('fails to import when load() returns null', () => expect(() => { - compileString('@import "other";', { + compileString('@use "other";', { importers: [ { canonicalize: (url: string) => new URL(`u:${url}`), @@ -384,7 +385,7 @@ it('fails to import when load() returns null', () => describe('with syntax', () => { it('scss, parses it as SCSS', () => { - const result = compileString('@import "other";', { + const result = compileString('@use "other";', { importers: [ { canonicalize: () => new URL('u:other'), @@ -397,7 +398,7 @@ describe('with syntax', () => { }); it('indented, parses it as the indented syntax', () => { - const result = compileString('@import "other";', { + const result = compileString('@use "other";', { importers: [ { canonicalize: () => new URL('u:other'), @@ -413,7 +414,7 @@ describe('with syntax', () => { }); it('css, allows plain CSS', () => { - const result = compileString('@import "other";', { + const result = compileString('@use "other";', { importers: [ { canonicalize: () => new URL('u:other'), @@ -427,7 +428,7 @@ describe('with syntax', () => { it('css, rejects SCSS', () => { expect(() => { - compileString('@import "other";', { + compileString('@use "other";', { importers: [ { canonicalize: () => new URL('u:other'), @@ -443,8 +444,8 @@ describe('with syntax', () => { }); describe('async', () => { - it('resolves an @import', async () => { - const result = await compileStringAsync('@import "orange";', { + it('resolves a @use', async () => { + const result = await compileStringAsync('@use "orange";', { importers: [ { canonicalize: (url: string) => Promise.resolve(new URL(`u:${url}`)), @@ -464,7 +465,7 @@ describe('async', () => { it('wraps an asynchronous error in canonicalize', async () => { await expectAsync(() => - compileStringAsync('@import "orange";', { + compileStringAsync('@use "orange";', { importers: [ { canonicalize: () => Promise.reject('this import is bad actually'), @@ -479,7 +480,7 @@ describe('async', () => { it('wraps a synchronous error in canonicalize', async () => { await expectAsync(() => - compileStringAsync('@import "orange";', { + compileStringAsync('@use "orange";', { importers: [ { canonicalize() { @@ -496,7 +497,7 @@ describe('async', () => { it('wraps an asynchronous error in load', async () => { await expectAsync(() => - compileStringAsync('@import "orange";', { + compileStringAsync('@use "orange";', { importers: [ { canonicalize: (url: string) => new URL(`u:${url}`), @@ -509,7 +510,7 @@ describe('async', () => { it('wraps a synchronous error in load', async () => { await expectAsync(() => - compileStringAsync('@import "orange";', { + compileStringAsync('@use "orange";', { importers: [ { canonicalize: (url: string) => new URL(`u:${url}`), @@ -525,7 +526,7 @@ describe('async', () => { describe("compileString()'s importer option", () => { it('loads relative imports from the entrypoint', () => { - const result = compileString('@import "orange";', { + const result = compileString('@use "orange";', { importer: { canonicalize: (url: string) => { expect(url).toBe('u:orange'); @@ -543,7 +544,7 @@ describe("compileString()'s importer option", () => { }); it("loads imports relative to the entrypoint's URL", () => { - const result = compileString('@import "baz/qux";', { + const result = compileString('@use "baz/qux";', { importer: { canonicalize: (url: string) => { expect(url).toBe('u:foo/baz/qux'); @@ -561,7 +562,7 @@ describe("compileString()'s importer option", () => { }); it('loads relative imports without an entrypoint URL', () => { - const result = compileString('@import "orange";', { + const result = compileString('@use "orange";', { importer: { canonicalize: (url: string) => { expect(url).toBe('orange'); @@ -578,7 +579,7 @@ describe("compileString()'s importer option", () => { }); it('takes precedence over the importer list for relative URLs', () => { - const result = compileString('@import "other";', { + const result = compileString('@use "other";', { importers: [ { canonicalize() { @@ -599,7 +600,7 @@ describe("compileString()'s importer option", () => { }); it("doesn't load absolute imports", () => { - const result = compileString('@import "u:orange";', { + const result = compileString('@use "u:orange";', { importer: { canonicalize: () => { throw 'Should not be called'; @@ -627,7 +628,7 @@ describe("compileString()'s importer option", () => { }); it("doesn't load from other importers", () => { - const result = compileString('@import "u:midstream";', { + const result = compileString('@use "u:midstream";', { importer: { canonicalize: () => { throw 'Should not be called'; @@ -641,7 +642,7 @@ describe("compileString()'s importer option", () => { canonicalize: (url: string) => new URL(url), load: (url: typeof URL) => { if (url.pathname === 'midstream') { - return {contents: "@import 'orange';", syntax: 'scss'}; + return {contents: "@use 'orange';", syntax: 'scss'}; } else { const color = url.pathname; return {contents: `.${color} {color: ${color}}`, syntax: 'scss'}; @@ -660,7 +661,7 @@ describe("compileString()'s importer option", () => { // "first:other" import is resolved it should be passed to the first // importer first despite being in the second importer's file. let secondCalled = false; - const result = compileString('@import "second:other";', { + const result = compileString('@use "second:other";', { importers: [ { canonicalize: (url: string) => @@ -678,7 +679,7 @@ describe("compileString()'s importer option", () => { secondCalled = true; return url.startsWith('second:') ? new URL(url) : null; }, - load: () => ({contents: '@import "first:other";', syntax: 'scss'}), + load: () => ({contents: '@use "first:other";', syntax: 'scss'}), }, ], }); @@ -689,7 +690,11 @@ describe("compileString()'s importer option", () => { describe('fromImport is', () => { it('true from an @import', () => { - compileString('@import "foo"', {importers: [expectFromImport(true)]}); + compileString('@import "foo"', { + importers: [expectFromImport(true)], + // TODO(jathak): Add this once import deprecation is active + // silenceDeprecations: ['import'], + }); }); it('false from a @use', () => { @@ -710,7 +715,7 @@ describe('fromImport is', () => { describe('when importer does not return string contents', () => { it('throws an error in sync mode', () => { expect(() => { - compileString('@import "other";', { + compileString('@use "other";', { importers: [ { canonicalize: (url: string) => new URL(`u:${url}`), @@ -735,7 +740,7 @@ describe('when importer does not return string contents', () => { it('throws an error in async mode', async () => { await expectAsync(async () => { - await compileStringAsync('@import "other";', { + await compileStringAsync('@use "other";', { importers: [ { canonicalize: (url: string) => new URL(`u:${url}`), @@ -761,7 +766,7 @@ describe('when importer does not return string contents', () => { it('throws an ArgumentError when the result sourceMapUrl is missing a scheme', () => { expect(() => { - compileString('@import "other";', { + compileString('@use "other";', { importers: [ { canonicalize: (url: string) => new URL(`u:${url}`), diff --git a/js-api-spec/legacy/importer.node.test.ts b/js-api-spec/legacy/importer.node.test.ts index 43f567fc24..a627285f00 100644 --- a/js-api-spec/legacy/importer.node.test.ts +++ b/js-api-spec/legacy/importer.node.test.ts @@ -13,10 +13,10 @@ it('imports cascade through importers', () => expect( sass .renderSync({ - data: "@import 'foo'", + data: "@use 'foo'", importer: [ - (url: string) => (url === 'foo' ? {contents: '@import "bar"'} : null), - (url: string) => (url === 'bar' ? {contents: '@import "baz"'} : null), + (url: string) => (url === 'foo' ? {contents: '@use "bar"'} : null), + (url: string) => (url === 'bar' ? {contents: '@use "baz"'} : null), (url: string) => (url === 'baz' ? {contents: 'a {b: c}'} : null), ], }) @@ -27,7 +27,7 @@ it('an empty object means an empty file', () => expect( sass .renderSync({ - data: "@import 'foo'", + data: "@use 'foo'", importer: () => ({} as sass.LegacyImporterResult), }) .css.toString() @@ -39,7 +39,7 @@ describe('import precedence:', () => { sandbox(dir => { dir.write({ 'sub/test.scss': 'a {from: relative}', - 'sub/base.scss': '@import "test"', + 'sub/base.scss': '@use "test"', }); dir.chdir(() => @@ -62,7 +62,7 @@ describe('import precedence:', () => { expect( sass .renderSync({ - data: '@import "test"', + data: '@use "test"', importer: () => ({contents: 'a {from: importer}'}), }) .css.toString() @@ -81,7 +81,7 @@ describe('import precedence:', () => { expect( sass .renderSync({ - data: '@import "test"', + data: '@use "test"', includePaths: [dir('sub')], }) .css.toString() @@ -94,7 +94,7 @@ describe('import precedence:', () => { sandbox(dir => { dir.write({ 'sub/test.scss': 'a {from: cwd}', - 'sub/base.scss': '@import "sub/test"', + 'sub/base.scss': '@use "sub/test"', }); dir.chdir(() => @@ -118,7 +118,7 @@ describe('import precedence:', () => { expect( sass .renderSync({ - data: '@import "test"', + data: '@use "test"', includePaths: [dir.root], importer: [], }) @@ -133,7 +133,7 @@ describe('with contents', () => { expect( sass .renderSync({ - data: '@import "foo"', + data: '@use "foo"', importer: () => ({contents: 'a {b: c}'}), }) .css.toString() @@ -146,7 +146,7 @@ describe('with contents', () => { expect( sass .renderSync({ - data: '@import "test"', + data: '@use "test"', importer: () => ({ contents: 'a {from: contents}', file: dir('test.scss'), @@ -159,7 +159,7 @@ describe('with contents', () => { it('contents use file name as canonical url', () => expect( sass.renderSync({ - data: '@import "foo"', + data: '@use "foo"', importer: () => ({ contents: '', file: 'bar', @@ -171,7 +171,7 @@ describe('with contents', () => { it('passes through an absolute file path', () => expect( sass.renderSync({ - data: '@import "foo"', + data: '@use "foo"', importer: () => ({ contents: '', file: p.resolve('bar'), @@ -192,9 +192,9 @@ describe('with contents', () => { }); dir.write({ - 'main.scss': '@import "sub1/test"; @import "sub1/sub2/test"', - 'sub1/test.scss': '@import "x"', - 'sub1/sub2/test.scss': '@import "x"', + 'main.scss': '@use "sub1/test"; @use "sub1/sub2/test" as test2', + 'sub1/test.scss': '@use "x"', + 'sub1/sub2/test.scss': '@use "x"', }); expect( @@ -218,7 +218,7 @@ describe('with a file redirect', () => { expect( sass .renderSync({ - data: '@import "foo"', + data: '@use "foo"', importer: () => ({file: dir('test.scss')}), }) .css.toString() @@ -232,7 +232,7 @@ describe('with a file redirect', () => { expect( sass .renderSync({ - data: '@import "foo"', + data: '@use "foo"', importer: () => ({file: dir('test.sass')}), }) .css.toString() @@ -247,7 +247,7 @@ describe('with a file redirect', () => { expect( sass .renderSync({ - data: '@import "foo"', + data: '@use "foo"', importer: () => ({file: dir('test.css')}), }) .css.toString() @@ -261,7 +261,7 @@ describe('with a file redirect', () => { expect( sass .renderSync({ - data: '@import "foo"', + data: '@use "foo"', importer: () => ({file: dir('target.scss')}), }) .css.toString() @@ -309,7 +309,7 @@ describe('with a file redirect', () => { expect( sass .renderSync({ - data: '@import "foo"', + data: '@use "foo"', importer: () => ({file: dir('test')}), }) .css.toString() @@ -320,7 +320,7 @@ describe('with a file redirect', () => { sandbox(dir => { dir.write({ '_other.scss': 'a {b: c}', - 'test.scss': '@import "foo"', + 'test.scss': '@use "foo"', }); expect( @@ -337,7 +337,7 @@ describe('with a file redirect', () => { sandbox(dir => { dir.write({ '_other.scss': 'a {b: c}', - 'test.scss': '@import "foo"', + 'test.scss': '@use "foo"', }); const result = sass.renderSync({ @@ -358,7 +358,7 @@ describe('with a file redirect', () => { expect( sass .renderSync({ - data: '@import "foo"', + data: '@use "foo"', includePaths: [dir.root], importer: () => ({file: 'test.scss'}), }) @@ -369,7 +369,7 @@ describe('with a file redirect', () => { it('relative to the base file takes precedence over include paths', () => sandbox(dir => { dir.write({ - 'test.scss': '@import "foo"', + 'test.scss': '@use "foo"', '_other.scss': 'a {from: relative}', 'sub/_other.scss': 'a {from: load path}', }); @@ -394,7 +394,7 @@ describe('with a file redirect', () => { expect( sass .renderSync({ - data: '@import "foo"', + data: '@use "foo"', importer: () => ({file: 'test.scss'}), }) .css.toString() @@ -406,7 +406,7 @@ describe('with a file redirect', () => { sandbox(dir => { dir.write({ '_other.scss': 'a {from: cwd}', - 'sub/test.scss': '@import "foo"', + 'sub/test.scss': '@use "foo"', 'sub/_other.scss': 'a {from: relative}', }); @@ -426,7 +426,7 @@ describe('with a file redirect', () => { sandbox(dir => { dir.write({ '_other.scss': 'a {from: cwd}', - 'test.scss': '@import "foo"', + 'test.scss': '@use "foo"', 'sub/_other.scss': 'a {from: load path}', }); @@ -452,7 +452,7 @@ describe('the imported URL', () => { return {contents: ''}; }); - sass.renderSync({data: '@import "foo"', importer}); + sass.renderSync({data: '@use "foo"', importer}); expect(importer).toHaveBeenCalled(); }); @@ -471,18 +471,18 @@ describe('the imported URL', () => { it("isn't resolved relative to the current file", () => { const importer = spy((url: string) => { - if (url === 'foo/bar') return {contents: '@import "baz"'}; + if (url === 'foo/bar') return {contents: '@use "baz"'}; expect(url).toBe('baz'); return {contents: ''}; }); - sass.renderSync({data: '@import "foo/bar"', importer}); + sass.renderSync({data: '@use "foo/bar"', importer}); expect(importer).toHaveBeenCalledTimes(2); }); it('is added to includedFiles', () => { const result = sass.renderSync({ - data: '@import "foo"', + data: '@use "foo"', importer: () => ({contents: ''}), }); expect(result.stats.includedFiles).toContain('foo'); @@ -495,7 +495,7 @@ describe('the imported URL', () => { return {contents: ''}; }); - sass.renderSync({data: '@import "/foo"', importer}); + sass.renderSync({data: '@use "/foo"', importer}); expect(importer).toHaveBeenCalled(); }); @@ -506,7 +506,7 @@ describe('the imported URL', () => { return {contents: ''}; }); - sass.renderSync({data: '@import "/foo/bar/baz"', importer}); + sass.renderSync({data: '@use "/foo/bar/baz"', importer}); expect(importer).toHaveBeenCalled(); }); @@ -524,7 +524,7 @@ describe('the imported URL', () => { describe('the previous URL', () => { it('is an absolute path for stylesheets from the filesystem', () => sandbox(dir => { - dir.write({'test.scss': '@import "foo"'}); + dir.write({'test.scss': '@use "foo"'}); const importer = spy((url, prev) => { expect(prev).toBe(p.resolve(dir('test.scss'))); @@ -538,8 +538,8 @@ describe('the previous URL', () => { it('is an absolute path for stylesheets redirected to the filesystem', () => sandbox(dir => { dir.write({ - 'test.scss': '@import "foo"', - '_other.scss': '@import "baz"', + 'test.scss': '@use "foo"', + '_other.scss': '@use "baz"', }); const importer = spy((url, prev) => { @@ -559,13 +559,13 @@ describe('the previous URL', () => { return {contents: ''}; }); - sass.renderSync({data: '@import "foo"', importer}); + sass.renderSync({data: '@use "foo"', importer}); expect(importer).toHaveBeenCalled(); }); it('is the imported string for imports from importers', () => { const importer1 = spy((url: string) => - url === 'foo' ? {contents: '@import "bar"'} : null + url === 'foo' ? {contents: '@use "bar"'} : null ); const importer2 = spy((url, prev) => { @@ -575,7 +575,7 @@ describe('the previous URL', () => { }); sass.renderSync({ - data: '@import "foo"', + data: '@use "foo"', importer: [importer1, importer2], }); expect(importer1).toHaveBeenCalledTimes(2); @@ -587,8 +587,8 @@ describe('the previous URL', () => { sandbox(dir => { dir.write({ 'test.scss': ` - @import "relative"; - @import "importer"; + @use "relative"; + @use "importer"; `, '_relative.scss': 'a {b: relative}', }); @@ -619,25 +619,25 @@ describe('this', () => { return {contents: ''}; }); - sass.renderSync({data: '@import "foo"', importer}); + sass.renderSync({data: '@use "foo"', importer}); expect(importer).toHaveBeenCalled(); }); it('includes the data when rendering via data', () => { const importer = spy(function (this: sass.LegacyImporterThis) { const options = this.options; - expect(options.data).toBe('@import "foo"'); + expect(options.data).toBe('@use "foo"'); expect(options.file).toBeUndefined(); return {contents: ''}; }); - sass.renderSync({data: '@import "foo"', importer}); + sass.renderSync({data: '@use "foo"', importer}); expect(importer).toHaveBeenCalled(); }); it('includes the filename when rendering via file', () => sandbox(dir => { - dir.write({'test.scss': '@import "foo"'}); + dir.write({'test.scss': '@use "foo"'}); const importer = spy(function (this: sass.LegacyImporterThis) { const options = this.options; @@ -666,7 +666,7 @@ describe('this', () => { }); sass.renderSync({ - data: '@import "foo"', + data: '@use "foo"', includePaths: [dir.root], importer, }); @@ -681,7 +681,7 @@ describe('this', () => { return {contents: ''}; }); - sass.renderSync({data: '@import "foo"', indentWidth: 5, importer}); + sass.renderSync({data: '@use "foo"', indentWidth: 5, importer}); expect(importer).toHaveBeenCalled(); }); @@ -691,7 +691,7 @@ describe('this', () => { return {contents: ''}; }); - sass.renderSync({data: '@import "foo"', indentType: 'tab', importer}); + sass.renderSync({data: '@use "foo"', indentType: 'tab', importer}); expect(importer).toHaveBeenCalled(); }); @@ -701,7 +701,7 @@ describe('this', () => { return {contents: ''}; }); - sass.renderSync({data: '@import "foo"', linefeed: 'cr', importer}); + sass.renderSync({data: '@use "foo"', linefeed: 'cr', importer}); expect(importer).toHaveBeenCalled(); }); }); @@ -713,7 +713,7 @@ describe('this', () => { return {contents: ''}; }); - sass.renderSync({data: '@import "foo"', importer}); + sass.renderSync({data: '@use "foo"', importer}); expect(importer).toHaveBeenCalled(); }); @@ -727,7 +727,7 @@ describe('this', () => { return {contents: ''}; }); - sass.renderSync({data: '@import "foo"', importer}); + sass.renderSync({data: '@use "foo"', importer}); expect(importer).toHaveBeenCalled(); }); @@ -737,13 +737,13 @@ describe('this', () => { return {contents: ''}; }); - sass.renderSync({data: '@import "foo"', importer}); + sass.renderSync({data: '@use "foo"', importer}); expect(importer).toHaveBeenCalled(); }); it('a file entry', () => sandbox(dir => { - dir.write({'test.scss': '@import "foo"'}); + dir.write({'test.scss': '@use "foo"'}); const importer = spy(function (this: sass.LegacyImporterThis) { expect(this.options.result.stats.entry).toBe(dir('test.scss')); @@ -805,7 +805,7 @@ describe('gracefully handles an error when', () => { it('an importer redirects to a non-existent file', () => expect(() => sass.renderSync({ - data: '@import "foo"', + data: '@use "foo"', importer: () => ({file: '_does_not_exist'}), }) ).toThrowLegacyException({line: 1})); @@ -813,7 +813,7 @@ describe('gracefully handles an error when', () => { it('an error is returned', () => expect(() => sass.renderSync({ - data: '@import "foo"', + data: '@use "foo"', importer: () => new Error('oh no'), }) ).toThrowLegacyException({line: 1})); @@ -823,7 +823,7 @@ describe('gracefully handles an error when', () => { expect(() => sass.renderSync({ - data: '@import "foo"', + data: '@use "foo"', importer: () => new MyError('oh no'), }) ).toThrowLegacyException({line: 1}); @@ -832,7 +832,7 @@ describe('gracefully handles an error when', () => { it('null is returned', () => expect(() => sass.renderSync({ - data: '@import "foo"', + data: '@use "foo"', importer: () => null, }) ).toThrowLegacyException({line: 1})); @@ -840,7 +840,7 @@ describe('gracefully handles an error when', () => { it('undefined is returned', () => expect(() => sass.renderSync({ - data: '@import "foo"', + data: '@use "foo"', importer: () => undefined as unknown as sass.LegacyImporterResult, }) ).toThrowLegacyException({line: 1})); @@ -848,7 +848,7 @@ describe('gracefully handles an error when', () => { it('an unrecognized value is returned', () => expect(() => sass.renderSync({ - data: '@import "foo"', + data: '@use "foo"', importer: () => 10 as unknown as sass.LegacyImporterResult, }) ).toThrowLegacyException({line: 1})); @@ -856,7 +856,7 @@ describe('gracefully handles an error when', () => { it('it occurs in a file with a custom URL scheme', () => expect(() => sass.renderSync({ - data: '@import "foo:bar"', + data: '@use "foo:bar"', importer: () => ({contents: '@error "oh no"'}), }) ).toThrowLegacyException({line: 1, file: 'foo:bar'})); @@ -866,7 +866,7 @@ describe('render()', () => { it('supports asynchronous importers', done => sass.render( { - data: '@import "foo"', + data: '@use "foo"', importer: (( _: string, __: string, @@ -884,7 +884,7 @@ describe('render()', () => { it('supports asynchronous errors', done => sass.render( { - data: '@import "foo"', + data: '@use "foo"', importer: (( _: string, __: string, @@ -902,7 +902,7 @@ describe('render()', () => { it('supports synchronous importers', done => sass.render( { - data: '@import "foo"', + data: '@use "foo"', importer: () => ({contents: 'a {b: c}'}), }, (err?: sass.LegacyException, result?: sass.LegacyResult) => { @@ -913,7 +913,7 @@ describe('render()', () => { it('supports synchronous null returns', done => sass.render( - {data: '@import "foo"', importer: () => null}, + {data: '@use "foo"', importer: () => null}, (err?: sass.LegacyException) => { expect(typeof err).toBe('object'); done(); @@ -925,7 +925,7 @@ describe('when importer returns non-string contents', () => { it('throws an error in sync mode', () => { expect(() => { sass.renderSync({ - data: '@import "other";', + data: '@use "other";', importer() { return { // Need to force an invalid type to test bad-type handling. @@ -944,7 +944,7 @@ describe('when importer returns non-string contents', () => { it('throws an error in async mode', done => { sass.render( { - data: '@import "other";', + data: '@use "other";', importer() { return { // Need to force an invalid type to test bad-type handling. diff --git a/js-api-spec/legacy/render.node.test.ts b/js-api-spec/legacy/render.node.test.ts index e0bf1dcadd..2a1cc99e2e 100644 --- a/js-api-spec/legacy/render.node.test.ts +++ b/js-api-spec/legacy/render.node.test.ts @@ -48,7 +48,7 @@ describe('renderSync()', () => { sandbox(dir => { dir.write({ '_other.scss': 'a {b: c}', - 'importer.scss': '@import "other";', + 'importer.scss': '@use "other";', }); expect( sass.renderSync({file: dir('importer.scss')}).css.toString() @@ -60,7 +60,7 @@ describe('renderSync()', () => { sandbox(dir => { dir.write({ '_other.scss': 'a {b: c}', - 'subdir/importer.scss': '@import "../other";', + 'subdir/importer.scss': '@use "../other";', }); dir.chdir(() => { expect( @@ -75,7 +75,7 @@ describe('renderSync()', () => { '_other.scss': 'a {b: c}', // Node Sass parses imports as paths, not as URLs, so the absolute // path should work here. - 'importer.scss': `@import "${dir('_other.scss').replace( + 'importer.scss': `@use "${dir('_other.scss').replace( /\\/g, '\\\\' )}";`, @@ -125,7 +125,7 @@ describe('renderSync()', () => { dir.write({'test.scss': 'a {b: c}'}); expect( sass - .renderSync({data: '@import "test"', includePaths: [dir.root]}) + .renderSync({data: '@use "test"', includePaths: [dir.root]}) .css.toString() ).toEqualIgnoringWhitespace('a { b: c; }'); })); @@ -140,7 +140,7 @@ describe('renderSync()', () => { withSassPath([dir('dir1'), dir('dir2')], () => expect( sass - .renderSync({data: '@import "test1"; @import "test2"'}) + .renderSync({data: '@use "test1"; @use "test2"'}) .css.toString() ).toEqualIgnoringWhitespace('a { b: c; } x { y: z; }') ); @@ -157,7 +157,7 @@ describe('renderSync()', () => { expect( sass .renderSync({ - data: '@import "test"', + data: '@use "test"', includePaths: [dir('dir2')], }) .css.toString() @@ -169,14 +169,14 @@ describe('renderSync()', () => { it('a file imported through a relative load path supports relative imports', () => sandbox(dir => { dir.write({ - 'sub/_midstream.scss': '@import "upstream"', + 'sub/_midstream.scss': '@use "upstream"', 'sub/_upstream.scss': 'a {b: c}', }); expect( sass .renderSync({ - data: '@import "sub/midstream"', + data: '@use "sub/midstream"', includePaths: [p.relative(process.cwd(), dir.root)], }) .css.toString() @@ -210,7 +210,7 @@ describe('renderSync()', () => { dir.write({'_other.scss': 'a {b: c}'}); expect( sass - .renderSync({file: dir('test.scss'), data: '@import "other"'}) + .renderSync({file: dir('test.scss'), data: '@use "other"'}) .css.toString() ).toEqualIgnoringWhitespace('a { b: c; }'); })); @@ -664,7 +664,7 @@ describe('the result object', () => { sandbox(dir => { dir.write({ '_other.scss': 'a {b: c}', - 'test.scss': '@import "other"', + 'test.scss': '@use "other"', }); expect( sass.renderSync({file: dir('test.scss')}).stats.includedFiles @@ -675,7 +675,7 @@ describe('the result object', () => { sandbox(dir => { dir.write({ '_other.scss': 'a {b: c}', - 'test.scss': '@import "other"', + 'test.scss': '@use "other"', }); expect( sass diff --git a/js-api-spec/legacy/source-map.node.test.ts b/js-api-spec/legacy/source-map.node.test.ts index b8429a725e..31d0b80a4a 100644 --- a/js-api-spec/legacy/source-map.node.test.ts +++ b/js-api-spec/legacy/source-map.node.test.ts @@ -68,7 +68,7 @@ describe('the sources list', () => { sandbox(dir => { dir.write({ 'test.scss': ` - @import "other"; + @use "other"; a {b: c} `, '_other.scss': 'x {y: z}', @@ -86,7 +86,7 @@ describe('the sources list', () => { sandbox(dir => { dir.write({ 'test.scss': ` - @import "other"; + @use "other"; a {b: c} `, 'subdir/_other.scss': 'x {y: z}', @@ -104,7 +104,7 @@ describe('the sources list', () => { it('contains a URL handled by an importer', () => { const map = renderSourceMap({ data: ` - @import "other"; + @use "other"; a {b: c} `, sourceMap: true, @@ -119,7 +119,7 @@ describe('the sources list', () => { sandbox(dir => { dir.write({ 'test.scss': ` - @import "other"; + @use "other"; a {b: c} `, 'subdir/_other.scss': 'x {y: z}', @@ -200,7 +200,7 @@ describe('with a string sourceMap and no outFile', () => { expect( renderSourceMap({ data: ` - @import "other"; + @use "other"; a {b: c} `, importer: () => ({contents: 'x {y: z}'}), @@ -291,7 +291,7 @@ describe('with sourceMapContents', () => { it("includes an imported file's contents in the source map", () => sandbox(dir => { const scss = ` - @import "other"; + @use "other"; a {b: c} `; dir.write({'test.scss': scss, 'other.scss': 'x {y: z}'}); From f4fedcc0261a1b6a4bc5ddbfdfaea45b221c658d Mon Sep 17 00:00:00 2001 From: Jennifer Thakar Date: Fri, 19 Jul 2024 09:39:16 -0700 Subject: [PATCH 09/10] Fix typo in is-bracketed --- spec/core_functions/global/list.hrx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/core_functions/global/list.hrx b/spec/core_functions/global/list.hrx index b654655ebd..6393e35e90 100644 --- a/spec/core_functions/global/list.hrx +++ b/spec/core_functions/global/list.hrx @@ -18,7 +18,7 @@ a { <===> ================================================================================ -<===> is_bracketed/input.scss +<===> is-bracketed/input.scss a {b: is-bracketed(a b c)} <===> is-bracketed/output.css From 56b4cfcd8992115fcf403d15e8238cda12925f86 Mon Sep 17 00:00:00 2001 From: Jennifer Thakar Date: Fri, 19 Jul 2024 09:49:03 -0700 Subject: [PATCH 10/10] Fix remaining failures --- js-api-spec/legacy/render.node.test.ts | 2 +- spec/libsass/bourbon.hrx | 285 ------------------------- 2 files changed, 1 insertion(+), 286 deletions(-) diff --git a/js-api-spec/legacy/render.node.test.ts b/js-api-spec/legacy/render.node.test.ts index 2a1cc99e2e..0b96311a04 100644 --- a/js-api-spec/legacy/render.node.test.ts +++ b/js-api-spec/legacy/render.node.test.ts @@ -75,7 +75,7 @@ describe('renderSync()', () => { '_other.scss': 'a {b: c}', // Node Sass parses imports as paths, not as URLs, so the absolute // path should work here. - 'importer.scss': `@use "${dir('_other.scss').replace( + 'importer.scss': `@import "${dir('_other.scss').replace( /\\/g, '\\\\' )}";`, diff --git a/spec/libsass/bourbon.hrx b/spec/libsass/bourbon.hrx index 3b564ed606..a6562240b2 100644 --- a/spec/libsass/bourbon.hrx +++ b/spec/libsass/bourbon.hrx @@ -1934,288 +1934,3 @@ div { background-image: -webkit-url("/images/a.png")-gradient(center), -webkit-url("images/b.png")-gradient(left); background-image: url("/images/a.png")-gradient( center), url("images/b.png")-gradient( left); } - -<===> warning -DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. -Use string.unquote instead. - -More info and automated migrator: https://sass-lang.com/d/import - - , -25 | $unquoted-inputs-list: append($unquoted-inputs-list, unquote($input-type), comma); - | ^^^^^^^^^^^^^^^^^^^^ - ' - lib/addons/_html5-input-types.scss 25:56 @import - lib/_bourbon.scss 50:9 @import - input.scss 2:9 root stylesheet - -DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. -Use list.append instead. - -More info and automated migrator: https://sass-lang.com/d/import - - , -25 | $unquoted-inputs-list: append($unquoted-inputs-list, unquote($input-type), comma); - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - ' - lib/addons/_html5-input-types.scss 25:26 @import - lib/_bourbon.scss 50:9 @import - input.scss 2:9 root stylesheet - -DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. -Use list.append instead. - -More info and automated migrator: https://sass-lang.com/d/import - - , -36 | $all-text-inputs-hover: append($all-text-inputs-hover, $input-type-hover, comma); - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - ' - lib/addons/_html5-input-types.scss 36:31 @import - lib/_bourbon.scss 50:9 @import - input.scss 2:9 root stylesheet - -DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. -Use list.append instead. - -More info and automated migrator: https://sass-lang.com/d/import - - , -44 | $all-text-inputs-focus: append($all-text-inputs-focus, $input-type-focus, comma); - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - ' - lib/addons/_html5-input-types.scss 44:31 @import - lib/_bourbon.scss 50:9 @import - input.scss 2:9 root stylesheet - -DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. -Use list.length instead. - -More info and automated migrator: https://sass-lang.com/d/import - - , -14 | @for $i from 1 through length($images) { - | ^^^^^^^^^^^^^^^ - ' - lib/css3/_background-image.scss 14:26 -add-prefix() - lib/css3/_background-image.scss 7:21 background-image() - input.scss 19:3 root stylesheet - -DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. -Use list.nth instead. - -More info and automated migrator: https://sass-lang.com/d/import - - , -15 | $type: type-of(nth($images, $i)); // Get type of variable - List or String - | ^^^^^^^^^^^^^^^^ - ' - lib/css3/_background-image.scss 15:20 -add-prefix() - lib/css3/_background-image.scss 7:21 background-image() - input.scss 19:3 root stylesheet - -DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. -Use meta.type-of instead. - -More info and automated migrator: https://sass-lang.com/d/import - - , -15 | $type: type-of(nth($images, $i)); // Get type of variable - List or String - | ^^^^^^^^^^^^^^^^^^^^^^^^^ - ' - lib/css3/_background-image.scss 15:12 -add-prefix() - lib/css3/_background-image.scss 7:21 background-image() - input.scss 19:3 root stylesheet - -DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. -Use list.nth instead. - -More info and automated migrator: https://sass-lang.com/d/import - - , -37 | $images-prefixed: join($images-prefixed, nth($images, $i), comma); - | ^^^^^^^^^^^^^^^^ - ' - lib/css3/_background-image.scss 37:48 -add-prefix() - lib/css3/_background-image.scss 7:21 background-image() - input.scss 19:3 root stylesheet - -DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. -Use list.join instead. - -More info and automated migrator: https://sass-lang.com/d/import - - , -37 | $images-prefixed: join($images-prefixed, nth($images, $i), comma); - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - ' - lib/css3/_background-image.scss 37:25 -add-prefix() - lib/css3/_background-image.scss 7:21 background-image() - input.scss 19:3 root stylesheet - -DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. -Use list.nth instead. - -More info and automated migrator: https://sass-lang.com/d/import - - , -3 | $pos-type: type-of(nth($pos, 1)); - | ^^^^^^^^^^^^ - ' - lib/functions/_linear-gradient.scss 3:22 linear-gradient() - input.scss 22:51 root stylesheet - -DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. -Use meta.type-of instead. - -More info and automated migrator: https://sass-lang.com/d/import - - , -3 | $pos-type: type-of(nth($pos, 1)); - | ^^^^^^^^^^^^^^^^^^^^^ - ' - lib/functions/_linear-gradient.scss 3:14 linear-gradient() - input.scss 22:51 root stylesheet - -DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. -Use list.zip instead. - -More info and automated migrator: https://sass-lang.com/d/import - - , -7 | $gradients: zip($pos $gradients); - | ^^^^^^^^^^^^^^^^^^^^ - ' - lib/functions/_linear-gradient.scss 7:17 linear-gradient() - input.scss 22:51 root stylesheet - -DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. -Use list.nth instead. - -More info and automated migrator: https://sass-lang.com/d/import - - , -19 | $gradient-type: nth(nth($images, $i), 1); // linear or radial - | ^^^^^^^^^^^^^^^^ - ' - lib/css3/_background-image.scss 19:27 -add-prefix() - lib/css3/_background-image.scss 7:21 background-image() - input.scss 22:3 root stylesheet - -DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. -Use list.nth instead. - -More info and automated migrator: https://sass-lang.com/d/import - - , -19 | $gradient-type: nth(nth($images, $i), 1); // linear or radial - | ^^^^^^^^^^^^^^^^^^^^^^^^ - ' - lib/css3/_background-image.scss 19:23 -add-prefix() - lib/css3/_background-image.scss 7:21 background-image() - input.scss 22:3 root stylesheet - -DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. -Use list.nth instead. - -More info and automated migrator: https://sass-lang.com/d/import - - , -24 | $gradient-pos: nth(nth($images, $i), 2); // Get gradient position - | ^^^^^^^^^^^^^^^^ - ' - lib/css3/_background-image.scss 24:29 -add-prefix() - lib/css3/_background-image.scss 7:21 background-image() - input.scss 22:3 root stylesheet - -DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. -Use list.nth instead. - -More info and automated migrator: https://sass-lang.com/d/import - - , -24 | $gradient-pos: nth(nth($images, $i), 2); // Get gradient position - | ^^^^^^^^^^^^^^^^^^^^^^^^ - ' - lib/css3/_background-image.scss 24:25 -add-prefix() - lib/css3/_background-image.scss 7:21 background-image() - input.scss 22:3 root stylesheet - -DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. -Use list.nth instead. - -More info and automated migrator: https://sass-lang.com/d/import - - , -25 | $gradient-args: nth(nth($images, $i), 3); // Get actual gradient (red, blue) - | ^^^^^^^^^^^^^^^^ - ' - lib/css3/_background-image.scss 25:29 -add-prefix() - lib/css3/_background-image.scss 7:21 background-image() - input.scss 22:3 root stylesheet - -DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. -Use list.nth instead. - -More info and automated migrator: https://sass-lang.com/d/import - - , -25 | $gradient-args: nth(nth($images, $i), 3); // Get actual gradient (red, blue) - | ^^^^^^^^^^^^^^^^^^^^^^^^ - ' - lib/css3/_background-image.scss 25:25 -add-prefix() - lib/css3/_background-image.scss 7:21 background-image() - input.scss 22:3 root stylesheet - -DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. -Use list.append instead. - -More info and automated migrator: https://sass-lang.com/d/import - - , -33 | $images-prefixed: append($images-prefixed, $gradient, comma); - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - ' - lib/css3/_background-image.scss 33:25 -add-prefix() - lib/css3/_background-image.scss 7:21 background-image() - input.scss 22:3 root stylesheet - -DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. -Use string.unquote instead. - -More info and automated migrator: https://sass-lang.com/d/import - - , -23 | $vendor-gradients: unquote($vendor-gradients); - | ^^^^^^^^^^^^^^^^^^^^^^^^^^ - ' - lib/helpers/_render-gradients.scss 23:24 -render-gradients() - lib/css3/_background-image.scss 32:18 -add-prefix() - lib/css3/_background-image.scss 8:21 background-image() - input.scss 22:3 root stylesheet - -DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. -Use list.nth instead. - -More info and automated migrator: https://sass-lang.com/d/import - - , -28 | $gradient-args: nth(nth($images, $i), 2); // Get actual gradient (red, blue) - | ^^^^^^^^^^^^^^^^ - ' - lib/css3/_background-image.scss 28:29 -add-prefix() - lib/css3/_background-image.scss 7:21 background-image() - input.scss 29:3 root stylesheet - -DEPRECATION WARNING: Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. -Use list.nth instead. - -More info and automated migrator: https://sass-lang.com/d/import - - , -28 | $gradient-args: nth(nth($images, $i), 2); // Get actual gradient (red, blue) - | ^^^^^^^^^^^^^^^^^^^^^^^^ - ' - lib/css3/_background-image.scss 28:25 -add-prefix() - lib/css3/_background-image.scss 7:21 background-image() - input.scss 29:3 root stylesheet