Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-12-28 14:03:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix slice indexing (#6322)

Browse source 
* Return empty suggestions if no span contents is present

* Fix slice indexing
This commit is contained in:
Daniel Buch Hansen 2022-08-18 12:44:09 +02:00 committed by GitHub
parent 1d18f6947e
commit 4ab468e65f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
crates/nu-cli/src/completions/command_completions.rs
View file

@ -81,6 +81,9 @@ impl CommandCompletion {
match_algorithm: MatchAlgorithm, match_algorithm: MatchAlgorithm,
) -> Vec<Suggestion> { ) -> Vec<Suggestion> {
let partial = working_set.get_span_contents(span); let partial = working_set.get_span_contents(span);
if partial.is_empty() {
return Vec::new();
}
let filter_predicate = |command: &[u8]| match_algorithm.matches_u8(command, partial); let filter_predicate = |command: &[u8]| match_algorithm.matches_u8(command, partial);

11
crates/nu-protocol/src/engine/engine_state.rs
View file

@ -576,8 +576,7 @@ impl EngineState {
return &contents[(span.start - start)..(span.end - start)]; return &contents[(span.start - start)..(span.end - start)];
} }
} }
&[0u8; 0]
panic!("internal error: span missing in file contents cache")
} }
pub fn get_config(&self) -> &Config { pub fn get_config(&self) -> &Config {
@ -1292,7 +1291,13 @@ impl<'a> StateWorkingSet<'a> {
if permanent_end <= span.start { if permanent_end <= span.start {
for (contents, start, finish) in &self.delta.file_contents { for (contents, start, finish) in &self.delta.file_contents {
if (span.start >= *start) && (span.end <= *finish) { if (span.start >= *start) && (span.end <= *finish) {
return &contents[(span.start - start)..(span.end - start)]; let begin = span.start - start;
let mut end = span.end - start;
if begin > end {
end = *finish - permanent_end;
}
return &contents[begin..end];
} }
} }
} else { } else {