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

remove syntax ptr

Browse source
This commit is contained in:
Aleksey Kladov 2018-11-28 02:15:21 +03:00
parent c2abd17f57
commit 201aa7ea2a
2 changed files with 1 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,13 +2,12 @@ use std::sync::Arc;
#[cfg(test)] #[cfg(test)]
use parking_lot::Mutex; use parking_lot::Mutex;
use ra_editor::LineIndex; use ra_editor::LineIndex;
use ra_syntax::{SourceFileNode, SyntaxNode}; use ra_syntax::{SourceFileNode};
use salsa::{self, Database}; use salsa::{self, Database};
use crate::{ use crate::{
hir, hir,
symbol_index::SymbolIndex, symbol_index::SymbolIndex,
syntax_ptr::SyntaxPtr,
loc2id::{IdMaps}, loc2id::{IdMaps},
Cancelable, Canceled, FileId, Cancelable, Canceled, FileId,
}; };
@ -122,7 +121,6 @@ salsa::database_storage! {
fn file_syntax() for FileSyntaxQuery; fn file_syntax() for FileSyntaxQuery;
fn file_lines() for FileLinesQuery; fn file_lines() for FileLinesQuery;
fn file_symbols() for FileSymbolsQuery; fn file_symbols() for FileSymbolsQuery;
fn resolve_syntax_ptr() for ResolveSyntaxPtrQuery;
} }
impl hir::db::HirDatabase { impl hir::db::HirDatabase {
fn module_tree() for hir::db::ModuleTreeQuery; fn module_tree() for hir::db::ModuleTreeQuery;
@ -148,12 +146,6 @@ salsa::query_group! {
fn file_symbols(file_id: FileId) -> Cancelable<Arc<SymbolIndex>> { fn file_symbols(file_id: FileId) -> Cancelable<Arc<SymbolIndex>> {
type FileSymbolsQuery; type FileSymbolsQuery;
} }
fn resolve_syntax_ptr(ptr: SyntaxPtr) -> SyntaxNode {
type ResolveSyntaxPtrQuery;
// Don't retain syntax trees in memory
storage dependencies;
use fn crate::syntax_ptr::resolve_syntax_ptr;
}
} }
} }

17
crates/ra_analysis/src/syntax_ptr.rs
View file

@ -1,22 +1,5 @@
use ra_syntax::{SourceFileNode, SyntaxKind, SyntaxNode, SyntaxNodeRef, TextRange}; use ra_syntax::{SourceFileNode, SyntaxKind, SyntaxNode, SyntaxNodeRef, TextRange};
use crate::db::SyntaxDatabase;
use crate::FileId;
pub(crate) fn resolve_syntax_ptr(db: &impl SyntaxDatabase, ptr: SyntaxPtr) -> SyntaxNode {
let syntax = db.file_syntax(ptr.file_id);
ptr.local.resolve(&syntax)
}
/// SyntaxPtr is a cheap `Copy` id which identifies a particular syntax node,
/// without retaining syntax tree in memory. You need to explicitly `resolve`
/// `SyntaxPtr` to get a `SyntaxNode`
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub(crate) struct SyntaxPtr {
file_id: FileId,
local: LocalSyntaxPtr,
}
/// A pionter to a syntax node inside a file. /// A pionter to a syntax node inside a file.
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub(crate) struct LocalSyntaxPtr { pub(crate) struct LocalSyntaxPtr {