language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 15:15:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add DocumentData to represent in-memory document with LSP info

Browse source
This commit is contained in:
kjeremy 2020-07-24 09:01:48 -04:00
parent 0e5095d3ca
commit 48da2d4c16
4 changed files with 26 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/rust-analyzer/src/global_state.rs
View file

@ -17,6 +17,7 @@ use rustc_hash::FxHashMap;
use crate::{
config::Config,
diagnostics::{CheckFixes, DiagnosticCollection},
document::DocumentData,
from_proto,
line_endings::LineEndings,
main_loop::Task,
@ -69,7 +70,7 @@ pub(crate) struct GlobalState {
pub(crate) config: Config,
pub(crate) analysis_host: AnalysisHost,
pub(crate) diagnostics: DiagnosticCollection,
pub(crate) mem_docs: FxHashMap<VfsPath, Option<i64>>,
pub(crate) mem_docs: FxHashMap<VfsPath, DocumentData>,
pub(crate) vfs: Arc<RwLock<(vfs::Vfs, FxHashMap<FileId, LineEndings>)>>,
pub(crate) status: Status,
pub(crate) source_root_config: SourceRootConfig,
@ -84,7 +85,7 @@ pub(crate) struct GlobalStateSnapshot {
pub(crate) analysis: Analysis,
pub(crate) check_fixes: CheckFixes,
pub(crate) latest_requests: Arc<RwLock<LatestRequests>>,
mem_docs: FxHashMap<VfsPath, Option<i64>>,
mem_docs: FxHashMap<VfsPath, DocumentData>,
vfs: Arc<RwLock<(vfs::Vfs, FxHashMap<FileId, LineEndings>)>>,
pub(crate) workspaces: Arc<Vec<ProjectWorkspace>>,
}
@ -259,7 +260,7 @@ impl GlobalStateSnapshot {
pub(crate) fn url_file_version(&self, url: &Url) -> Option<i64> {
let path = from_proto::vfs_path(&url).ok()?;
self.mem_docs.get(&path).copied()?
self.mem_docs.get(&path)?.version
}
pub(crate) fn anchored_path(&self, file_id: FileId, path: &str) -> Url {