Pass ParserOptions to the parser (#16220)

## Summary

This is part of the preparation for detecting syntax errors in the
parser from https://github.com/astral-sh/ruff/pull/16090/. As suggested
in [this
comment](https://github.com/astral-sh/ruff/pull/16090/#discussion_r1953084509),
I started working on a `ParseOptions` struct that could be stored in the
parser. For this initial refactor, I only made it hold the existing
`Mode` option, but for syntax errors, we will also need it to have a
`PythonVersion`. For that use case, I'm picturing something like a
`ParseOptions::with_python_version` method, so you can extend the
current calls to something like

```rust
ParseOptions::from(mode).with_python_version(settings.target_version)
```

But I thought it was worth adding `ParseOptions` alone without changing
any other behavior first.

Most of the diff is just updating call sites taking `Mode` to take
`ParseOptions::from(Mode)` or those taking `PySourceType`s to take
`ParseOptions::from(PySourceType)`. The interesting changes are in the
new `parser/options.rs` file and smaller parts of `parser/mod.rs` and
`ruff_python_parser/src/lib.rs`.

## Test Plan

Existing tests, this should not change any behavior.
This commit is contained in:
Brent Westbrook 2025-02-19 10:50:50 -05:00 committed by GitHub
parent cfc6941d5c
commit 97d0659ce3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
25 changed files with 148 additions and 93 deletions

View file

@ -4,7 +4,7 @@ use insta::assert_snapshot;
use ruff_python_ast::visitor::source_order::{SourceOrderVisitor, TraversalSignal};
use ruff_python_ast::{AnyNodeRef, BoolOp, CmpOp, Operator, Singleton, UnaryOp};
use ruff_python_parser::{parse, Mode};
use ruff_python_parser::{parse, Mode, ParseOptions};
#[test]
fn function_arguments() {
@ -147,7 +147,7 @@ fn f_strings() {
}
fn trace_source_order_visitation(source: &str) -> String {
let parsed = parse(source, Mode::Module).unwrap();
let parsed = parse(source, ParseOptions::from(Mode::Module)).unwrap();
let mut visitor = RecordVisitor::default();
visitor.visit_mod(parsed.syntax());

View file

@ -13,7 +13,7 @@ use ruff_python_ast::{
Expr, FString, FStringElement, Keyword, MatchCase, Operator, Parameter, Parameters, Pattern,
Stmt, StringLiteral, TypeParam, UnaryOp, WithItem,
};
use ruff_python_parser::{parse, Mode};
use ruff_python_parser::{parse, Mode, ParseOptions};
#[test]
fn function_arguments() {
@ -156,7 +156,7 @@ fn f_strings() {
}
fn trace_visitation(source: &str) -> String {
let parsed = parse(source, Mode::Module).unwrap();
let parsed = parse(source, ParseOptions::from(Mode::Module)).unwrap();
let mut visitor = RecordVisitor::default();
walk_module(&mut visitor, parsed.syntax());