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

rename ParsedFile -> File

Browse source
This commit is contained in:
Aleksey Kladov 2018-08-25 11:44:58 +03:00
parent cf278ed3bf
commit 220d285b4a
11 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/libanalysis/src/lib.rs
View file

@ -27,7 +27,7 @@ use std::{
};
use libsyntax2::{
ParsedFile,
File,
TextUnit, TextRange, SmolStr,
ast::{self, AstNode, NameOwner},
SyntaxKind::*,
@ -132,7 +132,7 @@ impl WorldState {
impl World {
pub fn file_syntax(&self, file_id: FileId) -> Result<ParsedFile> {
pub fn file_syntax(&self, file_id: FileId) -> Result<File> {
let data = self.file_data(file_id)?;
Ok(data.syntax().clone())
}
@ -265,7 +265,7 @@ struct WorldData {
struct FileData {
text: String,
symbols: OnceCell<FileSymbols>,
syntax: OnceCell<ParsedFile>,
syntax: OnceCell<File>,
lines: OnceCell<LineIndex>,
}
@ -279,14 +279,14 @@ impl FileData {
}
}
fn syntax(&self) -> &ParsedFile {
fn syntax(&self) -> &File {
self.syntax
.get_or_init(|| ParsedFile::parse(&self.text))
.get_or_init(|| File::parse(&self.text))
}
fn syntax_transient(&self) -> ParsedFile {
fn syntax_transient(&self) -> File {
self.syntax.get().map(|s| s.clone())
.unwrap_or_else(|| ParsedFile::parse(&self.text))
.unwrap_or_else(|| File::parse(&self.text))
}
fn symbols(&self) -> &FileSymbols {