language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 22:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

remove SyntaxPtrDatabase

Browse source
This commit is contained in:
Aleksey Kladov 2018-11-01 13:15:11 +03:00
parent 2b210d98b8
commit 2050812cad
4 changed files with 12 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/ra_analysis/src/db.rs
View file

@ -1,7 +1,7 @@
use std::sync::Arc;
use ra_editor::LineIndex;
use ra_syntax::File;
use ra_syntax::{File, SyntaxNode};
use salsa;
use crate::{
@ -11,7 +11,7 @@ use crate::{
SubmodulesQuery,
},
symbol_index::SymbolIndex,
syntax_ptr::{ResolveSyntaxPtrQuery, SyntaxPtrDatabase},
syntax_ptr::SyntaxPtr,
Cancelable, Canceled, FileId,
};
@ -62,6 +62,7 @@ salsa::database_storage! {
fn file_syntax() for FileSyntaxQuery;
fn file_lines() for FileLinesQuery;
fn file_symbols() for FileSymbolsQuery;
fn resolve_syntax_ptr() for ResolveSyntaxPtrQuery;
}
impl DescriptorDatabase {
fn module_tree() for ModuleTreeQuery;
@ -70,9 +71,6 @@ salsa::database_storage! {
fn fn_syntax() for FnSyntaxQuery;
fn fn_scopes() for FnScopesQuery;
}
impl SyntaxPtrDatabase {
fn resolve_syntax_ptr() for ResolveSyntaxPtrQuery;
}
}
}
@ -87,6 +85,12 @@ salsa::query_group! {
fn file_symbols(file_id: FileId) -> Cancelable<Arc<SymbolIndex>> {
type FileSymbolsQuery;
}
fn resolve_syntax_ptr(ptr: SyntaxPtr) -> SyntaxNode {
type ResolveSyntaxPtrQuery;
// Don't retain syntax trees in memory
storage volatile;
use fn crate::syntax_ptr::resolve_syntax_ptr;
}
}
}