WIP

co-authored-by: conrad <conrad.irwin@zed.dev>

crates/gpui2/src/app/test_context.rs

@@ -1,8 +1,8 @@
 use crate::{
-    AnyView, AnyWindowHandle, AppCell, AppContext, AsyncAppContext, BackgroundExecutor, Context,
-    EventEmitter, ForegroundExecutor, InputEvent, KeyDownEvent, Keystroke, Model, ModelContext,
-    Render, Result, Task, TestDispatcher, TestPlatform, View, ViewContext, VisualContext,
-    WindowContext, WindowHandle, WindowOptions,
+    div, AnyView, AnyWindowHandle, AppCell, AppContext, AsyncAppContext, BackgroundExecutor,
+    Context, Div, EventEmitter, ForegroundExecutor, InputEvent, KeyDownEvent, Keystroke, Model,
+    ModelContext, Render, Result, Task, TestDispatcher, TestPlatform, View, ViewContext,
+    VisualContext, WindowContext, WindowHandle, WindowOptions,
 };
 use anyhow::{anyhow, bail};
 use futures::{Stream, StreamExt};
@@ -132,6 +132,14 @@ impl TestAppContext {
         cx.open_window(WindowOptions::default(), |cx| cx.build_view(build_window))
     }
 
+    pub fn add_empty_window(&mut self) -> AnyWindowHandle {
+        let mut cx = self.app.borrow_mut();
+        cx.open_window(WindowOptions::default(), |cx| {
+            cx.build_view(|_| EmptyView {})
+        })
+        .any_handle
+    }
+
     pub fn add_window_view<F, V>(&mut self, build_window: F) -> (View<V>, VisualTestContext)
     where
         F: FnOnce(&mut ViewContext<V>) -> V,
@@ -456,3 +464,23 @@ impl<'a> VisualContext for VisualTestContext<'a> {
             .unwrap()
     }
 }
+
+impl AnyWindowHandle {
+    pub fn build_view<V: Render + 'static>(
+        &self,
+        cx: &mut TestAppContext,
+        build_view: impl FnOnce(&mut ViewContext<'_, V>) -> V,
+    ) -> View<V> {
+        self.update(cx, |_, cx| cx.build_view(build_view)).unwrap()
+    }
+}
+
+pub struct EmptyView {}
+
+impl Render for EmptyView {
+    type Element = Div<Self>;
+
+    fn render(&mut self, _cx: &mut crate::ViewContext<Self>) -> Self::Element {
+        div()
+    }
+}

crates/gpui2/src/platform/test/window.rs

@@ -8,7 +8,8 @@ use parking_lot::Mutex;
 
 use crate::{
     px, AtlasKey, AtlasTextureId, AtlasTile, Pixels, PlatformAtlas, PlatformDisplay,
-    PlatformWindow, Point, Scene, Size, TileId, WindowAppearance, WindowBounds, WindowOptions,
+    PlatformInputHandler, PlatformWindow, Point, Scene, Size, TileId, WindowAppearance,
+    WindowBounds, WindowOptions,
 };
 
 #[derive(Default)]
@@ -23,6 +24,7 @@ pub struct TestWindow {
     bounds: WindowBounds,
     current_scene: Mutex<Option<Scene>>,
     display: Rc<dyn PlatformDisplay>,
+    input_handler: Option<Box<dyn PlatformInputHandler>>,
 
     handlers: Mutex<Handlers>,
     sprite_atlas: Arc<dyn PlatformAtlas>,
@@ -33,7 +35,7 @@ impl TestWindow {
             bounds: options.bounds,
             current_scene: Default::default(),
             display,
-
+            input_handler: None,
             sprite_atlas: Arc::new(TestAtlas::new()),
             handlers: Default::default(),
         }
@@ -77,8 +79,8 @@ impl PlatformWindow for TestWindow {
         todo!()
     }
 
-    fn set_input_handler(&mut self, _input_handler: Box<dyn crate::PlatformInputHandler>) {
-        todo!()
+    fn set_input_handler(&mut self, input_handler: Box<dyn crate::PlatformInputHandler>) {
+        self.input_handler = Some(input_handler);
     }
 
     fn prompt(

crates/gpui2/src/text_system/line_layout.rs

@@ -54,9 +54,9 @@ impl LineLayout {
     pub fn closest_index_for_x(&self, x: Pixels) -> usize {
         let mut prev_index = 0;
         let mut prev_x = px(0.);
-
         for run in self.runs.iter() {
             for glyph in run.glyphs.iter() {
+                glyph.index;
                 if glyph.position.x >= x {
                     if glyph.position.x - x < x - prev_x {
                         return glyph.index;
@@ -68,7 +68,7 @@ impl LineLayout {
                 prev_x = glyph.position.x;
             }
         }
-        prev_index
+        prev_index + 1
     }
 
     pub fn x_for_index(&self, index: usize) -> Pixels {