Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 25 additions & 16 deletions crates/ruff/tests/lint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -994,6 +994,7 @@ fn value_given_to_table_key_is_not_inline_table_2() {
- `lint.extend-per-file-ignores`
- `lint.exclude`
- `lint.preview`
- `lint.typing-extensions`

For more information, try '--help'.
");
Expand Down Expand Up @@ -2117,7 +2118,7 @@ requires-python = ">= 3.11"
.arg("test.py")
.arg("-")
.current_dir(project_dir)
, @r###"
, @r#"
success: true
exit_code: 0
----- stdout -----
Expand Down Expand Up @@ -2207,6 +2208,7 @@ requires-python = ">= 3.11"
XXX,
]
linter.typing_modules = []
linter.typing_extensions = true

# Linter Plugins
linter.flake8_annotations.mypy_init_return = false
Expand Down Expand Up @@ -2390,7 +2392,7 @@ requires-python = ">= 3.11"
analyze.include_dependencies = {}

----- stderr -----
"###);
"#);
});
Ok(())
}
Expand Down Expand Up @@ -2428,7 +2430,7 @@ requires-python = ">= 3.11"
.arg("test.py")
.arg("-")
.current_dir(project_dir)
, @r###"
, @r#"
success: true
exit_code: 0
----- stdout -----
Expand Down Expand Up @@ -2518,6 +2520,7 @@ requires-python = ">= 3.11"
XXX,
]
linter.typing_modules = []
linter.typing_extensions = true

# Linter Plugins
linter.flake8_annotations.mypy_init_return = false
Expand Down Expand Up @@ -2701,7 +2704,7 @@ requires-python = ">= 3.11"
analyze.include_dependencies = {}

----- stderr -----
"###);
"#);
});
Ok(())
}
Expand Down Expand Up @@ -2790,7 +2793,7 @@ from typing import Union;foo: Union[int, str] = 1
.args(STDIN_BASE_OPTIONS)
.arg("test.py")
.arg("--show-settings")
.current_dir(project_dir), @r###"
.current_dir(project_dir), @r#"
success: true
exit_code: 0
----- stdout -----
Expand Down Expand Up @@ -2881,6 +2884,7 @@ from typing import Union;foo: Union[int, str] = 1
XXX,
]
linter.typing_modules = []
linter.typing_extensions = true

# Linter Plugins
linter.flake8_annotations.mypy_init_return = false
Expand Down Expand Up @@ -3064,7 +3068,7 @@ from typing import Union;foo: Union[int, str] = 1
analyze.include_dependencies = {}

----- stderr -----
"###);
"#);
});
Ok(())
}
Expand Down Expand Up @@ -3170,7 +3174,7 @@ from typing import Union;foo: Union[int, str] = 1
.arg("--show-settings")
.args(["--select","UP007"])
.arg("foo/test.py")
.current_dir(&project_dir), @r###"
.current_dir(&project_dir), @r#"
success: true
exit_code: 0
----- stdout -----
Expand Down Expand Up @@ -3260,6 +3264,7 @@ from typing import Union;foo: Union[int, str] = 1
XXX,
]
linter.typing_modules = []
linter.typing_extensions = true

# Linter Plugins
linter.flake8_annotations.mypy_init_return = false
Expand Down Expand Up @@ -3443,7 +3448,7 @@ from typing import Union;foo: Union[int, str] = 1
analyze.include_dependencies = {}

----- stderr -----
"###);
"#);
});
Ok(())
}
Expand Down Expand Up @@ -3497,7 +3502,7 @@ from typing import Union;foo: Union[int, str] = 1
.arg("--show-settings")
.args(["--select","UP007"])
.arg("foo/test.py")
.current_dir(&project_dir), @r###"
.current_dir(&project_dir), @r#"
success: true
exit_code: 0
----- stdout -----
Expand Down Expand Up @@ -3587,6 +3592,7 @@ from typing import Union;foo: Union[int, str] = 1
XXX,
]
linter.typing_modules = []
linter.typing_extensions = true

# Linter Plugins
linter.flake8_annotations.mypy_init_return = false
Expand Down Expand Up @@ -3770,7 +3776,7 @@ from typing import Union;foo: Union[int, str] = 1
analyze.include_dependencies = {}

----- stderr -----
"###);
"#);
});
Ok(())
}
Expand Down Expand Up @@ -3823,7 +3829,7 @@ from typing import Union;foo: Union[int, str] = 1
.args(STDIN_BASE_OPTIONS)
.arg("--show-settings")
.arg("foo/test.py")
.current_dir(&project_dir), @r###"
.current_dir(&project_dir), @r#"
success: true
exit_code: 0
----- stdout -----
Expand Down Expand Up @@ -3914,6 +3920,7 @@ from typing import Union;foo: Union[int, str] = 1
XXX,
]
linter.typing_modules = []
linter.typing_extensions = true

# Linter Plugins
linter.flake8_annotations.mypy_init_return = false
Expand Down Expand Up @@ -4097,7 +4104,7 @@ from typing import Union;foo: Union[int, str] = 1
analyze.include_dependencies = {}

----- stderr -----
"###);
"#);
});

insta::with_settings!({
Expand All @@ -4107,7 +4114,7 @@ from typing import Union;foo: Union[int, str] = 1
.args(STDIN_BASE_OPTIONS)
.arg("--show-settings")
.arg("test.py")
.current_dir(project_dir.join("foo")), @r###"
.current_dir(project_dir.join("foo")), @r#"
success: true
exit_code: 0
----- stdout -----
Expand Down Expand Up @@ -4198,6 +4205,7 @@ from typing import Union;foo: Union[int, str] = 1
XXX,
]
linter.typing_modules = []
linter.typing_extensions = true

# Linter Plugins
linter.flake8_annotations.mypy_init_return = false
Expand Down Expand Up @@ -4381,7 +4389,7 @@ from typing import Union;foo: Union[int, str] = 1
analyze.include_dependencies = {}

----- stderr -----
"###);
"#);
});
Ok(())
}
Expand Down Expand Up @@ -4444,7 +4452,7 @@ from typing import Union;foo: Union[int, str] = 1
.args(STDIN_BASE_OPTIONS)
.arg("--show-settings")
.arg("test.py")
.current_dir(&project_dir), @r###"
.current_dir(&project_dir), @r#"
success: true
exit_code: 0
----- stdout -----
Expand Down Expand Up @@ -4535,6 +4543,7 @@ from typing import Union;foo: Union[int, str] = 1
XXX,
]
linter.typing_modules = []
linter.typing_extensions = true

# Linter Plugins
linter.flake8_annotations.mypy_init_return = false
Expand Down Expand Up @@ -4718,7 +4727,7 @@ from typing import Union;foo: Union[int, str] = 1
analyze.include_dependencies = {}

----- stderr -----
"###);
"#);
});

Ok(())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ linter.task_tags = [
XXX,
]
linter.typing_modules = []
linter.typing_extensions = true

# Linter Plugins
linter.flake8_annotations.mypy_init_return = false
Expand Down
44 changes: 34 additions & 10 deletions crates/ruff_linter/src/checkers/ast/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -533,26 +533,50 @@ impl<'a> Checker<'a> {
self.semantic_checker = checker;
}

/// Attempt to create an [`Edit`] that imports `member`.
/// Create a [`TypingImporter`] that will import `member` from either `typing` or
/// `typing_extensions`.
///
/// On Python <`version_added_to_typing`, `member` is imported from `typing_extensions`, while
/// on Python >=`version_added_to_typing`, it is imported from `typing`.
///
/// See [`Importer::get_or_import_symbol`] for more details on the returned values.
pub(crate) fn import_from_typing(
&self,
member: &str,
position: TextSize,
/// If the Python version is less than `version_added_to_typing` but
/// `LinterSettings::typing_extensions` is `false`, this method returns `None`.
pub(crate) fn typing_importer<'b>(
&'b self,
member: &'b str,
version_added_to_typing: PythonVersion,
) -> Result<(Edit, String), ResolutionError> {
) -> Option<TypingImporter<'b, 'a>> {
let source_module = if self.target_version() >= version_added_to_typing {
"typing"
} else if !self.settings.typing_extensions {
return None;
} else {
"typing_extensions"
};
let request = ImportRequest::import_from(source_module, member);
self.importer()
.get_or_import_symbol(&request, position, self.semantic())
Some(TypingImporter {
checker: self,
source_module,
member,
})
}
}

pub(crate) struct TypingImporter<'a, 'b> {
checker: &'a Checker<'b>,
source_module: &'static str,
member: &'a str,
}

impl TypingImporter<'_, '_> {
/// Create an [`Edit`] that makes the requested symbol available at `position`.
///
/// See [`Importer::get_or_import_symbol`] for more details on the returned values and
/// [`Checker::typing_importer`] for a way to construct a [`TypingImporter`].
pub(crate) fn import(&self, position: TextSize) -> Result<(Edit, String), ResolutionError> {
let request = ImportRequest::import_from(self.source_module, self.member);
self.checker
.importer
.get_or_import_symbol(&request, position, self.checker.semantic())
}
}

Expand Down
Loading
Loading