From a55f6439261931de05eda1cfbf1c90fd4571e748 Mon Sep 17 00:00:00 2001 From: Nathan Weizenbaum Date: Sat, 27 Mar 2010 14:57:47 -0700 Subject: [PATCH] [Sass] I guess we don't need a special check for semicolons in properties anymore. --- lib/sass/tree/prop_node.rb | 2 -- test/sass/engine_test.rb | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/sass/tree/prop_node.rb b/lib/sass/tree/prop_node.rb index 84ab49f4..713065be 100644 --- a/lib/sass/tree/prop_node.rb +++ b/lib/sass/tree/prop_node.rb @@ -159,8 +159,6 @@ module Sass::Tree raise Sass::SyntaxError.new("Illegal property syntax: can't use new syntax when :property_syntax => :old is set.") elsif @options[:property_syntax] == :new && @prop_syntax == :old raise Sass::SyntaxError.new("Illegal property syntax: can't use old syntax when :property_syntax => :new is set.") - elsif resolved_value[-1] == ?; - raise Sass::SyntaxError.new("Invalid property: #{declaration.dump} (no \";\" required at end-of-line).") elsif resolved_value.empty? raise Sass::SyntaxError.new("Invalid property: #{declaration.dump} (no value)." + pseudo_class_selector_message) diff --git a/test/sass/engine_test.rb b/test/sass/engine_test.rb index 18e1ab75..c306fd00 100755 --- a/test/sass/engine_test.rb +++ b/test/sass/engine_test.rb @@ -32,8 +32,8 @@ MSG "a\n :b: c" => 'Invalid property: ":b: c".', "a\n :b:c d" => 'Invalid property: ":b:c d".', "a\n :b=c d" => 'Invalid property: ":b=c d".', - "a\n :b c;" => 'Invalid property: ":b c;" (no ";" required at end-of-line).', - "a\n b: c;" => 'Invalid property: "b: c;" (no ";" required at end-of-line).', + "a\n :b c;" => 'Invalid CSS after "c": expected expression (e.g. 1px, bold), was ";"', + "a\n b: c;" => 'Invalid CSS after "c": expected expression (e.g. 1px, bold), was ";"', "a\n b : c" => 'Invalid property: "b : c".', "a\n b=c: d" => 'Invalid property: "b=c: d".', "a: b" => 'Properties aren\'t allowed at the root of a document.',