Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #18444 - ferjm:bug1384221.alias.errors, r=jdm

Browse source 
stylo: Fix error reporting for invalid values in property alias

- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix [bug 1384221](https://bugzilla.mozilla.org/show_bug.cgi?id=1384221)
- [X] There are [tests](https://bug1384221.bmoattachments.org/attachment.cgi?id=8906527) for these changes

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18444)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-09-11 12:50:11 -05:00 • committed by GitHub
commit d2b689cf2e
4 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/style/properties/declaration_block.rs
View file

@ -951,7 +951,8 @@ pub fn parse_one_declaration_into<R>(declarations: &mut SourcePropertyDeclaratio
let start_position = parser.position(); let start_position = parser.position();
let start_location = parser.current_source_location(); let start_location = parser.current_source_location();
parser.parse_entirely(|parser| { parser.parse_entirely(|parser| {
PropertyDeclaration::parse_into(declarations, id, &context, parser) let name = id.name().into();
PropertyDeclaration::parse_into(declarations, id, name, &context, parser)
.map_err(|e| e.into()) .map_err(|e| e.into())
}).map_err(|err| { }).map_err(|err| {
let error = ContextualParseError::UnsupportedPropertyDeclaration( let error = ContextualParseError::UnsupportedPropertyDeclaration(
@ -1000,7 +1001,7 @@ impl<'a, 'b, 'i> DeclarationParser<'i> for PropertyDeclarationParser<'a, 'b> {
} }
}; };
input.parse_until_before(Delimiter::Bang, |input| { input.parse_until_before(Delimiter::Bang, |input| {
PropertyDeclaration::parse_into(self.declarations, id, self.context, input) PropertyDeclaration::parse_into(self.declarations, id, name, self.context, input)
.map_err(|e| e.into()) .map_err(|e| e.into())
})?; })?;
let importance = match input.try(parse_important) { let importance = match input.try(parse_important) {

17
components/style/properties/properties.mako.rs
View file

@ -19,7 +19,7 @@ use std::{fmt, mem, ops};
#[cfg(feature = "gecko")] use std::ptr; #[cfg(feature = "gecko")] use std::ptr;
#[cfg(feature = "servo")] use cssparser::RGBA; #[cfg(feature = "servo")] use cssparser::RGBA;
use cssparser::{Parser, TokenSerializationType, serialize_identifier}; use cssparser::{CowRcStr, Parser, TokenSerializationType, serialize_identifier};
use cssparser::ParserInput; use cssparser::ParserInput;
#[cfg(feature = "servo")] use euclid::SideOffsets2D; #[cfg(feature = "servo")] use euclid::SideOffsets2D;
use computed_values; use computed_values;
@ -1528,12 +1528,13 @@ impl PropertyDeclaration {
/// to Importance::Normal. Parsing Importance values is the job of PropertyDeclarationParser, /// to Importance::Normal. Parsing Importance values is the job of PropertyDeclarationParser,
/// we only set them here so that we don't have to reallocate /// we only set them here so that we don't have to reallocate
pub fn parse_into<'i, 't>(declarations: &mut SourcePropertyDeclaration, pub fn parse_into<'i, 't>(declarations: &mut SourcePropertyDeclaration,
id: PropertyId, context: &ParserContext, input: &mut Parser<'i, 't>) id: PropertyId, name: CowRcStr<'i>,
context: &ParserContext, input: &mut Parser<'i, 't>)
-> Result<(), PropertyDeclarationParseError<'i>> { -> Result<(), PropertyDeclarationParseError<'i>> {
assert!(declarations.is_empty()); assert!(declarations.is_empty());
let start = input.state(); let start = input.state();
match id { match id {
PropertyId::Custom(name) => { PropertyId::Custom(property_name) => {
// FIXME: fully implement https://github.com/w3c/csswg-drafts/issues/774 // FIXME: fully implement https://github.com/w3c/csswg-drafts/issues/774
// before adding skip_whitespace here. // before adding skip_whitespace here.
// This probably affects some test results. // This probably affects some test results.
@ -1545,7 +1546,7 @@ impl PropertyDeclaration {
ValueParseError::from_parse_error(e))), ValueParseError::from_parse_error(e))),
} }
}; };
declarations.push(PropertyDeclaration::Custom(name, value)); declarations.push(PropertyDeclaration::Custom(property_name, value));
Ok(()) Ok(())
} }
PropertyId::Longhand(id) => { PropertyId::Longhand(id) => {
@ -1561,7 +1562,7 @@ impl PropertyDeclaration {
input.reset(&start); input.reset(&start);
let (first_token_type, css) = let (first_token_type, css) =
::custom_properties::parse_non_custom_with_var(input).map_err(|e| { ::custom_properties::parse_non_custom_with_var(input).map_err(|e| {
PropertyDeclarationParseError::InvalidValue(id.name().into(), PropertyDeclarationParseError::InvalidValue(name,
ValueParseError::from_parse_error(e)) ValueParseError::from_parse_error(e))
})?; })?;
Ok(PropertyDeclaration::WithVariables(id, Arc::new(UnparsedValue { Ok(PropertyDeclaration::WithVariables(id, Arc::new(UnparsedValue {
@ -1571,7 +1572,7 @@ impl PropertyDeclaration {
from_shorthand: None, from_shorthand: None,
}))) })))
} else { } else {
Err(PropertyDeclarationParseError::InvalidValue(id.name().into(), Err(PropertyDeclarationParseError::InvalidValue(name,
ValueParseError::from_parse_error(err))) ValueParseError::from_parse_error(err)))
} }
}) })
@ -1600,7 +1601,7 @@ impl PropertyDeclaration {
input.reset(&start); input.reset(&start);
let (first_token_type, css) = let (first_token_type, css) =
::custom_properties::parse_non_custom_with_var(input).map_err(|e| { ::custom_properties::parse_non_custom_with_var(input).map_err(|e| {
PropertyDeclarationParseError::InvalidValue(id.name().into(), PropertyDeclarationParseError::InvalidValue(name,
ValueParseError::from_parse_error(e)) ValueParseError::from_parse_error(e))
})?; })?;
let unparsed = Arc::new(UnparsedValue { let unparsed = Arc::new(UnparsedValue {
@ -1620,7 +1621,7 @@ impl PropertyDeclaration {
} }
Ok(()) Ok(())
} else { } else {
Err(PropertyDeclarationParseError::InvalidValue(id.name().into(), Err(PropertyDeclarationParseError::InvalidValue(name,
ValueParseError::from_parse_error(err))) ValueParseError::from_parse_error(err)))
} }
}) })

4
components/style/stylesheets/keyframes_rule.rs
View file

@ -583,8 +583,8 @@ impl<'a, 'b, 'i> DeclarationParser<'i> for KeyframeDeclarationParser<'a, 'b> {
let property_context = PropertyParserContext::new(self.context); let property_context = PropertyParserContext::new(self.context);
let id = PropertyId::parse(&name, Some(&property_context)) let id = PropertyId::parse(&name, Some(&property_context))
.map_err(|()| PropertyDeclarationParseError::UnknownProperty(name))?; .map_err(|()| PropertyDeclarationParseError::UnknownProperty(name.clone()))?;
match PropertyDeclaration::parse_into(self.declarations, id, self.context, input) { match PropertyDeclaration::parse_into(self.declarations, id, name, self.context, input) {
Ok(()) => { Ok(()) => {
// In case there is still unparsed text in the declaration, we should roll back. // In case there is still unparsed text in the declaration, we should roll back.
input.expect_exhausted().map_err(|e| e.into()) input.expect_exhausted().map_err(|e| e.into())

2
components/style/stylesheets/supports_rule.rs
View file

@ -265,7 +265,7 @@ impl Declaration {
let mut declarations = SourcePropertyDeclaration::new(); let mut declarations = SourcePropertyDeclaration::new();
input.parse_until_before(Delimiter::Bang, |input| { input.parse_until_before(Delimiter::Bang, |input| {
PropertyDeclaration::parse_into(&mut declarations, id, &context, input) PropertyDeclaration::parse_into(&mut declarations, id, prop.into(), &context, input)
.map_err(|e| StyleParseError::PropertyDeclaration(e).into()) .map_err(|e| StyleParseError::PropertyDeclaration(e).into())
})?; })?;
let _ = input.try(parse_important); let _ = input.try(parse_important);