mirror of
https://github.com/astral-sh/ruff.git
synced 2025-10-01 06:11:43 +00:00
[red-knot] Add support for untitled files (#12492)
## Summary This PR adds support for untitled files in the Red Knot project. Refer to the [design discussion](https://github.com/astral-sh/ruff/discussions/12336) for more details. ### Changes * The `parsed_module` always assumes that the `SystemVirtual` path is of `PySourceType::Python`. * For the module resolver, as suggested, I went ahead by adding a new `SystemOrVendoredPath` enum and renamed `FilePathRef` to `SystemOrVendoredPathRef` (happy to consider better names here). * The `file_to_module` query would return if it's a `FilePath::SystemVirtual` variant because a virtual file doesn't belong to any module. * The sync implementation for the system virtual path is basically the same as that of system path except that it uses the `virtual_path_metadata`. The reason for this is that the system (language server) would provide the metadata on whether it still exists or not and if it exists, the corresponding metadata. For point (1), VS Code would use `Untitled-1` for Python files and `Untitled-1.ipynb` for Jupyter Notebooks. We could use this distinction to determine whether the source type is `Python` or `Ipynb`. ## Test Plan Added test cases in #12526
This commit is contained in:
parent
71f7aa4971
commit
6f4db8675b
11 changed files with 534 additions and 63 deletions
|
@ -593,6 +593,137 @@ impl ruff_cache::CacheKey for SystemPathBuf {
|
|||
}
|
||||
}
|
||||
|
||||
/// A slice of a virtual path on [`System`](super::System) (akin to [`str`]).
|
||||
#[repr(transparent)]
|
||||
pub struct SystemVirtualPath(str);
|
||||
|
||||
impl SystemVirtualPath {
|
||||
pub fn new(path: &str) -> &SystemVirtualPath {
|
||||
// SAFETY: SystemVirtualPath is marked as #[repr(transparent)] so the conversion from a
|
||||
// *const str to a *const SystemVirtualPath is valid.
|
||||
unsafe { &*(path as *const str as *const SystemVirtualPath) }
|
||||
}
|
||||
|
||||
/// Converts the path to an owned [`SystemVirtualPathBuf`].
|
||||
pub fn to_path_buf(&self) -> SystemVirtualPathBuf {
|
||||
SystemVirtualPathBuf(self.0.to_string())
|
||||
}
|
||||
|
||||
/// Extracts the file extension, if possible.
|
||||
///
|
||||
/// # Examples
|
||||
///
|
||||
/// ```
|
||||
/// use ruff_db::system::SystemVirtualPath;
|
||||
///
|
||||
/// assert_eq!(None, SystemVirtualPath::new("untitled:Untitled-1").extension());
|
||||
/// assert_eq!("ipynb", SystemVirtualPath::new("untitled:Untitled-1.ipynb").extension().unwrap());
|
||||
/// assert_eq!("ipynb", SystemVirtualPath::new("vscode-notebook-cell:Untitled-1.ipynb").extension().unwrap());
|
||||
/// ```
|
||||
///
|
||||
/// See [`Path::extension`] for more details.
|
||||
pub fn extension(&self) -> Option<&str> {
|
||||
Path::new(&self.0).extension().and_then(|ext| ext.to_str())
|
||||
}
|
||||
|
||||
/// Returns the path as a string slice.
|
||||
#[inline]
|
||||
pub fn as_str(&self) -> &str {
|
||||
&self.0
|
||||
}
|
||||
}
|
||||
|
||||
/// An owned, virtual path on [`System`](`super::System`) (akin to [`String`]).
|
||||
#[derive(Eq, PartialEq, Clone, Hash, PartialOrd, Ord)]
|
||||
pub struct SystemVirtualPathBuf(String);
|
||||
|
||||
impl SystemVirtualPathBuf {
|
||||
#[inline]
|
||||
pub fn as_path(&self) -> &SystemVirtualPath {
|
||||
SystemVirtualPath::new(&self.0)
|
||||
}
|
||||
}
|
||||
|
||||
impl From<String> for SystemVirtualPathBuf {
|
||||
fn from(value: String) -> Self {
|
||||
SystemVirtualPathBuf(value)
|
||||
}
|
||||
}
|
||||
|
||||
impl AsRef<SystemVirtualPath> for SystemVirtualPathBuf {
|
||||
#[inline]
|
||||
fn as_ref(&self) -> &SystemVirtualPath {
|
||||
self.as_path()
|
||||
}
|
||||
}
|
||||
|
||||
impl AsRef<SystemVirtualPath> for SystemVirtualPath {
|
||||
#[inline]
|
||||
fn as_ref(&self) -> &SystemVirtualPath {
|
||||
self
|
||||
}
|
||||
}
|
||||
|
||||
impl AsRef<SystemVirtualPath> for str {
|
||||
#[inline]
|
||||
fn as_ref(&self) -> &SystemVirtualPath {
|
||||
SystemVirtualPath::new(self)
|
||||
}
|
||||
}
|
||||
|
||||
impl AsRef<SystemVirtualPath> for String {
|
||||
#[inline]
|
||||
fn as_ref(&self) -> &SystemVirtualPath {
|
||||
SystemVirtualPath::new(self)
|
||||
}
|
||||
}
|
||||
|
||||
impl Deref for SystemVirtualPathBuf {
|
||||
type Target = SystemVirtualPath;
|
||||
|
||||
fn deref(&self) -> &Self::Target {
|
||||
self.as_path()
|
||||
}
|
||||
}
|
||||
|
||||
impl std::fmt::Debug for SystemVirtualPath {
|
||||
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
|
||||
self.0.fmt(f)
|
||||
}
|
||||
}
|
||||
|
||||
impl std::fmt::Display for SystemVirtualPath {
|
||||
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
|
||||
self.0.fmt(f)
|
||||
}
|
||||
}
|
||||
|
||||
impl std::fmt::Debug for SystemVirtualPathBuf {
|
||||
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
|
||||
self.0.fmt(f)
|
||||
}
|
||||
}
|
||||
|
||||
impl std::fmt::Display for SystemVirtualPathBuf {
|
||||
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
|
||||
self.0.fmt(f)
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(feature = "cache")]
|
||||
impl ruff_cache::CacheKey for SystemVirtualPath {
|
||||
fn cache_key(&self, hasher: &mut ruff_cache::CacheKeyHasher) {
|
||||
self.as_str().cache_key(hasher);
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(feature = "cache")]
|
||||
impl ruff_cache::CacheKey for SystemVirtualPathBuf {
|
||||
fn cache_key(&self, hasher: &mut ruff_cache::CacheKeyHasher) {
|
||||
self.as_path().cache_key(hasher);
|
||||
}
|
||||
}
|
||||
|
||||
/// Deduplicates identical paths and removes nested paths.
|
||||
///
|
||||
/// # Examples
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue