extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-11-29 03:44:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make only_buffer_difference: true work (#11488)

Browse Source
This commit is contained in:
Yash Thakur 2024-01-11 12:58:14 -05:00 committed by GitHub
parent bd07f7b302
commit 0ebbc8f71c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 46 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -4375,7 +4375,7 @@ dependencies = [
[[package]] [[package]]
name = "reedline" name = "reedline"
version = "0.28.0" version = "0.28.0"
source = "git+https://github.com/nushell/reedline.git?branch=main#3e2c0fef3b0bf6bff2ab8c8853a4f0bb8c1d53f1" source = "git+https://github.com/nushell/reedline.git?branch=main#0c5f9817465df3c80e062dd1b5b05bdd91924b83"
dependencies = [ dependencies = [
"chrono", "chrono",
"crossterm", "crossterm",

44
crates/nu-cli/src/completions/completer.rs
View File

@ -110,10 +110,16 @@ impl NuCompleter {
fn completion_helper(&mut self, line: &str, pos: usize) -> Vec<Suggestion> { fn completion_helper(&mut self, line: &str, pos: usize) -> Vec<Suggestion> {
let mut working_set = StateWorkingSet::new(&self.engine_state); let mut working_set = StateWorkingSet::new(&self.engine_state);
let offset = working_set.next_span_start(); let offset = working_set.next_span_start();
// TODO: Callers should be trimming the line themselves
let line = if line.len() > pos { &line[..pos] } else { line };
// Adjust offset so that the spans of the suggestions will start at the right
// place even with `only_buffer_difference: true`
let fake_offset = offset + line.len() - pos;
let pos = offset + line.len();
let initial_line = line.to_string(); let initial_line = line.to_string();
let mut line = line.to_string(); let mut line = line.to_string();
line.insert(pos, 'a'); line.push('a');
let pos = offset + pos;
let config = self.engine_state.get_config(); let config = self.engine_state.get_config();
let output = parse(&mut working_set, Some("completer"), line.as_bytes(), false); let output = parse(&mut working_set, Some("completer"), line.as_bytes(), false);
@ -186,7 +192,7 @@ impl NuCompleter {
&working_set, &working_set,
prefix, prefix,
new_span, new_span,
offset, fake_offset,
pos, pos,
); );
} }
@ -200,7 +206,7 @@ impl NuCompleter {
&working_set, &working_set,
prefix.clone(), prefix.clone(),
new_span, new_span,
offset, fake_offset,
pos, pos,
); );
@ -211,9 +217,12 @@ impl NuCompleter {
// We got no results for internal completion // We got no results for internal completion
// now we can check if external completer is set and use it // now we can check if external completer is set and use it
if let Some(block_id) = config.external_completer { if let Some(block_id) = config.external_completer {
if let Some(external_result) = self if let Some(external_result) = self.external_completion(
.external_completion(block_id, &spans, offset, new_span) block_id,
{ &spans,
fake_offset,
new_span,
) {
return external_result; return external_result;
} }
} }
@ -237,7 +246,7 @@ impl NuCompleter {
&working_set, &working_set,
prefix, prefix,
new_span, new_span,
offset, fake_offset,
pos, pos,
); );
} }
@ -262,7 +271,7 @@ impl NuCompleter {
&working_set, &working_set,
prefix, prefix,
new_span, new_span,
offset, fake_offset,
pos, pos,
); );
} else if prev_expr_str == b"ls" { } else if prev_expr_str == b"ls" {
@ -274,7 +283,7 @@ impl NuCompleter {
&working_set, &working_set,
prefix, prefix,
new_span, new_span,
offset, fake_offset,
pos, pos,
); );
} }
@ -296,7 +305,7 @@ impl NuCompleter {
&working_set, &working_set,
prefix, prefix,
new_span, new_span,
offset, fake_offset,
pos, pos,
); );
} }
@ -309,7 +318,7 @@ impl NuCompleter {
&working_set, &working_set,
prefix, prefix,
new_span, new_span,
offset, fake_offset,
pos, pos,
); );
} }
@ -322,7 +331,7 @@ impl NuCompleter {
&working_set, &working_set,
prefix, prefix,
new_span, new_span,
offset, fake_offset,
pos, pos,
); );
} }
@ -341,7 +350,7 @@ impl NuCompleter {
&working_set, &working_set,
prefix.clone(), prefix.clone(),
new_span, new_span,
offset, fake_offset,
pos, pos,
); );
@ -352,7 +361,10 @@ impl NuCompleter {
// Try to complete using an external completer (if set) // Try to complete using an external completer (if set)
if let Some(block_id) = config.external_completer { if let Some(block_id) = config.external_completer {
if let Some(external_result) = self.external_completion( if let Some(external_result) = self.external_completion(
block_id, &spans, offset, new_span, block_id,
&spans,
fake_offset,
new_span,
) { ) {
return external_result; return external_result;
} }
@ -366,7 +378,7 @@ impl NuCompleter {
&working_set, &working_set,
prefix, prefix,
new_span, new_span,
offset, fake_offset,
pos, pos,
); );

18
crates/nu-cli/src/menus/description_menu.rs
View File

@ -482,23 +482,27 @@ impl Menu for DescriptionMenu {
/// Updates menu values /// Updates menu values
fn update_values(&mut self, editor: &mut Editor, completer: &mut dyn Completer) { fn update_values(&mut self, editor: &mut Editor, completer: &mut dyn Completer) {
if self.only_buffer_difference { self.values = if self.only_buffer_difference {
if let Some(old_string) = &self.input { if let Some(old_string) = &self.input {
let (start, input) = string_difference(editor.get_buffer(), old_string); let (start, input) = string_difference(editor.get_buffer(), old_string);
if !input.is_empty() { if !input.is_empty() {
self.reset_position(); completer.complete(input, start + input.len())
self.values = completer.complete(input, start); } else {
completer.complete("", editor.line_buffer().insertion_point())
} }
} else {
completer.complete("", editor.line_buffer().insertion_point())
} }
} else { } else {
let trimmed_buffer = editor.get_buffer().replace('\n', " "); let trimmed_buffer = editor.get_buffer().replace('\n', " ");
self.values = completer.complete( completer.complete(
trimmed_buffer.as_str(), &trimmed_buffer.as_str()[..editor.line_buffer().insertion_point()],
editor.line_buffer().insertion_point(), editor.line_buffer().insertion_point(),
); )
};
self.reset_position(); self.reset_position();
} }
}
/// The working details for the menu changes based on the size of the lines /// The working details for the menu changes based on the size of the lines
/// collected from the completer /// collected from the completer

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

@ -550,7 +550,7 @@ impl LanguageServer {
let location = let location =
Self::lsp_position_to_location(&params.text_document_position.position, rope_of_file); Self::lsp_position_to_location(&params.text_document_position.position, rope_of_file);
let results = completer.complete(&rope_of_file.to_string(), location); let results = completer.complete(&rope_of_file.to_string()[..location], location);
if results.is_empty() { if results.is_empty() {
None None
} else { } else {

5
src/ide.rs
View File

@ -607,7 +607,10 @@ pub fn complete(engine_reference: Arc<EngineState>, file_path: &str, location: &
}); });
if let Ok(location) = location.as_i64() { if let Ok(location) = location.as_i64() {
let results = completer.complete(&String::from_utf8_lossy(&file), location as usize); let results = completer.complete(
&String::from_utf8_lossy(&file)[..location as usize],
location as usize,
);
print!("{{\"completions\": ["); print!("{{\"completions\": [");
let mut first = true; let mut first = true;
for result in results { for result in results {