Python
/
ruff
mirror of https://github.com/astral-sh/ruff
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[syntax errors] Stabilize version-specific unsupported syntax errors (#18522)

This commit is contained in:
Dylan 2025-06-07 11:30:45 -05:00 committed by Brent Westbrook
parent 9f2ae1f568
commit bf53bc4256
4 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crates/ruff/tests/lint.rs
View File

@ -5436,14 +5436,15 @@ match 2:
print("it's one") print("it's one")
"# "#
), ),
@r" @r###"
success: true success: false
exit_code: 0 exit_code: 1
----- stdout ----- ----- stdout -----
All checks passed! test.py:2:1: SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)
Found 1 error.
----- stderr ----- ----- stderr -----
" "###
); );
// syntax error on 3.9 with preview // syntax error on 3.9 with preview

8
crates/ruff_linter/src/linter.rs
View File

@ -30,7 +30,7 @@ use crate::fix::{FixResult, fix_file};
use crate::message::Message; use crate::message::Message;
use crate::noqa::add_noqa; use crate::noqa::add_noqa;
use crate::package::PackageRoot; use crate::package::PackageRoot;
use crate::preview::{is_py314_support_enabled, is_unsupported_syntax_enabled}; use crate::preview::is_py314_support_enabled;
use crate::registry::{AsRule, Rule, RuleSet}; use crate::registry::{AsRule, Rule, RuleSet};
#[cfg(any(feature = "test-rules", test))] #[cfg(any(feature = "test-rules", test))]
use crate::rules::ruff::rules::test_rules::{self, TEST_RULES, TestRule}; use crate::rules::ruff::rules::test_rules::{self, TEST_RULES, TestRule};
@ -447,11 +447,7 @@ pub fn check_path(
} }
} }
let syntax_errors = if is_unsupported_syntax_enabled(settings) { let syntax_errors = parsed.unsupported_syntax_errors();
parsed.unsupported_syntax_errors()
} else {
&[]
};
diagnostics_to_messages( diagnostics_to_messages(
diagnostics, diagnostics,

5
crates/ruff_linter/src/preview.rs
View File

@ -13,11 +13,6 @@ pub(crate) const fn is_semantic_errors_enabled(settings: &LinterSettings) -> boo
settings.preview.is_enabled() settings.preview.is_enabled()
} }
// https://github.com/astral-sh/ruff/pull/16429
pub(crate) const fn is_unsupported_syntax_enabled(settings: &LinterSettings) -> bool {
settings.preview.is_enabled()
}
pub(crate) const fn is_py314_support_enabled(settings: &LinterSettings) -> bool { pub(crate) const fn is_py314_support_enabled(settings: &LinterSettings) -> bool {
settings.preview.is_enabled() settings.preview.is_enabled()
} }

2
crates/ruff_wasm/tests/api.rs
View File

@ -65,7 +65,7 @@ fn syntax_error() {
fn unsupported_syntax_error() { fn unsupported_syntax_error() {
check!( check!(
"match 2:\n case 1: ...", "match 2:\n case 1: ...",
r#"{"preview": true, "target-version": "py39"}"#, r#"{"target-version": "py39"}"#,
[ExpandedMessage { [ExpandedMessage {
code: None, code: None,
message: "SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)".to_string(), message: "SyntaxError: Cannot use `match` statement on Python 3.9 (syntax was added in Python 3.10)".to_string(),