Skip to content

Commit

Permalink
Stabilize fixes for RET50{5-8} (#12840)
Browse files Browse the repository at this point in the history 
Fixes #10099
  • Loading branch information
@MichaReiser
MichaReiser authored Aug 12, 2024
1 parent b53cc11 commit d997913
Show file tree
Hide file tree
Showing 13 changed files with 640 additions and 1,122 deletions.
8 changes: 8 additions & 0 deletions crates/ruff_linter/resources/test/fixtures/flake8_return/RET505.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,3 +244,11 @@ def f():
return True
else:
return False


def has_untracted_files():
if b'Untracked files' in result.stdout:
return True
else:
\
return False
34 changes: 18 additions & 16 deletions crates/ruff_linter/src/fix/edits.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,26 +318,28 @@ pub(crate) fn adjust_indentation(
line_indentation.contains('\t') && line_indentation.contains(' ')
});

if contains_multiline_string || mixed_indentation {
let module_text = format!("def f():{}{contents}", stylist.line_ending().as_str());
// For simple cases, try to do a manual dedent.
if !contains_multiline_string && !mixed_indentation {
if let Some(dedent) = dedent_to(contents, indentation) {
return Ok(dedent);
}
}

let mut tree = match_statement(&module_text)?;
let module_text = format!("def f():{}{contents}", stylist.line_ending().as_str());

let embedding = match_function_def(&mut tree)?;
let mut tree = match_statement(&module_text)?;

let indented_block = match_indented_block(&mut embedding.body)?;
indented_block.indent = Some(indentation);
let embedding = match_function_def(&mut tree)?;

let module_text = indented_block.codegen_stylist(stylist);
let module_text = module_text
.strip_prefix(stylist.line_ending().as_str())
.unwrap()
.to_string();
Ok(module_text)
} else {
// Otherwise, we can do a simple adjustment ourselves.
Ok(dedent_to(contents, indentation))
}
let indented_block = match_indented_block(&mut embedding.body)?;
indented_block.indent = Some(indentation);

let module_text = indented_block.codegen_stylist(stylist);
let module_text = module_text
.strip_prefix(stylist.line_ending().as_str())
.unwrap()
.to_string();
Ok(module_text)
}

/// Determine if a vector contains only one, specific element.
Expand Down
24 changes: 1 addition & 23 deletions crates/ruff_linter/src/rules/flake8_return/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@ mod tests {
use anyhow::Result;
use test_case::test_case;

use crate::assert_messages;
use crate::registry::Rule;
use crate::settings::types::PreviewMode;
use crate::settings::LinterSettings;
use crate::test::test_path;
use crate::{assert_messages, settings};

#[test_case(Rule::UnnecessaryReturnNone, Path::new("RET501.py"))]
#[test_case(Rule::ImplicitReturnValue, Path::new("RET502.py"))]
Expand All @@ -34,25 +33,4 @@ mod tests {
assert_messages!(snapshot, diagnostics);
Ok(())
}

#[test_case(Rule::SuperfluousElseReturn, Path::new("RET505.py"))]
#[test_case(Rule::SuperfluousElseRaise, Path::new("RET506.py"))]
#[test_case(Rule::SuperfluousElseContinue, Path::new("RET507.py"))]
#[test_case(Rule::SuperfluousElseBreak, Path::new("RET508.py"))]
fn preview_rules(rule_code: Rule, path: &Path) -> Result<()> {
let snapshot = format!(
"preview__{}_{}",
rule_code.noqa_code(),
path.to_string_lossy()
);
let diagnostics = test_path(
Path::new("flake8_return").join(path).as_path(),
&settings::LinterSettings {
preview: PreviewMode::Enabled,
..settings::LinterSettings::for_rule(rule_code)
},
)?;
assert_messages!(snapshot, diagnostics);
Ok(())
}
}
75 changes: 35 additions & 40 deletions crates/ruff_linter/src/rules/flake8_return/rules/function.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -656,16 +656,14 @@ fn superfluous_else_node(
.unwrap_or_else(|| elif_else.range()),
);
if checker.enabled(diagnostic.kind.rule()) {
if checker.settings.preview.is_enabled() {
diagnostic.try_set_fix(|| {
remove_else(
elif_else,
checker.locator(),
checker.indexer(),
checker.stylist(),
)
});
}
diagnostic.try_set_fix(|| {
remove_else(
elif_else,
checker.locator(),
checker.indexer(),
checker.stylist(),
)
});
checker.diagnostics.push(diagnostic);
}
return true;
Expand All @@ -676,16 +674,15 @@ fn superfluous_else_node(
.unwrap_or_else(|| elif_else.range()),
);
if checker.enabled(diagnostic.kind.rule()) {
if checker.settings.preview.is_enabled() {
diagnostic.try_set_fix(|| {
remove_else(
elif_else,
checker.locator(),
checker.indexer(),
checker.stylist(),
)
});
}
diagnostic.try_set_fix(|| {
remove_else(
elif_else,
checker.locator(),
checker.indexer(),
checker.stylist(),
)
});

checker.diagnostics.push(diagnostic);
}
return true;
Expand All @@ -696,16 +693,15 @@ fn superfluous_else_node(
.unwrap_or_else(|| elif_else.range()),
);
if checker.enabled(diagnostic.kind.rule()) {
if checker.settings.preview.is_enabled() {
diagnostic.try_set_fix(|| {
remove_else(
elif_else,
checker.locator(),
checker.indexer(),
checker.stylist(),
)
});
}
diagnostic.try_set_fix(|| {
remove_else(
elif_else,
checker.locator(),
checker.indexer(),
checker.stylist(),
)
});

checker.diagnostics.push(diagnostic);
}
return true;
Expand All @@ -716,16 +712,15 @@ fn superfluous_else_node(
.unwrap_or_else(|| elif_else.range()),
);
if checker.enabled(diagnostic.kind.rule()) {
if checker.settings.preview.is_enabled() {
diagnostic.try_set_fix(|| {
remove_else(
elif_else,
checker.locator(),
checker.indexer(),
checker.stylist(),
)
});
}
diagnostic.try_set_fix(|| {
remove_else(
elif_else,
checker.locator(),
checker.indexer(),
checker.stylist(),
)
});

checker.diagnostics.push(diagnostic);
}
return true;
Expand Down
Loading

0 comments on commit d997913

Please sign in to comment.