syntaxAlchemist/lib-nested
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Activity

PTYListEditor: move style into node constructor

Browse source
This commit is contained in:
Michael Sippel 2023-02-11 12:03:37 +01:00
parent 4afdb61b87
commit d43d99c6d3
Signed by: senvas
GPG key ID: F96CF119C34B64A6
3 changed files with 29 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
nested/src/integer/editor.rs
View file

@ -125,13 +125,14 @@ impl PosIntEditor {
TypeTerm::Num(radix as i64)
]
},
None,
0
).into_node(
match radix {
16 => SeqDecorStyle::Hex,
_ => SeqDecorStyle::Plain
},
None,
0
).into_node()
}
)
}
}

60
nested/src/list/pty_editor.rs
View file

@ -26,12 +26,7 @@ use {
pub struct PTYListEditor {
pub editor: Arc<RwLock<ListEditor>>,
split_char: Option<char>,
style: SeqDecorStyle,
depth: usize,
pub diag: OuterViewPort<dyn SequenceView<Item = crate::diagnostics::Message>>,
pub view: OuterViewPort<dyn TerminalView>
depth: usize
}
//<<<<>>>><<>><><<>><<<*>>><<>><><<>><<<<>>>>
@ -40,27 +35,38 @@ impl PTYListEditor {
pub fn new(
ctx: Arc<RwLock<Context>>,
typ: TypeTerm,
style: SeqDecorStyle,
split_char: Option<char>,
depth: usize
) -> Self {
Self::from_editor(
ListEditor::new(ctx, typ, depth), style, split_char, depth)
ListEditor::new(ctx, typ, depth), split_char, depth)
}
pub fn from_editor(
editor: ListEditor,
style: SeqDecorStyle,
split_char: Option<char>,
depth: usize
) -> Self {
PTYListEditor {
split_char,
style,
depth,
editor: Arc::new(RwLock::new(editor)),
}
}
view: editor.get_seg_seq_view().pty_decorate(style, depth),
diag: editor.get_data_port()
pub fn into_node(self, style: SeqDecorStyle) -> NestedNode {
let editor = Arc::new(RwLock::new(self));
let ed = editor.read().unwrap();
let edd = ed.editor.read().unwrap();
NestedNode::new()
.set_cmd(editor.clone())
.set_nav(ed.editor.clone())
.set_ctx(edd.ctx.clone())
.set_view(edd.get_seg_seq_view().pty_decorate(style, ed.depth))
.set_diag(
edd.get_data_port()
.enumerate()
.map(
|(idx, item_editor)| {
@ -76,45 +82,25 @@ impl PTYListEditor {
)
}
)
.flatten(),
editor: Arc::new(RwLock::new(editor)),
}
.flatten()
)
}
pub fn into_node(self) -> NestedNode {
let editor = Arc::new(RwLock::new(self));
let ed = editor.read().unwrap();
let edd = ed.editor.read().unwrap();
NestedNode::new()
.set_cmd(editor.clone())
.set_nav(ed.editor.clone())
.set_ctx(edd.ctx.clone())
.set_diag(ed.diag.clone())
.set_view(ed.view.clone())
}
pub fn get_data_port(&self) -> OuterViewPort<dyn SequenceView<Item = NestedNode>> {
self.editor.read().unwrap().get_data_port()
}
pub fn clear(&mut self) {
self.editor.write().unwrap().clear();
}
pub fn get_item(&self) -> Option<NestedNode> {
self.editor.read().unwrap().get_item()
}
pub fn set_depth(&mut self, depth: usize) {
self.depth = depth;
}
pub fn set_style(&mut self, style: SeqDecorStyle) {
self.style = style;
}
}
impl Commander for PTYListEditor {

3
nested/src/type_system/make_editor.rs
View file

@ -74,10 +74,9 @@ pub fn init_editor_ctx(parent: Arc<RwLock<Context>>) -> Arc<RwLock<Context>> {
PTYListEditor::new(
ctx.clone(),
args[0].clone(),
style,
delim,
depth
).into_node()
).into_node(style)
)
} else {
None