Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-09 15:35:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use the current parser location for CSS error

Browse source 
… rather than the start location of the current construct.
This likely places the error just *after* of the unexpected token
whereas before would be best, but that’s likely a much bigger change.

See https://bugzilla.mozilla.org/show_bug.cgi?id=1378861
This commit is contained in:
Simon Sapin 2017-09-21 01:44:53 +02:00
parent bc0903c928
commit 056e599562
10 changed files with 34 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

2
components/style/font_face.rs
View file

@ -125,7 +125,7 @@ pub fn parse_font_face_block<R>(context: &ParserContext,
while let Some(declaration) = iter.next() {
if let Err(err) = declaration {
let error = ContextualParseError::UnsupportedFontFaceDescriptor(err.slice, err.error);
context.log_css_error(error_context, err.location, error)
context.log_css_error(error_context, iter.input.current_source_location(), error)
}
}
}

3
components/style/media_queries.rs
View file

@ -257,7 +257,6 @@ where
let mut media_queries = vec![];
loop {
let start_position = input.position();
let start_location = input.current_source_location();
match input.parse_until_before(Delimiter::Comma, |i| MediaQuery::parse(context, i)) {
Ok(mq) => {
media_queries.push(mq);
@ -267,7 +266,7 @@ where
let error = ContextualParseError::InvalidMediaRule(
input.slice_from(start_position), err);
let error_context = ParserErrorContext { error_reporter };
context.log_css_error(&error_context, start_location, error);
context.log_css_error(&error_context, input.current_source_location(), error);
},
}

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

@ -1035,7 +1035,6 @@ pub fn parse_one_declaration_into<R>(declarations: &mut SourcePropertyDeclaratio
let mut input = ParserInput::new(input);
let mut parser = Parser::new(&mut input);
let start_position = parser.position();
let start_location = parser.current_source_location();
parser.parse_entirely(|parser| {
let name = id.name().into();
PropertyDeclaration::parse_into(declarations, id, name, &context, parser)
@ -1044,7 +1043,7 @@ pub fn parse_one_declaration_into<R>(declarations: &mut SourcePropertyDeclaratio
let error = ContextualParseError::UnsupportedPropertyDeclaration(
parser.slice_from(start_position), err);
let error_context = ParserErrorContext { error_reporter: error_reporter };
context.log_css_error(&error_context, start_location, error);
context.log_css_error(&error_context, parser.current_source_location(), error);
})
}
@ -1133,7 +1132,8 @@ pub fn parse_property_declaration_list<R>(context: &ParserContext,
}
let error = ContextualParseError::UnsupportedPropertyDeclaration(err.slice, err.error);
context.log_css_error(error_context, err.location, error);
let location = iter.input.current_source_location();
context.log_css_error(error_context, location, error);
}
}
}

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

@ -273,7 +273,8 @@ macro_rules! font_feature_values_blocks {
while let Some(result) = iter.next() {
if let Err(err) = result {
let error = ContextualParseError::UnsupportedRule(err.slice, err.error);
context.log_css_error(error_context, err.location, error);
let location = iter.input.current_source_location();
context.log_css_error(error_context, location, error);
}
}
}
@ -427,7 +428,8 @@ macro_rules! font_feature_values_blocks {
if let Err(err) = declaration {
let error = ContextualParseError::UnsupportedKeyframePropertyDeclaration(
err.slice, err.error);
self.context.log_css_error(self.error_context, err.location, error);
let location = iter.input.current_source_location();
self.context.log_css_error(self.error_context, location, error);
}
}
},

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

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

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

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

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

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

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

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