@@ -19,8 +19,10 @@ use rustc_hash::FxHashSet;
1919use crate :: Edit ;
2020use crate :: Locator ;
2121use crate :: fs:: relativize_path;
22+ use crate :: preview:: is_human_readable_names_enabled;
2223use crate :: registry:: Rule ;
2324use crate :: rule_redirects:: get_redirect_target;
25+ use crate :: settings:: types:: PreviewMode ;
2426use crate :: suppression:: { self , Suppressions } ;
2527
2628/// Generates an array of edits that matches the length of `diagnostics`.
@@ -39,6 +41,7 @@ pub fn generate_suppression_edits(
3941 line_ending : LineEnding ,
4042 suppressions : & Suppressions ,
4143 suppression_kind : SuppressionKind ,
44+ preview : PreviewMode ,
4245) -> Vec < Option < Edit > > {
4346 let file_directives = FileNoqaDirectives :: extract ( locator, comment_ranges, external, path) ;
4447 let exemption = FileExemption :: from ( & file_directives) ;
@@ -51,6 +54,7 @@ pub fn generate_suppression_edits(
5154 noqa_line_for,
5255 suppressions,
5356 suppression_kind,
57+ preview,
5458 ) ;
5559 build_suppression_edits_by_diagnostic ( comments, locator, line_ending, None , suppression_kind)
5660}
@@ -780,6 +784,7 @@ pub(crate) fn add_suppression(
780784 reason : Option < & str > ,
781785 suppressions : & Suppressions ,
782786 suppression_kind : SuppressionKind ,
787+ preview : PreviewMode ,
783788) -> Result < usize > {
784789 let ( count, output) = add_suppression_inner (
785790 path,
@@ -792,6 +797,7 @@ pub(crate) fn add_suppression(
792797 reason,
793798 suppressions,
794799 suppression_kind,
800+ preview,
795801 ) ;
796802
797803 fs:: write ( path, output) ?;
@@ -810,6 +816,7 @@ fn add_suppression_inner(
810816 reason : Option < & str > ,
811817 suppressions : & Suppressions ,
812818 suppression_kind : SuppressionKind ,
819+ preview : PreviewMode ,
813820) -> ( usize , String ) {
814821 let mut count = 0 ;
815822
@@ -827,6 +834,7 @@ fn add_suppression_inner(
827834 noqa_line_for,
828835 suppressions,
829836 suppression_kind,
837+ preview,
830838 ) ;
831839
832840 let edits =
@@ -938,6 +946,7 @@ impl Ranged for ExistingDirective<'_> {
938946 }
939947}
940948
949+ #[ expect( clippy:: too_many_arguments) ]
941950fn find_suppression_comments < ' a > (
942951 diagnostics : & ' a [ Diagnostic ] ,
943952 locator : & ' a Locator ,
@@ -946,6 +955,7 @@ fn find_suppression_comments<'a>(
946955 noqa_line_for : & NoqaMapping ,
947956 suppressions : & ' a Suppressions ,
948957 suppression_kind : SuppressionKind ,
958+ preview : PreviewMode ,
949959) -> Vec < Option < SuppressionComment < ' a > > > {
950960 // List of suppression comments, ordered to match up with `messages`
951961 let mut comments_by_line: Vec < Option < SuppressionComment < ' a > > > = vec ! [ ] ;
@@ -1023,7 +1033,8 @@ fn find_suppression_comments<'a>(
10231033
10241034 let identifier = match suppression_kind {
10251035 SuppressionKind :: Noqa => code. as_str ( ) ,
1026- SuppressionKind :: Ignore => message. name ( ) ,
1036+ SuppressionKind :: Ignore if is_human_readable_names_enabled ( preview) => message. name ( ) ,
1037+ SuppressionKind :: Ignore => code. as_str ( ) ,
10271038 } ;
10281039
10291040 comments_by_line. push ( Some ( SuppressionComment {
@@ -1368,6 +1379,7 @@ mod tests {
13681379 use crate :: rules:: pycodestyle:: rules:: { AmbiguousVariableName , UselessSemicolon } ;
13691380 use crate :: rules:: pyflakes:: rules:: UnusedVariable ;
13701381 use crate :: rules:: pyupgrade:: rules:: PrintfStringFormatting ;
1382+ use crate :: settings:: types:: PreviewMode ;
13711383 use crate :: settings:: { LinterSettings , flags} ;
13721384 use crate :: source_kind:: SourceKind ;
13731385 use crate :: suppression:: Suppressions ;
@@ -1423,6 +1435,7 @@ mod tests {
14231435 None ,
14241436 & suppressions,
14251437 suppression_kind,
1438+ settings. preview ,
14261439 )
14271440 }
14281441
@@ -3328,6 +3341,7 @@ mod tests {
33283341 None ,
33293342 & Suppressions :: default ( ) ,
33303343 SuppressionKind :: Noqa ,
3344+ PreviewMode :: Disabled ,
33313345 ) ;
33323346 assert_eq ! ( count, 0 ) ;
33333347 assert_eq ! ( output, format!( "{contents}" ) ) ;
@@ -3354,6 +3368,7 @@ mod tests {
33543368 None ,
33553369 & Suppressions :: default ( ) ,
33563370 SuppressionKind :: Noqa ,
3371+ PreviewMode :: Disabled ,
33573372 ) ;
33583373 assert_eq ! ( count, 1 ) ;
33593374 assert_eq ! ( output, "x = 1 # noqa: F841\n " ) ;
@@ -3387,6 +3402,7 @@ mod tests {
33873402 None ,
33883403 & Suppressions :: default ( ) ,
33893404 SuppressionKind :: Noqa ,
3405+ PreviewMode :: Disabled ,
33903406 ) ;
33913407 assert_eq ! ( count, 1 ) ;
33923408 assert_eq ! ( output, "x = 1 # noqa: E741, F841\n " ) ;
@@ -3420,6 +3436,7 @@ mod tests {
34203436 None ,
34213437 & Suppressions :: default ( ) ,
34223438 SuppressionKind :: Noqa ,
3439+ PreviewMode :: Disabled ,
34233440 ) ;
34243441 assert_eq ! ( count, 0 ) ;
34253442 assert_eq ! ( output, "x = 1 # noqa" ) ;
@@ -3453,6 +3470,7 @@ print(
34533470 LineEnding :: Lf ,
34543471 & suppressions,
34553472 SuppressionKind :: Noqa ,
3473+ PreviewMode :: Disabled ,
34563474 ) ;
34573475 assert_eq ! (
34583476 edits,
@@ -3487,6 +3505,7 @@ bar =
34873505 LineEnding :: Lf ,
34883506 & suppressions,
34893507 SuppressionKind :: Noqa ,
3508+ PreviewMode :: Disabled ,
34903509 ) ;
34913510 assert_eq ! (
34923511 edits,
0 commit comments