extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-09 11:45:50 +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

25
crates/nu-lsp/src/lib.rs
View File

@ -284,11 +284,15 @@ impl LanguageServer {
if let Some(block_id) = working_set.get_decl(decl_id).get_block_id() {
let block = working_set.get_block(block_id);
if let Some(span) = &block.span {
for (file_path, file_start, file_end) in working_set.files() {
if span.start >= *file_start && span.start < *file_end {
for cached_file in working_set.files() {
if cached_file.covered_span.contains(span.start) {
return Some(GotoDefinitionResponse::Scalar(Location {
uri: Url::from_file_path(&**file_path).ok()?,
range: Self::span_to_range(span, file, *file_start),
uri: Url::from_file_path(&*cached_file.name).ok()?,
range: Self::span_to_range(
span,
file,
cached_file.covered_span.start,
),
}));
}
}
@ -297,9 +301,10 @@ impl LanguageServer {
}
Id::Variable(var_id) => {
let var = working_set.get_variable(var_id);
for (_, file_start, file_end) in working_set.files() {
if var.declaration_span.start >= *file_start
&& var.declaration_span.start < *file_end
for cached_file in working_set.files() {
if cached_file
.covered_span
.contains(var.declaration_span.start)
{
return Some(GotoDefinitionResponse::Scalar(Location {
uri: params
@ -307,7 +312,11 @@ impl LanguageServer {
.text_document
.uri
.clone(),
range: Self::span_to_range(&var.declaration_span, file, *file_start),
range: Self::span_to_range(
&var.declaration_span,
file,
cached_file.covered_span.start,
),
}));
}
}