From 10ba79489a1968db131f13707e3fff5523c30fed Mon Sep 17 00:00:00 2001
From: Charlie Marsh <charlie.r.marsh@gmail.com>
Date: Fri, 2 Jun 2023 00:04:25 -0400
Subject: [PATCH] Exclude function definition from too-many-statements rule
 (#4794)

---
 .../rules/pylint/rules/too_many_statements.rs | 32 +++++++++----------
 ...tests__PLR0915_too_many_statements.py.snap |  2 +-
 ..._rules__pylint__tests__max_statements.snap | 18 +----------
 3 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/crates/ruff/src/rules/pylint/rules/too_many_statements.rs b/crates/ruff/src/rules/pylint/rules/too_many_statements.rs
index 9991ca3215..ff563b5047 100644
--- a/crates/ruff/src/rules/pylint/rules/too_many_statements.rs
+++ b/crates/ruff/src/rules/pylint/rules/too_many_statements.rs
@@ -151,7 +151,7 @@ pub(crate) fn too_many_statements(
     max_statements: usize,
     locator: &Locator,
 ) -> Option<Diagnostic> {
-    let statements = num_statements(body) + 1;
+    let statements = num_statements(body);
     if statements > max_statements {
         Some(Diagnostic::new(
             TooManyStatements {
@@ -176,7 +176,7 @@ mod tests {
     #[test]
     fn pass() -> Result<()> {
         let source: &str = r#"
-def f():  # 2
+def f():
     pass
 "#;
         let stmts = Suite::parse(source, "<filename>")?;
@@ -216,7 +216,7 @@ def f():
     #[test]
     fn if_elif() -> Result<()> {
         let source: &str = r#"
-def f():  # 5
+def f():
     if a:
         print()
     elif a:
@@ -230,7 +230,7 @@ def f():  # 5
     #[test]
     fn if_elif_else() -> Result<()> {
         let source: &str = r#"
-def f():  # 9
+def f():
     if a:
         print()
     elif a == 2:
@@ -248,7 +248,7 @@ def f():  # 9
     #[test]
     fn many_statements() -> Result<()> {
         let source: &str = r#"
-async def f():  # 19
+async def f():
     a = 1
     b = 2
     c = 3
@@ -277,7 +277,7 @@ async def f():  # 19
     #[test]
     fn for_() -> Result<()> {
         let source: &str = r#"
-def f():  # 2
+def f():
     for i in range(10):
         pass
 "#;
@@ -289,7 +289,7 @@ def f():  # 2
     #[test]
     fn for_else() -> Result<()> {
         let source: &str = r#"
-def f():  # 3
+def f():
     for i in range(10):
         print()
     else:
@@ -303,7 +303,7 @@ def f():  # 3
     #[test]
     fn nested_def() -> Result<()> {
         let source: &str = r#"
-def f():  # 5
+def f():
     def g():
         print()
         print()
@@ -318,7 +318,7 @@ def f():  # 5
     #[test]
     fn nested_class() -> Result<()> {
         let source: &str = r#"
-def f():  # 3
+def f():
     class A:
         def __init__(self):
             pass
@@ -347,7 +347,7 @@ def f():
     #[test]
     fn with() -> Result<()> {
         let source: &str = r#"
-def f():  # 6
+def f():
     with a:
         if a:
             print()
@@ -363,7 +363,7 @@ def f():  # 6
     #[test]
     fn try_except() -> Result<()> {
         let source: &str = r#"
-def f():  # 5
+def f():
     try:
         print()
     except Exception:
@@ -377,7 +377,7 @@ def f():  # 5
     #[test]
     fn try_except_else() -> Result<()> {
         let source: &str = r#"
-def f():  # 7
+def f():
     try:
         print()
     except ValueError:
@@ -393,7 +393,7 @@ def f():  # 7
     #[test]
     fn try_except_else_finally() -> Result<()> {
         let source: &str = r#"
-def f():  # 10
+def f():
     try:
         print()
     except ValueError:
@@ -411,7 +411,7 @@ def f():  # 10
     #[test]
     fn try_except_except() -> Result<()> {
         let source: &str = r#"
-def f():  # 8
+def f():
     try:
         print()
     except ValueError:
@@ -427,7 +427,7 @@ def f():  # 8
     #[test]
     fn try_except_except_finally() -> Result<()> {
         let source: &str = r#"
-def f():  # 11
+def f():
     try:
         print()
     except:
@@ -445,7 +445,7 @@ def f():  # 11
     #[test]
     fn yield_() -> Result<()> {
         let source: &str = r#"
-def f():  # 2
+def f():
     for i in range(10):
         yield i
 "#;
diff --git a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR0915_too_many_statements.py.snap b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR0915_too_many_statements.py.snap
index 8bf44746fb..9f64562901 100644
--- a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR0915_too_many_statements.py.snap
+++ b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__PLR0915_too_many_statements.py.snap
@@ -1,7 +1,7 @@
 ---
 source: crates/ruff/src/rules/pylint/mod.rs
 ---
-too_many_statements.py:5:11: PLR0915 Too many statements (52 > 50)
+too_many_statements.py:5:11: PLR0915 Too many statements (51 > 50)
   |
 5 | async def f():  # Too many statements (52/50)
   |           ^ PLR0915
diff --git a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__max_statements.snap b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__max_statements.snap
index e2e963c6fd..55e63e6817 100644
--- a/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__max_statements.snap
+++ b/crates/ruff/src/rules/pylint/snapshots/ruff__rules__pylint__tests__max_statements.snap
@@ -1,15 +1,7 @@
 ---
 source: crates/ruff/src/rules/pylint/mod.rs
 ---
-too_many_statements_params.py:2:5: PLR0915 Too many statements (2 > 1)
-  |
-2 | # Too may statements (2/1) for max_statements=1
-3 | def f(x):
-  |     ^ PLR0915
-4 |     pass
-  |
-
-too_many_statements_params.py:6:5: PLR0915 Too many statements (3 > 1)
+too_many_statements_params.py:6:5: PLR0915 Too many statements (2 > 1)
   |
 6 | def f(x):
   |     ^ PLR0915
@@ -17,12 +9,4 @@ too_many_statements_params.py:6:5: PLR0915 Too many statements (3 > 1)
 8 |         pass
   |
 
-too_many_statements_params.py:7:9: PLR0915 Too many statements (2 > 1)
-  |
-7 | def f(x):
-8 |     def g(x):
-  |         ^ PLR0915
-9 |         pass
-  |
-