From 4ce5c2814656f6eac6f760632452942155616e22 Mon Sep 17 00:00:00 2001 From: Dhruv Manilawala Date: Thu, 27 Jul 2023 07:11:33 +0530 Subject: [PATCH] Use `is_jupyter_notebook` param --- .../flake8_pytest_style/rules/parametrize.rs | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/crates/ruff/src/rules/flake8_pytest_style/rules/parametrize.rs b/crates/ruff/src/rules/flake8_pytest_style/rules/parametrize.rs index 109b3c58b9658..a6ebbcb61ed1e 100644 --- a/crates/ruff/src/rules/flake8_pytest_style/rules/parametrize.rs +++ b/crates/ruff/src/rules/flake8_pytest_style/rules/parametrize.rs @@ -99,11 +99,17 @@ fn get_parametrize_name_range( decorator: &Decorator, expr: &Expr, locator: &Locator, - mode: Mode, + is_jupyter_notebook: bool, ) -> TextRange { let mut locations = Vec::new(); let mut implicit_concat = None; + let mode = if is_jupyter_notebook { + Mode::Jupyter + } else { + Mode::Module + }; + // The parenthesis are not part of the AST, so we need to tokenize the // decorator to find them. for (tok, range) in @@ -132,11 +138,6 @@ fn get_parametrize_name_range( /// PT006 fn check_names(checker: &mut Checker, decorator: &Decorator, expr: &Expr) { let names_type = checker.settings.flake8_pytest_style.parametrize_names_type; - let mode = if checker.is_jupyter_notebook { - Mode::Jupyter - } else { - Mode::Module - }; match expr { Expr::Constant(ast::ExprConstant { @@ -147,8 +148,12 @@ fn check_names(checker: &mut Checker, decorator: &Decorator, expr: &Expr) { if names.len() > 1 { match names_type { types::ParametrizeNameType::Tuple => { - let name_range = - get_parametrize_name_range(decorator, expr, checker.locator(), mode); + let name_range = get_parametrize_name_range( + decorator, + expr, + checker.locator(), + checker.is_jupyter_notebook, + ); let mut diagnostic = Diagnostic::new( PytestParametrizeNamesWrongType { expected: names_type, @@ -178,8 +183,12 @@ fn check_names(checker: &mut Checker, decorator: &Decorator, expr: &Expr) { checker.diagnostics.push(diagnostic); } types::ParametrizeNameType::List => { - let name_range = - get_parametrize_name_range(decorator, expr, checker.locator(), mode); + let name_range = get_parametrize_name_range( + decorator, + expr, + checker.locator(), + checker.is_jupyter_notebook, + ); let mut diagnostic = Diagnostic::new( PytestParametrizeNamesWrongType { expected: names_type,