use LinterSettings::resolve_target_version

Author: ntBre

crates/ruff/src/cache.rs

@@ -613,7 +613,7 @@ mod tests {
         let settings = Settings {
             cache_dir,
             linter: LinterSettings {
-                target_version: PythonVersion::PY310,
+                unresolved_target_version: PythonVersion::PY310,
                 ..Default::default()
             },
             ..Settings::default()

crates/ruff_linter/src/linter.rs

@@ -335,8 +335,8 @@ pub fn add_noqa_to_path(
     settings: &LinterSettings,
 ) -> Result<usize> {
     // Parse once.
-    // TODO(brent) resolve_target_version(path) here
-    let parsed = parse_unchecked_source(source_kind, source_type, settings.target_version);
+    let target_version = settings.resolve_target_version(path);
+    let parsed = parse_unchecked_source(source_kind, source_type, target_version);
 
     // Map row and column locations to byte slices (lazily).
     let locator = Locator::new(source_kind.source_code());
@@ -394,8 +394,8 @@ pub fn lint_only(
     source_type: PySourceType,
     source: ParseSource,
 ) -> LinterResult {
-    // TODO(brent) resolve_target_version(path) here
-    let parsed = source.into_parsed(source_kind, source_type, settings.target_version);
+    let target_version = settings.resolve_target_version(path);
+    let parsed = source.into_parsed(source_kind, source_type, target_version);
 
     // Map row and column locations to byte slices (lazily).
     let locator = Locator::new(source_kind.source_code());
@@ -503,8 +503,8 @@ pub fn lint_fix<'a>(
     // Continuously fix until the source code stabilizes.
     loop {
         // Parse once.
-        // TODO(brent) resolve_target_version(path) here
-        let parsed = parse_unchecked_source(&transformed, source_type, settings.target_version);
+        let target_version = settings.resolve_target_version(path);
+        let parsed = parse_unchecked_source(&transformed, source_type, target_version);
 
         // Map row and column locations to byte slices (lazily).
         let locator = Locator::new(transformed.source_code());

crates/ruff_linter/src/rules/pyflakes/mod.rs

@@ -745,7 +745,8 @@ mod tests {
         let source_type = PySourceType::default();
         let source_kind = SourceKind::Python(contents.to_string());
         let settings = LinterSettings::for_rules(Linter::Pyflakes.rules());
-        let options = ParseOptions::from(source_type).with_target_version(settings.target_version);
+        let options =
+            ParseOptions::from(source_type).with_target_version(settings.unresolved_target_version);
         let parsed = ruff_python_parser::parse_unchecked(source_kind.source_code(), options)
             .try_into_module()
             .expect("PySourceType always parses into a module");

crates/ruff_linter/src/test.rs

@@ -110,7 +110,8 @@ pub(crate) fn test_contents<'a>(
     settings: &LinterSettings,
 ) -> (Vec<Message>, Cow<'a, SourceKind>) {
     let source_type = PySourceType::from(path);
-    let options = ParseOptions::from(source_type).with_target_version(settings.target_version);
+    let options =
+        ParseOptions::from(source_type).with_target_version(settings.resolve_target_version(path));
     let parsed = ruff_python_parser::parse_unchecked(source_kind.source_code(), options.clone())
         .try_into_module()
         .expect("PySourceType always parses into a module");