Rename PreorderVisitor to SourceOrderVisitor (#11798)

Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
This commit is contained in:
Micha Reiser 2024-06-07 19:01:58 +02:00 committed by GitHub
parent 37d8de3316
commit 32ca704956
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
27 changed files with 496 additions and 491 deletions

View file

@ -2,7 +2,7 @@ use std::fmt::{Debug, Write};
use insta::assert_snapshot;
use ruff_python_ast::visitor::preorder::{PreorderVisitor, TraversalSignal};
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};
@ -10,7 +10,7 @@ use ruff_python_parser::{parse, Mode};
fn function_arguments() {
let source = r"def a(b, c,/, d, e = 20, *args, named=5, other=20, **kwargs): pass";
let trace = trace_preorder_visitation(source);
let trace = trace_source_order_visitation(source);
assert_snapshot!(trace);
}
@ -19,7 +19,7 @@ fn function_arguments() {
fn function_positional_only_with_default() {
let source = r"def a(b, c = 34,/, e = 20, *args): pass";
let trace = trace_preorder_visitation(source);
let trace = trace_source_order_visitation(source);
assert_snapshot!(trace);
}
@ -28,7 +28,7 @@ fn function_positional_only_with_default() {
fn compare() {
let source = r"4 < x < 5";
let trace = trace_preorder_visitation(source);
let trace = trace_source_order_visitation(source);
assert_snapshot!(trace);
}
@ -37,7 +37,7 @@ fn compare() {
fn list_comprehension() {
let source = "[x for x in numbers]";
let trace = trace_preorder_visitation(source);
let trace = trace_source_order_visitation(source);
assert_snapshot!(trace);
}
@ -46,7 +46,7 @@ fn list_comprehension() {
fn dict_comprehension() {
let source = "{x: x**2 for x in numbers}";
let trace = trace_preorder_visitation(source);
let trace = trace_source_order_visitation(source);
assert_snapshot!(trace);
}
@ -55,7 +55,7 @@ fn dict_comprehension() {
fn set_comprehension() {
let source = "{x for x in numbers}";
let trace = trace_preorder_visitation(source);
let trace = trace_source_order_visitation(source);
assert_snapshot!(trace);
}
@ -70,7 +70,7 @@ match x:
...
";
let trace = trace_preorder_visitation(source);
let trace = trace_source_order_visitation(source);
assert_snapshot!(trace);
}
@ -87,7 +87,7 @@ class A:
pass
";
let trace = trace_preorder_visitation(source);
let trace = trace_source_order_visitation(source);
assert_snapshot!(trace);
}
@ -96,7 +96,7 @@ class A:
fn type_aliases() {
let source = r"type X[T: str, U, *Ts, **P] = list[T]";
let trace = trace_preorder_visitation(source);
let trace = trace_source_order_visitation(source);
assert_snapshot!(trace);
}
@ -105,7 +105,7 @@ fn type_aliases() {
fn class_type_parameters() {
let source = r"class X[T: str, U, *Ts, **P]: ...";
let trace = trace_preorder_visitation(source);
let trace = trace_source_order_visitation(source);
assert_snapshot!(trace);
}
@ -114,7 +114,7 @@ fn class_type_parameters() {
fn function_type_parameters() {
let source = r"def X[T: str, U, *Ts, **P](): ...";
let trace = trace_preorder_visitation(source);
let trace = trace_source_order_visitation(source);
assert_snapshot!(trace);
}
@ -123,7 +123,7 @@ fn function_type_parameters() {
fn string_literals() {
let source = r"'a' 'b' 'c'";
let trace = trace_preorder_visitation(source);
let trace = trace_source_order_visitation(source);
assert_snapshot!(trace);
}
@ -132,7 +132,7 @@ fn string_literals() {
fn bytes_literals() {
let source = r"b'a' b'b' b'c'";
let trace = trace_preorder_visitation(source);
let trace = trace_source_order_visitation(source);
assert_snapshot!(trace);
}
@ -141,12 +141,12 @@ fn bytes_literals() {
fn f_strings() {
let source = r"'pre' f'foo {bar:.{x}f} baz'";
let trace = trace_preorder_visitation(source);
let trace = trace_source_order_visitation(source);
assert_snapshot!(trace);
}
fn trace_preorder_visitation(source: &str) -> String {
fn trace_source_order_visitation(source: &str) -> String {
let parsed = parse(source, Mode::Module).unwrap();
let mut visitor = RecordVisitor::default();
@ -173,7 +173,7 @@ impl RecordVisitor {
}
}
impl<'a> PreorderVisitor<'a> for RecordVisitor {
impl<'a> SourceOrderVisitor<'a> for RecordVisitor {
fn enter_node(&mut self, node: AnyNodeRef<'a>) -> TraversalSignal {
self.emit(&node.kind());
self.depth += 1;