Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'src/main.rs')
-rw-r--r--src/main.rs31
1 files changed, 22 insertions, 9 deletions
diff --git a/src/main.rs b/src/main.rs
index 8c617ba..9ac477a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,4 +1,5 @@
#![feature(
+ const_convert,
unsized_const_params,
exact_div,
yeet_expr,
@@ -64,8 +65,10 @@ use Default::default;
use NamedKey::*;
use dsb::cell::Style;
use dsb::{Cell, F};
+use env_logger::{Env, TimestampPrecision};
use fimg::Image;
use libc::{atexit, signal};
+use log::LevelFilter;
use lsp::Rq;
use lsp_types::*;
use rust_fsm::StateMachine;
@@ -103,10 +106,15 @@ fn main() {
let _x = 4;
// let x = HashMap::new();
unsafe { std::env::set_var("CARGO_UNSTABLE_RUSTC_UNICODE", "true") };
- env_logger::builder()
- .filter_level(log::LevelFilter::Info)
- .parse_env("GRA_LOG")
- .init();
+ env_logger::builder().filter_level(LevelFilter::Error).init();
+ // .format_timestamp(Some(TimestampPrecision::Seconds))
+ // .filter(Some("regex_cursor"), LevelFilter::Error)
+ // .filter(Some("calloop"), LevelFilter::Error)
+ // .filter(Some("tracing::span"), LevelFilter::Error)
+ // .parse_env(Env::new().default_filter_or("info"))
+ // .filter_level(log::LevelFilter::Info)
+ // .parse_env("G"RA_LOG")
+ // .init();
// lsp::x();
entry(EventLoop::new().unwrap())
}
@@ -236,7 +244,12 @@ pub(crate) fn entry(event_loop: EventLoop) {
if let Some((.., c)) = &mut ed.lsp && let Some(c) = c.take() {
c.send(window.clone()).unwrap();
}
+
let lsp_mn = &mut lsp_mn;
+ for lem in &lsp_mn.four {
+ lem.1.status();
+ // dbg!(lem.1);
+ }
let (fw, fh) = dsb::dims(&FONT, ppem);
let (c, r) = dsb::fit(
&FONT,
@@ -504,11 +517,11 @@ rust_fsm::state_machine! {
pub(crate) CompletionState => #[derive(Debug)] pub(crate) CompletionAction<'i> => pub(crate) CDo
None => Click => None,
None => K(Key<&'i str> => Key::Character(k @ ("." | ":"))) => Complete(
- RqS<Complete, lsp_types::request::Completion, usize> => default()
- ) [Request(CompletionContext => CompletionContext {trigger_kind: CompletionTriggerKind::TRIGGER_CHARACTER, trigger_character:Some(k.to_string()) })],
- None => K(Key::Character(" ") if ctrl()) => Complete(default()) [Request(CompletionContext { trigger_kind: CompletionTriggerKind::INVOKED, trigger_character:None })],
+ RqS<Complete, lsp_types::CompletionRequest, usize> => default()
+ ) [Request(CompletionContext => CompletionContext {trigger_kind: CompletionTriggerKind::TriggerCharacter, trigger_character:Some(k.to_string()) })],
+ None => K(Key::Character(" ") if ctrl()) => Complete(default()) [Request(CompletionContext { trigger_kind: CompletionTriggerKind::Invoked, trigger_character:None })],
None => K(Key::Character(x) if x.chars().all(char::is_alphabetic)
- && !matches!(x, "w"|"a"|"s"|"d" if alt())) => Complete(default()) [Request(CompletionContext { trigger_kind: CompletionTriggerKind::INVOKED, trigger_character:None })],
+ && !matches!(x, "w"|"a"|"s"|"d" if alt())) => Complete(default()) [Request(CompletionContext { trigger_kind: CompletionTriggerKind::Invoked, trigger_character:None })],
None => K(_) => _,
// when
@@ -526,7 +539,7 @@ rust_fsm::state_machine! {
Complete(Rq { result: Some(x), .. }) => K(Key::Named(NamedKey::Enter)) => None [Finish(Complete => x)],
- Complete(_x) => K(_) => _ [Request(CompletionContext { trigger_kind: CompletionTriggerKind::TRIGGER_FOR_INCOMPLETE_COMPLETIONS, trigger_character:None })],
+ Complete(_x) => K(_) => _ [Request(CompletionContext { trigger_kind: CompletionTriggerKind::TriggerForIncompleteCompletions, trigger_character:None })],
}
use complete::Complete;