add a test for annotations

Author: AlexWaygood

crates/ty/tests/cli.rs

@@ -308,6 +308,61 @@ fn config_file_annotation_showing_where_python_version_set_typing_error() -> any
     Ok(())
 }
 
+#[test]
+fn pyvenv_cfg_file_annotation_showing_where_python_version_set() -> anyhow::Result<()> {
+    let case = TestCase::with_files([
+        (
+            "pyproject.toml",
+            r#"
+            [tool.ty.environment]
+            python = ".venv"
+            "#,
+        ),
+        (
+            ".venv/pyvenv.cfg",
+            r#"
+            home = /usr
+            version = 3.8
+            "#,
+        ),
+        if cfg!(target_os = "windows") {
+            (".venv/Lib/site-packages/foo.py", "")
+        } else {
+            (".venv/lib/python3.8/site-packages/foo.py", "")
+        },
+        ("test.py", "aiter"),
+    ])?;
+
+    assert_cmd_snapshot!(case.command(), @r"
+    success: false
+    exit_code: 1
+    ----- stdout -----
+    error[unresolved-reference]: Name `aiter` used when not defined
+     --> test.py:1:1
+      |
+    1 | aiter
+      | ^^^^^
+      |
+    info: `aiter` was added as a builtin in Python 3.10
+    info: Python 3.8 was assumed when resolving types because of your virtual environment
+     --> .venv/pyvenv.cfg:3:11
+      |
+    2 | home = /usr
+    3 | version = 3.8
+      |           ^^^ Python version inferred from virtual environment metadata file
+      |
+    info: No Python version was specified on the command line or in a configuration file
+    info: rule `unresolved-reference` is enabled by default
+
+    Found 1 diagnostic
+
+    ----- stderr -----
+    WARN ty is pre-release software and not ready for production use. Expect to encounter bugs, missing features, and fatal errors.
+    ");
+
+    Ok(())
+}
+
 #[test]
 fn config_file_annotation_showing_where_python_version_set_syntax_error() -> anyhow::Result<()> {
     let case = TestCase::with_files([

crates/ty_python_semantic/src/module_resolver/resolver.rs

@@ -251,8 +251,7 @@ impl SearchPaths {
                 //  than the one resolved in the program settings because it indicates
                 //  that the `target-version` is incorrectly configured or that the
                 //  venv is out of date.
-                PythonEnvironment::new(sys_prefix.clone(), *origin, system)?
-                    .into_settings(system)?
+                PythonEnvironment::new(sys_prefix, *origin, system)?.into_settings(system)?
             }
 
             PythonPath::Resolve(target, origin) => {

crates/ty_python_semantic/src/site_packages.rs

@@ -133,7 +133,7 @@ impl PythonEnvironment {
         system: &dyn System,
     ) -> SitePackagesDiscoveryResult<SitePackagesPaths> {
         match self {
-            Self::Virtual(venv) => venv.site_packages_directories(system),
+            Self::Virtual(env) => env.site_packages_directories(system),
             Self::System(env) => env.site_packages_directories(system),
         }
     }
@@ -290,7 +290,7 @@ impl VirtualEnvironment {
                 }
 
                 while !cursor.is_eof() {
-                    if cursor.eat_char('\n') || cursor.eat_char2('\r', '\n') {
+                    if cursor.eat_char('\n') {
                         break;
                     }
                     cursor.bump();