mirror of
https://github.com/RustPython/Parser.git
synced 2025-07-08 05:35:22 +00:00
Merge pull request #2 from astral-sh/include-decorators-in-class-and-func-range
This commit is contained in:
Micha Reiser
GitHub
commit
335780aeea
4 changed files with 117 additions and 25 deletions
|
|
@ -853,4 +853,24 @@ def args_to_tuple(*args: *Ts) -> Tuple[*Ts]: ...
|
|||
.unwrap();
|
||||
insta::assert_debug_snapshot!(parse_ast);
|
||||
}
|
||||
|
||||
#[test]
|
||||
#[cfg(not(feature = "all-nodes-with-ranges"))]
|
||||
fn decorator_ranges() {
|
||||
let parse_ast = parse_program(
|
||||
r#"
|
||||
@my_decorator
|
||||
def test():
|
||||
pass
|
||||
|
||||
@class_decorator
|
||||
class Abcd:
|
||||
pass
|
||||
"#
|
||||
.trim(),
|
||||
"<test>",
|
||||
)
|
||||
.unwrap();
|
||||
insta::assert_debug_snapshot!(parse_ast);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -964,7 +964,7 @@ WithItem<Goal>: ast::Withitem = {
|
|||
};
|
||||
|
||||
FuncDef: ast::Stmt = {
|
||||
<decorator_list:Decorator*> <location:@L> <is_async:"async"?> "def" <name:Identifier> <args:Parameters> <r:("->" <Test<"all">>)?> ":" <body:Suite> => {
|
||||
<location:@L> <decorator_list:Decorator*> <is_async:"async"?> "def" <name:Identifier> <args:Parameters> <r:("->" <Test<"all">>)?> ":" <body:Suite> => {
|
||||
let args = Box::new(args);
|
||||
let returns = r.map(|x| Box::new(x));
|
||||
let end_location = body.last().unwrap().end();
|
||||
|
|
@ -1135,7 +1135,7 @@ KwargParameter<ArgType>: Option<Box<ast::Arg>> = {
|
|||
};
|
||||
|
||||
ClassDef: ast::Stmt = {
|
||||
<decorator_list:Decorator*> <location:@L> "class" <name:Identifier> <a:("(" ArgumentList ")")?> ":" <body:Suite> => {
|
||||
<location:@L> <decorator_list:Decorator*> "class" <name:Identifier> <a:("(" ArgumentList ")")?> ":" <body:Suite> => {
|
||||
let (bases, keywords) = match a {
|
||||
Some((_, arg, _)) => (arg.args, arg.keywords),
|
||||
None => (vec![], vec![]),
|
||||
|
|
|
|||
46
parser/src/python.rs
generated
46
parser/src/python.rs
generated
|
|
@ -1,5 +1,5 @@
|
|||
// auto-generated: "lalrpop 0.20.0"
|
||||
// sha3: a33e9abb4be2a3730161519ce0f298452edbc50335b9e0c812d5a1730f1d8816
|
||||
// sha3: f95a98ddc92e7f056dba3f921c7c9b36d7725b180106324fd00b6157a1c36fe7
|
||||
use crate::{
|
||||
ast::{self as ast, Ranged},
|
||||
lexer::{LexicalError, LexicalErrorType},
|
||||
|
|
@ -30961,8 +30961,8 @@ fn __action156<
|
|||
#[allow(clippy::too_many_arguments)]
|
||||
fn __action157<
|
||||
>(
|
||||
(_, decorator_list, _): (TextSize, alloc::vec::Vec<ast::Expr>, TextSize),
|
||||
(_, location, _): (TextSize, TextSize, TextSize),
|
||||
(_, decorator_list, _): (TextSize, alloc::vec::Vec<ast::Expr>, TextSize),
|
||||
(_, is_async, _): (TextSize, core::option::Option<token::Tok>, TextSize),
|
||||
(_, _, _): (TextSize, token::Tok, TextSize),
|
||||
(_, name, _): (TextSize, ast::Identifier, TextSize),
|
||||
|
|
@ -31055,8 +31055,8 @@ fn __action161<
|
|||
#[allow(clippy::too_many_arguments)]
|
||||
fn __action162<
|
||||
>(
|
||||
(_, decorator_list, _): (TextSize, alloc::vec::Vec<ast::Expr>, TextSize),
|
||||
(_, location, _): (TextSize, TextSize, TextSize),
|
||||
(_, decorator_list, _): (TextSize, alloc::vec::Vec<ast::Expr>, TextSize),
|
||||
(_, _, _): (TextSize, token::Tok, TextSize),
|
||||
(_, name, _): (TextSize, ast::Identifier, TextSize),
|
||||
(_, a, _): (TextSize, core::option::Option<(token::Tok, ArgumentList, token::Tok)>, TextSize),
|
||||
|
|
@ -37788,8 +37788,8 @@ fn __action636<
|
|||
#[allow(clippy::too_many_arguments)]
|
||||
fn __action637<
|
||||
>(
|
||||
__0: (TextSize, alloc::vec::Vec<ast::Expr>, TextSize),
|
||||
__1: (TextSize, TextSize, TextSize),
|
||||
__0: (TextSize, TextSize, TextSize),
|
||||
__1: (TextSize, alloc::vec::Vec<ast::Expr>, TextSize),
|
||||
__2: (TextSize, token::Tok, TextSize),
|
||||
__3: (TextSize, token::Tok, TextSize),
|
||||
__4: (TextSize, ast::Identifier, TextSize),
|
||||
|
|
@ -37821,8 +37821,8 @@ fn __action637<
|
|||
#[allow(clippy::too_many_arguments)]
|
||||
fn __action638<
|
||||
>(
|
||||
__0: (TextSize, alloc::vec::Vec<ast::Expr>, TextSize),
|
||||
__1: (TextSize, TextSize, TextSize),
|
||||
__0: (TextSize, TextSize, TextSize),
|
||||
__1: (TextSize, alloc::vec::Vec<ast::Expr>, TextSize),
|
||||
__2: (TextSize, token::Tok, TextSize),
|
||||
__3: (TextSize, ast::Identifier, TextSize),
|
||||
__4: (TextSize, ast::Arguments, TextSize),
|
||||
|
|
@ -37991,8 +37991,8 @@ fn __action643<
|
|||
#[allow(clippy::too_many_arguments)]
|
||||
fn __action644<
|
||||
>(
|
||||
__0: (TextSize, alloc::vec::Vec<ast::Expr>, TextSize),
|
||||
__1: (TextSize, TextSize, TextSize),
|
||||
__0: (TextSize, TextSize, TextSize),
|
||||
__1: (TextSize, alloc::vec::Vec<ast::Expr>, TextSize),
|
||||
__2: (TextSize, token::Tok, TextSize),
|
||||
__3: (TextSize, ast::Identifier, TextSize),
|
||||
__4: (TextSize, token::Tok, TextSize),
|
||||
|
|
@ -38024,8 +38024,8 @@ fn __action644<
|
|||
#[allow(clippy::too_many_arguments)]
|
||||
fn __action645<
|
||||
>(
|
||||
__0: (TextSize, alloc::vec::Vec<ast::Expr>, TextSize),
|
||||
__1: (TextSize, TextSize, TextSize),
|
||||
__0: (TextSize, TextSize, TextSize),
|
||||
__1: (TextSize, alloc::vec::Vec<ast::Expr>, TextSize),
|
||||
__2: (TextSize, token::Tok, TextSize),
|
||||
__3: (TextSize, ast::Identifier, TextSize),
|
||||
__4: (TextSize, token::Tok, TextSize),
|
||||
|
|
@ -40293,16 +40293,16 @@ fn __action738<
|
|||
__7: (TextSize, ast::Suite, TextSize),
|
||||
) -> ast::Stmt
|
||||
{
|
||||
let __start0 = __0.2;
|
||||
let __end0 = __1.0;
|
||||
let __start0 = __0.0;
|
||||
let __end0 = __0.0;
|
||||
let __temp0 = __action371(
|
||||
&__start0,
|
||||
&__end0,
|
||||
);
|
||||
let __temp0 = (__start0, __temp0, __end0);
|
||||
__action644(
|
||||
__0,
|
||||
__temp0,
|
||||
__0,
|
||||
__1,
|
||||
__2,
|
||||
__3,
|
||||
|
|
@ -40323,16 +40323,16 @@ fn __action739<
|
|||
__4: (TextSize, ast::Suite, TextSize),
|
||||
) -> ast::Stmt
|
||||
{
|
||||
let __start0 = __0.2;
|
||||
let __end0 = __1.0;
|
||||
let __start0 = __0.0;
|
||||
let __end0 = __0.0;
|
||||
let __temp0 = __action371(
|
||||
&__start0,
|
||||
&__end0,
|
||||
);
|
||||
let __temp0 = (__start0, __temp0, __end0);
|
||||
__action645(
|
||||
__0,
|
||||
__temp0,
|
||||
__0,
|
||||
__1,
|
||||
__2,
|
||||
__3,
|
||||
|
|
@ -41316,16 +41316,16 @@ fn __action777<
|
|||
__7: (TextSize, ast::Suite, TextSize),
|
||||
) -> ast::Stmt
|
||||
{
|
||||
let __start0 = __0.2;
|
||||
let __end0 = __1.0;
|
||||
let __start0 = __0.0;
|
||||
let __end0 = __0.0;
|
||||
let __temp0 = __action371(
|
||||
&__start0,
|
||||
&__end0,
|
||||
);
|
||||
let __temp0 = (__start0, __temp0, __end0);
|
||||
__action637(
|
||||
__0,
|
||||
__temp0,
|
||||
__0,
|
||||
__1,
|
||||
__2,
|
||||
__3,
|
||||
|
|
@ -41348,16 +41348,16 @@ fn __action778<
|
|||
__6: (TextSize, ast::Suite, TextSize),
|
||||
) -> ast::Stmt
|
||||
{
|
||||
let __start0 = __0.2;
|
||||
let __end0 = __1.0;
|
||||
let __start0 = __0.0;
|
||||
let __end0 = __0.0;
|
||||
let __temp0 = __action371(
|
||||
&__start0,
|
||||
&__end0,
|
||||
);
|
||||
let __temp0 = (__start0, __temp0, __end0);
|
||||
__action638(
|
||||
__0,
|
||||
__temp0,
|
||||
__0,
|
||||
__1,
|
||||
__2,
|
||||
__3,
|
||||
|
|
|
|||
72
parser/src/snapshots/rustpython_parser__parser__tests__decorator_ranges.snap
generated
Normal file
72
parser/src/snapshots/rustpython_parser__parser__tests__decorator_ranges.snap
generated
Normal file
|
|
@ -0,0 +1,72 @@
|
|||
---
|
||||
source: parser/src/parser.rs
|
||||
expression: parse_ast
|
||||
---
|
||||
[
|
||||
FunctionDef(
|
||||
StmtFunctionDef {
|
||||
range: 0..34,
|
||||
name: Identifier(
|
||||
"test",
|
||||
),
|
||||
args: Arguments {
|
||||
range: (),
|
||||
posonlyargs: [],
|
||||
args: [],
|
||||
vararg: None,
|
||||
kwonlyargs: [],
|
||||
kw_defaults: [],
|
||||
kwarg: None,
|
||||
defaults: [],
|
||||
},
|
||||
body: [
|
||||
Pass(
|
||||
StmtPass {
|
||||
range: 30..34,
|
||||
},
|
||||
),
|
||||
],
|
||||
decorator_list: [
|
||||
Name(
|
||||
ExprName {
|
||||
range: 1..13,
|
||||
id: Identifier(
|
||||
"my_decorator",
|
||||
),
|
||||
ctx: Load,
|
||||
},
|
||||
),
|
||||
],
|
||||
returns: None,
|
||||
type_comment: None,
|
||||
},
|
||||
),
|
||||
ClassDef(
|
||||
StmtClassDef {
|
||||
range: 40..77,
|
||||
name: Identifier(
|
||||
"Abcd",
|
||||
),
|
||||
bases: [],
|
||||
keywords: [],
|
||||
body: [
|
||||
Pass(
|
||||
StmtPass {
|
||||
range: 73..77,
|
||||
},
|
||||
),
|
||||
],
|
||||
decorator_list: [
|
||||
Name(
|
||||
ExprName {
|
||||
range: 41..56,
|
||||
id: Identifier(
|
||||
"class_decorator",
|
||||
),
|
||||
ctx: Load,
|
||||
},
|
||||
),
|
||||
],
|
||||
},
|
||||
),
|
||||
]
|
||||
Loading…
Add table
Add a link
Reference in a new issue