Python
/
ruff
mirror of https://github.com/astral-sh/ruff
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

red_knot_python_semantic: migrate `types/string_annotation` to new diagnostics

This commit is contained in:
Andrew Gallant 2025-04-18 12:18:50 -04:00 committed by Andrew Gallant
parent 27a377f077
commit ad5a659f29
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
crates/red_knot_python_semantic/src/types/string_annotation.rs
View File

@ -142,38 +142,38 @@ pub(crate) fn parse_string_annotation(
if let Some(string_literal) = string_expr.as_single_part_string() { if let Some(string_literal) = string_expr.as_single_part_string() {
let prefix = string_literal.flags.prefix(); let prefix = string_literal.flags.prefix();
if prefix.is_raw() { if prefix.is_raw() {
context.report_lint_old( if let Some(builder) = context.report_lint(&RAW_STRING_TYPE_ANNOTATION, string_literal)
&RAW_STRING_TYPE_ANNOTATION, {
string_literal, builder.into_diagnostic("Type expressions cannot use raw string literal");
format_args!("Type expressions cannot use raw string literal"), }
);
// Compare the raw contents (without quotes) of the expression with the parsed contents // Compare the raw contents (without quotes) of the expression with the parsed contents
// contained in the string literal. // contained in the string literal.
} else if &source[string_literal.content_range()] == string_literal.as_str() { } else if &source[string_literal.content_range()] == string_literal.as_str() {
match ruff_python_parser::parse_string_annotation(source.as_str(), string_literal) { match ruff_python_parser::parse_string_annotation(source.as_str(), string_literal) {
Ok(parsed) => return Some(parsed), Ok(parsed) => return Some(parsed),
Err(parse_error) => context.report_lint_old( Err(parse_error) => {
&INVALID_SYNTAX_IN_FORWARD_ANNOTATION, if let Some(builder) =
string_literal, context.report_lint(&INVALID_SYNTAX_IN_FORWARD_ANNOTATION, string_literal)
format_args!("Syntax error in forward annotation: {}", parse_error.error), {
), builder.into_diagnostic(format_args!(
"Syntax error in forward annotation: {}",
parse_error.error
));
} }
} else { }
}
} else if let Some(builder) =
context.report_lint(&ESCAPE_CHARACTER_IN_FORWARD_ANNOTATION, string_expr)
{
// The raw contents of the string doesn't match the parsed content. This could be the // The raw contents of the string doesn't match the parsed content. This could be the
// case for annotations that contain escape sequences. // case for annotations that contain escape sequences.
context.report_lint_old( builder.into_diagnostic("Type expressions cannot contain escape characters");
&ESCAPE_CHARACTER_IN_FORWARD_ANNOTATION,
string_expr,
format_args!("Type expressions cannot contain escape characters"),
);
} }
} else { } else if let Some(builder) =
context.report_lint(&IMPLICIT_CONCATENATED_STRING_TYPE_ANNOTATION, string_expr)
{
// String is implicitly concatenated. // String is implicitly concatenated.
context.report_lint_old( builder.into_diagnostic("Type expressions cannot span multiple string literals");
&IMPLICIT_CONCATENATED_STRING_TYPE_ANNOTATION,
string_expr,
format_args!("Type expressions cannot span multiple string literals"),
);
} }
None None