From 26e21191127eed5690c46c3a4d6fde4461d39022 Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Mon, 20 Feb 2023 13:04:24 -0500 Subject: [PATCH] Fix fixtures --- .../test/fixtures/tryceratops/TRY401.py | 8 +- crates/ruff/src/checkers/ast.rs | 2 +- .../tryceratops/rules/verbose_log_message.rs | 3 +- ..._tests__verbose-log-message_TRY401.py.snap | 95 +++++++++++++++++++ 4 files changed, 100 insertions(+), 8 deletions(-) create mode 100644 crates/ruff/src/rules/tryceratops/snapshots/ruff__rules__tryceratops__tests__verbose-log-message_TRY401.py.snap diff --git a/crates/ruff/resources/test/fixtures/tryceratops/TRY401.py b/crates/ruff/resources/test/fixtures/tryceratops/TRY401.py index a53d79c7d3ac3..84f9d922353b8 100644 --- a/crates/ruff/resources/test/fixtures/tryceratops/TRY401.py +++ b/crates/ruff/resources/test/fixtures/tryceratops/TRY401.py @@ -1,6 +1,4 @@ -# These SHOULD change - - +# Errors def main_function(): try: process() @@ -52,9 +50,7 @@ def func_comma(): logger.exception("log message", ex) -# These should NOT change - - +# OK def main_function(): try: process() diff --git a/crates/ruff/src/checkers/ast.rs b/crates/ruff/src/checkers/ast.rs index 9072f3f5b1b74..e4841b02f1851 100644 --- a/crates/ruff/src/checkers/ast.rs +++ b/crates/ruff/src/checkers/ast.rs @@ -1752,7 +1752,7 @@ where if self.settings.rules.enabled(&Rule::VerboseRaise) { tryceratops::rules::verbose_raise(self, handlers); } - if self.settings.rules.enabled(&Rule::VerboseRaise) { + if self.settings.rules.enabled(&Rule::VerboseLogMessage) { tryceratops::rules::verbose_log_message(self, handlers); } if self.settings.rules.enabled(&Rule::RaiseWithinTry) { diff --git a/crates/ruff/src/rules/tryceratops/rules/verbose_log_message.rs b/crates/ruff/src/rules/tryceratops/rules/verbose_log_message.rs index 03bee0cf8aae2..2cee57583639a 100644 --- a/crates/ruff/src/rules/tryceratops/rules/verbose_log_message.rs +++ b/crates/ruff/src/rules/tryceratops/rules/verbose_log_message.rs @@ -1,6 +1,7 @@ -use ruff_macros::{define_violation, derive_message_formats}; use rustpython_parser::ast::{Excepthandler, ExcepthandlerKind, Expr, ExprKind}; +use ruff_macros::{define_violation, derive_message_formats}; + use crate::ast::types::Range; use crate::ast::visitor; use crate::ast::visitor::Visitor; diff --git a/crates/ruff/src/rules/tryceratops/snapshots/ruff__rules__tryceratops__tests__verbose-log-message_TRY401.py.snap b/crates/ruff/src/rules/tryceratops/snapshots/ruff__rules__tryceratops__tests__verbose-log-message_TRY401.py.snap new file mode 100644 index 0000000000000..8525fd78f5f58 --- /dev/null +++ b/crates/ruff/src/rules/tryceratops/snapshots/ruff__rules__tryceratops__tests__verbose-log-message_TRY401.py.snap @@ -0,0 +1,95 @@ +--- +source: crates/ruff/src/rules/tryceratops/mod.rs +expression: diagnostics +--- +- kind: + VerboseLogMessage: ~ + location: + row: 8 + column: 44 + end_location: + row: 8 + column: 46 + fix: ~ + parent: ~ +- kind: + VerboseLogMessage: ~ + location: + row: 19 + column: 52 + end_location: + row: 19 + column: 55 + fix: ~ + parent: ~ +- kind: + VerboseLogMessage: ~ + location: + row: 21 + column: 43 + end_location: + row: 21 + column: 46 + fix: ~ + parent: ~ +- kind: + VerboseLogMessage: ~ + location: + row: 21 + column: 49 + end_location: + row: 21 + column: 52 + fix: ~ + parent: ~ +- kind: + VerboseLogMessage: ~ + location: + row: 23 + column: 43 + end_location: + row: 23 + column: 46 + fix: ~ + parent: ~ +- kind: + VerboseLogMessage: ~ + location: + row: 24 + column: 43 + end_location: + row: 24 + column: 46 + fix: ~ + parent: ~ +- kind: + VerboseLogMessage: ~ + location: + row: 36 + column: 40 + end_location: + row: 36 + column: 42 + fix: ~ + parent: ~ +- kind: + VerboseLogMessage: ~ + location: + row: 43 + column: 47 + end_location: + row: 43 + column: 49 + fix: ~ + parent: ~ +- kind: + VerboseLogMessage: ~ + location: + row: 50 + column: 40 + end_location: + row: 50 + column: 42 + fix: ~ + parent: ~ +