extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-09 08:16:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor source cache into CachedFile struct (#12240)

Browse Source 
# Description
Get rid of two parallel `Vec`s in `StateDelta` and `EngineState`, that
also duplicated span information. Use a struct with documenting fields.

Also use `Arc<str>` and `Arc<[u8]>` for the allocations as they are
never modified and cloned often (see #12229 for the first improvement).
This also makes the representation more compact as no capacity is
necessary.

# User-Facing Changes
API breakage on `EngineState`/`StateWorkingSet`/`StateDelta` that should
not really affect plugin authors.
This commit is contained in:
Stefan Holderbach
2024-03-20 19:43:50 +01:00
committed by GitHub
parent 63335e99ae
commit ec528c0626
10 changed files with 133 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ide.rs
View File

@ -160,14 +160,14 @@ pub fn goto_def(engine_state: &mut EngineState, file_path: &str, location: &Valu
let block = working_set.get_block(block_id);
if let Some(span) = &block.span {
for file in working_set.files() {
if span.start >= file.1 && span.start < file.2 {
if file.covered_span.contains(span.start) {
println!(
"{}",
json!(
{
"file": &**file.0,
"start": span.start - file.1,
"end": span.end - file.1
"file": &*file.name,
"start": span.start - file.covered_span.start,
"end": span.end - file.covered_span.start,
}
)
);
@ -180,14 +180,14 @@ pub fn goto_def(engine_state: &mut EngineState, file_path: &str, location: &Valu
Some((Id::Variable(var_id), ..)) => {
let var = working_set.get_variable(var_id);
for file in working_set.files() {
if var.declaration_span.start >= file.1 && var.declaration_span.start < file.2 {
if file.covered_span.contains(var.declaration_span.start) {
println!(
"{}",
json!(
{
"file": &**file.0,
"start": var.declaration_span.start - file.1,
"end": var.declaration_span.end - file.1
"file": &*file.name,
"start": var.declaration_span.start - file.covered_span.start,
"end": var.declaration_span.end - file.covered_span.start,
}
)
);