Merge pull request #22063 from Veykril/push-zyrytxqturpp

Remove `LineIndexDatabase`

Author: Veykril

Cargo.lock

@@ -1,5 +1,5 @@
 use crate::assist_context::{AssistContext, Assists};
-use ide_db::{LineIndexDatabase, assists::AssistId, defs::Definition};
+use ide_db::{assists::AssistId, defs::Definition, line_index};
 use syntax::{
     AstNode,
     ast::{self, HasName, edit::AstNodeEdit},
@@ -43,7 +43,7 @@ pub(crate) fn bind_unused_param(acc: &mut Assists, ctx: &AssistContext<'_>) -> O
         format!("Bind as `let _ = {name};`"),
         param.syntax().text_range(),
         |builder| {
-            let line_index = ctx.db().line_index(ctx.vfs_file_id());
+            let line_index = line_index(ctx.db(), ctx.vfs_file_id());
 
             let indent = func.indent_level();
             let text_indent = indent + 1;

crates/ide-assists/src/handlers/bind_unused_param.rs

@@ -25,7 +25,6 @@ arrayvec.workspace = true
 memchr = "2.7.5"
 salsa.workspace = true
 salsa-macros.workspace = true
-query-group.workspace = true
 triomphe.workspace = true
 nohash-hasher.workspace = true
 bitflags.workspace = true

crates/ide-db/Cargo.toml

@@ -61,7 +61,7 @@ use std::{fmt, mem::ManuallyDrop};
 
 use base_db::{
     CrateGraphBuilder, CratesMap, FileSourceRootInput, FileText, Files, Nonce, SourceDatabase,
-    SourceRoot, SourceRootId, SourceRootInput, query_group, set_all_crates_with_durability,
+    SourceRoot, SourceRootId, SourceRootInput, set_all_crates_with_durability,
 };
 use hir::{
     FilePositionWrapper, FileRangeWrapper,
@@ -252,15 +252,20 @@ impl RootDatabase {
     }
 }
 
-#[query_group::query_group]
-pub trait LineIndexDatabase: base_db::SourceDatabase {
-    #[salsa::invoke_interned(line_index)]
-    fn line_index(&self, file_id: FileId) -> Arc<LineIndex>;
-}
-
-fn line_index(db: &dyn LineIndexDatabase, file_id: FileId) -> Arc<LineIndex> {
-    let text = db.file_text(file_id).text(db);
-    Arc::new(LineIndex::new(text))
+pub fn line_index(db: &dyn SourceDatabase, file_id: FileId) -> &Arc<LineIndex> {
+    #[salsa::interned]
+    pub struct InternedFileId {
+        id: FileId,
+    }
+    #[salsa::tracked(returns(ref))]
+    fn line_index<'db>(
+        db: &'db dyn SourceDatabase,
+        file_id: InternedFileId<'db>,
+    ) -> Arc<LineIndex> {
+        let text = db.file_text(file_id.id(db)).text(db);
+        Arc::new(LineIndex::new(text))
+    }
+    line_index(db, InternedFileId::new(db, file_id))
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]

crates/ide-db/src/lib.rs

@@ -400,22 +400,16 @@ impl<'db> SymbolIndex<'db> {
     /// The symbol index for a given module. These modules should only be in source roots that
     /// are inside local_roots.
     pub fn module_symbols(db: &dyn HirDatabase, module: Module) -> &SymbolIndex<'_> {
-        // FIXME:
-        #[salsa::interned]
-        struct InternedModuleId {
-            id: hir::ModuleId,
-        }
-
         #[salsa::tracked(returns(ref))]
         fn module_symbols<'db>(
             db: &'db dyn HirDatabase,
-            module: InternedModuleId<'db>,
+            module: hir::ModuleId,
         ) -> SymbolIndex<'db> {
             let _p = tracing::info_span!("module_symbols").entered();
 
             // We call this without attaching because this runs in parallel, so we need to attach here.
             hir::attach_db(db, || {
-                let module: Module = module.id(db).into();
+                let module: Module = module.into();
                 SymbolIndex::new(SymbolCollector::new_module(
                     db,
                     module,
@@ -424,7 +418,7 @@ impl<'db> SymbolIndex<'db> {
             })
         }
 
-        module_symbols(db, InternedModuleId::new(db, hir::ModuleId::from(module)))
+        module_symbols(db, hir::ModuleId::from(module))
     }
 
     /// The symbol index for all extern prelude crates.

crates/ide-db/src/symbol_index.rs

@@ -4,11 +4,9 @@ use std::iter;
 
 use hir::crate_def_map;
 use hir::{InFile, ModuleSource};
-use ide_db::base_db;
 use ide_db::text_edit::TextEdit;
-use ide_db::{
-    FileId, FileRange, LineIndexDatabase, base_db::SourceDatabase, source_change::SourceChange,
-};
+use ide_db::{FileId, FileRange, base_db::SourceDatabase, source_change::SourceChange};
+use ide_db::{base_db, line_index};
 use paths::Utf8Component;
 use syntax::{
     AstNode, TextRange,
@@ -26,7 +24,7 @@ pub(crate) fn unlinked_file(
     acc: &mut Vec<Diagnostic>,
     file_id: FileId,
 ) {
-    let mut range = TextRange::up_to(ctx.sema.db.line_index(file_id).len());
+    let mut range = TextRange::up_to(line_index(ctx.sema.db, file_id).len());
     let fixes = fixes(ctx, file_id, range);
     // FIXME: This is a hack for the vscode extension to notice whether there is an autofix or not before having to resolve diagnostics.
     // This is to prevent project linking popups from appearing when there is an autofix. https://github.com/rust-lang/rust-analyzer/issues/14523

crates/ide-diagnostics/src/handlers/unlinked_file.rs

@@ -4,9 +4,10 @@ mod overly_long_real_world_cases;
 
 use hir::setup_tracing;
 use ide_db::{
-    LineIndexDatabase, RootDatabase,
+    RootDatabase,
     assists::{AssistResolveStrategy, ExprFillDefaultMode},
     base_db::SourceDatabase,
+    line_index,
 };
 use itertools::Itertools;
 use stdx::trim_indent;
@@ -242,7 +243,7 @@ pub(crate) fn check_diagnostics_with_config(
         .into_group_map();
     for file_id in files {
         let file_id = file_id.file_id(&db);
-        let line_index = db.line_index(file_id);
+        let line_index = line_index(&db, file_id);
 
         let mut actual = annotations.remove(&file_id).unwrap_or_default();
         let mut expected = extract_annotations(db.file_text(file_id).text(&db));

crates/ide-diagnostics/src/tests.rs

@@ -1,5 +1,5 @@
 use hir::{ConstEvalError, DefWithBody, DisplayTarget, Semantics};
-use ide_db::{FilePosition, LineIndexDatabase, RootDatabase, base_db::SourceDatabase};
+use ide_db::{FilePosition, RootDatabase, base_db::SourceDatabase, line_index};
 use std::time::{Duration, Instant};
 use stdx::format_to;
 use syntax::{AstNode, TextRange, algo::ancestors_at_offset, ast};
@@ -40,7 +40,7 @@ fn find_and_interpret(db: &RootDatabase, position: FilePosition) -> Option<(Dura
 
         let path = source_root.path_for_file(&file_id).map(|x| x.to_string());
         let path = path.as_deref().unwrap_or("<unknown file>");
-        match db.line_index(file_id).try_line_col(text_range.start()) {
+        match line_index(db, file_id).try_line_col(text_range.start()) {
             Some(line_col) => format!("file://{path}:{}:{}", line_col.line + 1, line_col.col),
             None => format!("file://{path} range {text_range:?}"),
         }
@@ -68,7 +68,7 @@ pub(crate) fn render_const_eval_error(
         let source_root = db.source_root(source_root).source_root(db);
         let path = source_root.path_for_file(&file_id).map(|x| x.to_string());
         let path = path.as_deref().unwrap_or("<unknown file>");
-        match db.line_index(file_id).try_line_col(text_range.start()) {
+        match line_index(db, file_id).try_line_col(text_range.start()) {
             Some(line_col) => format!("file://{path}:{}:{}", line_col.line + 1, line_col.col),
             None => format!("file://{path} range {text_range:?}"),
         }

crates/ide/src/interpret.rs

@@ -64,9 +64,10 @@ use cfg::CfgOptions;
 use fetch_crates::CrateInfo;
 use hir::{ChangeWithProcMacros, EditionedFileId, crate_def_map, sym};
 use ide_db::base_db::relevant_crates;
+use ide_db::line_index;
 use ide_db::ra_fixture::RaFixtureAnalysis;
 use ide_db::{
-    FxHashMap, FxIndexSet, LineIndexDatabase,
+    FxHashMap, FxIndexSet,
     base_db::{
         CrateOrigin, CrateWorkspaceData, Env, FileSet, SourceDatabase, VfsPath,
         salsa::{Cancelled, Database},
@@ -358,7 +359,7 @@ impl Analysis {
     /// Gets the file's `LineIndex`: data structure to convert between absolute
     /// offsets and line/column representation.
     pub fn file_line_index(&self, file_id: FileId) -> Cancellable<Arc<LineIndex>> {
-        self.with_db(|db| db.line_index(file_id))
+        self.with_db(|db| line_index(db, file_id).clone())
     }
 
     /// Selects the next syntactic nodes encompassing the range.

crates/ide/src/lib.rs

@@ -1,6 +1,6 @@
 use hir::Semantics;
 use ide_db::{
-    FileId, LineIndexDatabase, RootDatabase,
+    FileId, RootDatabase, line_index,
     line_index::{LineCol, LineIndex},
 };
 use span::{TextRange, TextSize};
@@ -20,7 +20,7 @@ use triomphe::Arc;
 // | VS Code | **Rust Syntax Tree** |
 pub(crate) fn view_syntax_tree(db: &RootDatabase, file_id: FileId) -> String {
     let sema = Semantics::new(db);
-    let line_index = db.line_index(file_id);
+    let line_index = line_index(db, file_id).clone();
     let parse = sema.parse_guess_edition(file_id);
 
     let ctx = SyntaxTreeCtx { line_index, in_string: None };