Make File contents lazy

Author: lionel-

Cargo.lock

@@ -57,6 +57,7 @@ ego-tree = "0.11.0"
 embed-resource = "3.0.9"
 env_logger = "0.11.10"
 etcetera = "0.11.0"
+filetime = "0.2.23"
 flate2 = "1.1.9"
 futures = "0.3.32"
 harp = { path = "crates/harp" }

Cargo.toml

@@ -55,7 +55,7 @@ impl ArkFile {
     }
 
     pub(crate) fn contents<'db>(&self, db: &'db dyn ArkDb) -> &'db str {
-        self.file.contents(db).as_str()
+        self.file.source_text(db).as_str()
     }
 
     pub(crate) fn get_line<'db>(&self, db: &'db dyn ArkDb, line: usize) -> Option<&'db str> {
@@ -148,7 +148,13 @@ pub(crate) fn test_ark_file(code: &str) -> (oak_db::OakDatabase, ArkFile) {
     let url = Url::parse("file:///test.R").unwrap();
     let key = FilePath::from_url(&url);
     let file = ArkFile {
-        file: File::new(&db, key, code.to_string(), None),
+        file: File::new(
+            &db,
+            key,
+            oak_db::FileRevision::zero(),
+            Some(code.to_string()),
+            None,
+        ),
         version: None,
         config: DocumentConfig::default(),
         url,

crates/ark/src/lsp/ark_file.rs

@@ -65,7 +65,7 @@ fn tree_sitter_query(db: &dyn ArkDb, file: File) -> TreeSitterTree {
 
     // Unwrap Safety: parsing without a timeout or cancellation flag never
     // returns `None`.
-    let tree = parser.parse(file.contents(db), None).unwrap();
+    let tree = parser.parse(file.source_text(db).as_str(), None).unwrap();
 
     TreeSitterTree(tree)
 }

crates/ark/src/lsp/db.rs

@@ -1173,7 +1173,13 @@ mod tests {
 
     fn generate_diagnostics(code: &str, state: WorldState) -> Vec<lsp_types::Diagnostic> {
         let url = url::Url::parse("file:///test.R").unwrap();
-        let file = oak_db::File::new(&state.db, FilePath::from_url(&url), code.to_string(), None);
+        let file = oak_db::File::new(
+            &state.db,
+            FilePath::from_url(&url),
+            oak_db::FileRevision::zero(),
+            Some(code.to_string()),
+            None,
+        );
         let ark_file = ArkFile {
             file,
             version: None,

crates/ark/src/lsp/diagnostics.rs

@@ -302,7 +302,7 @@ mod tests {
         let mut contents = file.contents(&*db).to_string();
         let mut line_index = file.line_index(&*db).clone();
         from_proto::apply_text_edits(&mut contents, edits, &mut line_index, encoding);
-        file.file.set_contents(db).to(contents);
+        file.file.set_source_text_override(db).to(Some(contents));
     }
 
     #[test]

crates/ark/src/lsp/indent.rs

@@ -103,7 +103,7 @@ pub(crate) fn find(db: &dyn ArkDb, symbol: &str) -> Option<IndexEntry> {
 #[salsa::tracked(returns(ref))]
 fn file_index(db: &dyn ArkDb, file: File) -> FileIndex {
     let tree = file.tree_sitter(db);
-    let contents = file.contents(db).as_str();
+    let contents = file.source_text(db).as_str();
 
     let root = tree.root_node();
     let mut cursor = root.walk();

crates/ark/src/lsp/indexer.rs

@@ -1,13 +1,20 @@
 use aether_path::FilePath;
 use oak_db::File;
+use oak_db::FileRevision;
 use oak_db::OakDatabase;
 use url::Url;
 
 use crate::lsp::db::FileExt;
 
 fn file(db: &OakDatabase, contents: &str) -> File {
     let url = FilePath::from_url(&Url::parse("file:///test.R").unwrap());
-    File::new(db, url, contents.to_string(), None)
+    File::new(
+        db,
+        url,
+        FileRevision::zero(),
+        Some(contents.to_string()),
+        None,
+    )
 }
 
 #[test]

crates/ark/src/lsp/tests/db.rs

@@ -251,7 +251,7 @@ fn test_r_file_created_routes_through_add_file() {
     assert_eq!(root.scripts(&state.db).len(), 1);
     let file_path = FilePath::from_path_buf(path.clone()).unwrap();
     let file = state.db.file_by_path(&file_path).unwrap();
-    assert_eq!(file.contents(&state.db), "x <- 1\n");
+    assert_eq!(file.source_text(&state.db), "x <- 1\n");
 }
 
 #[test]
@@ -280,7 +280,7 @@ fn test_r_file_changed_for_editor_open_file_is_skipped() {
     did_change_watched_files(params, &mut state).unwrap();
 
     let file = state.db.file_by_path(&file_path).unwrap();
-    assert_eq!(file.contents(&state.db), "editor_v2\n");
+    assert_eq!(file.source_text(&state.db), "editor_v2\n");
 }
 
 #[test]
@@ -318,7 +318,7 @@ fn test_r_file_changed_for_unopened_file_updates_contents() {
             .db
             .file_by_path(&file_path)
             .unwrap()
-            .contents(&state.db),
+            .source_text(&state.db),
         "v1\n"
     );
 
@@ -333,7 +333,7 @@ fn test_r_file_changed_for_unopened_file_updates_contents() {
             .db
             .file_by_path(&file_path)
             .unwrap()
-            .contents(&state.db),
+            .source_text(&state.db),
         "v2\n"
     );
 }
@@ -365,7 +365,7 @@ fn test_r_file_deleted_for_editor_open_file_is_skipped() {
     did_change_watched_files(params, &mut state).unwrap();
 
     let file = state.db.file_by_path(&file_path).unwrap();
-    assert_eq!(file.contents(&state.db), "editor_v2\n");
+    assert_eq!(file.source_text(&state.db), "editor_v2\n");
 }
 
 #[test]
@@ -591,7 +591,7 @@ fn test_did_change_workspace_folders_preserves_open_buffer_across_churn() {
         .orphan_root()
         .files(&state.db)
         .contains(&after_remove));
-    assert_eq!(after_remove.contents(&state.db), "editor <- 2\n");
+    assert_eq!(after_remove.source_text(&state.db), "editor <- 2\n");
 
     // Re-add the same folder. The file snaps back into pkg.files with
     // the same entity and the editor content carries over (the scan's
@@ -602,7 +602,7 @@ fn test_did_change_workspace_folders_preserves_open_buffer_across_churn() {
     let after_readd = state.db.file_by_path(&file_path).unwrap();
     assert_eq!(file_before, after_readd);
     assert!(after_readd.package(&state.db).is_some());
-    assert_eq!(after_readd.contents(&state.db), "editor <- 2\n");
+    assert_eq!(after_readd.source_text(&state.db), "editor <- 2\n");
     // `upsert_root_file` cleaned the orphan reference.
     assert!(!state
         .db

crates/ark/src/lsp/tests/state_handlers.rs

@@ -21,6 +21,7 @@ biome_line_index.workspace = true
 biome_rowan.workspace = true
 camino.workspace = true
 compact_str.workspace = true
+filetime.workspace = true
 log.workspace = true
 oak_core.workspace = true
 oak_package_metadata.workspace = true
@@ -33,3 +34,4 @@ url.workspace = true
 
 [dev-dependencies]
 oak_semantic = { workspace = true, features = ["salsa", "testing"] }
+tempfile.workspace = true