Fix rebase conflicts

Author: lionel-

crates/ark/src/lsp/goto_definition.rs

@@ -17,10 +17,10 @@ pub(crate) fn goto_definition(
     let uri = &params.text_document_position_params.text_document.uri;
     let position = params.text_document_position_params.position;
 
-    let db = &state.oak;
+    let db = &state.db;
     let encoding = state.config.position_encoding;
 
-    let Some(file) = db.file_by_url(&FilePath::from_url(uri)) else {
+    let Some(file) = db.file_by_path(&FilePath::from_url(uri)) else {
         return Ok(None);
     };
 
@@ -55,7 +55,7 @@ fn nav_target_to_link(
 
     Ok(LocationLink {
         origin_selection_range: None,
-        target_uri: target.file.url(db).to_url(),
+        target_uri: target.file.path(db).to_url(),
         target_range,
         target_selection_range,
     })

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

@@ -1,5 +1,5 @@
 use aether_path::FilePath;
-use oak_scan::DbExt;
+use oak_scan::DbScan;
 use tower_lsp::lsp_types;
 
 use crate::lsp::document::Document;
@@ -17,7 +17,7 @@ pub(super) fn make_state(uri: &lsp_types::Url, doc: &Document) -> WorldState {
 pub(super) fn insert_file(state: &mut WorldState, uri: &lsp_types::Url, doc: &Document) {
     state.insert_document(uri.clone(), doc.clone());
     state
-        .oak
+        .db
         .upsert_editor(FilePath::from_url(uri), doc.contents.clone());
 }
 

crates/oak_db/src/file_resolve.rs

@@ -154,7 +154,7 @@ impl<'db> File {
             ..
         } = index.definitions(scope)[def_id].kind()
         {
-            let target = db.file_by_url(&FilePath::from_url(target_url))?;
+            let target = db.file_by_path(&FilePath::from_url(target_url))?;
             return target.resolve_export(db, Name::new(db, forwarded.as_str()));
         }
         self.definition(db, scope, def_id)

crates/oak_ide/tests/integration/goto_definition.rs

@@ -12,7 +12,7 @@ use biome_rowan::TextSize;
 use oak_db::File;
 use oak_db::OakDatabase;
 use oak_ide::goto_definition;
-use oak_scan::DbExt;
+use oak_scan::DbScan;
 use url::Url;
 
 fn file_url(name: &str) -> Url {