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

Supports more cases in SIM112 (#3876)

Browse source
This commit is contained in:
kyoto7250 2023-04-05 04:49:24 +09:00 • committed by GitHub
parent 251340a246
commit 390d7dcf39
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 121 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
crates/ruff/resources/test/fixtures/flake8_simplify/SIM112.py vendored
View file

@ -9,6 +9,17 @@ os.environ.get('foo', 'bar')
os.getenv('foo')
env = os.environ.get('foo')
env = os.environ['foo']
if env := os.environ.get('foo'):
pass
if env := os.environ['foo']:
pass
# Good
os.environ['FOO']
@ -17,3 +28,13 @@ os.environ.get('FOO')
os.environ.get('FOO', 'bar')
os.getenv('FOO')
env = os.getenv('FOO')
if env := os.getenv('FOO'):
pass
env = os.environ['FOO']
if env := os.environ['FOO']:
pass

23
crates/ruff/src/checkers/ast/mod.rs
View file

@ -1847,13 +1847,6 @@ where
if self.settings.rules.enabled(Rule::UselessExpression) {
flake8_bugbear::rules::useless_expression(self, value);
}
if self
.settings
.rules
.enabled(Rule::UncapitalizedEnvironmentVariables)
{
flake8_simplify::rules::use_capital_environment_variables(self, value);
}
if self.settings.rules.enabled(Rule::AsyncioDanglingTask) {
if let Some(diagnostic) = ruff::rules::asyncio_dangling_task(value, |expr| {
self.ctx.resolve_call_path(expr)
@ -2210,6 +2203,14 @@ where
]) {
flake8_2020::rules::subscript(self, value, slice);
}
if self
.settings
.rules
.enabled(Rule::UncapitalizedEnvironmentVariables)
{
flake8_simplify::rules::use_capital_environment_variables(self, expr);
}
}
ExprKind::Tuple { elts, ctx } | ExprKind::List { elts, ctx } => {
if matches!(ctx, ExprContext::Store) {
@ -2910,6 +2911,14 @@ where
}
// flake8-simplify
if self
.settings
.rules
.enabled(Rule::UncapitalizedEnvironmentVariables)
{
flake8_simplify::rules::use_capital_environment_variables(self, expr);
}
if self
.settings
.rules

84
crates/ruff/src/rules/flake8_simplify/snapshots/ruff__rules__flake8_simplify__tests__SIM112_SIM112.py.snap
View file

@ -86,4 +86,88 @@ expression: diagnostics
row: 10
column: 15
parent: ~
- kind:
name: UncapitalizedEnvironmentVariables
body: "Use capitalized environment variable `FOO` instead of `foo`"
suggestion: "Replace `foo` with `FOO`"
fixable: true
location:
row: 12
column: 21
end_location:
row: 12
column: 26
fix:
edits:
- content: "'FOO'"
location:
row: 12
column: 21
end_location:
row: 12
column: 26
parent: ~
- kind:
name: UncapitalizedEnvironmentVariables
body: "Use capitalized environment variable `FOO` instead of `foo`"
suggestion: "Replace `foo` with `FOO`"
fixable: true
location:
row: 14
column: 17
end_location:
row: 14
column: 22
fix:
edits:
- content: "'FOO'"
location:
row: 14
column: 17
end_location:
row: 14
column: 22
parent: ~
- kind:
name: UncapitalizedEnvironmentVariables
body: "Use capitalized environment variable `FOO` instead of `foo`"
suggestion: "Replace `foo` with `FOO`"
fixable: true
location:
row: 16
column: 25
end_location:
row: 16
column: 30
fix:
edits:
- content: "'FOO'"
location:
row: 16
column: 25
end_location:
row: 16
column: 30
parent: ~
- kind:
name: UncapitalizedEnvironmentVariables
body: "Use capitalized environment variable `FOO` instead of `foo`"
suggestion: "Replace `foo` with `FOO`"
fixable: true
location:
row: 19
column: 21
end_location:
row: 19
column: 26
fix:
edits:
- content: "'FOO'"
location:
row: 19
column: 21
end_location:
row: 19
column: 26
parent: ~