mirror of
https://github.com/GraphiteEditor/Graphite.git
synced 2026-09-19 02:48:12 +08:00
* Add input manager * WIP lifetime hell * Hell yeah, dark lifetime magic * Replace events with actions in tools * Fix borrow in GlobalEventHandler * Fix typo in response-handler * Distribute dispatch structure * Add translation from events to actions * Port default key actions to input_mapper * Split actions macro * Add handling for Ambiguous Mouse events * Fix warnings and clippy lints * Add actions macro * WIP rework * Add AsMessage macro * Add implementation for derived enums * Add macro implementation for top level message * Add #[child] attribute to indicate derivation * Replace some mentions of Actions and Responses with Message * It compiles !!! * Add functionality to some message handlers * Add document rendering * ICE * Rework the previous code while keeping basic functionality * Reduce parent-top-level macro args to only two * Add workaround for ICE * Fix cyclic reference in document.rs * Make derive_transitive_child a bit more powerful This addresses the todo that was left, enabling arbitrary expressions to be passed as the last parameter of a #[parent] attribute * Adapt frontend message format * Make responses use VecDeque Our responses are a queue so we should use a queue type for them * Move traits to sensible location * Are we rectangle yet? * Simplify, improve & document `derive_discriminant` * Change `child` to `sub_discriminant` This only applies to `ToDiscriminant`. Code using `#[impl_message]` continues to work. * Add docs for `derive_transitive_child` * Finish docs and improve macros The improvements are that impl_message now uses trait resolution to obtain the parent's discriminant and that derive_as_message now allows for non-unit variants (which we don't use but it's nice to have, just in case) * Remove logging call * Move files around and cleanup structure * Fix proc macro doc tests * Improve actions_fn!() macro * Add ellipse tool * Pass populated actions list to the input mapper * Add KeyState bitvector * Merge mouse buttons into "keyboard" * Add macro for initialization of key mapper table * Add syntactic sugar for the macro * Implement mapping function * Translate the remaining tools * Fix shape tool * Add keybindings for line and pen tool * Fix modifiers * Cleanup * Add doc comments for the actions macro * Fix formatting * Rename MouseMove to PointerMove * Add keybinds for tools * Apply review suggestions * Rename KeyMappings -> KeyMappingEntries * Apply review changes Co-authored-by: T0mstone <realt0mstone@gmail.com> Co-authored-by: Paul Kupper <kupper.pa@gmail.com>
68 lines
1.9 KiB
Rust
68 lines
1.9 KiB
Rust
use proc_macro2::{Ident, Span};
|
|
use syn::punctuated::Punctuated;
|
|
use syn::{Path, PathArguments, PathSegment, Token};
|
|
|
|
/// Returns `Ok(Vec<T>)` if all items are `Ok(T)`, else returns a combination of every error encountered (not just the first one)
|
|
pub fn fold_error_iter<T>(iter: impl Iterator<Item = syn::Result<T>>) -> syn::Result<Vec<T>> {
|
|
iter.fold(Ok(vec![]), |acc, x| match acc {
|
|
Ok(mut v) => x.map(|x| {
|
|
v.push(x);
|
|
v
|
|
}),
|
|
Err(mut e) => match x {
|
|
Ok(_) => Err(e),
|
|
Err(e2) => {
|
|
e.combine(e2);
|
|
Err(e)
|
|
}
|
|
},
|
|
})
|
|
}
|
|
|
|
/// Creates an ident at the call site
|
|
pub fn call_site_ident<S: AsRef<str>>(s: S) -> Ident {
|
|
Ident::new(s.as_ref(), Span::call_site())
|
|
}
|
|
|
|
/// Creates the path `left::right` from the idents `left` and `right`
|
|
pub fn two_segment_path(left_ident: Ident, right_ident: Ident) -> Path {
|
|
let mut segments: Punctuated<PathSegment, Token![::]> = Punctuated::new();
|
|
segments.push(PathSegment {
|
|
ident: left_ident,
|
|
arguments: PathArguments::None,
|
|
});
|
|
segments.push(PathSegment {
|
|
ident: right_ident,
|
|
arguments: PathArguments::None,
|
|
});
|
|
|
|
Path { leading_colon: None, segments }
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use quote::ToTokens;
|
|
use syn::spanned::Spanned;
|
|
|
|
#[test]
|
|
fn test_fold_error_iter() {
|
|
let res = fold_error_iter(vec![Ok(()), Ok(())].into_iter());
|
|
assert!(res.is_ok());
|
|
|
|
let _span = quote::quote! { "" }.span();
|
|
let res = fold_error_iter(vec![Ok(()), Err(syn::Error::new(_span, "err1")), Err(syn::Error::new(_span, "err2"))].into_iter());
|
|
assert!(res.is_err());
|
|
let err = res.unwrap_err();
|
|
let mut check_err = syn::Error::new(_span, "err1");
|
|
check_err.combine(syn::Error::new(_span, "err2"));
|
|
assert_eq!(err.to_compile_error().to_string(), check_err.to_compile_error().to_string());
|
|
}
|
|
|
|
#[test]
|
|
fn test_two_path() {
|
|
let _span = quote::quote! { "" }.span();
|
|
assert_eq!(two_segment_path(Ident::new("a", _span), Ident::new("b", _span)).to_token_stream().to_string(), "a :: b");
|
|
}
|
|
}
|