Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use the location in the error value when reporting a CSS error

Browse source
This commit is contained in:
Simon Sapin 2017-10-05 19:00:48 +02:00
parent c0f8f15f39
commit c64374bc58
10 changed files with 34 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/style/counter_style/mod.rs
View file

@ -68,8 +68,9 @@ pub fn parse_counter_style_body<'i, 't, R>(name: CustomIdent,
let mut iter = DeclarationListParser::new(input, parser); let mut iter = DeclarationListParser::new(input, parser);
while let Some(declaration) = iter.next() { while let Some(declaration) = iter.next() {
if let Err((error, slice)) = declaration { if let Err((error, slice)) = declaration {
let location = error.location;
let error = ContextualParseError::UnsupportedCounterStyleDescriptorDeclaration(slice, error); let error = ContextualParseError::UnsupportedCounterStyleDescriptorDeclaration(slice, error);
context.log_css_error(error_context, iter.input.current_source_location(), error) context.log_css_error(error_context, location, error)
} }
} }
} }

3
components/style/font_face.rs
View file

@ -124,8 +124,9 @@ pub fn parse_font_face_block<R>(context: &ParserContext,
let mut iter = DeclarationListParser::new(input, parser); let mut iter = DeclarationListParser::new(input, parser);
while let Some(declaration) = iter.next() { while let Some(declaration) = iter.next() {
if let Err((error, slice)) = declaration { if let Err((error, slice)) = declaration {
let location = error.location;
let error = ContextualParseError::UnsupportedFontFaceDescriptor(slice, error); let error = ContextualParseError::UnsupportedFontFaceDescriptor(slice, error);
context.log_css_error(error_context, iter.input.current_source_location(), error) context.log_css_error(error_context, location, error)
} }
} }
} }

3
components/style/media_queries.rs
View file

@ -263,10 +263,11 @@ where
}, },
Err(err) => { Err(err) => {
media_queries.push(MediaQuery::never_matching()); media_queries.push(MediaQuery::never_matching());
let location = err.location;
let error = ContextualParseError::InvalidMediaRule( let error = ContextualParseError::InvalidMediaRule(
input.slice_from(start_position), err); input.slice_from(start_position), err);
let error_context = ParserErrorContext { error_reporter }; let error_context = ParserErrorContext { error_reporter };
context.log_css_error(&error_context, input.current_source_location(), error); context.log_css_error(&error_context, location, error);
}, },
} }

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

@ -1040,10 +1040,11 @@ pub fn parse_one_declaration_into<R>(declarations: &mut SourcePropertyDeclaratio
PropertyDeclaration::parse_into(declarations, id, name, &context, parser) 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 location = err.location;
let error = ContextualParseError::UnsupportedPropertyDeclaration( let error = ContextualParseError::UnsupportedPropertyDeclaration(
parser.slice_from(start_position), err); parser.slice_from(start_position), err);
let error_context = ParserErrorContext { error_reporter: error_reporter }; let error_context = ParserErrorContext { error_reporter: error_reporter };
context.log_css_error(&error_context, parser.current_source_location(), error); context.log_css_error(&error_context, location, error);
}) })
} }
@ -1131,8 +1132,8 @@ pub fn parse_property_declaration_list<R>(context: &ParserContext,
continue; continue;
} }
let location = error.location;
let error = ContextualParseError::UnsupportedPropertyDeclaration(slice, error); let error = ContextualParseError::UnsupportedPropertyDeclaration(slice, error);
let location = iter.input.current_source_location();
context.log_css_error(error_context, location, error); context.log_css_error(error_context, location, error);
} }
} }

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

@ -276,8 +276,8 @@ macro_rules! font_feature_values_blocks {
}); });
while let Some(result) = iter.next() { while let Some(result) = iter.next() {
if let Err((error, slice)) = result { if let Err((error, slice)) = result {
let location = error.location;
let error = ContextualParseError::UnsupportedRule(slice, error); let error = ContextualParseError::UnsupportedRule(slice, error);
let location = iter.input.current_source_location();
context.log_css_error(error_context, location, error); context.log_css_error(error_context, location, error);
} }
} }
@ -430,10 +430,10 @@ macro_rules! font_feature_values_blocks {
let mut iter = DeclarationListParser::new(input, parser); let mut iter = DeclarationListParser::new(input, parser);
while let Some(declaration) = iter.next() { while let Some(declaration) = iter.next() {
if let Err((error, slice)) = declaration { if let Err((error, slice)) = declaration {
let location = error.location;
let error = ContextualParseError::UnsupportedKeyframePropertyDeclaration( let error = ContextualParseError::UnsupportedKeyframePropertyDeclaration(
slice, error slice, error
); );
let location = iter.input.current_source_location();
self.context.log_css_error(self.error_context, location, error); self.context.log_css_error(self.error_context, location, error);
} }
} }

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

@ -525,8 +525,9 @@ impl<'a, 'i, R: ParseErrorReporter> QualifiedRuleParser<'i> for KeyframeListPars
}) })
}, },
Err(e) => { Err(e) => {
let location = e.location;
let error = ContextualParseError::InvalidKeyframeRule(input.slice_from(start_position), e.clone()); let error = ContextualParseError::InvalidKeyframeRule(input.slice_from(start_position), e.clone());
self.context.log_css_error(self.error_context, input.current_source_location(), error); self.context.log_css_error(self.error_context, location, error);
Err(e) Err(e)
} }
} }
@ -554,8 +555,9 @@ impl<'a, 'i, R: ParseErrorReporter> QualifiedRuleParser<'i> for KeyframeListPars
} }
Err((error, slice)) => { Err((error, slice)) => {
iter.parser.declarations.clear(); iter.parser.declarations.clear();
let location = error.location;
let error = ContextualParseError::UnsupportedKeyframePropertyDeclaration(slice, error); let error = ContextualParseError::UnsupportedKeyframePropertyDeclaration(slice, error);
context.log_css_error(self.error_context, iter.input.current_source_location(), error); context.log_css_error(self.error_context, location, error);
} }
} }
// `parse_important` is not called here, `!important` is not allowed in keyframe blocks. // `parse_important` is not called here, `!important` is not allowed in keyframe blocks.

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

@ -333,8 +333,8 @@ impl<'a, 'b, R: ParseErrorReporter> NestedRuleParser<'a, 'b, R> {
match result { match result {
Ok(rule) => rules.push(rule), Ok(rule) => rules.push(rule),
Err((error, slice)) => { Err((error, slice)) => {
let location = error.location;
let error = ContextualParseError::UnsupportedRule(slice, error); let error = ContextualParseError::UnsupportedRule(slice, error);
let location = iter.input.current_source_location();
self.context.log_css_error(self.error_context, location, error); self.context.log_css_error(self.error_context, location, error);
} }
} }

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

@ -395,8 +395,8 @@ impl Stylesheet {
} }
}, },
Err((error, slice)) => { Err((error, slice)) => {
let location = error.location;
let error = ContextualParseError::InvalidRule(slice, error); let error = ContextualParseError::InvalidRule(slice, error);
let location = iter.input.current_source_location();
iter.parser.context.log_css_error(&iter.parser.error_context, iter.parser.context.log_css_error(&iter.parser.error_context,
location, error); location, error);
} }

3
components/style/stylesheets/viewport_rule.rs
View file

@ -369,8 +369,9 @@ impl ViewportRule {
} }
} }
Err((error, slice)) => { Err((error, slice)) => {
let location = error.location;
let error = ContextualParseError::UnsupportedViewportDescriptorDeclaration(slice, error); let error = ContextualParseError::UnsupportedViewportDescriptorDeclaration(slice, error);
context.log_css_error(error_context, parser.input.current_source_location(), error); context.log_css_error(error_context, location, error);
} }
} }
} }

30
tests/unit/style/stylesheets.rs
View file

@ -323,7 +323,7 @@ fn test_report_error_stylesheet() {
background-image: linear-gradient(0deg, black, invalid, transparent); background-image: linear-gradient(0deg, black, invalid, transparent);
invalid: true; invalid: true;
} }
@media (min-width: invalid 1000px) {} @media (min-width: 10px invalid 1000px) {}
@font-face { src: url(), invalid, url(); } @font-face { src: url(), invalid, url(); }
@counter-style foo { symbols: a 0invalid b } @counter-style foo { symbols: a 0invalid b }
@font-feature-values Sans Sans { @foo {} @swash { foo: 1 invalid 2 } } @font-feature-values Sans Sans { @foo {} @swash { foo: 1 invalid 2 } }
@ -342,26 +342,26 @@ fn test_report_error_stylesheet() {
None, &error_reporter, QuirksMode::NoQuirks, 5); None, &error_reporter, QuirksMode::NoQuirks, 5);
error_reporter.assert_messages_contain(&[ error_reporter.assert_messages_contain(&[
(8, 26, "Unsupported property declaration: 'display: invalid;'"), (8, 18, "Unsupported property declaration: 'display: invalid;'"),
(9, 78, "Unsupported property declaration: 'background-image:"), (9, 27, "Unsupported property declaration: 'background-image:"), // FIXME: column should be around 56
(10, 23, "Unsupported property declaration: 'invalid: true;'"), (10, 17, "Unsupported property declaration: 'invalid: true;'"),
(12, 40, "Invalid media rule"), (12, 28, "Invalid media rule"),
(13, 45, "Unsupported @font-face descriptor declaration"), (13, 30, "Unsupported @font-face descriptor declaration"),
// When @counter-style is supported, this should be replaced with two errors // When @counter-style is supported, this should be replaced with two errors
(14, 25, "Invalid rule: '@counter-style "), (14, 19, "Invalid rule: '@counter-style "),
// When @font-feature-values is supported, this should be replaced with two errors // When @font-feature-values is supported, this should be replaced with two errors
(15, 37, "Invalid rule: '@font-feature-values "), (15, 25, "Invalid rule: '@font-feature-values "),
// FIXME: the message of these two should be consistent // FIXME: the message of these two should be consistent
(16, 14, "Invalid rule: '@invalid'"), (16, 13, "Invalid rule: '@invalid'"),
(17, 30, "Unsupported rule: '@invalid'"), (17, 29, "Unsupported rule: '@invalid'"),
(18, 59, "Invalid rule: '@supports "), (18, 34, "Invalid rule: '@supports "),
(19, 35, "Invalid keyframe rule: 'from invalid '"), (19, 26, "Invalid keyframe rule: 'from invalid '"),
(19, 63, "Unsupported keyframe property declaration: 'margin: 0 invalid 0;'"), (19, 52, "Unsupported keyframe property declaration: 'margin: 0 invalid 0;'"),
(20, 43, "Unsupported @viewport descriptor declaration: 'width: 320px invalid auto;'"), (20, 29, "Unsupported @viewport descriptor declaration: 'width: 320px invalid auto;'"),
]); ]);
assert_eq!(error_reporter.errors.borrow()[0].url, url); assert_eq!(error_reporter.errors.borrow()[0].url, url);
@ -385,7 +385,7 @@ fn test_no_report_unrecognized_vendor_properties() {
None, &error_reporter, QuirksMode::NoQuirks, 0); None, &error_reporter, QuirksMode::NoQuirks, 0);
error_reporter.assert_messages_contain(&[ error_reporter.assert_messages_contain(&[
(4, 36, "Unsupported property declaration: '-moz-background-color: red;'"), (4, 31, "Unsupported property declaration: '-moz-background-color: red;'"),
]); ]);
} }