diff --git a/parser/src/lib.rs b/parser/src/lib.rs index 5cfa4a68d4..dc5f91e930 100644 --- a/parser/src/lib.rs +++ b/parser/src/lib.rs @@ -125,8 +125,8 @@ mod string; mod token; pub use parser::{ - parse, parse_expression, parse_expression_at, parse_program, parse_starts_at, parse_tokens, - ParseError, ParseErrorType, + parse, parse_expression, parse_expression_starts_at, parse_program, parse_starts_at, + parse_tokens, ParseError, ParseErrorType, }; pub use string::FStringErrorType; pub use token::{StringKind, Tok}; diff --git a/parser/src/parser.rs b/parser/src/parser.rs index d13c8845de..b479d3daaa 100644 --- a/parser/src/parser.rs +++ b/parser/src/parser.rs @@ -70,7 +70,7 @@ pub fn parse_program(source: &str, source_path: &str) -> Result Result { - parse_expression_at(source, path, TextSize::default()) + parse_expression_starts_at(source, path, TextSize::default()) } /// Parses a Python expression from a given location. @@ -84,12 +84,12 @@ pub fn parse_expression(source: &str, path: &str) -> Result", TextSize::from(400)); +/// let expr = parse_expression_starts_at("1 + 2", "", TextSize::from(400)); /// assert!(expr.is_ok()); /// ``` -pub fn parse_expression_at( +pub fn parse_expression_starts_at( source: &str, path: &str, offset: TextSize, diff --git a/parser/src/string.rs b/parser/src/string.rs index 65456604a3..532fae5977 100644 --- a/parser/src/string.rs +++ b/parser/src/string.rs @@ -6,7 +6,7 @@ use crate::{ ast::{self, Constant, Expr, ExprKind, Int}, lexer::{LexicalError, LexicalErrorType}, - parser::{parse_expression_at, LalrpopError, ParseError, ParseErrorType}, + parser::{parse_expression_starts_at, LalrpopError, ParseError, ParseErrorType}, token::{StringKind, Tok}, }; use itertools::Itertools; @@ -575,7 +575,7 @@ impl<'a> StringParser<'a> { fn parse_fstring_expr(source: &str, location: TextSize) -> Result { let fstring_body = format!("({source})"); let start = location - TextSize::from(1); - parse_expression_at(&fstring_body, "", start) + parse_expression_starts_at(&fstring_body, "", start) } fn parse_string(