caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-14 04:56:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Also hash syntax tree in source

Browse Source
This commit is contained in:
Laurenz 2022-10-14 13:24:38 +02:00
parent 0a0feb75fe
commit 86990d2287
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/source.rs
View File

@ -23,7 +23,7 @@ pub struct Source {
path: PathBuf, path: PathBuf,
text: Prehashed<String>, text: Prehashed<String>,
lines: Vec<Line>, lines: Vec<Line>,
root: SyntaxNode, root: Prehashed<SyntaxNode>,
} }
impl Source { impl Source {
@ -39,9 +39,9 @@ impl Source {
Self { Self {
id, id,
path: path.normalize(), path: path.normalize(),
root,
text: Prehashed::new(text), text: Prehashed::new(text),
lines, lines,
root: Prehashed::new(root),
} }
} }
@ -53,7 +53,9 @@ impl Source {
/// Create a source file with the same synthetic span for all nodes. /// Create a source file with the same synthetic span for all nodes.
pub fn synthesized(text: impl Into<String>, span: Span) -> Self { pub fn synthesized(text: impl Into<String>, span: Span) -> Self {
let mut file = Self::detached(text); let mut file = Self::detached(text);
file.root.synthesize(span); let mut root = file.root.into_inner();
root.synthesize(span);
file.root = Prehashed::new(root);
file.id = span.source(); file.id = span.source();
file file
} }
@ -98,8 +100,9 @@ impl Source {
self.text = Prehashed::new(text); self.text = Prehashed::new(text);
self.lines = vec![Line { byte_idx: 0, utf16_idx: 0 }]; self.lines = vec![Line { byte_idx: 0, utf16_idx: 0 }];
self.lines.extend(lines(0, 0, &self.text)); self.lines.extend(lines(0, 0, &self.text));
self.root = parse(&self.text); let mut root = parse(&self.text);
self.root.numberize(self.id(), Span::FULL).unwrap(); root.numberize(self.id(), Span::FULL).unwrap();
self.root = Prehashed::new(root);
} }
/// Edit the source file by replacing the given range and increase the /// Edit the source file by replacing the given range and increase the
@ -129,7 +132,10 @@ impl Source {
.extend(lines(start_byte, start_utf16, &self.text[start_byte ..])); .extend(lines(start_byte, start_utf16, &self.text[start_byte ..]));
// Incrementally reparse the replaced range. // Incrementally reparse the replaced range.
reparse(&mut self.root, &self.text, replace, with.len()) let mut root = std::mem::take(&mut self.root).into_inner();
let range = reparse(&mut root, &self.text, replace, with.len());
self.root = Prehashed::new(root);
range
} }
/// Get the length of the file in UTF-8 encoded bytes. /// Get the length of the file in UTF-8 encoded bytes.
@ -249,6 +255,7 @@ impl Hash for Source {
self.id.hash(state); self.id.hash(state);
self.path.hash(state); self.path.hash(state);
self.text.hash(state); self.text.hash(state);
self.root.hash(state);
} }
} }
@ -399,8 +406,8 @@ mod tests {
let result = Source::detached(after); let result = Source::detached(after);
source.edit(range, with); source.edit(range, with);
assert_eq!(source.text, result.text); assert_eq!(source.text, result.text);
assert_eq!(source.root, result.root);
assert_eq!(source.lines, result.lines); assert_eq!(source.lines, result.lines);
assert_eq!(*source.root, *result.root);
} }
// Test inserting at the begining. // Test inserting at the begining.