reduce nessting a bit more

oxc-project · May 11, 2024 · f799919 · f799919
1 parent 2ecd2c2
commit f799919
Showing 1 changed file with 21 additions and 30 deletions.
diff --git a/crates/oxc_linter/src/rules/typescript/consistent_indexed_object_style.rs b/crates/oxc_linter/src/rules/typescript/consistent_indexed_object_style.rs
@@ -269,19 +269,16 @@ impl Rule for ConsistentIndexedObjectStyle {
                                         }
                                     }
                                 }
-                            }
-
-                            if self.is_index_signature {
-                                if let TSType::TSTypeReference(tref) = &return_type.type_annotation
-                                {
-                                    if let TSTypeName::IdentifierReference(r) = &tref.type_name {
-                                        if r.name == "Record" {
-                                            ctx.diagnostic(ConsistentIndexedObjectStyleDiagnostic(
-                                                "index signature",
-                                                "record",
-                                                tref.span,
-                                            ));
-                                        }
+                            } else if let TSType::TSTypeReference(tref) =
+                                &return_type.type_annotation
+                            {
+                                if let TSTypeName::IdentifierReference(r) = &tref.type_name {
+                                    if r.name == "Record" {
+                                        ctx.diagnostic(ConsistentIndexedObjectStyleDiagnostic(
+                                            "index signature",
+                                            "record",
+                                            tref.span,
+                                        ));
                                     }
                                 }
                             }
@@ -307,23 +304,16 @@ impl Rule for ConsistentIndexedObjectStyle {
                                             }
                                         }
                                     }
-                                }
-
-                                if self.is_index_signature {
-                                    if let TSType::TSTypeReference(tref) =
-                                        &ts_type_annotation.type_annotation
-                                    {
-                                        if let TSTypeName::IdentifierReference(r) = &tref.type_name
-                                        {
-                                            if r.name == "Record" {
-                                                ctx.diagnostic(
-                                                    ConsistentIndexedObjectStyleDiagnostic(
-                                                        "index signature",
-                                                        "record",
-                                                        tref.span,
-                                                    ),
-                                                );
-                                            }
+                                } else if let TSType::TSTypeReference(tref) =
+                                    &ts_type_annotation.type_annotation
+                                {
+                                    if let TSTypeName::IdentifierReference(r) = &tref.type_name {
+                                        if r.name == "Record" {
+                                            ctx.diagnostic(ConsistentIndexedObjectStyleDiagnostic(
+                                                "index signature",
+                                                "record",
+                                                tref.span,
+                                            ));
                                         }
                                     }
                                 }
@@ -332,6 +322,7 @@ impl Rule for ConsistentIndexedObjectStyle {
                     }
                 }
             }
+
             _ => {}
         }
     }