mirror of https://github.com/astral-sh/ruff
Support `ignore-names` for all relevant pep8-naming rules (#2617)
This commit is contained in:
parent
95fef43c4d
commit
f981f491aa
|
|
@ -5,3 +5,7 @@ def func(_, a, A):
|
||||||
class Class:
|
class Class:
|
||||||
def method(self, _, a, A):
|
def method(self, _, a, A):
|
||||||
return _, a, A
|
return _, a, A
|
||||||
|
|
||||||
|
|
||||||
|
def func(_, setUp):
|
||||||
|
return _, setUp
|
||||||
|
|
|
||||||
|
|
@ -3711,8 +3711,11 @@ where
|
||||||
}
|
}
|
||||||
|
|
||||||
if self.settings.rules.enabled(&Rule::InvalidArgumentName) {
|
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);
|
self.diagnostics.push(diagnostic);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -224,7 +224,10 @@ pub fn invalid_function_name(
|
||||||
ignore_names: &[String],
|
ignore_names: &[String],
|
||||||
locator: &Locator,
|
locator: &Locator,
|
||||||
) -> Option<Diagnostic> {
|
) -> 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(
|
return Some(Diagnostic::new(
|
||||||
InvalidFunctionName {
|
InvalidFunctionName {
|
||||||
name: name.to_string(),
|
name: name.to_string(),
|
||||||
|
|
@ -236,7 +239,10 @@ pub fn invalid_function_name(
|
||||||
}
|
}
|
||||||
|
|
||||||
/// N803
|
/// 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 {
|
if name.to_lowercase() != name {
|
||||||
return Some(Diagnostic::new(
|
return Some(Diagnostic::new(
|
||||||
InvalidArgumentName {
|
InvalidArgumentName {
|
||||||
|
|
@ -269,15 +275,17 @@ pub fn invalid_first_argument_name_for_class_method(
|
||||||
) {
|
) {
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
if let Some(arg) = args.posonlyargs.first() {
|
if let Some(arg) = args.posonlyargs.first().or_else(|| args.args.first()) {
|
||||||
if arg.node.arg != "cls" {
|
|
||||||
return Some(Diagnostic::new(
|
|
||||||
InvalidFirstArgumentNameForClassMethod,
|
|
||||||
Range::from_located(arg),
|
|
||||||
));
|
|
||||||
}
|
|
||||||
} else if let Some(arg) = args.args.first() {
|
|
||||||
if arg.node.arg != "cls" {
|
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(
|
return Some(Diagnostic::new(
|
||||||
InvalidFirstArgumentNameForClassMethod,
|
InvalidFirstArgumentNameForClassMethod,
|
||||||
Range::from_located(arg),
|
Range::from_located(arg),
|
||||||
|
|
@ -312,6 +320,15 @@ pub fn invalid_first_argument_name_for_method(
|
||||||
if arg.node.arg == "self" {
|
if arg.node.arg == "self" {
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
|
if checker
|
||||||
|
.settings
|
||||||
|
.pep8_naming
|
||||||
|
.ignore_names
|
||||||
|
.iter()
|
||||||
|
.any(|ignore_name| ignore_name == name)
|
||||||
|
{
|
||||||
|
return None;
|
||||||
|
}
|
||||||
Some(Diagnostic::new(
|
Some(Diagnostic::new(
|
||||||
InvalidFirstArgumentNameForMethod,
|
InvalidFirstArgumentNameForMethod,
|
||||||
Range::from_located(arg),
|
Range::from_located(arg),
|
||||||
|
|
@ -325,6 +342,16 @@ pub fn non_lowercase_variable_in_function(
|
||||||
stmt: &Stmt,
|
stmt: &Stmt,
|
||||||
name: &str,
|
name: &str,
|
||||||
) {
|
) {
|
||||||
|
if checker
|
||||||
|
.settings
|
||||||
|
.pep8_naming
|
||||||
|
.ignore_names
|
||||||
|
.iter()
|
||||||
|
.any(|ignore_name| ignore_name == name)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if name.to_lowercase() != name
|
if name.to_lowercase() != name
|
||||||
&& !helpers::is_namedtuple_assignment(checker, stmt)
|
&& !helpers::is_namedtuple_assignment(checker, stmt)
|
||||||
&& !helpers::is_typeddict_assignment(checker, stmt)
|
&& !helpers::is_typeddict_assignment(checker, stmt)
|
||||||
|
|
@ -450,6 +477,15 @@ pub fn mixed_case_variable_in_class_scope(
|
||||||
stmt: &Stmt,
|
stmt: &Stmt,
|
||||||
name: &str,
|
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) {
|
if helpers::is_mixed_case(name) && !helpers::is_namedtuple_assignment(checker, stmt) {
|
||||||
checker.diagnostics.push(Diagnostic::new(
|
checker.diagnostics.push(Diagnostic::new(
|
||||||
MixedCaseVariableInClassScope {
|
MixedCaseVariableInClassScope {
|
||||||
|
|
@ -467,6 +503,15 @@ pub fn mixed_case_variable_in_global_scope(
|
||||||
stmt: &Stmt,
|
stmt: &Stmt,
|
||||||
name: &str,
|
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) {
|
if helpers::is_mixed_case(name) && !helpers::is_namedtuple_assignment(checker, stmt) {
|
||||||
checker.diagnostics.push(Diagnostic::new(
|
checker.diagnostics.push(Diagnostic::new(
|
||||||
MixedCaseVariableInGlobalScope {
|
MixedCaseVariableInGlobalScope {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue