mirror of
https://github.com/astral-sh/ruff.git
synced 2025-07-15 09:05:09 +00:00
22de00de16
Summary -- This PR updates `check_path` in the `ruff_linter` crate to return a `Vec<Message>` instead of a `Vec<Diagnostic>`. The main motivation for this is to make it easier to convert semantic syntax errors directly into `Message`s rather than `Diagnostic`s in #16106. However, this also has the benefit of keeping the preview check on unsupported syntax errors in `check_path`, as suggested in https://github.com/astral-sh/ruff/pull/16429#discussion_r1974748024. All of the interesting changes are in the first commit. The second commit just renames variables like `diagnostics` to `messages`, and the third commit is a tiny import fix. I also updated the `ExpandedMessage::location` field name, which caused a few extra commits tidying up the playground code. I thought it was nicely symmetric with `end_location`, but I'm happy to revert that too. Test Plan -- Existing tests. I also tested the playground and server manually.
99 lines
2.9 KiB
Rust
99 lines
2.9 KiB
Rust
#![cfg(target_arch = "wasm32")]
|
|
|
|
use wasm_bindgen_test::wasm_bindgen_test;
|
|
|
|
use ruff_linter::registry::Rule;
|
|
use ruff_source_file::{OneIndexed, SourceLocation};
|
|
use ruff_wasm::{ExpandedMessage, Workspace};
|
|
|
|
macro_rules! check {
|
|
($source:expr, $config:expr, $expected:expr) => {{
|
|
let config = js_sys::JSON::parse($config).unwrap();
|
|
match Workspace::new(config).unwrap().check($source) {
|
|
Ok(output) => {
|
|
let result: Vec<ExpandedMessage> = serde_wasm_bindgen::from_value(output).unwrap();
|
|
assert_eq!(result, $expected);
|
|
}
|
|
Err(e) => assert!(false, "{:#?}", e),
|
|
}
|
|
}};
|
|
}
|
|
|
|
#[wasm_bindgen_test]
|
|
fn empty_config() {
|
|
check!(
|
|
"if (1, 2):\n pass",
|
|
r#"{}"#,
|
|
[ExpandedMessage {
|
|
code: Some(Rule::IfTuple.noqa_code().to_string()),
|
|
message: "If test is a tuple, which is always `True`".to_string(),
|
|
start_location: SourceLocation {
|
|
row: OneIndexed::from_zero_indexed(0),
|
|
column: OneIndexed::from_zero_indexed(3)
|
|
},
|
|
end_location: SourceLocation {
|
|
row: OneIndexed::from_zero_indexed(0),
|
|
column: OneIndexed::from_zero_indexed(9)
|
|
},
|
|
fix: None,
|
|
}]
|
|
);
|
|
}
|
|
|
|
#[wasm_bindgen_test]
|
|
fn syntax_error() {
|
|
check!(
|
|
"x =\ny = 1\n",
|
|
r#"{}"#,
|
|
[ExpandedMessage {
|
|
code: None,
|
|
message: "SyntaxError: Expected an expression".to_string(),
|
|
start_location: SourceLocation {
|
|
row: OneIndexed::from_zero_indexed(0),
|
|
column: OneIndexed::from_zero_indexed(3)
|
|
},
|
|
end_location: SourceLocation {
|
|
row: OneIndexed::from_zero_indexed(1),
|
|
column: OneIndexed::from_zero_indexed(0)
|
|
},
|
|
fix: None,
|
|
}]
|
|
);
|
|
}
|
|
|
|
#[wasm_bindgen_test]
|
|
fn unsupported_syntax_error() {
|
|
check!(
|
|
"match 2:\n case 1: ...",
|
|
r#"{"preview": true}"#,
|
|
[ExpandedMessage {
|
|
code: None,
|
|
message: "SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)".to_string(),
|
|
start_location: SourceLocation {
|
|
row: OneIndexed::from_zero_indexed(0),
|
|
column: OneIndexed::from_zero_indexed(0)
|
|
},
|
|
end_location: SourceLocation {
|
|
row: OneIndexed::from_zero_indexed(0),
|
|
column: OneIndexed::from_zero_indexed(5)
|
|
},
|
|
fix: None,
|
|
}]
|
|
);
|
|
}
|
|
|
|
#[wasm_bindgen_test]
|
|
fn partial_config() {
|
|
check!("if (1, 2):\n pass", r#"{"ignore": ["F"]}"#, []);
|
|
}
|
|
|
|
#[wasm_bindgen_test]
|
|
fn partial_nested_config() {
|
|
let config = r#"{
|
|
"select": ["Q"],
|
|
"flake8-quotes": {
|
|
"inline-quotes": "single"
|
|
}
|
|
}"#;
|
|
check!(r#"print('hello world')"#, config, []);
|
|
}
|