rename FilesDatabase -> SourceDatabase

This commit is contained in:
Aleksey Kladov 2019-01-26 11:20:30 +03:00
parent 3223de5976
commit 4711cbcace
17 changed files with 27 additions and 25 deletions

View file

@ -1,4 +1,4 @@
use ra_db::FilesDatabase;
use ra_db::SourceDatabase;
use ra_syntax::{
AstNode, SyntaxNode, TextUnit, TextRange,
SyntaxKind::FN_DEF,

View file

@ -9,7 +9,7 @@ mod complete_path;
mod complete_scope;
mod complete_postfix;
use ra_db::FilesDatabase;
use ra_db::SourceDatabase;
use crate::{
db,

View file

@ -1,14 +1,14 @@
use std::sync::Arc;
use ra_db::{
CheckCanceled, FileId, Canceled, FilesDatabase,
CheckCanceled, FileId, Canceled, SourceDatabase,
salsa,
};
use crate::{LineIndex, symbol_index::{self, SymbolsDatabase}};
#[salsa::database(
ra_db::FilesDatabaseStorage,
ra_db::SourceDatabaseStorage,
LineIndexDatabaseStorage,
symbol_index::SymbolsDatabaseStorage,
hir::db::HirDatabaseStorage
@ -59,11 +59,11 @@ impl AsRef<hir::HirInterner> for RootDatabase {
}
#[salsa::query_group(LineIndexDatabaseStorage)]
pub(crate) trait LineIndexDatabase: ra_db::FilesDatabase + CheckCanceled {
pub(crate) trait LineIndexDatabase: ra_db::SourceDatabase + CheckCanceled {
fn line_index(&self, file_id: FileId) -> Arc<LineIndex>;
}
fn line_index(db: &impl ra_db::FilesDatabase, file_id: FileId) -> Arc<LineIndex> {
fn line_index(db: &impl ra_db::SourceDatabase, file_id: FileId) -> Arc<LineIndex> {
let text = db.file_text(file_id);
Arc::new(LineIndex::new(&*text))
}

View file

@ -1,4 +1,4 @@
use ra_db::FilesDatabase;
use ra_db::SourceDatabase;
use ra_syntax::{
SyntaxNode, AstNode, SourceFile,
ast, algo::find_covering_node,

View file

@ -1,4 +1,4 @@
use ra_db::{FileId, FilesDatabase};
use ra_db::{FileId, SourceDatabase};
use ra_syntax::{
AstNode, ast,
algo::find_node_at_offset,

View file

@ -1,4 +1,4 @@
use ra_db::FilesDatabase;
use ra_db::SourceDatabase;
use ra_syntax::{
AstNode, SyntaxNode, TreeArc, ast,
algo::{find_covering_node, find_node_at_offset, find_leaf_at_offset, visit::{visitor, Visitor}},

View file

@ -4,7 +4,7 @@ use hir::{
self, Problem, source_binder
};
use ra_db::{
FilesDatabase, SourceRoot, SourceRootId,
SourceDatabase, SourceRoot, SourceRootId,
salsa::{Database, SweepStrategy},
};
use ra_ide_api_light::{self, assists, LocalEdit, Severity};

View file

@ -34,7 +34,7 @@ use std::{fmt, sync::Arc};
use ra_syntax::{SourceFile, TreeArc, TextRange, TextUnit};
use ra_text_edit::TextEdit;
use ra_db::{
FilesDatabase, CheckCanceled,
SourceDatabase, CheckCanceled,
salsa::{self, ParallelDatabase},
};
use rayon::prelude::*;

View file

@ -17,7 +17,7 @@ use crate::{
SourceChange,
SourceFileEdit,
};
use ra_db::FilesDatabase;
use ra_db::SourceDatabase;
use relative_path::RelativePath;
pub(crate) fn rename(

View file

@ -3,7 +3,7 @@ use ra_syntax::{
TextRange, SyntaxNode,
ast::{self, AstNode, NameOwner, ModuleItemOwner},
};
use ra_db::FilesDatabase;
use ra_db::SourceDatabase;
use crate::{db::RootDatabase, FileId};

View file

@ -34,7 +34,7 @@ use ra_syntax::{
ast::{self, NameOwner},
};
use ra_db::{
SourceRootId, FilesDatabase,
SourceRootId, SourceDatabase,
salsa::{self, ParallelDatabase},
};
use rayon::prelude::*;

View file

@ -1,5 +1,5 @@
use ra_syntax::{ast, AstNode,};
use ra_db::FilesDatabase;
use ra_db::SourceDatabase;
use crate::{
FileId, HighlightedRange,