mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-08-04 10:48:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Support ignore-names for all relevant pep8-naming rules (#2617)

Browse source
This commit is contained in:
Charlie Marsh 2023-02-06 21:14:55 -05:00 • committed by GitHub
parent 95fef43c4d
commit f981f491aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 64 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/ruff/resources/test/fixtures/pep8_naming/N803.py vendored
View file

@ -5,3 +5,7 @@ def func(_, a, A):
class Class:
def method(self, _, a, A):
return _, a, A
def func(_, setUp):
return _, setUp

7
crates/ruff/src/checkers/ast.rs
View file

@ -3711,8 +3711,11 @@ where
}
if self.settings.rules.enabled(&Rule::InvalidArgumentName) {
if let Some(diagnostic) = pep8_naming::rules::invalid_argument_name(&arg.node.arg, arg)
{
if let Some(diagnostic) = pep8_naming::rules::invalid_argument_name(
&arg.node.arg,
arg,
&self.settings.pep8_naming.ignore_names,
) {
self.diagnostics.push(diagnostic);
}
}

65
crates/ruff/src/rules/pep8_naming/rules.rs
View file

@ -224,7 +224,10 @@ pub fn invalid_function_name(
ignore_names: &[String],
locator: &Locator,
) -> Option<Diagnostic> {
if name.to_lowercase() != name && !ignore_names.iter().any(|ignore_name| ignore_name == name) {
if ignore_names.iter().any(|ignore_name| ignore_name == name) {
return None;
}
if name.to_lowercase() != name {
return Some(Diagnostic::new(
InvalidFunctionName {
name: name.to_string(),
@ -236,7 +239,10 @@ pub fn invalid_function_name(
}
/// N803
pub fn invalid_argument_name(name: &str, arg: &Arg) -> Option<Diagnostic> {
pub fn invalid_argument_name(name: &str, arg: &Arg, ignore_names: &[String]) -> Option<Diagnostic> {
if ignore_names.iter().any(|ignore_name| ignore_name == name) {
return None;
}
if name.to_lowercase() != name {
return Some(Diagnostic::new(
InvalidArgumentName {
@ -269,15 +275,17 @@ pub fn invalid_first_argument_name_for_class_method(
) {
return None;
}
if let Some(arg) = args.posonlyargs.first() {
if arg.node.arg != "cls" {
return Some(Diagnostic::new(
InvalidFirstArgumentNameForClassMethod,
Range::from_located(arg),
));
}
} else if let Some(arg) = args.args.first() {
if let Some(arg) = args.posonlyargs.first().or_else(|| args.args.first()) {
if arg.node.arg != "cls" {
if checker
.settings
.pep8_naming
.ignore_names
.iter()
.any(|ignore_name| ignore_name == name)
{
return None;
}
return Some(Diagnostic::new(
InvalidFirstArgumentNameForClassMethod,
Range::from_located(arg),
@ -312,6 +320,15 @@ pub fn invalid_first_argument_name_for_method(
if arg.node.arg == "self" {
return None;
}
if checker
.settings
.pep8_naming
.ignore_names
.iter()
.any(|ignore_name| ignore_name == name)
{
return None;
}
Some(Diagnostic::new(
InvalidFirstArgumentNameForMethod,
Range::from_located(arg),
@ -325,6 +342,16 @@ pub fn non_lowercase_variable_in_function(
stmt: &Stmt,
name: &str,
) {
if checker
.settings
.pep8_naming
.ignore_names
.iter()
.any(|ignore_name| ignore_name == name)
{
return;
}
if name.to_lowercase() != name
&& !helpers::is_namedtuple_assignment(checker, stmt)
&& !helpers::is_typeddict_assignment(checker, stmt)
@ -450,6 +477,15 @@ pub fn mixed_case_variable_in_class_scope(
stmt: &Stmt,
name: &str,
) {
if checker
.settings
.pep8_naming
.ignore_names
.iter()
.any(|ignore_name| ignore_name == name)
{
return;
}
if helpers::is_mixed_case(name) && !helpers::is_namedtuple_assignment(checker, stmt) {
checker.diagnostics.push(Diagnostic::new(
MixedCaseVariableInClassScope {
@ -467,6 +503,15 @@ pub fn mixed_case_variable_in_global_scope(
stmt: &Stmt,
name: &str,
) {
if checker
.settings
.pep8_naming
.ignore_names
.iter()
.any(|ignore_name| ignore_name == name)
{
return;
}
if helpers::is_mixed_case(name) && !helpers::is_namedtuple_assignment(checker, stmt) {
checker.diagnostics.push(Diagnostic::new(
MixedCaseVariableInGlobalScope {