fix: format imports (lapce#1431)

* fix: add nightly options

* style: format/sort imports

Author: panekj

.rustfmt.toml

@@ -1 +1,4 @@
 max_width = 85
+# below requires nightly
+# imports_granularity = "Crate"
+# group_imports = "StdExternalCrate"

lapce-core/src/buffer/test.rs

@@ -1,9 +1,10 @@
 use super::Buffer;
 
 mod editing {
+    use xi_rope::Rope;
+
     use super::*;
     use crate::{editor::EditType, selection::Selection};
-    use xi_rope::Rope;
 
     #[test]
     fn is_pristine() {

lapce-core/src/cursor.rs

@@ -1,10 +1,12 @@
 use serde::{Deserialize, Serialize};
 use xi_rope::{RopeDelta, Transformer};
 
-use crate::buffer::Buffer;
-use crate::mode::{Mode, MotionMode, VisualMode};
-use crate::register::RegisterData;
-use crate::selection::{InsertDrift, SelRegion, Selection};
+use crate::{
+    buffer::Buffer,
+    mode::{Mode, MotionMode, VisualMode},
+    register::RegisterData,
+    selection::{InsertDrift, SelRegion, Selection},
+};
 
 #[derive(Clone, Copy, PartialEq, Debug, Serialize, Deserialize)]
 pub enum ColPosition {

lapce-core/src/editor.rs

@@ -1384,10 +1384,12 @@ enum DuplicateDirection {
 
 #[cfg(test)]
 mod test {
-    use crate::buffer::Buffer;
-    use crate::cursor::{Cursor, CursorMode};
-    use crate::editor::{DuplicateDirection, Editor};
-    use crate::selection::{SelRegion, Selection};
+    use crate::{
+        buffer::Buffer,
+        cursor::{Cursor, CursorMode},
+        editor::{DuplicateDirection, Editor},
+        selection::{SelRegion, Selection},
+    };
 
     #[test]
     fn test_insert_simple() {

lapce-core/src/language.rs

@@ -915,9 +915,10 @@ mod test {
     // function(s) in the module become unused.  Hence turning off the lints.
     #![allow(unused, unreachable_code)]
 
-    use super::LapceLanguage;
     use std::path::PathBuf;
 
+    use super::LapceLanguage;
+
     fn assert_language(expected: LapceLanguage, exts: &[&str]) {
         for ext in exts {
             let path = PathBuf::from(&format!("a.{ext}"));

lapce-core/src/selection.rs

@@ -1,5 +1,6 @@
-use serde::{Deserialize, Serialize};
 use std::cmp::{max, min, Ordering};
+
+use serde::{Deserialize, Serialize};
 use xi_rope::{RopeDelta, Transformer};
 
 use crate::cursor::ColPosition;
@@ -534,9 +535,11 @@ fn remove_n_at<T>(v: &mut Vec<T>, index: usize, n: usize) {
 
 #[cfg(test)]
 mod test {
-    use crate::buffer::Buffer;
-    use crate::editor::EditType;
-    use crate::selection::{InsertDrift, SelRegion, Selection};
+    use crate::{
+        buffer::Buffer,
+        editor::EditType,
+        selection::{InsertDrift, SelRegion, Selection},
+    };
 
     #[test]
     fn should_return_selection_region_min() {

lapce-core/src/style.rs

@@ -1,7 +1,6 @@
 use std::str;
 
 use lapce_rpc::style::{LineStyle, Style};
-
 use xi_rope::{spans::Spans, LinesMetric, Rope};
 
 pub const SCOPES: &[&str] = &[

lapce-core/src/syntax/highlight.rs

@@ -20,9 +20,8 @@ use tree_sitter::{
 };
 use xi_rope::Rope;
 
-use crate::{language::LapceLanguage, style::SCOPES};
-
 use super::{util::RopeProvider, PARSER};
+use crate::{language::LapceLanguage, style::SCOPES};
 
 macro_rules! declare_language_highlights {
     ($($name:ident: $feature_name:expr),* $(,)?) => {

lapce-core/src/syntax/mod.rs

@@ -24,12 +24,6 @@ use xi_rope::{
     Interval, Rope, RopeDelta,
 };
 
-use crate::{
-    language::LapceLanguage,
-    lens::{Lens, LensBuilder},
-    style::SCOPES,
-};
-
 use self::{
     edit::generate_edits,
     highlight::{
@@ -39,6 +33,11 @@ use self::{
     },
     util::{matching_char, RopeProvider},
 };
+use crate::{
+    language::LapceLanguage,
+    lens::{Lens, LensBuilder},
+    style::SCOPES,
+};
 
 mod edit;
 pub mod highlight;

lapce-core/src/word.rs

@@ -420,8 +420,7 @@ fn classify_boundary(
     prev: CharClassification,
     next: CharClassification,
 ) -> WordBoundary {
-    use self::CharClassification::*;
-    use self::WordBoundary::*;
+    use self::{CharClassification::*, WordBoundary::*};
     match (prev, next) {
         (Lf, Lf) => Start,
         (Lf, Space) => Interior,
@@ -442,9 +441,10 @@ fn classify_boundary(
 
 #[cfg(test)]
 mod test {
-    use super::WordCursor;
     use xi_rope::Rope;
 
+    use super::WordCursor;
+
     #[test]
     fn prev_boundary_should_be_none_at_position_zero() {
         let rope = Rope::from("Hello world");

lapce-data/src/command.rs

@@ -5,14 +5,20 @@ use druid::{
     EventCtx, FileInfo, Point, Rect, Selector, SingleUse, Size, WidgetId, WindowId,
 };
 use indexmap::IndexMap;
-use lapce_core::buffer::DiffLines;
-use lapce_core::command::{
-    EditCommand, FocusCommand, MotionModeCommand, MoveCommand, MultiSelectionCommand,
+use lapce_core::{
+    buffer::DiffLines,
+    command::{
+        EditCommand, FocusCommand, MotionModeCommand, MoveCommand,
+        MultiSelectionCommand,
+    },
+    syntax::Syntax,
 };
-use lapce_core::syntax::Syntax;
-use lapce_rpc::plugin::{PluginId, VoltInfo, VoltMetadata};
 use lapce_rpc::{
-    buffer::BufferId, file::FileNodeItem, source_control::DiffInfo, style::Style,
+    buffer::BufferId,
+    file::FileNodeItem,
+    plugin::{PluginId, VoltInfo, VoltMetadata},
+    source_control::DiffInfo,
+    style::Style,
     terminal::TermId,
 };
 use lsp_types::{
@@ -25,22 +31,23 @@ use strum::{self, EnumMessage, IntoEnumIterator};
 use strum_macros::{Display, EnumIter, EnumMessage, EnumString, IntoStaticStr};
 use xi_rope::{spans::Spans, Rope};
 
-use crate::alert::AlertContentData;
-use crate::data::{LapceMainSplitData, LapceTabData, LapceWorkspace};
-use crate::document::BufferContent;
-use crate::editor::{EditorPosition, Line, LineCol};
-use crate::menu::MenuKind;
-use crate::rich_text::RichText;
-use crate::selection_range::SelectionRangeDirection;
-use crate::update::ReleaseInfo;
 use crate::{
-    data::{EditorTabChild, SplitContent},
-    editor::EditorLocation,
+    alert::AlertContentData,
+    data::{
+        EditorTabChild, LapceMainSplitData, LapceTabData, LapceWorkspace,
+        SplitContent,
+    },
+    document::BufferContent,
+    editor::{EditorLocation, EditorPosition, Line, LineCol},
     keypress::{KeyMap, KeyPress},
+    menu::MenuKind,
     palette::{PaletteItem, PaletteType},
     proxy::ProxyStatus,
+    rich_text::RichText,
     search::Match,
+    selection_range::SelectionRangeDirection,
     split::{SplitDirection, SplitMoveDirection},
+    update::ReleaseInfo,
 };
 
 pub const LAPCE_OPEN_FOLDER: Selector<FileInfo> = Selector::new("lapce.open-folder");

lapce-data/src/completion.rs

@@ -1,4 +1,4 @@
-use std::{fmt::Display, path::PathBuf, sync::Arc};
+use std::{fmt::Display, path::PathBuf, str::FromStr, sync::Arc};
 
 use anyhow::Error;
 use druid::{EventCtx, Size, WidgetId};
@@ -8,7 +8,6 @@ use lapce_core::command::FocusCommand;
 use lapce_rpc::{buffer::BufferId, plugin::PluginId};
 use lsp_types::{CompletionItem, CompletionResponse, Position};
 use regex::Regex;
-use std::str::FromStr;
 
 use crate::{config::LapceConfig, list::ListData, proxy::LapceProxy};
 

lapce-data/src/config.rs

@@ -1,4 +1,5 @@
 use std::{
+    collections::HashMap,
     io::Write,
     path::{Path, PathBuf},
     sync::Arc,
@@ -9,11 +10,11 @@ use druid::{
     Color, ExtEventSink, FontFamily, Size, Target,
 };
 use indexmap::IndexMap;
+pub use lapce_proxy::APPLICATION_NAME;
 use lapce_proxy::{directory::Directory, plugin::wasi::find_all_volts};
 use once_cell::sync::Lazy;
 use parking_lot::{Mutex, RwLock};
 use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
 use structdesc::FieldNames;
 use thiserror::Error;
 use toml_edit::easy as toml;
@@ -23,8 +24,6 @@ use crate::{
     data::{LapceWorkspace, LapceWorkspaceType},
 };
 
-pub use lapce_proxy::APPLICATION_NAME;
-
 pub const LOGO: &str = include_str!("../../extra/images/logo.svg");
 const DEFAULT_SETTINGS: &str = include_str!("../../defaults/settings.toml");
 const DEFAULT_LIGHT_THEME: &str = include_str!("../../defaults/light-theme.toml");

lapce-data/src/data.rs

@@ -1,3 +1,5 @@
+#[cfg(target_os = "windows")]
+use std::env;
 use std::{
     cell::RefCell,
     cmp::Ordering,
@@ -10,16 +12,12 @@ use std::{
     time::Instant,
 };
 
-#[cfg(target_os = "windows")]
-use std::env;
-
 use anyhow::{anyhow, Result};
 use crossbeam_channel::{unbounded, Receiver, Sender};
 use druid::{
     piet::PietText, theme, Command, Data, Env, EventCtx, ExtEventSink,
     FileDialogOptions, Lens, Point, Rect, Size, Target, Vec2, WidgetId, WindowId,
 };
-
 use itertools::Itertools;
 use lapce_core::{
     command::{FocusCommand, MultiSelectionCommand},
@@ -40,7 +38,6 @@ use lapce_rpc::{
     terminal::TermId,
     RpcMessage,
 };
-
 use lsp_types::{Diagnostic, DiagnosticSeverity, Position, ProgressToken, TextEdit};
 use notify::Watcher;
 use serde::{Deserialize, Serialize};

lapce-data/src/db.rs

@@ -9,7 +9,6 @@ use std::{
 use anyhow::{anyhow, Result};
 use crossbeam_channel::{unbounded, Sender};
 use druid::{ExtEventSink, Point, Rect, Size, Vec2, WidgetId};
-
 use lapce_proxy::directory::Directory;
 use serde::{Deserialize, Serialize};
 use xi_rope::Rope;

lapce-data/src/document.rs

@@ -44,7 +44,6 @@ use xi_rope::{
     Interval, Rope, RopeDelta, Transformer,
 };
 
-use crate::selection_range::SelectionRangeDirection;
 use crate::{
     command::{InitBufferContentCb, LapceUICommand, LAPCE_UI_COMMAND},
     config::{LapceConfig, LapceTheme},
@@ -53,7 +52,7 @@ use crate::{
     find::{Find, FindProgress},
     history::DocumentHistory,
     proxy::LapceProxy,
-    selection_range::SyntaxSelectionRanges,
+    selection_range::{SelectionRangeDirection, SyntaxSelectionRanges},
     settings::SettingsValueKind,
 };