Remove DocumentRef

Author: MichaReiser

crates/ty_server/src/document/notebook.rs

@@ -226,6 +226,7 @@ impl NotebookDocument {
     }
 
     /// Get the text document representing the contents of a cell by the cell URI.
+    #[expect(unused)]
     pub(crate) fn cell_document_by_uri(&self, uri: &str) -> Option<&TextDocument> {
         self.cells
             .get(*self.cell_index.get(uri)?)

crates/ty_server/src/lib.rs

@@ -8,7 +8,7 @@ pub use crate::logging::{LogLevel, init_logging};
 pub use crate::server::{PartialWorkspaceProgress, PartialWorkspaceProgressParams, Server};
 pub use crate::session::{ClientOptions, DiagnosticMode};
 pub use document::{NotebookDocument, PositionEncoding, TextDocument};
-pub(crate) use session::{DocumentRef, Session};
+pub(crate) use session::Session;
 
 mod capabilities;
 mod document;

crates/ty_server/src/server/api.rs

@@ -273,7 +273,8 @@ where
             });
         };
 
-        let db = session.project_db(document.file_path()).clone();
+        let path = document.to_file_path();
+        let db = session.project_db(&path).clone();
 
         Box::new(move |client| {
             let _span = tracing::debug_span!("request", %id, method = R::METHOD).entered();

crates/ty_server/src/server/api/diagnostics.rs

@@ -17,12 +17,12 @@ use crate::document::{FileRangeExt, ToRangeExt};
 use crate::session::DocumentSnapshot;
 use crate::session::client::Client;
 use crate::system::{AnySystemPath, file_to_url};
-use crate::{DocumentRef, PositionEncoding, Session};
+use crate::{NotebookDocument, PositionEncoding, Session};
 
 pub(super) struct Diagnostics<'a> {
     items: Vec<ruff_db::diagnostic::Diagnostic>,
     encoding: PositionEncoding,
-    document: &'a DocumentRef,
+    notebook: Option<&'a NotebookDocument>,
 }
 
 impl Diagnostics<'_> {
@@ -53,7 +53,7 @@ impl Diagnostics<'_> {
     }
 
     pub(super) fn to_lsp_diagnostics(&self, db: &ProjectDatabase) -> LspDiagnostics {
-        if let Some(notebook) = self.document.as_notebook() {
+        if let Some(notebook) = self.notebook {
             let mut cell_diagnostics: FxHashMap<Url, Vec<Diagnostic>> = FxHashMap::default();
 
             // Populates all relevant URLs with an empty diagnostic list. This ensures that documents
@@ -151,7 +151,7 @@ pub(super) fn publish_diagnostics(session: &Session, url: &lsp_types::Url, clien
         }
     };
 
-    let db = session.project_db(snapshot.file_path());
+    let db = session.project_db(&snapshot.to_file_path());
 
     let Some(diagnostics) = compute_diagnostics(db, &snapshot) else {
         return;
@@ -253,8 +253,11 @@ pub(super) fn compute_diagnostics<'a>(
     db: &ProjectDatabase,
     snapshot: &'a DocumentSnapshot,
 ) -> Option<Diagnostics<'a>> {
-    let Some(file) = snapshot.file(db) else {
-        tracing::info!("No file found for snapshot for `{}`", snapshot.file_path());
+    let Some(file) = snapshot.to_file(db) else {
+        tracing::info!(
+            "No file found for snapshot for `{}`",
+            snapshot.to_file_path()
+        );
         return None;
     };
 
@@ -263,7 +266,7 @@ pub(super) fn compute_diagnostics<'a>(
     Some(Diagnostics {
         items: diagnostics,
         encoding: snapshot.encoding(),
-        document: snapshot.document(),
+        notebook: snapshot.notebook(),
     })
 }
 

crates/ty_server/src/server/api/notifications/did_change.rs

@@ -36,7 +36,8 @@ impl SyncNotificationHandler for DidChangeTextDocumentHandler {
             .update_text_document(session, content_changes, version)
             .with_failure_code(ErrorCode::InternalError)?;
 
-        let changes = match document.file_path() {
+        let path = document.to_file_path();
+        let changes = match &*path {
             AnySystemPath::System(system_path) => {
                 vec![ChangeEvent::file_content_changed(system_path.clone())]
             }
@@ -45,7 +46,7 @@ impl SyncNotificationHandler for DidChangeTextDocumentHandler {
             }
         };
 
-        session.apply_changes(document.file_path(), changes);
+        session.apply_changes(&path, changes);
 
         publish_diagnostics(session, document.url(), client);
 

crates/ty_server/src/server/api/notifications/did_close.rs

@@ -31,9 +31,10 @@ impl SyncNotificationHandler for DidCloseTextDocumentHandler {
             .document(&uri)
             .with_failure_code(ErrorCode::InternalError)?;
 
-        let db = session.project_db_mut(document.file_path());
+        let path = document.to_file_path();
+        let db = session.project_db_mut(&path);
 
-        match document.file_path() {
+        match &*path {
             AnySystemPath::System(system_path) => {
                 if let Some(file) = db.files().try_system(db, system_path) {
                     db.project().close_file(db, file);

crates/ty_server/src/server/api/notifications/did_close_notebook.rs

@@ -30,9 +30,11 @@ impl SyncNotificationHandler for DidCloseNotebookHandler {
             .document(&uri)
             .with_failure_code(lsp_server::ErrorCode::InternalError)?;
 
-        if let AnySystemPath::SystemVirtual(virtual_path) = document.file_path() {
+        let path = document.to_file_path();
+
+        if let AnySystemPath::SystemVirtual(virtual_path) = &*path {
             session.apply_changes(
-                document.file_path(),
+                &path,
                 vec![ChangeEvent::DeletedVirtual(virtual_path.clone())],
             );
         }

crates/ty_server/src/server/api/notifications/did_open.rs

@@ -39,19 +39,19 @@ impl SyncNotificationHandler for DidOpenTextDocumentHandler {
             TextDocument::new(uri, text, version).with_language_id(&language_id),
         );
 
-        let path = document.file_path();
+        let path = document.to_file_path();
 
         // This is a "maybe" because the `File` might've not been interned yet i.e., the
         // `try_system` call will return `None` which doesn't mean that the file is new, it's just
         // that the server didn't need the file yet.
         let is_maybe_new_system_file = path.as_system().is_some_and(|system_path| {
-            let db = session.project_db(path);
+            let db = session.project_db(&path);
             db.files()
                 .try_system(db, system_path)
                 .is_none_or(|file| !file.exists(db))
         });
 
-        match path {
+        match &*path {
             AnySystemPath::System(system_path) => {
                 let event = if is_maybe_new_system_file {
                     ChangeEvent::Created {
@@ -61,16 +61,16 @@ impl SyncNotificationHandler for DidOpenTextDocumentHandler {
                 } else {
                     ChangeEvent::Opened(system_path.clone())
                 };
-                session.apply_changes(path, vec![event]);
+                session.apply_changes(&path, vec![event]);
 
-                let db = session.project_db_mut(path);
+                let db = session.project_db_mut(&path);
                 match system_path_to_file(db, system_path) {
                     Ok(file) => db.project().open_file(db, file),
                     Err(err) => tracing::warn!("Failed to open file {system_path}: {err}"),
                 }
             }
             AnySystemPath::SystemVirtual(virtual_path) => {
-                let db = session.project_db_mut(path);
+                let db = session.project_db_mut(&path);
                 let virtual_file = db.files().virtual_file(db, virtual_path);
                 db.project().open_file(db, virtual_file.file());
             }

crates/ty_server/src/server/api/notifications/did_open_notebook.rs

@@ -42,14 +42,14 @@ impl SyncNotificationHandler for DidOpenNotebookHandler {
         .with_failure_code(ErrorCode::InternalError)?;
 
         let document = session.open_notebook_document(notebook);
-        let path = document.file_path();
+        let path = document.to_file_path();
 
-        match path {
+        match &*path {
             AnySystemPath::System(system_path) => {
-                session.apply_changes(path, vec![ChangeEvent::Opened(system_path.clone())]);
+                session.apply_changes(&path, vec![ChangeEvent::Opened(system_path.clone())]);
             }
             AnySystemPath::SystemVirtual(virtual_path) => {
-                let db = session.project_db_mut(path);
+                let db = session.project_db_mut(&path);
                 db.files().virtual_file(db, virtual_path);
             }
         }

crates/ty_server/src/server/api/requests/completion.rs

@@ -45,7 +45,7 @@ impl BackgroundDocumentRequestHandler for CompletionRequestHandler {
             return Ok(None);
         }
 
-        let Some(file) = snapshot.file(db) else {
+        let Some(file) = snapshot.to_file(db) else {
             return Ok(None);
         };