Skip to content

Commit

Permalink
Fetch the correct preview settings for output formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
snowsignal committed Feb 1, 2024
1 parent 99eddbd commit dda469e
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 1 deletion.
4 changes: 3 additions & 1 deletion crates/ruff/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,9 @@ pub fn check(args: CheckCommand, log_level: LogLevel) -> Result<ExitStatus> {
printer_flags,
);

let preview = overrides.preview.unwrap_or_default().is_enabled();
// the settings should already be combined with the CLI overrides at this point
// TODO(jane): let's make this `PreviewMode`
let preview = pyproject_config.settings.linter.preview.is_enabled();

if cli.watch {
if output_format != SerializationFormat::default(preview) {
Expand Down
29 changes: 29 additions & 0 deletions crates/ruff/tests/integration_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -755,6 +755,35 @@ fn full_output_preview() {
"###);
}

#[test]
fn full_output_preview_config() {
let tempdir = TempDir::new().unwrap();
let pyproject_toml = tempdir.path().join("pyproject.toml");
fs::write(
&pyproject_toml,
r#"
[tool.ruff]
preview = true
"#,
)
.unwrap();
let mut cmd = RuffCheck::default().config(&pyproject_toml).build();
assert_cmd_snapshot!(cmd.pass_stdin("l = 1"), @r###"
success: false
exit_code: 1
----- stdout -----
-:1:1: E741 Ambiguous variable name: `l`
|
1 | l = 1
| ^ E741
|
Found 1 error.
----- stderr -----
"###);
}

#[test]
fn full_output_format() {
let mut cmd = RuffCheck::default().output_format("full").build();
Expand Down

0 comments on commit dda469e

Please sign in to comment.