Merge some imports.

pull/11/head
Blaž Hrastnik 4 years ago
parent c4792efead
commit cbcacb1063

@ -51,8 +51,7 @@ pub use tendril::StrTendril as Tendril;
pub use {regex, tree_sitter};
pub use position::{coords_at_pos, pos_at_coords, Position};
pub use selection::Range;
pub use selection::Selection;
pub use selection::{Range, Selection};
pub use syntax::Syntax;
pub use diagnostic::Diagnostic;

@ -1,12 +1,13 @@
use crate::{Change, Rope, RopeSlice, Transaction};
pub use helix_syntax::Lang;
pub use helix_syntax::{get_language, get_language_name};
use std::borrow::Cow;
use std::cell::RefCell;
use std::collections::HashMap;
use std::path::{Path, PathBuf};
use std::sync::Arc;
pub use helix_syntax::{get_language, get_language_name, Lang};
use std::{
borrow::Cow,
cell::RefCell,
collections::HashMap,
path::{Path, PathBuf},
sync::Arc,
};
use once_cell::sync::{Lazy, OnceCell};
@ -355,9 +356,11 @@ pub struct LanguageLayer {
pub(crate) tree: Option<Tree>,
}
use crate::coords_at_pos;
use crate::transaction::{ChangeSet, Operation};
use crate::Tendril;
use crate::{
coords_at_pos,
transaction::{ChangeSet, Operation},
Tendril,
};
impl LanguageLayer {
// pub fn new() -> Self {

@ -1,6 +1,5 @@
use crate::{Range, Rope, Selection, State, Tendril};
use std::borrow::Cow;
use std::convert::TryFrom;
use std::{borrow::Cow, convert::TryFrom};
/// (from, to, replacement)
pub type Change = (usize, usize, Option<Tendril>);

@ -1,15 +1,15 @@
//! An unbounded set of streams
use core::fmt::{self, Debug};
use core::iter::FromIterator;
use core::pin::Pin;
use core::{
fmt::{self, Debug},
iter::FromIterator,
pin::Pin,
};
use smol::ready;
use smol::stream::Stream;
use smol::{ready, stream::Stream};
use std::task::{Context, Poll};
use futures_util::stream::FusedStream;
use futures_util::stream::{FuturesUnordered, StreamExt, StreamFuture};
use futures_util::stream::{FusedStream, FuturesUnordered, StreamExt, StreamFuture};
/// An unbounded set of streams
///

@ -2,8 +2,7 @@ use clap::ArgMatches as Args;
use helix_view::{document::Mode, Document, Editor, Theme, View};
use crate::compositor::Compositor;
use crate::ui;
use crate::{compositor::Compositor, ui};
use log::{error, info};
@ -139,9 +138,8 @@ impl Application {
.diagnostics
.into_iter()
.map(|diagnostic| {
use helix_core::diagnostic::Severity::*;
use helix_core::{
diagnostic::{Range, Severity},
diagnostic::{Range, Severity, Severity::*},
Diagnostic,
};
use helix_lsp::{lsp, util::lsp_pos_to_pos};

@ -10,8 +10,10 @@ use helix_core::{
use once_cell::sync::Lazy;
use crate::compositor::Compositor;
use crate::ui::{self, Popup, Prompt, PromptEvent};
use crate::{
compositor::Compositor,
ui::{self, Popup, Prompt, PromptEvent},
};
use std::path::PathBuf;

@ -5,8 +5,7 @@
use crossterm::event::Event;
use helix_core::Position;
use smol::Executor;
use tui::buffer::Buffer as Surface;
use tui::layout::Rect;
use tui::{buffer::Buffer as Surface, layout::Rect};
pub type Callback = Box<dyn FnOnce(&mut Compositor, &mut Editor)>;

@ -1,7 +1,9 @@
use crate::commands;
use crate::compositor::{Component, Compositor, Context, EventResult};
use crate::keymap::{self, Keymaps};
use crate::ui::text_color;
use crate::{
commands,
compositor::{Component, Compositor, Context, EventResult},
keymap::{self, Keymaps},
ui::text_color,
};
use helix_core::{
indent::TAB_WIDTH,

@ -1,7 +1,7 @@
use crate::compositor::{Component, Compositor, Context, EventResult};
use crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers};
use tui::buffer::Buffer as Surface;
use tui::{
buffer::Buffer as Surface,
layout::Rect,
style::{Color, Style},
text::Text,

@ -1,7 +1,7 @@
use crate::compositor::{Component, Compositor, Context, EventResult};
use crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers};
use tui::buffer::Buffer as Surface;
use tui::{
buffer::Buffer as Surface,
layout::Rect,
style::{Color, Style},
widgets::{Block, Borders},

@ -1,7 +1,7 @@
use crate::compositor::{Component, Compositor, Context, EventResult};
use crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers};
use tui::buffer::Buffer as Surface;
use tui::{
buffer::Buffer as Surface,
layout::Rect,
style::{Color, Style},
widgets::{Block, Borders},

@ -1,7 +1,7 @@
use crate::compositor::{Component, Compositor, Context, EventResult};
use crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers};
use tui::buffer::Buffer as Surface;
use tui::{
buffer::Buffer as Surface,
layout::Rect,
style::{Color, Style},
widgets::{Block, Borders},
@ -107,8 +107,10 @@ impl Component for Popup {
}
fn render(&self, viewport: Rect, surface: &mut Surface, cx: &mut Context) {
use tui::text::Text;
use tui::widgets::{Paragraph, Widget, Wrap};
use tui::{
text::Text,
widgets::{Paragraph, Widget, Wrap},
};
cx.scroll = Some(self.scroll);

@ -1,8 +1,7 @@
use crate::compositor::{Component, Compositor, Context, EventResult};
use crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers};
use helix_core::Position;
use helix_view::Editor;
use helix_view::Theme;
use helix_view::{Editor, Theme};
use std::{borrow::Cow, ops::RangeFrom};
pub struct Prompt {

@ -1,7 +1,7 @@
use crate::compositor::{Component, Compositor, Context, EventResult};
use crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers};
use tui::buffer::Buffer as Surface;
use tui::{
buffer::Buffer as Surface,
layout::Rect,
style::{Color, Style},
};

@ -1,6 +1,4 @@
use crate::theme::Theme;
use crate::tree::Tree;
use crate::{Document, View};
use crate::{theme::Theme, tree::Tree, Document, View};
use std::path::PathBuf;

Loading…
Cancel
Save