Fix broken tests and comment out remaining tests

crates/editor2/src/test/editor_lsp_test_context.rs

@@ -59,6 +59,7 @@ impl<'a> EditorLspTestContext<'a> {
             .await;
 
         let project = Project::test(app_state.fs.clone(), [], cx).await;
+
         project.update(cx, |project, _| project.languages().add(Arc::new(language)));
 
         app_state
@@ -68,7 +69,9 @@ impl<'a> EditorLspTestContext<'a> {
             .await;
 
         let window = cx.add_window(|cx| Workspace::test_new(project.clone(), cx));
+
         let workspace = window.root_view(cx).unwrap();
+
         let mut cx = VisualTestContext::from_window(*window.deref(), cx);
         project
             .update(&mut cx, |project, cx| {
@@ -78,7 +81,6 @@ impl<'a> EditorLspTestContext<'a> {
             .unwrap();
         cx.read(|cx| workspace.read(cx).worktree_scans_complete(cx))
             .await;
-
         let file = cx.read(|cx| workspace.file_project_paths(cx)[0].clone());
         let item = workspace
             .update(&mut cx, |workspace, cx| {
@@ -86,7 +88,6 @@ impl<'a> EditorLspTestContext<'a> {
             })
             .await
             .expect("Could not open test file");
-
         let editor = cx.update(|cx| {
             item.act_as::<Editor>(cx)
                 .expect("Opened test file wasn't an editor")
@@ -94,7 +95,6 @@ impl<'a> EditorLspTestContext<'a> {
         editor.update(&mut cx, |editor, cx| editor.focus(cx));
 
         let lsp = fake_servers.next().await.unwrap();
-
         Self {
             cx: EditorTestContext {
                 cx,

crates/gpui2/src/elements/text.rs

@@ -81,6 +81,7 @@ impl<V: 'static> Element<V> for Text<V> {
         let text = self.text.clone();
 
         let rem_size = cx.rem_size();
+
         let layout_id = cx.request_measured_layout(Default::default(), rem_size, {
             let element_state = element_state.clone();
             move |known_dimensions, _| {
@@ -93,6 +94,10 @@ impl<V: 'static> Element<V> for Text<V> {
                     )
                     .log_err()
                 else {
+                    element_state.lock().replace(TextElementState {
+                        lines: Default::default(),
+                        line_height,
+                    });
                     return Size::default();
                 };
 
@@ -131,7 +136,8 @@ impl<V: 'static> Element<V> for Text<V> {
         let element_state = element_state.lock();
         let element_state = element_state
             .as_ref()
-            .expect("measurement has not been performed");
+            .ok_or_else(|| anyhow::anyhow!("measurement has not been performed on {}", &self.text))
+            .unwrap();
 
         let line_height = element_state.line_height;
         let mut line_origin = bounds.origin;

crates/gpui2/src/window.rs

@@ -2138,7 +2138,7 @@ impl<'a, V: 'static> ViewContext<'a, V> {
         &mut self,
         handler: impl Fn(&mut V, &Event, DispatchPhase, &mut ViewContext<V>) + 'static,
     ) {
-        let handle = self.view();
+        let handle = self.view().clone();
         self.window_cx.on_key_event(move |event, phase, cx| {
             handle.update(cx, |view, cx| {
                 handler(view, event, phase, cx);
@@ -2151,7 +2151,7 @@ impl<'a, V: 'static> ViewContext<'a, V> {
         action_type: TypeId,
         handler: impl Fn(&mut V, &dyn Any, DispatchPhase, &mut ViewContext<V>) + 'static,
     ) {
-        let handle = self.view();
+        let handle = self.view().clone();
         self.window_cx
             .on_action(action_type, move |action, phase, cx| {
                 handle.update(cx, |view, cx| {