Skip to content

Commit

Permalink
Remove CalculationInterpolation (#161)
Browse files Browse the repository at this point in the history
  • Loading branch information
ntkme committed Oct 10, 2023
1 parent 7ce0f5b commit 47cd663
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 29 deletions.
1 change: 0 additions & 1 deletion lib/sass/calculation_value.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,4 @@ def assert_calculation_value(_name = nil)
end
end

require_relative 'calculation_value/calculation_interpolation'
require_relative 'calculation_value/calculation_operation'
19 changes: 0 additions & 19 deletions lib/sass/calculation_value/calculation_interpolation.rb

This file was deleted.

5 changes: 2 additions & 3 deletions lib/sass/value/calculation.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def max(arguments)
def clamp(min, value = nil, max = nil)
if (value.nil? && !valid_clamp_arg?(min)) ||
(max.nil? && [min, value].none? { |x| x && valid_clamp_arg?(x) })
raise Sass::ScriptError, 'Argument must be an unquoted SassString or CalculationInterpolation.'
raise Sass::ScriptError, 'Argument must be an unquoted SassString.'
end

new('clamp', [min, value, max].compact)
Expand All @@ -46,8 +46,7 @@ def clamp(min, value = nil, max = nil)
private

def valid_clamp_arg?(value)
value.is_a?(Sass::CalculationValue::CalculationInterpolation) ||
(value.is_a?(Sass::Value::String) && !value.quoted?)
value.is_a?(Sass::Value::String) && !value.quoted?
end
end

Expand Down
8 changes: 3 additions & 5 deletions spec/sass/value/calculation_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
Sass::Value::Number.new(1),
Sass::Value::String.new('1', quoted: false),
described_class.calc(Sass::Value::Number.new(1)),
Sass::CalculationValue::CalculationOperation.new('+', Sass::Value::Number.new(1), Sass::Value::Number.new(1)),
Sass::CalculationValue::CalculationInterpolation.new('')
Sass::CalculationValue::CalculationOperation.new('+', Sass::Value::Number.new(1), Sass::Value::Number.new(1))
]
invalid_calculation_values = [Sass::Value::String.new('1', quoted: true)]

Expand Down Expand Up @@ -164,8 +163,7 @@
# When `clamp()` is called with less than three arguments, the list of
# accepted values is much narrower
valid_clamp_values = [
Sass::Value::String.new('1', quoted: false),
Sass::CalculationValue::CalculationInterpolation.new('1')
Sass::Value::String.new('1', quoted: false)
]
invalid_clamp_values = [
Sass::Value::Number.new(1),
Expand Down Expand Up @@ -298,7 +296,7 @@
expect do
Sass.compile_string('a {b: foo()}',
functions: { 'foo()': fn }).css
end.to raise_sass_compile_error.with_message('SassString or CalculationInterpolation')
end.to raise_sass_compile_error.with_message('SassString')
end

it 'an unknown calculation function' do
Expand Down
1 change: 0 additions & 1 deletion spec/sass_proto_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ def remote_eq(lhs, rhs)
])
]),
__LINE__ => Sass::Value::Calculation.clamp(Sass::Value::String.new('var(--clamp)', quoted: false)),
__LINE__ => Sass::Value::Calculation.clamp(Sass::CalculationValue::CalculationInterpolation.new('var(--clamp)')),
__LINE__ => Sass::Value::Color.new(red: 0, green: 0, blue: 0, alpha: 1),
__LINE__ => Sass::Value::Color.new(hue: 0, saturation: 0, lightness: 0, alpha: 1),
__LINE__ => Sass::Value::Color.new(hue: 0, whiteness: 0, blackness: 0, alpha: 1),
Expand Down

0 comments on commit 47cd663

Please sign in to comment.