|
|
|
|
@ -4,8 +4,9 @@ use helix_view::{document::Mode, Editor};
|
|
|
|
|
use once_cell::sync::Lazy;
|
|
|
|
|
use steel::{
|
|
|
|
|
gc::unsafe_erased_pointers::CustomReference,
|
|
|
|
|
rvals::{IntoSteelVal, SteelString},
|
|
|
|
|
steel_vm::register_fn::RegisterFn,
|
|
|
|
|
rvals::{FromSteelVal, IntoSteelVal, SteelString},
|
|
|
|
|
steel_vm::{engine::Engine, register_fn::RegisterFn},
|
|
|
|
|
SteelVal,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
use std::{
|
|
|
|
|
@ -21,14 +22,15 @@ use std::{
|
|
|
|
|
use steel::{rvals::Custom, steel_vm::builtin::BuiltInModule};
|
|
|
|
|
|
|
|
|
|
use crate::{
|
|
|
|
|
compositor::{self, Compositor},
|
|
|
|
|
compositor::{self, Component, Compositor},
|
|
|
|
|
job::{self, Callback},
|
|
|
|
|
keymap::{merge_keys, Keymap},
|
|
|
|
|
ui::{self, Popup, PromptEvent},
|
|
|
|
|
ui::{self, overlay::overlaid, Popup, PromptEvent},
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
use super::{
|
|
|
|
|
insert::{insert_char, insert_string},
|
|
|
|
|
plugin::{DylibContainers, ExternalModule},
|
|
|
|
|
shell_impl, Context, MappableCommand, TYPABLE_COMMAND_LIST,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
@ -36,6 +38,40 @@ thread_local! {
|
|
|
|
|
pub static ENGINE: std::rc::Rc<std::cell::RefCell<steel::steel_vm::engine::Engine>> = configure_engine();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub struct ExternalContainersAndModules {
|
|
|
|
|
containers: DylibContainers,
|
|
|
|
|
modules: Vec<ExternalModule>,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// External modules that can load via rust dylib. These can then be consumed from
|
|
|
|
|
// steel as needed, via the standard FFI for plugin functions.
|
|
|
|
|
pub(crate) static EXTERNAL_DYLIBS: Lazy<Arc<RwLock<ExternalContainersAndModules>>> =
|
|
|
|
|
Lazy::new(|| {
|
|
|
|
|
let mut containers = DylibContainers::new();
|
|
|
|
|
|
|
|
|
|
// Load the plugins with respect to the extensions directory.
|
|
|
|
|
// containers.load_modules_from_directory(Some(
|
|
|
|
|
// helix_loader::config_dir()
|
|
|
|
|
// .join("extensions")
|
|
|
|
|
// .to_str()
|
|
|
|
|
// .unwrap()
|
|
|
|
|
// .to_string(),
|
|
|
|
|
// ));
|
|
|
|
|
|
|
|
|
|
println!("Found dylibs: {}", containers.containers.len());
|
|
|
|
|
|
|
|
|
|
let modules = containers.create_commands();
|
|
|
|
|
|
|
|
|
|
println!("Modules length: {}", modules.len());
|
|
|
|
|
|
|
|
|
|
Arc::new(RwLock::new(ExternalContainersAndModules {
|
|
|
|
|
containers,
|
|
|
|
|
modules,
|
|
|
|
|
}))
|
|
|
|
|
|
|
|
|
|
// Arc::new(RwLock::new(containers))
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
pub fn initialize_engine() {
|
|
|
|
|
ENGINE.with(|x| x.borrow().globals().first().copied());
|
|
|
|
|
}
|
|
|
|
|
@ -60,7 +96,7 @@ pub fn run_initialization_script(cx: &mut Context) {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Start the worker thread - i.e. message passing to the workers
|
|
|
|
|
configure_background_thread()
|
|
|
|
|
// configure_background_thread()
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub static KEYBINDING_QUEUE: Lazy<SharedKeyBindingsEventQueue> =
|
|
|
|
|
@ -140,6 +176,10 @@ fn get_editor<'a>(cx: &'a mut Context<'a>) -> &'a mut Editor {
|
|
|
|
|
cx.editor
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn get_ro_editor<'a>(cx: &'a mut Context<'a>) -> &'a Editor {
|
|
|
|
|
&cx.editor
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn get_themes(cx: &mut Context) -> Vec<String> {
|
|
|
|
|
ui::completers::theme(cx.editor, "")
|
|
|
|
|
.into_iter()
|
|
|
|
|
@ -147,25 +187,499 @@ fn get_themes(cx: &mut Context) -> Vec<String> {
|
|
|
|
|
.collect()
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn configure_background_thread() {
|
|
|
|
|
std::thread::spawn(move || {
|
|
|
|
|
let mut engine = steel::steel_vm::engine::Engine::new();
|
|
|
|
|
// TODO: This is not necessary anymore. We can get away with native threads in steel, and otherwise run background tasks
|
|
|
|
|
// that may or may not live the duration of the editor time in there.
|
|
|
|
|
// fn configure_background_thread() {
|
|
|
|
|
// std::thread::spawn(move || {
|
|
|
|
|
// let mut engine = steel::steel_vm::engine::Engine::new();
|
|
|
|
|
|
|
|
|
|
// engine.register_fn("set-status-line!", StatusLineMessage::set);
|
|
|
|
|
|
|
|
|
|
// let helix_module_path = helix_loader::config_dir().join("background.scm");
|
|
|
|
|
|
|
|
|
|
// if let Ok(contents) = std::fs::read_to_string(&helix_module_path) {
|
|
|
|
|
// engine.run(&contents).ok();
|
|
|
|
|
// }
|
|
|
|
|
// });
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
/// A dynamic component, used for rendering thing
|
|
|
|
|
#[derive(Clone)]
|
|
|
|
|
// TODO: Implement `trace` method for objects that hold steel vals
|
|
|
|
|
struct SteelDynamicComponent {
|
|
|
|
|
name: String,
|
|
|
|
|
// This _should_ be a struct, but in theory can be whatever you want. It will be the first argument
|
|
|
|
|
// passed to the functions in the remainder of the struct.
|
|
|
|
|
state: SteelVal,
|
|
|
|
|
handle_event: Option<SteelVal>,
|
|
|
|
|
should_update: Option<SteelVal>,
|
|
|
|
|
render: SteelVal,
|
|
|
|
|
cursor: Option<SteelVal>,
|
|
|
|
|
required_size: Option<SteelVal>,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl SteelDynamicComponent {
|
|
|
|
|
fn new(name: String, state: SteelVal, render: SteelVal, h: HashMap<String, SteelVal>) -> Self {
|
|
|
|
|
// if let SteelVal::HashMapV(h) = functions {
|
|
|
|
|
|
|
|
|
|
Self {
|
|
|
|
|
name,
|
|
|
|
|
state,
|
|
|
|
|
render,
|
|
|
|
|
handle_event: h.get("handle_event").cloned(),
|
|
|
|
|
should_update: h.get("should_update").cloned(),
|
|
|
|
|
cursor: h.get("cursor").cloned(),
|
|
|
|
|
required_size: h.get("required_size").cloned(),
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
engine.register_fn("set-status-line!", StatusLineMessage::set);
|
|
|
|
|
// } else {
|
|
|
|
|
// panic!("Implement better error handling")
|
|
|
|
|
// }
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let helix_module_path = helix_loader::config_dir().join("background.scm");
|
|
|
|
|
fn new_dyn(
|
|
|
|
|
name: String,
|
|
|
|
|
state: SteelVal,
|
|
|
|
|
render: SteelVal,
|
|
|
|
|
h: HashMap<String, SteelVal>,
|
|
|
|
|
) -> WrappedDynComponent {
|
|
|
|
|
let s = Self::new(name, state, render, h);
|
|
|
|
|
|
|
|
|
|
if let Ok(contents) = std::fs::read_to_string(&helix_module_path) {
|
|
|
|
|
engine.run(&contents).ok();
|
|
|
|
|
WrappedDynComponent {
|
|
|
|
|
inner: Some(Box::new(s)),
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn get_state(&self) -> SteelVal {
|
|
|
|
|
self.state.clone()
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn get_render(&self) -> SteelVal {
|
|
|
|
|
self.render.clone()
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn get_handle_event(&self) -> Option<SteelVal> {
|
|
|
|
|
self.handle_event.clone()
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn get_should_update(&self) -> Option<SteelVal> {
|
|
|
|
|
self.should_update.clone()
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn get_cursor(&self) -> Option<SteelVal> {
|
|
|
|
|
self.cursor.clone()
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn get_required_size(&self) -> Option<SteelVal> {
|
|
|
|
|
self.required_size.clone()
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl Custom for SteelDynamicComponent {}
|
|
|
|
|
impl Custom for compositor::EventResult {}
|
|
|
|
|
impl FromSteelVal for compositor::EventResult {
|
|
|
|
|
fn from_steelval(val: &SteelVal) -> steel::rvals::Result<Self> {
|
|
|
|
|
match val {
|
|
|
|
|
SteelVal::SymbolV(v) if v.as_str() == "EventResult::Ignored" => {
|
|
|
|
|
Ok(compositor::EventResult::Ignored(None))
|
|
|
|
|
}
|
|
|
|
|
SteelVal::SymbolV(v) if v.as_str() == "EventResult::Consumed" => {
|
|
|
|
|
Ok(compositor::EventResult::Consumed(None))
|
|
|
|
|
}
|
|
|
|
|
_ => Err(steel::SteelErr::new(
|
|
|
|
|
steel::rerrs::ErrorKind::TypeMismatch,
|
|
|
|
|
"Unable to convert value to event result".to_string(),
|
|
|
|
|
)),
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// impl CustomReference for tui::buffer::Buffer {}
|
|
|
|
|
|
|
|
|
|
// TODO: Call the function inside the component, using the global engine. Consider running in its own engine
|
|
|
|
|
// but leaving it all in the same one is kinda nice
|
|
|
|
|
impl Component for SteelDynamicComponent {
|
|
|
|
|
fn render(
|
|
|
|
|
&mut self,
|
|
|
|
|
area: helix_view::graphics::Rect,
|
|
|
|
|
frame: &mut tui::buffer::Buffer,
|
|
|
|
|
ctx: &mut compositor::Context,
|
|
|
|
|
) {
|
|
|
|
|
let mut ctx = Context {
|
|
|
|
|
register: None,
|
|
|
|
|
count: None,
|
|
|
|
|
editor: ctx.editor,
|
|
|
|
|
callback: None,
|
|
|
|
|
on_next_key_callback: None,
|
|
|
|
|
jobs: ctx.jobs,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
// Pass the `state` object through - this can be used for storing the state of whatever plugin thing we're
|
|
|
|
|
// attempting to render
|
|
|
|
|
let thunk = |engine: &mut Engine, f, c| {
|
|
|
|
|
engine.call_function_with_args(
|
|
|
|
|
self.render.clone(),
|
|
|
|
|
vec![self.state.clone(), area.into_steelval().unwrap(), f, c],
|
|
|
|
|
)
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
ENGINE
|
|
|
|
|
.with(|x| {
|
|
|
|
|
x.borrow_mut()
|
|
|
|
|
.with_mut_reference::<tui::buffer::Buffer, tui::buffer::Buffer>(frame)
|
|
|
|
|
.with_mut_reference::<Context, Context>(&mut ctx)
|
|
|
|
|
.consume(|engine, args| {
|
|
|
|
|
let mut arg_iter = args.into_iter();
|
|
|
|
|
|
|
|
|
|
(thunk)(engine, arg_iter.next().unwrap(), arg_iter.next().unwrap())
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
// .run_with_references::<tui::buffer::Buffer, tui::buffer::Buffer, Context, Context>(
|
|
|
|
|
// frame, &mut ctx, thunk,
|
|
|
|
|
// )
|
|
|
|
|
})
|
|
|
|
|
.unwrap();
|
|
|
|
|
|
|
|
|
|
log::info!("Calling dynamic render!");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// TODO: Pass in event as well? Need to have immutable reference type
|
|
|
|
|
// Otherwise, we're gonna be in a bad spot. For now - just clone the object and pass it through.
|
|
|
|
|
// Clong is _not_ ideal, but it might be all we can do for now.
|
|
|
|
|
fn handle_event(
|
|
|
|
|
&mut self,
|
|
|
|
|
event: &helix_view::input::Event,
|
|
|
|
|
ctx: &mut compositor::Context,
|
|
|
|
|
) -> compositor::EventResult {
|
|
|
|
|
if let Some(handle_event) = &mut self.handle_event {
|
|
|
|
|
let mut ctx = Context {
|
|
|
|
|
register: None,
|
|
|
|
|
count: None,
|
|
|
|
|
editor: ctx.editor,
|
|
|
|
|
callback: None,
|
|
|
|
|
on_next_key_callback: None,
|
|
|
|
|
jobs: ctx.jobs,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
// Pass the `state` object through - this can be used for storing the state of whatever plugin thing we're
|
|
|
|
|
// attempting to render
|
|
|
|
|
let thunk = |engine: &mut Engine, c| {
|
|
|
|
|
engine.call_function_with_args(
|
|
|
|
|
handle_event.clone(),
|
|
|
|
|
vec![
|
|
|
|
|
self.state.clone(),
|
|
|
|
|
// TODO: We do _not_ want to clone here, we would need to create a bunch of methods on the engine for various
|
|
|
|
|
// combinations of reference passing to do this safely. Right now its limited to mutable references, but we should
|
|
|
|
|
// expose more - investigate macros on how to do that with recursively crunching the list to generate the combinations.
|
|
|
|
|
// Experimentation needed.
|
|
|
|
|
event.clone().into_steelval().unwrap(),
|
|
|
|
|
c,
|
|
|
|
|
],
|
|
|
|
|
)
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
match ENGINE.with(|x| {
|
|
|
|
|
x.borrow_mut()
|
|
|
|
|
.run_thunk_with_reference::<Context, Context>(&mut ctx, thunk)
|
|
|
|
|
}) {
|
|
|
|
|
Ok(v) => compositor::EventResult::from_steelval(&v)
|
|
|
|
|
.unwrap_or_else(|_| compositor::EventResult::Ignored(None)),
|
|
|
|
|
Err(_) => compositor::EventResult::Ignored(None),
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
compositor::EventResult::Ignored(None)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn should_update(&self) -> bool {
|
|
|
|
|
if let Some(should_update) = &self.should_update {
|
|
|
|
|
match ENGINE.with(|x| {
|
|
|
|
|
x.borrow_mut()
|
|
|
|
|
.call_function_with_args(should_update.clone(), vec![self.state.clone()])
|
|
|
|
|
}) {
|
|
|
|
|
Ok(v) => bool::from_steelval(&v).unwrap_or(true),
|
|
|
|
|
Err(_) => true,
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
true
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// TODO: Implement immutable references. Right now I'm only supporting mutable references.
|
|
|
|
|
fn cursor(
|
|
|
|
|
&self,
|
|
|
|
|
area: helix_view::graphics::Rect,
|
|
|
|
|
ctx: &Editor,
|
|
|
|
|
) -> (
|
|
|
|
|
Option<helix_core::Position>,
|
|
|
|
|
helix_view::graphics::CursorKind,
|
|
|
|
|
) {
|
|
|
|
|
if let Some(cursor) = &self.cursor {
|
|
|
|
|
// Pass the `state` object through - this can be used for storing the state of whatever plugin thing we're
|
|
|
|
|
// attempting to render
|
|
|
|
|
let thunk = |engine: &mut Engine, e| {
|
|
|
|
|
engine.call_function_with_args(
|
|
|
|
|
cursor.clone(),
|
|
|
|
|
vec![self.state.clone(), area.into_steelval().unwrap(), e],
|
|
|
|
|
)
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
<(
|
|
|
|
|
Option<helix_core::Position>,
|
|
|
|
|
helix_view::graphics::CursorKind,
|
|
|
|
|
)>::from_steelval(&ENGINE.with(|x| {
|
|
|
|
|
x.borrow_mut()
|
|
|
|
|
.run_thunk_with_ro_reference::<Editor, Editor>(ctx, thunk)
|
|
|
|
|
.unwrap()
|
|
|
|
|
}))
|
|
|
|
|
.unwrap()
|
|
|
|
|
} else {
|
|
|
|
|
(None, helix_view::graphics::CursorKind::Hidden)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn required_size(&mut self, viewport: (u16, u16)) -> Option<(u16, u16)> {
|
|
|
|
|
let name = self.type_name();
|
|
|
|
|
|
|
|
|
|
if let Some(required_size) = &mut self.required_size {
|
|
|
|
|
log::info!("Calling required-size inside: {}", name);
|
|
|
|
|
|
|
|
|
|
// TODO: Create some token that we can grab to enqueue function calls internally. Referencing
|
|
|
|
|
// the external API would cause problems - we just need to include a handle to the interpreter
|
|
|
|
|
// instance. Something like:
|
|
|
|
|
// ENGINE.call_function_or_enqueue? OR - this is the externally facing render function. Internal
|
|
|
|
|
// render calls do _not_ go through this interface. Instead, they are just called directly.
|
|
|
|
|
//
|
|
|
|
|
// If we go through this interface, we're going to get an already borrowed mut error, since it is
|
|
|
|
|
// re-entrant attempting to grab the ENGINE instead mutably, since we have to break the recursion
|
|
|
|
|
// somehow. By putting it at the edge, we then say - hey for these functions on this interface,
|
|
|
|
|
// call the engine instance. Otherwise, all computation happens inside the engine.
|
|
|
|
|
let res = ENGINE
|
|
|
|
|
.with(|x| {
|
|
|
|
|
x.borrow_mut().call_function_with_args(
|
|
|
|
|
required_size.clone(),
|
|
|
|
|
vec![self.state.clone(), viewport.into_steelval().unwrap()],
|
|
|
|
|
)
|
|
|
|
|
})
|
|
|
|
|
.and_then(|x| Option::<(u16, u16)>::from_steelval(&x))
|
|
|
|
|
.unwrap();
|
|
|
|
|
|
|
|
|
|
res
|
|
|
|
|
} else {
|
|
|
|
|
None
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn type_name(&self) -> &'static str {
|
|
|
|
|
std::any::type_name::<Self>()
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn id(&self) -> Option<&'static str> {
|
|
|
|
|
None
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Does this work?
|
|
|
|
|
impl Custom for Box<dyn Component> {}
|
|
|
|
|
|
|
|
|
|
struct WrappedDynComponent {
|
|
|
|
|
inner: Option<Box<dyn Component>>,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl Custom for WrappedDynComponent {}
|
|
|
|
|
|
|
|
|
|
struct BoxDynComponent {
|
|
|
|
|
inner: Box<dyn Component>,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl BoxDynComponent {
|
|
|
|
|
pub fn new(inner: Box<dyn Component>) -> Self {
|
|
|
|
|
Self { inner }
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl Component for BoxDynComponent {
|
|
|
|
|
fn handle_event(
|
|
|
|
|
&mut self,
|
|
|
|
|
_event: &helix_view::input::Event,
|
|
|
|
|
_ctx: &mut compositor::Context,
|
|
|
|
|
) -> compositor::EventResult {
|
|
|
|
|
self.inner.handle_event(_event, _ctx)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn should_update(&self) -> bool {
|
|
|
|
|
self.inner.should_update()
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn cursor(
|
|
|
|
|
&self,
|
|
|
|
|
_area: helix_view::graphics::Rect,
|
|
|
|
|
_ctx: &Editor,
|
|
|
|
|
) -> (
|
|
|
|
|
Option<helix_core::Position>,
|
|
|
|
|
helix_view::graphics::CursorKind,
|
|
|
|
|
) {
|
|
|
|
|
self.inner.cursor(_area, _ctx)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn required_size(&mut self, _viewport: (u16, u16)) -> Option<(u16, u16)> {
|
|
|
|
|
self.inner.required_size(_viewport)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn type_name(&self) -> &'static str {
|
|
|
|
|
std::any::type_name::<Self>()
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn id(&self) -> Option<&'static str> {
|
|
|
|
|
None
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn render(
|
|
|
|
|
&mut self,
|
|
|
|
|
area: helix_view::graphics::Rect,
|
|
|
|
|
frame: &mut tui::buffer::Buffer,
|
|
|
|
|
ctx: &mut compositor::Context,
|
|
|
|
|
) {
|
|
|
|
|
self.inner.render(area, frame, ctx)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn configure_engine() -> std::rc::Rc<std::cell::RefCell<steel::steel_vm::engine::Engine>> {
|
|
|
|
|
let mut engine = steel::steel_vm::engine::Engine::new();
|
|
|
|
|
|
|
|
|
|
println!("Loading engine!");
|
|
|
|
|
|
|
|
|
|
// Load native modules from the directory. Another idea - have a separate dlopen loading system
|
|
|
|
|
// in place that does not use the type id, and instead we generate the module after the dylib
|
|
|
|
|
// is added. That way functions _must_ have a specific signature, and then we add the integration
|
|
|
|
|
// later.
|
|
|
|
|
// engine.load_modules_from_directory(
|
|
|
|
|
// helix_loader::config_dir()
|
|
|
|
|
// .join("extensions")
|
|
|
|
|
// .to_str()
|
|
|
|
|
// .unwrap()
|
|
|
|
|
// .to_string(),
|
|
|
|
|
// );
|
|
|
|
|
|
|
|
|
|
// Get the current OS
|
|
|
|
|
engine.register_fn("current-os!", || std::env::consts::OS);
|
|
|
|
|
engine.register_fn("new-component!", SteelDynamicComponent::new_dyn);
|
|
|
|
|
|
|
|
|
|
engine.register_fn("SteelDynamicComponent?", |object: SteelVal| {
|
|
|
|
|
if let SteelVal::Custom(v) = object {
|
|
|
|
|
if let Some(wrapped) = v.borrow().as_any_ref().downcast_ref::<BoxDynComponent>() {
|
|
|
|
|
return wrapped.inner.as_any().is::<SteelDynamicComponent>();
|
|
|
|
|
} else {
|
|
|
|
|
false
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
false
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
engine.register_fn(
|
|
|
|
|
"SteelDynamicComponent-state",
|
|
|
|
|
SteelDynamicComponent::get_state,
|
|
|
|
|
);
|
|
|
|
|
engine.register_fn(
|
|
|
|
|
"SteelDynamicComponent-render",
|
|
|
|
|
SteelDynamicComponent::get_render,
|
|
|
|
|
);
|
|
|
|
|
engine.register_fn(
|
|
|
|
|
"SteelDynamicComponent-handle-event",
|
|
|
|
|
SteelDynamicComponent::get_handle_event,
|
|
|
|
|
);
|
|
|
|
|
engine.register_fn(
|
|
|
|
|
"SteelDynamicComponent-should-update",
|
|
|
|
|
SteelDynamicComponent::should_update,
|
|
|
|
|
);
|
|
|
|
|
engine.register_fn(
|
|
|
|
|
"SteelDynamicComponent-cursor",
|
|
|
|
|
SteelDynamicComponent::cursor,
|
|
|
|
|
);
|
|
|
|
|
engine.register_fn(
|
|
|
|
|
"SteelDynamicComponent-required-size",
|
|
|
|
|
SteelDynamicComponent::get_required_size,
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
// engine.register_fn("WrappedComponent", WrappedDynComponent::new)
|
|
|
|
|
|
|
|
|
|
engine.register_fn(
|
|
|
|
|
"Popup::new",
|
|
|
|
|
|contents: &mut WrappedDynComponent,
|
|
|
|
|
position: helix_core::Position|
|
|
|
|
|
-> WrappedDynComponent {
|
|
|
|
|
let inner = contents.inner.take().unwrap(); // Panic, for now
|
|
|
|
|
|
|
|
|
|
WrappedDynComponent {
|
|
|
|
|
inner: Some(Box::new(
|
|
|
|
|
Popup::<BoxDynComponent>::new("popup", BoxDynComponent::new(inner))
|
|
|
|
|
.position(Some(position)),
|
|
|
|
|
)),
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
// engine.register_fn(
|
|
|
|
|
// "Picker::new",
|
|
|
|
|
// |contents: &mut Wrapped
|
|
|
|
|
// )
|
|
|
|
|
|
|
|
|
|
engine.register_fn("Component::Text", |contents: String| WrappedDynComponent {
|
|
|
|
|
inner: Some(Box::new(crate::ui::Text::new(contents))),
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
// Separate this out into its own component module - This just lets us call the underlying
|
|
|
|
|
// component, not sure if we can go from trait object -> trait object easily but we'll see!
|
|
|
|
|
engine.register_fn(
|
|
|
|
|
"Component::render",
|
|
|
|
|
|t: &mut WrappedDynComponent,
|
|
|
|
|
area: helix_view::graphics::Rect,
|
|
|
|
|
frame: &mut tui::buffer::Buffer,
|
|
|
|
|
ctx: &mut Context| {
|
|
|
|
|
t.inner.as_mut().unwrap().render(
|
|
|
|
|
area,
|
|
|
|
|
frame,
|
|
|
|
|
&mut compositor::Context {
|
|
|
|
|
jobs: ctx.jobs,
|
|
|
|
|
editor: ctx.editor,
|
|
|
|
|
scroll: None,
|
|
|
|
|
},
|
|
|
|
|
)
|
|
|
|
|
},
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
engine.register_fn(
|
|
|
|
|
"Component::handle-event",
|
|
|
|
|
|s: &mut WrappedDynComponent, event: &helix_view::input::Event, ctx: &mut Context| {
|
|
|
|
|
s.inner.as_mut().unwrap().handle_event(
|
|
|
|
|
event,
|
|
|
|
|
&mut compositor::Context {
|
|
|
|
|
jobs: ctx.jobs,
|
|
|
|
|
editor: ctx.editor,
|
|
|
|
|
scroll: None,
|
|
|
|
|
},
|
|
|
|
|
)
|
|
|
|
|
},
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
engine.register_fn("Component::should-update", |s: &mut WrappedDynComponent| {
|
|
|
|
|
s.inner.as_mut().unwrap().should_update()
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
engine.register_fn(
|
|
|
|
|
"Component::cursor",
|
|
|
|
|
|s: &WrappedDynComponent, area: helix_view::graphics::Rect, ctx: &Editor| {
|
|
|
|
|
s.inner.as_ref().unwrap().cursor(area, ctx)
|
|
|
|
|
},
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
engine.register_fn(
|
|
|
|
|
"Component::required-size",
|
|
|
|
|
|s: &mut WrappedDynComponent, viewport: (u16, u16)| {
|
|
|
|
|
s.inner.as_mut().unwrap().required_size(viewport)
|
|
|
|
|
},
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
let mut module = BuiltInModule::new("helix/core/keybindings".to_string());
|
|
|
|
|
module.register_fn("set-keybindings!", SharedKeyBindingsEventQueue::merge);
|
|
|
|
|
@ -181,6 +695,29 @@ fn configure_engine() -> std::rc::Rc<std::cell::RefCell<steel::steel_vm::engine:
|
|
|
|
|
helix_view::Editor,
|
|
|
|
|
>::register_fn(&mut engine, "cx-editor!", get_editor);
|
|
|
|
|
|
|
|
|
|
// RegisterFn::<
|
|
|
|
|
// _,
|
|
|
|
|
// steel::steel_vm::register_fn::MarkerWrapper7<(
|
|
|
|
|
// Context<'_>,
|
|
|
|
|
// helix_view::Editor,
|
|
|
|
|
// helix_view::Editor,
|
|
|
|
|
// Context<'static>,
|
|
|
|
|
// )>,
|
|
|
|
|
// helix_view::Editor,
|
|
|
|
|
// >::register_fn(&mut engine, "cx-editor-ro!", get_ro_editor);
|
|
|
|
|
|
|
|
|
|
engine.register_fn("editor-cursor", Editor::cursor);
|
|
|
|
|
|
|
|
|
|
engine.register_fn("cx->cursor", |cx: &mut Context| cx.editor.cursor());
|
|
|
|
|
|
|
|
|
|
// TODO:
|
|
|
|
|
// Position related functions. These probably should be defined alongside the actual impl for Custom in the core crate
|
|
|
|
|
engine.register_fn("Position::new", helix_core::Position::new);
|
|
|
|
|
engine.register_fn("Position::default", helix_core::Position::default);
|
|
|
|
|
engine.register_fn("Position-row", |position: helix_core::Position| {
|
|
|
|
|
position.row
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
engine.register_fn("cx->themes", get_themes);
|
|
|
|
|
engine.register_fn("set-status-line!", StatusLineMessage::set);
|
|
|
|
|
|
|
|
|
|
@ -208,6 +745,59 @@ fn configure_engine() -> std::rc::Rc<std::cell::RefCell<steel::steel_vm::engine:
|
|
|
|
|
module.register_fn(command.name, func);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// // Load the plugins with respect to the extensions directory.
|
|
|
|
|
// EXTERNAL_DYLIBS
|
|
|
|
|
// .write()
|
|
|
|
|
// .unwrap()
|
|
|
|
|
// .load_modules_from_directory(Some(
|
|
|
|
|
// helix_loader::config_dir()
|
|
|
|
|
// .join("extensions")
|
|
|
|
|
// .to_str()
|
|
|
|
|
// .unwrap()
|
|
|
|
|
// .to_string(),
|
|
|
|
|
// ));
|
|
|
|
|
|
|
|
|
|
// let commands = EXTERNAL_DYLIBS.read().unwrap().create_commands();
|
|
|
|
|
|
|
|
|
|
// TODO: @Matt - these commands need to get loaded into their _own_ module, and registered as such.
|
|
|
|
|
// for dylib in &EXTERNAL_DYLIBS.read().unwrap().modules {
|
|
|
|
|
// let mut module = BuiltInModule::new(dylib.name.to_string());
|
|
|
|
|
|
|
|
|
|
// println!("{}", dylib.get_name());
|
|
|
|
|
|
|
|
|
|
// // println!("{}", dylib.name);
|
|
|
|
|
|
|
|
|
|
// for command in dylib.commands.iter() {
|
|
|
|
|
// // TODO: The name needs to be registered for static - but we shouldn't _need_ it to be
|
|
|
|
|
// // registered for static. We can probably get away with accepting an owned string and pay the price,
|
|
|
|
|
// // if need be.
|
|
|
|
|
|
|
|
|
|
// let inner = command.fun.clone();
|
|
|
|
|
|
|
|
|
|
// let func = move |cx: &mut Context,
|
|
|
|
|
// args: Box<[Box<str>]>,
|
|
|
|
|
// event: PromptEvent|
|
|
|
|
|
// -> anyhow::Result<()> {
|
|
|
|
|
// // Ensure the lifetime of these variables
|
|
|
|
|
// let _config = cx.editor.config.clone();
|
|
|
|
|
// let _theme_loader = cx.editor.theme_loader.clone();
|
|
|
|
|
// let _syn_loader = cx.editor.syn_loader.clone();
|
|
|
|
|
|
|
|
|
|
// println!("{}", Arc::strong_count(&_config));
|
|
|
|
|
// println!("{}", Arc::strong_count(&_theme_loader));
|
|
|
|
|
// println!("{}", Arc::strong_count(&_syn_loader));
|
|
|
|
|
// // println!("{:p}", _theme_loader);
|
|
|
|
|
// // println!("{:p}", _syn_loader);
|
|
|
|
|
|
|
|
|
|
// (inner)(cx, &_theme_loader, &_syn_loader, args, &event)
|
|
|
|
|
// };
|
|
|
|
|
|
|
|
|
|
// module.register_owned_fn(command.name.to_string(), func);
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
// engine.register_module(module);
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
engine.register_module(module);
|
|
|
|
|
|
|
|
|
|
let mut module = BuiltInModule::new("helix/core/static".to_string());
|
|
|
|
|
@ -231,6 +821,8 @@ fn configure_engine() -> std::rc::Rc<std::cell::RefCell<steel::steel_vm::engine:
|
|
|
|
|
|
|
|
|
|
engine.register_module(module);
|
|
|
|
|
|
|
|
|
|
engine.register_fn("push-component!", push_component);
|
|
|
|
|
|
|
|
|
|
let helix_module_path = helix_loader::helix_module_file();
|
|
|
|
|
|
|
|
|
|
engine
|
|
|
|
|
@ -436,3 +1028,46 @@ fn run_shell_command_text(
|
|
|
|
|
anyhow::bail!("Command failed!: {}", output.to_string())
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Pin the value to _this_ thread?
|
|
|
|
|
|
|
|
|
|
// Overlay the dynamic component, see what happens?
|
|
|
|
|
// Probably need to pin the values to this thread - wrap it in a shim which pins the value
|
|
|
|
|
// to this thread? - call methods on the thread local value?
|
|
|
|
|
fn push_component(cx: &mut Context, component: &mut WrappedDynComponent) {
|
|
|
|
|
// let component = crate::ui::Text::new("Hello world!".to_string());
|
|
|
|
|
|
|
|
|
|
log::info!("Pushing dynamic component!");
|
|
|
|
|
|
|
|
|
|
// todo!();
|
|
|
|
|
|
|
|
|
|
// let callback = async move {
|
|
|
|
|
// let call: job::Callback = Callback::EditorCompositor(Box::new(
|
|
|
|
|
// move |_editor: &mut Editor, compositor: &mut Compositor| {
|
|
|
|
|
// compositor.push(Box::new(component));
|
|
|
|
|
// },
|
|
|
|
|
// ));
|
|
|
|
|
|
|
|
|
|
// Ok(call)
|
|
|
|
|
// };
|
|
|
|
|
|
|
|
|
|
// cx.jobs.callback(callback);
|
|
|
|
|
|
|
|
|
|
// Why does this not work? - UPDATE: This does work when called in a static command context, but
|
|
|
|
|
// in a typed command context, we do not have access to the real compositor. Thus, we need a callback
|
|
|
|
|
// that then requires the values to be moved over threads. We'll need some message passing scheme
|
|
|
|
|
// to call values from the typed command context.
|
|
|
|
|
cx.push_layer(component.inner.take().unwrap());
|
|
|
|
|
|
|
|
|
|
// TODO: This _needs_ to go through a callback. Otherwise the new layer is just dropped.
|
|
|
|
|
// Set up some sort of callback queue for dynamic components that we can pull from instead, so that
|
|
|
|
|
// things stay thread local?
|
|
|
|
|
|
|
|
|
|
// let root = helix_core::find_workspace().0;
|
|
|
|
|
// let picker = ui::file_picker(root, &cx.editor.config());
|
|
|
|
|
// cx.push_layer(Box::new(overlaid(picker)));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// fn push_component_raw(cx: &mut Context, component: Box<dyn Component>) {
|
|
|
|
|
// cx.push_layer(component);
|
|
|
|
|
// }
|
|
|
|
|
|
mattwparas
2 years ago