Use wire_url() with indexer-based handlers

Author: lionel-

crates/ark/src/lsp/completions/sources/composite/workspace.rs

@@ -69,13 +69,15 @@ fn completions_from_workspace(
     let token = token.as_str();
 
     // get entries from the index
-    indexer::map(&state.db, |uri, symbol, entry| {
+    indexer::map(&state.db, |file, symbol, entry| {
         if !symbol.fuzzy_matches(token) {
             return;
         }
 
         match &entry.data {
             indexer::IndexEntryData::Function { name, .. } => {
+                let uri = state.wire_url(file);
+
                 let fun_context = match completion_context.function_context() {
                     Ok(fun_context) => fun_context,
                     Err(err) => {

crates/ark/src/lsp/diagnostics.rs

@@ -171,7 +171,7 @@ pub(crate) fn generate_diagnostics(
     context.document_symbols.push(HashMap::new());
 
     // Add the current workspace symbols.
-    indexer::map(db, |_uri, _symbol, entry| match &entry.data {
+    indexer::map(db, |_file, _symbol, entry| match &entry.data {
         indexer::IndexEntryData::Function { name, arguments: _ } => {
             context.workspace_symbols.insert(name.to_string());
         },

crates/ark/src/lsp/indexer.rs

@@ -14,7 +14,6 @@ use stdext::unwrap;
 use stdext::unwrap::IntoResult;
 use tree_sitter::Node;
 use tree_sitter::Query;
-use url::Url;
 
 use crate::lsp;
 use crate::lsp::db::ArkDb;
@@ -124,15 +123,16 @@ fn file_index(db: &dyn ArkDb, file: File) -> FileIndex {
     FileIndex { symbols }
 }
 
-/// Visit every workspace symbol across all indexable files.
-pub(crate) fn map(db: &dyn ArkDb, mut callback: impl FnMut(&Url, &str, &IndexEntry)) {
+/// Visit every workspace symbol across all indexable files. Callers that need a
+/// URL for messages to the frontend can resolve it from `File` via
+/// `WorldState::wire_url`.
+pub(crate) fn map(db: &dyn ArkDb, mut callback: impl FnMut(File, &str, &IndexEntry)) {
     for &file in oak_db::workspace_files(db) {
         if !is_indexable(db, file) {
             continue;
         }
-        let url = file.path(db).to_url();
         for (symbol, entry) in file_index(db, file).symbols.iter() {
-            callback(&url, symbol, entry);
+            callback(file, symbol, entry);
         }
     }
 }
@@ -344,6 +344,7 @@ mod tests {
     use assert_matches::assert_matches;
     use insta::assert_debug_snapshot;
     use oak_scan::DbScan;
+    use url::Url;
 
     use super::*;
     use crate::lsp::ark_file::test_ark_file;

crates/ark/src/lsp/symbols.rs

@@ -11,7 +11,7 @@ use std::result::Result::Ok;
 
 use aether_lsp_utils::proto::to_proto;
 use aether_lsp_utils::proto::PositionEncoding;
-use aether_path::FilePath;
+use oak_db::File;
 use stdext::unwrap::IntoResult;
 use tower_lsp::lsp_types::DocumentSymbol;
 use tower_lsp::lsp_types::DocumentSymbolParams;
@@ -21,7 +21,6 @@ use tower_lsp::lsp_types::SymbolInformation;
 use tower_lsp::lsp_types::SymbolKind;
 use tower_lsp::lsp_types::WorkspaceSymbolParams;
 use tree_sitter::Node;
-use url::Url;
 
 use crate::lsp::ark_file::ArkFile;
 use crate::lsp::db::ArkDb;
@@ -68,15 +67,17 @@ pub(crate) fn symbols(
     let encoding = state.config.position_encoding;
     let mut info: Vec<SymbolInformation> = Vec::new();
 
-    indexer::map(db, |uri, symbol, entry| {
+    indexer::map(db, |file, symbol, entry| {
         if !symbol.fuzzy_matches(query) {
             return;
         }
 
-        let Some(range) = index_range_to_lsp_range(db, uri, entry.range, encoding) else {
+        let Some(range) = index_range_to_lsp_range(db, file, entry.range, encoding) else {
             return;
         };
 
+        let uri = state.wire_url(file);
+
         match &entry.data {
             IndexEntryData::Function { name, arguments: _ } => {
                 info.push(SymbolInformation {
@@ -142,16 +143,14 @@ pub(crate) fn symbols(
 }
 
 /// Convert an index entry's tree-sitter point range to an LSP range, resolving
-/// the file's line index from the db. Returns `None` if the file is no longer
-/// in the db or the points fall outside it, in which case the symbol is
-/// dropped from the results.
+/// the file's line index from the db. Returns `None` if the points fall outside
+/// the line index, in which case the symbol is dropped from the results.
 fn index_range_to_lsp_range(
     db: &dyn ArkDb,
-    uri: &Url,
+    file: File,
     range: indexer::IndexRange,
     encoding: PositionEncoding,
 ) -> Option<Range> {
-    let file = db.file_by_path(&FilePath::from_url(uri))?;
     let line_index = file.line_index(db);
 
     let to_position = |point: indexer::IndexPoint| {