chore: fmt
This commit is contained in:
parent
cfecbc5522
commit
d0f287772b
3 changed files with 124 additions and 130 deletions
|
@ -1,6 +1,4 @@
|
|||
use super::{AppVersion, CursorStyle, WindowBounds};
|
||||
use anyhow::{anyhow, Result};
|
||||
use collections::VecDeque;
|
||||
use crate::{
|
||||
geometry::{
|
||||
rect::RectF,
|
||||
|
@ -9,6 +7,8 @@ use crate::{
|
|||
keymap_matcher::KeymapMatcher,
|
||||
Action, AnyWindowHandle, ClipboardItem, Menu,
|
||||
};
|
||||
use anyhow::{anyhow, Result};
|
||||
use collections::VecDeque;
|
||||
use parking_lot::Mutex;
|
||||
use postage::oneshot;
|
||||
use std::{
|
||||
|
@ -330,12 +330,7 @@ impl super::Window for Window {
|
|||
|
||||
fn set_input_handler(&mut self, _: Box<dyn super::InputHandler>) {}
|
||||
|
||||
fn prompt(
|
||||
&self,
|
||||
_: super::PromptLevel,
|
||||
_: &str,
|
||||
_: &[&str],
|
||||
) -> oneshot::Receiver<usize> {
|
||||
fn prompt(&self, _: super::PromptLevel, _: &str, _: &[&str]) -> oneshot::Receiver<usize> {
|
||||
let (done_tx, done_rx) = oneshot::channel();
|
||||
self.pending_prompts.borrow_mut().push_back(done_tx);
|
||||
done_rx
|
||||
|
|
|
@ -1,10 +1,9 @@
|
|||
|
||||
use gpui::fonts::{Properties, Weight};
|
||||
use gpui::text_layout::*;
|
||||
|
||||
use gpui::text_layout::*;
|
||||
use gpui::fonts::{Properties, Weight};
|
||||
|
||||
#[gpui::test]
|
||||
fn test_wrap_line(cx: &mut gpui::AppContext) {
|
||||
#[gpui::test]
|
||||
fn test_wrap_line(cx: &mut gpui::AppContext) {
|
||||
let font_cache = cx.font_cache().clone();
|
||||
let font_system = cx.platform().fonts();
|
||||
let family = font_cache
|
||||
|
@ -62,10 +61,10 @@
|
|||
Boundary::new(22, 3),
|
||||
]
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
#[gpui::test(retries = 5)]
|
||||
fn test_wrap_shaped_line(cx: &mut gpui::AppContext) {
|
||||
#[gpui::test(retries = 5)]
|
||||
fn test_wrap_shaped_line(cx: &mut gpui::AppContext) {
|
||||
// This is failing intermittently on CI and we don't have time to figure it out
|
||||
let font_cache = cx.font_cache().clone();
|
||||
let font_system = cx.platform().fonts();
|
||||
|
@ -121,5 +120,4 @@
|
|||
}
|
||||
],
|
||||
);
|
||||
|
||||
}
|
||||
|
|
|
@ -75,7 +75,8 @@ fn main() {
|
|||
|
||||
log::info!("========== starting zed ==========");
|
||||
let platform = platform();
|
||||
let foreground = std::rc::Rc::new(gpui::executor::Foreground::platform(platform.dispatcher()).unwrap());
|
||||
let foreground =
|
||||
std::rc::Rc::new(gpui::executor::Foreground::platform(platform.dispatcher()).unwrap());
|
||||
let fplatform = foreground_platform(foreground);
|
||||
let mut app = gpui::App::new(Assets, platform, fplatform).unwrap();
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue