Public/nushell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

explore: stop drilling down into scalar values

Browse Source
This commit is contained in:
Reilly Wood 2024-07-03 18:07:34 -07:00
parent 3fae77209a
commit 274fe5d3a3
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
crates/nu-explore/src/views/record/mod.rs
View File

@ -20,7 +20,7 @@ use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
use nu_color_config::StyleComputer; use nu_color_config::StyleComputer;
use nu_protocol::{ use nu_protocol::{
engine::{EngineState, Stack}, engine::{EngineState, Stack},
Config, Record, Span, Value, Config, Record, Value,
}; };
use ratatui::{layout::Rect, widgets::Block}; use ratatui::{layout::Rect, widgets::Block};
use std::collections::HashMap; use std::collections::HashMap;
@ -122,7 +122,7 @@ impl RecordView {
self.mode = UIMode::View; self.mode = UIMode::View;
} }
pub fn get_current_value(&self) -> Value { pub fn get_current_value(&self) -> &Value {
let Position { row, column } = self.get_cursor_position(); let Position { row, column } = self.get_cursor_position();
let layer = self.get_layer_last(); let layer = self.get_layer_last();
@ -131,13 +131,11 @@ impl RecordView {
Orientation::Left => (column, row), Orientation::Left => (column, row),
}; };
if row >= layer.record_values.len() || column >= layer.column_names.len() { // These should never happen as long as the cursor is working correctly
// actually must never happen; unless cursor works incorrectly assert!(row < layer.record_values.len(), "row out of bounds");
// if being sure about cursor it can be deleted; assert!(column < layer.column_names.len(), "column out of bounds");
return Value::nothing(Span::unknown());
}
layer.record_values[row][column].clone() &layer.record_values[row][column]
} }
fn create_table_widget<'a>(&'a mut self, cfg: ViewConfig<'a>) -> TableWidget<'a> { fn create_table_widget<'a>(&'a mut self, cfg: ViewConfig<'a>) -> TableWidget<'a> {
@ -559,16 +557,24 @@ fn handle_key_event_cursor_mode(
Ok(Some(Transition::Ok)) Ok(Some(Transition::Ok))
} }
// Try to "drill down" into the selected value
KeyCode::Enter => { KeyCode::Enter => {
let value = view.get_current_value(); let value = view.get_current_value();
// ...but it only makes sense to drill down into a few types of values
if !matches!(
value,
Value::Record { .. } | Value::List { .. } | Value::Custom { .. }
) {
return Ok(None);
}
let is_record = matches!(value, Value::Record { .. }); let is_record = matches!(value, Value::Record { .. });
let next_layer = create_layer(value)?; let next_layer = create_layer(value.clone())?;
push_layer(view, next_layer); push_layer(view, next_layer);
if is_record { if is_record {
view.set_orientation_current(Orientation::Left); view.set_orientation_current(Orientation::Left);
} else if view.orientation == view.get_layer_last().orientation {
view.get_layer_last_mut().orientation = view.orientation;
} else { } else {
view.set_orientation_current(view.orientation); view.set_orientation_current(view.orientation);
} }
@ -648,7 +654,7 @@ fn highlight_selected_cell(f: &mut Frame, info: ElementInfo, cfg: &ExploreConfig
fn build_last_value(v: &RecordView) -> Value { fn build_last_value(v: &RecordView) -> Value {
if v.mode == UIMode::Cursor { if v.mode == UIMode::Cursor {
v.get_current_value() v.get_current_value().clone()
} else if v.get_layer_last().count_rows() < 2 { } else if v.get_layer_last().count_rows() < 2 {
build_table_as_record(v) build_table_as_record(v)
} else { } else {