[pycodestyle] Add blank line(s) rules (E301, E302, E303, E304, E305, E306)

crates/ruff/src/checkers/logical_lines.rs

@@ -7,10 +7,11 @@ use ruff_python_ast::token_kind::TokenKind;
 
 use crate::registry::{AsRule, Rule};
 use crate::rules::pycodestyle::rules::logical_lines::{
-    extraneous_whitespace, indentation, missing_whitespace, missing_whitespace_after_keyword,
-    missing_whitespace_around_operator, space_around_operator, whitespace_around_keywords,
-    whitespace_around_named_parameter_equals, whitespace_before_comment,
-    whitespace_before_parameters, LogicalLines, TokenFlags,
+    blank_lines, extraneous_whitespace, indentation, missing_whitespace,
+    missing_whitespace_after_keyword, missing_whitespace_around_operator, space_around_operator,
+    whitespace_around_keywords, whitespace_around_named_parameter_equals,
+    whitespace_before_comment, whitespace_before_parameters, BlankLinesTrackingVars, LogicalLines,
+    TokenFlags,
 };
 use crate::settings::Settings;
 
@@ -49,6 +50,7 @@ pub(crate) fn check_logical_lines(
     let should_fix_whitespace_before_punctuation =
         settings.rules.should_fix(Rule::WhitespaceBeforePunctuation);
 
+    let mut blank_lines_tracking_vars = BlankLinesTrackingVars::default();
     let mut prev_line = None;
     let mut prev_indent_level = None;
     let indent_char = stylist.indentation().as_char();
@@ -119,6 +121,16 @@ pub(crate) fn check_logical_lines(
             }
         }
 
+        blank_lines(
+            &line,
+            prev_line.as_ref(),
+            &mut blank_lines_tracking_vars,
+            indent_level,
+            locator,
+            stylist,
+            &mut context,
+        );
+
         if !line.is_comment_only() {
             prev_line = Some(line);
             prev_indent_level = Some(indent_level);

crates/ruff/src/codes.rs

@@ -83,6 +83,12 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Pycodestyle, "E273") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::TabAfterKeyword),
         (Pycodestyle, "E274") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::TabBeforeKeyword),
         (Pycodestyle, "E275") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::MissingWhitespaceAfterKeyword),
+        (Pycodestyle, "E301") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::BlankLineBetweenMethods),
+        (Pycodestyle, "E302") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::BlankLinesTopLevel),
+        (Pycodestyle, "E303") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::TooManyBlankLines),
+        (Pycodestyle, "E304") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::BlankLineAfterDecorator),
+        (Pycodestyle, "E305") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::BlankLinesAfterFunctionOrClass),
+        (Pycodestyle, "E306") => (RuleGroup::Nursery, rules::pycodestyle::rules::logical_lines::BlankLinesBeforeNestedDefinition),
         (Pycodestyle, "E401") => (RuleGroup::Unspecified, rules::pycodestyle::rules::MultipleImportsOnOneLine),
         (Pycodestyle, "E402") => (RuleGroup::Unspecified, rules::pycodestyle::rules::ModuleImportNotAtTopOfFile),
         (Pycodestyle, "E501") => (RuleGroup::Unspecified, rules::pycodestyle::rules::LineTooLong),

crates/ruff/src/flake8_to_ruff/parser.rs

@@ -290,6 +290,10 @@ mod tests {
                 pattern: "examples/*".to_string(),
                 prefix: codes::Pyflakes::_841.into(),
             },
+            PatternPrefixPair {
+                pattern: "*.pyi".to_string(),
+                prefix: codes::Pycodestyle::E302.into(),
+            },
         ];
         assert_eq!(actual, expected);
 

crates/ruff/src/registry.rs

@@ -310,7 +310,12 @@ impl Rule {
             Rule::IOError => LintSource::Io,
             Rule::UnsortedImports | Rule::MissingRequiredImport => LintSource::Imports,
             Rule::ImplicitNamespacePackage | Rule::InvalidModuleName => LintSource::Filesystem,
-            Rule::IndentationWithInvalidMultiple
+            Rule::BlankLineAfterDecorator
+            | Rule::BlankLineBetweenMethods
+            | Rule::BlankLinesAfterFunctionOrClass
+            | Rule::BlankLinesBeforeNestedDefinition
+            | Rule::BlankLinesTopLevel
+            | Rule::IndentationWithInvalidMultiple
             | Rule::IndentationWithInvalidMultipleComment
             | Rule::MissingWhitespace
             | Rule::MissingWhitespaceAfterKeyword
@@ -334,6 +339,7 @@ impl Rule {
             | Rule::TabBeforeKeyword
             | Rule::TabBeforeOperator
             | Rule::TooFewSpacesBeforeInlineComment
+            | Rule::TooManyBlankLines
             | Rule::UnexpectedIndentation
             | Rule::UnexpectedIndentationComment
             | Rule::UnexpectedSpacesAroundKeywordParameterEquals

crates/ruff/src/rules/pycodestyle/mod.rs

@@ -104,6 +104,12 @@ mod tests {
         Path::new("E25.py")
     )]
     #[test_case(Rule::MissingWhitespaceAroundParameterEquals, Path::new("E25.py"))]
+    #[test_case(Rule::BlankLineBetweenMethods, Path::new("E30.py"))]
+    #[test_case(Rule::BlankLinesTopLevel, Path::new("E30.py"))]
+    #[test_case(Rule::TooManyBlankLines, Path::new("E30.py"))]
+    #[test_case(Rule::BlankLineAfterDecorator, Path::new("E30.py"))]
+    #[test_case(Rule::BlankLinesAfterFunctionOrClass, Path::new("E30.py"))]
+    #[test_case(Rule::BlankLinesBeforeNestedDefinition, Path::new("E30.py"))]
     fn logical(rule_code: Rule, path: &Path) -> Result<()> {
         let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
         let diagnostics = test_path(