language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-10-02 22:55:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add space after return when inlining number for RET504 (#7116)

Browse source
This commit is contained in:
Charlie Marsh 2023-09-03 22:33:41 +01:00 • committed by GitHub
parent b57ddd54d2
commit c004e03395
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/ruff/resources/test/fixtures/flake8_return/RET504.py vendored
View file

@ -357,3 +357,9 @@ def foo():
def foo(): def foo():
a = 1 # Comment a = 1 # Comment
return a return a
# Regression test for: https://github.com/astral-sh/ruff/issues/7098
def mavko_debari(P_kbar):
D=0.4853881 + 3.6006116*P - 0.0117368*(P-1.3822)**2
return D

3
crates/ruff/src/rules/flake8_return/rules/function.rs
View file

@ -12,6 +12,7 @@ use ruff_python_ast::stmt_if::elif_else_range;
use ruff_python_ast::visitor::Visitor; use ruff_python_ast::visitor::Visitor;
use ruff_python_ast::whitespace::indentation; use ruff_python_ast::whitespace::indentation;
use ruff_python_semantic::SemanticModel; use ruff_python_semantic::SemanticModel;
use ruff_python_trivia::is_python_whitespace;
use crate::autofix::edits; use crate::autofix::edits;
use crate::checkers::ast::Checker; use crate::checkers::ast::Checker;
@ -549,7 +550,7 @@ fn unnecessary_assign(checker: &mut Checker, stack: &Stack) {
if content[after_equals..] if content[after_equals..]
.chars() .chars()
.next() .next()
.is_some_and(char::is_alphabetic) .is_some_and(is_python_whitespace)
{ {
"return".to_string() "return".to_string()
} else { } else {

20
crates/ruff/src/rules/flake8_return/snapshots/ruff__rules__flake8_return__tests__RET504_RET504.py.snap
View file

@ -197,5 +197,25 @@ RET504.py:359:12: RET504 [*] Unnecessary assignment to `a` before `return` state
358 |- a = 1 # Comment 358 |- a = 1 # Comment
359 |- return a 359 |- return a
358 |+ return 1 # Comment 358 |+ return 1 # Comment
360 359 |
361 360 |
362 361 | # Regression test for: https://github.com/astral-sh/ruff/issues/7098
RET504.py:365:12: RET504 [*] Unnecessary assignment to `D` before `return` statement
|
363 | def mavko_debari(P_kbar):
364 | D=0.4853881 + 3.6006116*P - 0.0117368*(P-1.3822)**2
365 | return D
| ^ RET504
|
= help: Remove unnecessary assignment
ℹ Suggested fix
361 361 |
362 362 | # Regression test for: https://github.com/astral-sh/ruff/issues/7098
363 363 | def mavko_debari(P_kbar):
364 |- D=0.4853881 + 3.6006116*P - 0.0117368*(P-1.3822)**2
365 |- return D
364 |+ return 0.4853881 + 3.6006116*P - 0.0117368*(P-1.3822)**2