Additional cleanup of prelude imports in editor codebase

Closes #744

.vscode/settings.json

@@ -28,6 +28,7 @@
 	// Rust Analyzer config
 	"rust-analyzer.cargo.target": "wasm32-unknown-unknown",
 	"rust-analyzer.checkOnSave.command": "clippy",
+	"rust-analyzer.diagnostics.disabled": ["unresolved-macro-call"], // Remove when https://github.com/rust-lang/rust-analyzer/issues/6835 is fixed
 	// ESLint config
 	"eslint.format.enable": true,
 	"eslint.workingDirectories": [
@@ -46,5 +47,4 @@
 	"html.format.wrapLineLength": 200,
 	"files.eol": "\n",
 	"files.insertFinalNewline": true,
-	"rust-analyzer.procMacro.attributes.enable": true,
 }

editor/src/dispatcher.rs

@@ -4,8 +4,6 @@ use crate::messages::prelude::*;
 
 use graphene::layers::text_layer::Font;
 
-use std::collections::VecDeque;
-
 #[derive(Debug, Default)]
 pub struct Dispatcher {
 	message_queues: Vec<VecDeque<Message>>,

editor/src/messages/broadcast/broadcast_message_handler.rs

@@ -1,7 +1,5 @@
 use crate::messages::prelude::*;
 
-use std::collections::HashMap;
-
 #[derive(Debug, Clone, Default)]
 pub struct BroadcastMessageHandler {
 	listeners: HashMap<BroadcastEvent, Vec<Message>>,

editor/src/messages/debug/debug_message_handler.rs

@@ -1,8 +1,6 @@
 use super::utility_types::MessageLoggingVerbosity;
 use crate::messages::prelude::*;
 
-use std::collections::VecDeque;
-
 #[derive(Debug, Default)]
 pub struct DebugMessageHandler {
 	pub message_logging_verbosity: MessageLoggingVerbosity,

editor/src/messages/dialog/dialog_message.rs

@@ -1,5 +1,3 @@
-use super::export_dialog::ExportDialogMessage;
-use super::new_document_dialog::NewDocumentDialogMessage;
 use crate::messages::prelude::*;
 
 use serde::{Deserialize, Serialize};

editor/src/messages/dialog/export_dialog/export_dialog_message_handler.rs

@@ -1,4 +1,3 @@
-use super::ExportDialogMessage;
 use crate::messages::frontend::utility_types::{ExportBounds, FileType};
 use crate::messages::layout::utility_types::layout_widget::{Layout, LayoutGroup, PropertyHolder, Widget, WidgetCallback, WidgetHolder, WidgetLayout};
 use crate::messages::layout::utility_types::misc::LayoutTarget;
@@ -9,8 +8,6 @@ use crate::messages::prelude::*;
 
 use graphene::LayerId;
 
-use std::collections::HashMap;
-
 /// A dialog to allow users to customize their file export.
 #[derive(Debug, Clone, Default)]
 pub struct ExportDialogMessageHandler {

editor/src/messages/dialog/new_document_dialog/new_document_dialog_message_handler.rs

@@ -1,4 +1,3 @@
-use super::NewDocumentDialogMessage;
 use crate::messages::layout::utility_types::layout_widget::{Layout, LayoutGroup, PropertyHolder, Widget, WidgetCallback, WidgetHolder, WidgetLayout};
 use crate::messages::layout::utility_types::misc::LayoutTarget;
 use crate::messages::layout::utility_types::widgets::button_widgets::TextButton;

editor/src/messages/dialog/simple_dialogs/close_document_dialog.rs

@@ -2,7 +2,6 @@ use crate::messages::broadcast::broadcast_event::BroadcastEvent;
 use crate::messages::layout::utility_types::layout_widget::{Layout, LayoutGroup, PropertyHolder, Widget, WidgetCallback, WidgetHolder, WidgetLayout};
 use crate::messages::layout::utility_types::widgets::button_widgets::TextButton;
 use crate::messages::layout::utility_types::widgets::label_widgets::TextLabel;
-use crate::messages::portfolio::document::DocumentMessage;
 use crate::messages::prelude::*;
 
 /// A dialog for confirming the closing a document with unsaved changes.

editor/src/messages/input_mapper/default_mapping.rs

@@ -1,5 +1,4 @@
 use crate::consts::{BIG_NUDGE_AMOUNT, NUDGE_AMOUNT};
-use crate::messages::input_mapper::input_mapper_message::InputMapperMessage;
 use crate::messages::input_mapper::utility_types::input_keyboard::{Key, KeyStates};
 use crate::messages::input_mapper::utility_types::macros::*;
 use crate::messages::input_mapper::utility_types::misc::MappingEntry;

editor/src/messages/input_preprocessor/input_preprocessor_message_handler.rs

@@ -172,12 +172,9 @@ impl InputPreprocessorMessageHandler {
 mod test {
 	use crate::messages::input_mapper::utility_types::input_keyboard::{Key, ModifierKeys};
 	use crate::messages::input_mapper::utility_types::input_mouse::EditorMouseState;
-	use crate::messages::input_mapper::InputMapperMessage;
 	use crate::messages::portfolio::document::utility_types::misc::KeyboardPlatformLayout;
 	use crate::messages::prelude::*;
 
-	use std::collections::VecDeque;
-
 	#[test]
 	fn process_action_mouse_move_handle_modifier_keys() {
 		let mut input_preprocessor = InputPreprocessorMessageHandler::default();

editor/src/messages/layout/layout_message_handler.rs

@@ -8,7 +8,6 @@ use crate::messages::prelude::*;
 use graphene::layers::text_layer::Font;
 
 use serde_json::Value;
-use std::collections::VecDeque;
 
 #[derive(Debug, Clone, Default)]
 pub struct LayoutMessageHandler {

editor/src/messages/layout/utility_types/layout_widget.rs

@@ -6,12 +6,10 @@ use crate::application::generate_uuid;
 use crate::messages::input_mapper::utility_types::input_keyboard::Key;
 use crate::messages::input_mapper::utility_types::misc::{keys_text_shortcut, ActionKeys};
 use crate::messages::layout::utility_types::misc::LayoutTarget;
-use crate::messages::layout::LayoutMessage;
 use crate::messages::portfolio::document::utility_types::misc::KeyboardPlatformLayout;
 use crate::messages::prelude::*;
 
 use serde::{Deserialize, Serialize};
-use std::collections::VecDeque;
 use std::rc::Rc;
 
 pub trait PropertyHolder {

editor/src/messages/portfolio/document/artboard/artboard_message_handler.rs

@@ -1,6 +1,6 @@
+use crate::application::generate_uuid;
 use crate::messages::prelude::*;
 
-use crate::application::generate_uuid;
 use graphene::color::Color;
 use graphene::document::Document as GrapheneDocument;
 use graphene::layers::style::{self, Fill, RenderData, ViewMode};
@@ -11,7 +11,6 @@ use graphene::Operation as DocumentOperation;
 
 use glam::DAffine2;
 use serde::{Deserialize, Serialize};
-use std::collections::VecDeque;
 
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 pub struct ArtboardMessageHandler {

editor/src/messages/portfolio/document/document_message_handler.rs

@@ -29,7 +29,6 @@ use graphene::{DocumentError, DocumentResponse, LayerId, Operation as DocumentOp
 use glam::{DAffine2, DVec2};
 use log::warn;
 use serde::{Deserialize, Serialize};
-use std::collections::{HashMap, HashSet, VecDeque};
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct DocumentMessageHandler {

editor/src/messages/portfolio/document/movement/movement_message_handler.rs

@@ -10,7 +10,6 @@ use graphene::Operation as DocumentOperation;
 
 use glam::{DAffine2, DVec2};
 use serde::{Deserialize, Serialize};
-use std::collections::VecDeque;
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct MovementMessageHandler {

editor/src/messages/portfolio/document/transform_layer/transform_layer_message_handler.rs

@@ -9,7 +9,6 @@ use graphene::LayerId;
 
 use glam::DVec2;
 use graphene::layers::text_layer::FontCache;
-use std::collections::{HashMap, VecDeque};
 
 #[derive(Debug, Clone, Default, PartialEq)]
 pub struct TransformLayerMessageHandler {

editor/src/messages/portfolio/menu_bar/menu_bar_message_handler.rs

@@ -1,4 +1,3 @@
-use super::MenuBarMessage;
 use crate::messages::input_mapper::utility_types::macros::action_keys;
 use crate::messages::layout::utility_types::layout_widget::{Layout, PropertyHolder};
 use crate::messages::layout::utility_types::misc::LayoutTarget;
@@ -6,8 +5,6 @@ use crate::messages::layout::utility_types::widgets::menu_widgets::{MenuColumn,
 use crate::messages::portfolio::document::utility_types::clipboards::Clipboard;
 use crate::messages::prelude::*;
 
-use std::collections::VecDeque;
-
 #[derive(Debug, Clone, Default)]
 pub struct MenuBarMessageHandler {}
 

editor/src/messages/portfolio/portfolio_message_handler.rs

@@ -13,7 +13,6 @@ use graphene::layers::text_layer::{Font, FontCache};
 use graphene::Operation as DocumentOperation;
 
 use log::warn;
-use std::collections::{HashMap, VecDeque};
 
 #[derive(Debug, Clone, Default)]
 pub struct PortfolioMessageHandler {

editor/src/messages/prelude.rs

@@ -1,8 +1,11 @@
+// Root
+pub use crate::utility_traits::{ActionList, AsMessage, MessageHandler, ToDiscriminant, TransitiveChild};
+
 // Message, MessageDiscriminant, MessageHandler
 pub use crate::messages::broadcast::{BroadcastMessage, BroadcastMessageDiscriminant, BroadcastMessageHandler};
 pub use crate::messages::debug::{DebugMessage, DebugMessageDiscriminant, DebugMessageHandler};
-pub use crate::messages::dialog::export_dialog::ExportDialogMessageHandler;
-pub use crate::messages::dialog::new_document_dialog::NewDocumentDialogMessageHandler;
+pub use crate::messages::dialog::export_dialog::{ExportDialogMessage, ExportDialogMessageDiscriminant, ExportDialogMessageHandler};
+pub use crate::messages::dialog::new_document_dialog::{NewDocumentDialogMessage, NewDocumentDialogMessageDiscriminant, NewDocumentDialogMessageHandler};
 pub use crate::messages::dialog::{DialogMessage, DialogMessageDiscriminant, DialogMessageHandler};
 pub use crate::messages::frontend::{FrontendMessage, FrontendMessageDiscriminant};
 pub use crate::messages::input_mapper::{InputMapperMessage, InputMapperMessageDiscriminant, InputMapperMessageHandler};
@@ -20,6 +23,7 @@ pub use crate::messages::tool::{ToolMessage, ToolMessageDiscriminant, ToolMessag
 pub use crate::messages::workspace::{WorkspaceMessage, WorkspaceMessageDiscriminant, WorkspaceMessageHandler};
 
 // Message, MessageDiscriminant
+pub use crate::messages::broadcast::broadcast_event::{BroadcastEvent, BroadcastEventDiscriminant};
 pub use crate::messages::message::{Message, MessageDiscriminant};
 pub use crate::messages::tool::tool_messages::artboard_tool::{ArtboardToolMessage, ArtboardToolMessageDiscriminant};
 pub use crate::messages::tool::tool_messages::ellipse_tool::{EllipseToolMessage, EllipseToolMessageDiscriminant};
@@ -37,10 +41,7 @@ pub use crate::messages::tool::tool_messages::shape_tool::{ShapeToolMessage, Sha
 pub use crate::messages::tool::tool_messages::spline_tool::{SplineToolMessage, SplineToolMessageDiscriminant};
 pub use crate::messages::tool::tool_messages::text_tool::{TextToolMessage, TextToolMessageDiscriminant};
 
-// Other
-pub use crate::messages::broadcast::broadcast_event::{BroadcastEvent, BroadcastEventDiscriminant};
-pub use crate::utility_traits::{ActionList, AsMessage, MessageHandler, ToDiscriminant, TransitiveChild};
-
+// Helper
 pub use graphite_proc_macros::*;
 
-pub use std::collections::VecDeque;
+pub use std::collections::{HashMap, HashSet, VecDeque};

editor/src/messages/tool/common_functionality/overlay_renderer.rs

@@ -13,7 +13,6 @@ use graphene::layers::vector::subpath::Subpath;
 use graphene::{LayerId, Operation};
 
 use glam::{DAffine2, DVec2};
-use std::collections::{HashMap, VecDeque};
 
 /// [ManipulatorGroupOverlay]s is the collection of overlays that make up an [ManipulatorGroup] visible in the editor.
 type ManipulatorGroupOverlays = [Option<Vec<LayerId>>; 5];

editor/src/messages/tool/common_functionality/path_outline.rs

@@ -10,7 +10,6 @@ use graphene::layers::vector::subpath::Subpath;
 use graphene::{LayerId, Operation};
 
 use glam::{DAffine2, DVec2};
-use std::collections::VecDeque;
 
 /// Manages the overlay used by the select tool for outlining selected shapes and when hovering over a non selected shape.
 #[derive(Clone, Debug, Default)]

editor/src/messages/tool/common_functionality/shape_editor.rs

@@ -8,7 +8,6 @@ use graphene::{LayerId, Operation};
 
 use glam::DVec2;
 use graphene::document::Document;
-use std::collections::VecDeque;
 
 /// ShapeEditor is the container for all of the layer paths that are represented as [Subpath]s and provides
 /// functionality required to query and create the [Subpath] / [ManipulatorGroup]s / [ManipulatorPoint]s.

editor/src/messages/tool/tool_message_handler.rs

@@ -8,8 +8,6 @@ use crate::messages::tool::utility_types::ToolType;
 use graphene::color::Color;
 use graphene::layers::text_layer::FontCache;
 
-use std::collections::VecDeque;
-
 #[derive(Debug, Default)]
 pub struct ToolMessageHandler {
 	tool_state: ToolFsmState,

editor/src/messages/tool/utility_types.rs

@@ -14,7 +14,6 @@ use graphene::color::Color;
 use graphene::layers::text_layer::FontCache;
 
 use serde::{Deserialize, Serialize};
-use std::collections::{HashMap, VecDeque};
 use std::fmt::{self, Debug};
 
 pub type ToolActionHandlerData<'a> = (&'a DocumentMessageHandler, &'a DocumentToolData, &'a InputPreprocessorMessageHandler, &'a FontCache);

editor/src/utility_traits.rs

@@ -1,8 +1,6 @@
 pub use crate::dispatcher::*;
 use crate::messages::prelude::*;
 
-use std::collections::VecDeque;
-
 /// Implements a message handler struct for a separate message struct.
 /// - The first generic argument (`M`) is that message struct type, representing a message enum variant to be matched and handled in `process_message()`.
 /// - The second generic argument (`D`) is the type of data that can be passed along by the caller to `process_message()`.
@@ -44,8 +42,6 @@ pub trait TransitiveChild: Into<Self::Parent> + Into<Self::TopParent> {
 	type Parent;
 }
 
-use std::collections::HashMap;
-
 pub trait Hint {
 	fn hints(&self) -> HashMap<String, String>;
 }

proc-macros/src/lib.rs

@@ -14,7 +14,6 @@ use crate::hint::derive_hint_impl;
 use crate::transitive_child::derive_transitive_child_impl;
 
 use proc_macro::TokenStream;
-use syn::parse_macro_input;
 
 /// Derive the `ToDiscriminant` trait and create a `<Type Name>Discriminant` enum
 ///
@@ -269,7 +268,7 @@ pub fn derive_hint(input_item: TokenStream) -> TokenStream {
 #[proc_macro_attribute]
 pub fn edge(attr: TokenStream, item: TokenStream) -> TokenStream {
 	// to make sure that only `#[edge("string")]` is allowed
-	let _verify = parse_macro_input!(attr as AttrInnerSingleString);
+	let _verify = syn::parse_macro_input!(attr as AttrInnerSingleString);
 
 	item
 }