youwen/iamb
1
0
Fork 0
mirror of https://github.com/youwen5/iamb.git synced 2025-06-20 21:59:52 -07:00
Code Issues Projects Releases Packages Wiki Activity

Update modalkit dependencies (#204)

Browse source
This commit is contained in:
Ulyssa 2024-02-27 21:21:05 -08:00 • committed by GitHub
parent 1cb280df8b
commit 1325295d2b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
19 changed files with 199 additions and 235 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/windows/mod.rs
View file

@ -24,7 +24,7 @@ use matrix_sdk::{
},
};
use modalkit::tui::{
use ratatui::{
buffer::Buffer,
layout::{Alignment, Rect},
style::{Modifier as StyleModifier, Style},
@ -48,25 +48,17 @@ use modalkit::{
UIError,
WindowAction,
},
base::{
CloseFlags,
MoveDir1D,
OpenTarget,
PositionList,
ScrollStyle,
ViewportContext,
WordStyle,
WriteFlags,
},
completion::CompletionList,
},
widgets::{
list::{List, ListCursor, ListItem, ListState},
TermOffset,
TerminalCursor,
Window,
WindowOps,
},
prelude::*,
};
use modalkit_ratatui::{
list::{List, ListCursor, ListItem, ListState},
TermOffset,
TerminalCursor,
Window,
WindowOps,
};
use crate::base::{
@ -281,7 +273,6 @@ fn room_prompt(
Err(err)
},
_ => Err(EditError::Unimplemented("unknown prompt action".to_string())),
}
}
@ -1332,7 +1323,6 @@ impl Promptable<ProgramContext, ProgramStore, IambInfo> for VerifyItem {
Err(err)
},
_ => Err(EditError::Unimplemented("unknown prompt action".to_string())),
}
}
}
@ -1428,7 +1418,6 @@ impl Promptable<ProgramContext, ProgramStore, IambInfo> for MemberItem {
Err(err)
},
_ => Err(EditError::Unimplemented("unknown prompt action".to_string())),
}
}
}

28
src/windows/room/chat.rs
View file

@ -31,17 +31,20 @@ use matrix_sdk::{
},
};
use modalkit::{
input::dialog::{MultiChoice, MultiChoiceItem, PromptYesNo},
tui::{
buffer::Buffer,
layout::Rect,
text::{Line, Span},
widgets::{Paragraph, StatefulWidget, Widget},
},
widgets::textbox::{TextBox, TextBoxState},
widgets::TerminalCursor,
widgets::{PromptActions, WindowOps},
use ratatui::{
buffer::Buffer,
layout::Rect,
text::{Line, Span},
widgets::{Paragraph, StatefulWidget, Widget},
};
use modalkit::keybindings::dialog::{MultiChoice, MultiChoiceItem, PromptYesNo};
use modalkit_ratatui::{
textbox::{TextBox, TextBoxState},
PromptActions,
TerminalCursor,
WindowOps,
};
use modalkit::editing::{
@ -59,12 +62,12 @@ use modalkit::editing::{
Scrollable,
UIError,
},
base::{CloseFlags, Count, MoveDir1D, PositionList, ScrollStyle, WordStyle, WriteFlags},
completion::CompletionList,
context::Resolve,
history::{self, HistoryList},
rope::EditRope,
};
use modalkit::prelude::*;
use crate::base::{
DownloadFlags,
@ -811,7 +814,6 @@ impl Promptable<ProgramContext, ProgramStore, IambInfo> for ChatState {
PromptAction::Recall(dir, count, prefixed) => {
self.recall(dir, count, *prefixed, ctx, store)
},
_ => Err(EditError::Unimplemented("unknown prompt action".to_string())),
}
}
}

21
src/windows/room/mod.rs
View file

@ -11,7 +11,7 @@ use matrix_sdk::{
DisplayName,
};
use modalkit::tui::{
use ratatui::{
buffer::Buffer,
layout::{Alignment, Rect},
style::{Modifier as StyleModifier, Style},
@ -19,6 +19,7 @@ use modalkit::tui::{
widgets::{Paragraph, StatefulWidget, Widget},
};
use modalkit::prelude::*;
use modalkit::{
editing::action::{
Action,
@ -32,22 +33,10 @@ use modalkit::{
Scrollable,
UIError,
},
editing::base::{
Axis,
CloseFlags,
Count,
MoveDir1D,
OpenTarget,
PositionList,
ScrollStyle,
WordStyle,
WriteFlags,
},
editing::completion::CompletionList,
input::dialog::PromptYesNo,
input::InputContext,
widgets::{TermOffset, TerminalCursor, WindowOps},
keybindings::dialog::PromptYesNo,
};
use modalkit_ratatui::{TermOffset, TerminalCursor, WindowOps};
use crate::base::{
IambAction,
@ -253,7 +242,7 @@ impl RoomState {
width.into(),
);
Ok(vec![(act, cmd.context.take())])
Ok(vec![(act, cmd.context.clone())])
},
RoomAction::Set(field, value) => {
let room = store

65
src/windows/room/scrollback.rs
View file

@ -5,14 +5,14 @@ use regex::Regex;
use matrix_sdk::ruma::OwnedRoomId;
use modalkit::tui::{
use modalkit_ratatui::{ScrollActions, TerminalCursor, WindowOps};
use ratatui::{
buffer::Buffer,
layout::{Alignment, Rect},
style::{Modifier as StyleModifier, Style},
text::{Line, Span},
widgets::{Paragraph, StatefulWidget, Widget},
};
use modalkit::widgets::{ScrollActions, TerminalCursor, WindowOps};
use modalkit::editing::{
action::{
@ -36,40 +36,14 @@ use modalkit::editing::{
UIError,
UIResult,
},
base::{
Axis,
CloseFlags,
CompletionDisplay,
CompletionSelection,
CompletionType,
Count,
EditRange,
EditTarget,
Mark,
MoveDir1D,
MoveDir2D,
MoveDirMod,
MovePosition,
MoveTerminus,
MoveType,
PositionList,
RangeType,
Register,
ScrollSize,
ScrollStyle,
SearchType,
TargetShape,
ViewportContext,
WordStyle,
WriteFlags,
},
completion::CompletionList,
context::{EditContext, Resolve},
context::Resolve,
cursor::{CursorGroup, CursorState},
history::HistoryList,
rope::EditRope,
store::{RegisterCell, RegisterPutFlags},
};
use modalkit::prelude::*;
use crate::{
base::{
@ -620,15 +594,9 @@ impl EditorActions<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
let dir = ctx.get_search_regex_dir();
let dir = flip.resolve(&dir);
let needle = match ctx.get_search_regex() {
Some(re) => re,
None => {
let lsearch = store.registers.get(&Register::LastSearch)?;
let lsearch = lsearch.value.to_string();
Regex::new(lsearch.as_ref())?
},
};
let lsearch = store.registers.get(&Register::LastSearch)?;
let lsearch = lsearch.value.to_string();
let needle = Regex::new(lsearch.as_ref())?;
let (mc, needs_load) = self.find_message(key, dir, &needle, count, info);
if needs_load {
@ -706,15 +674,9 @@ impl EditorActions<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
let dir = ctx.get_search_regex_dir();
let dir = flip.resolve(&dir);
let needle = match ctx.get_search_regex() {
Some(re) => re,
None => {
let lsearch = store.registers.get(&Register::LastSearch)?;
let lsearch = lsearch.value.to_string();
Regex::new(lsearch.as_ref())?
},
};
let lsearch = store.registers.get(&Register::LastSearch)?;
let lsearch = lsearch.value.to_string();
let needle = Regex::new(lsearch.as_ref())?;
let (mc, needs_load) = self.find_message(key, dir, &needle, count, info);
if needs_load {
@ -833,7 +795,6 @@ impl EditorActions<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
HistoryAction::Checkpoint => Ok(None),
HistoryAction::Undo(_) => Err(EditError::Failure("Nothing to undo".into())),
HistoryAction::Redo(_) => Err(EditError::Failure("Nothing to redo".into())),
_ => Err(EditError::Unimplemented(format!("Unknown action: {act:?}"))),
}
}
@ -1013,12 +974,6 @@ impl Promptable<ProgramContext, ProgramStore, IambInfo> for ScrollbackState {
let msg = "Cannot recall previous messages.";
let err = EditError::Failure(msg.into());
return Err(err);
},
_ => {
let msg = format!("Messages scrollback doesn't support {act:?}");
let err = EditError::Unimplemented(msg);
return Err(err);
},
}

10
src/windows/room/space.rs
View file

@ -7,7 +7,7 @@ use matrix_sdk::{
ruma::{OwnedRoomId, RoomId},
};
use modalkit::tui::{
use ratatui::{
buffer::Buffer,
layout::Rect,
style::{Color, Style},
@ -15,9 +15,11 @@ use modalkit::tui::{
widgets::StatefulWidget,
};
use modalkit::{
widgets::list::{List, ListState},
widgets::{TermOffset, TerminalCursor, WindowOps},
use modalkit_ratatui::{
list::{List, ListState},
TermOffset,
TerminalCursor,
WindowOps,
};
use crate::base::{IambBufferId, IambInfo, ProgramStore, RoomFocus};

10
src/windows/welcome.rs
View file

@ -1,17 +1,13 @@
//! Welcome Window
use std::ops::{Deref, DerefMut};
use modalkit::tui::{buffer::Buffer, layout::Rect};
use ratatui::{buffer::Buffer, layout::Rect};
use modalkit::{
widgets::textbox::TextBoxState,
widgets::WindowOps,
widgets::{TermOffset, TerminalCursor},
};
use modalkit_ratatui::{textbox::TextBoxState, TermOffset, TerminalCursor, WindowOps};
use modalkit::editing::action::EditInfo;
use modalkit::editing::base::{CloseFlags, WordStyle, WriteFlags};
use modalkit::editing::completion::CompletionList;
use modalkit::prelude::*;
use crate::base::{IambBufferId, IambInfo, IambResult, ProgramStore};