Get more of chat panel compiling, but lots of todos
This commit is contained in:
Nathan Sobo
Max Brunsfeld
parent
6955579f19
commit
213ed2028c
12 changed files with 1058 additions and 992 deletions
|
|
@ -2,7 +2,9 @@ use channel::{ChannelId, ChannelMembership, ChannelStore, MessageParams};
|
|||
use client::UserId;
|
||||
use collections::HashMap;
|
||||
use editor::{AnchorRangeExt, Editor};
|
||||
use gpui::{AnyView, AsyncAppContext, Model, Render, Task, View, ViewContext, WeakView};
|
||||
use gpui::{
|
||||
AnyView, AsyncWindowContext, Model, Render, SharedString, Task, View, ViewContext, WeakView,
|
||||
};
|
||||
use language::{language_settings::SoftWrap, Buffer, BufferSnapshot, LanguageRegistry};
|
||||
use lazy_static::lazy_static;
|
||||
use project::search::SearchQuery;
|
||||
|
|
@ -46,15 +48,14 @@ impl MessageEditor {
|
|||
cx.subscribe(&buffer, Self::on_buffer_event).detach();
|
||||
|
||||
let markdown = language_registry.language_for_name("Markdown");
|
||||
cx.app_context()
|
||||
.spawn(|mut cx| async move {
|
||||
let markdown = markdown.await?;
|
||||
buffer.update(&mut cx, |buffer, cx| {
|
||||
buffer.set_language(Some(markdown), cx)
|
||||
});
|
||||
anyhow::Ok(())
|
||||
})
|
||||
.detach_and_log_err(cx);
|
||||
cx.spawn(|_, mut cx| async move {
|
||||
let markdown = markdown.await?;
|
||||
buffer.update(&mut cx, |buffer, cx| {
|
||||
buffer.set_language(Some(markdown), cx)
|
||||
});
|
||||
anyhow::Ok(())
|
||||
})
|
||||
.detach_and_log_err(cx);
|
||||
|
||||
Self {
|
||||
editor,
|
||||
|
|
@ -69,7 +70,7 @@ impl MessageEditor {
|
|||
pub fn set_channel(
|
||||
&mut self,
|
||||
channel_id: u64,
|
||||
channel_name: Option<String>,
|
||||
channel_name: Option<SharedString>,
|
||||
cx: &mut ViewContext<Self>,
|
||||
) {
|
||||
self.editor.update(cx, |editor, cx| {
|
||||
|
|
@ -137,7 +138,9 @@ impl MessageEditor {
|
|||
if let language::Event::Reparsed | language::Event::Edited = event {
|
||||
let buffer = buffer.read(cx).snapshot();
|
||||
self.mentions_task = Some(cx.spawn(|this, cx| async move {
|
||||
cx.background().timer(MENTIONS_DEBOUNCE_INTERVAL).await;
|
||||
cx.background_executor()
|
||||
.timer(MENTIONS_DEBOUNCE_INTERVAL)
|
||||
.await;
|
||||
Self::find_mentions(this, buffer, cx).await;
|
||||
}));
|
||||
}
|
||||
|
|
@ -146,10 +149,10 @@ impl MessageEditor {
|
|||
async fn find_mentions(
|
||||
this: WeakView<MessageEditor>,
|
||||
buffer: BufferSnapshot,
|
||||
mut cx: AsyncAppContext,
|
||||
mut cx: AsyncWindowContext,
|
||||
) {
|
||||
let (buffer, ranges) = cx
|
||||
.background()
|
||||
.background_executor()
|
||||
.spawn(async move {
|
||||
let ranges = MENTIONS_SEARCH.search(&buffer, None).await;
|
||||
(buffer, ranges)
|
||||
|
|
@ -186,6 +189,10 @@ impl MessageEditor {
|
|||
})
|
||||
.ok();
|
||||
}
|
||||
|
||||
pub(crate) fn focus_handle(&self, cx: &gpui::AppContext) -> gpui::FocusHandle {
|
||||
todo!()
|
||||
}
|
||||
}
|
||||
|
||||
impl Render for MessageEditor {
|
||||
|
|
@ -196,98 +203,98 @@ impl Render for MessageEditor {
|
|||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use client::{Client, User, UserStore};
|
||||
use gpui::{TestAppContext, WindowHandle};
|
||||
use language::{Language, LanguageConfig};
|
||||
use rpc::proto;
|
||||
use settings::SettingsStore;
|
||||
use util::{http::FakeHttpClient, test::marked_text_ranges};
|
||||
// #[cfg(test)]
|
||||
// mod tests {
|
||||
// use super::*;
|
||||
// use client::{Client, User, UserStore};
|
||||
// use gpui::{TestAppContext, WindowHandle};
|
||||
// use language::{Language, LanguageConfig};
|
||||
// use rpc::proto;
|
||||
// use settings::SettingsStore;
|
||||
// use util::{http::FakeHttpClient, test::marked_text_ranges};
|
||||
|
||||
#[gpui::test]
|
||||
async fn test_message_editor(cx: &mut TestAppContext) {
|
||||
let editor = init_test(cx);
|
||||
let editor = editor.root(cx);
|
||||
// #[gpui::test]
|
||||
// async fn test_message_editor(cx: &mut TestAppContext) {
|
||||
// let editor = init_test(cx);
|
||||
// let editor = editor.root(cx);
|
||||
|
||||
editor.update(cx, |editor, cx| {
|
||||
editor.set_members(
|
||||
vec![
|
||||
ChannelMembership {
|
||||
user: Arc::new(User {
|
||||
github_login: "a-b".into(),
|
||||
id: 101,
|
||||
avatar: None,
|
||||
}),
|
||||
kind: proto::channel_member::Kind::Member,
|
||||
role: proto::ChannelRole::Member,
|
||||
},
|
||||
ChannelMembership {
|
||||
user: Arc::new(User {
|
||||
github_login: "C_D".into(),
|
||||
id: 102,
|
||||
avatar: None,
|
||||
}),
|
||||
kind: proto::channel_member::Kind::Member,
|
||||
role: proto::ChannelRole::Member,
|
||||
},
|
||||
],
|
||||
cx,
|
||||
);
|
||||
// editor.update(cx, |editor, cx| {
|
||||
// editor.set_members(
|
||||
// vec![
|
||||
// ChannelMembership {
|
||||
// user: Arc::new(User {
|
||||
// github_login: "a-b".into(),
|
||||
// id: 101,
|
||||
// avatar: None,
|
||||
// }),
|
||||
// kind: proto::channel_member::Kind::Member,
|
||||
// role: proto::ChannelRole::Member,
|
||||
// },
|
||||
// ChannelMembership {
|
||||
// user: Arc::new(User {
|
||||
// github_login: "C_D".into(),
|
||||
// id: 102,
|
||||
// avatar: None,
|
||||
// }),
|
||||
// kind: proto::channel_member::Kind::Member,
|
||||
// role: proto::ChannelRole::Member,
|
||||
// },
|
||||
// ],
|
||||
// cx,
|
||||
// );
|
||||
|
||||
editor.editor.update(cx, |editor, cx| {
|
||||
editor.set_text("Hello, @a-b! Have you met @C_D?", cx)
|
||||
});
|
||||
});
|
||||
// editor.editor.update(cx, |editor, cx| {
|
||||
// editor.set_text("Hello, @a-b! Have you met @C_D?", cx)
|
||||
// });
|
||||
// });
|
||||
|
||||
cx.foreground().advance_clock(MENTIONS_DEBOUNCE_INTERVAL);
|
||||
// cx.foreground().advance_clock(MENTIONS_DEBOUNCE_INTERVAL);
|
||||
|
||||
editor.update(cx, |editor, cx| {
|
||||
let (text, ranges) = marked_text_ranges("Hello, «@a-b»! Have you met «@C_D»?", false);
|
||||
assert_eq!(
|
||||
editor.take_message(cx),
|
||||
MessageParams {
|
||||
text,
|
||||
mentions: vec![(ranges[0].clone(), 101), (ranges[1].clone(), 102)],
|
||||
}
|
||||
);
|
||||
});
|
||||
}
|
||||
// editor.update(cx, |editor, cx| {
|
||||
// let (text, ranges) = marked_text_ranges("Hello, «@a-b»! Have you met «@C_D»?", false);
|
||||
// assert_eq!(
|
||||
// editor.take_message(cx),
|
||||
// MessageParams {
|
||||
// text,
|
||||
// mentions: vec![(ranges[0].clone(), 101), (ranges[1].clone(), 102)],
|
||||
// }
|
||||
// );
|
||||
// });
|
||||
// }
|
||||
|
||||
fn init_test(cx: &mut TestAppContext) -> WindowHandle<MessageEditor> {
|
||||
cx.foreground().forbid_parking();
|
||||
// fn init_test(cx: &mut TestAppContext) -> WindowHandle<MessageEditor> {
|
||||
// cx.foreground().forbid_parking();
|
||||
|
||||
cx.update(|cx| {
|
||||
let http = FakeHttpClient::with_404_response();
|
||||
let client = Client::new(http.clone(), cx);
|
||||
let user_store = cx.add_model(|cx| UserStore::new(client.clone(), http, cx));
|
||||
cx.set_global(SettingsStore::test(cx));
|
||||
theme::init((), cx);
|
||||
language::init(cx);
|
||||
editor::init(cx);
|
||||
client::init(&client, cx);
|
||||
channel::init(&client, user_store, cx);
|
||||
});
|
||||
// cx.update(|cx| {
|
||||
// let http = FakeHttpClient::with_404_response();
|
||||
// let client = Client::new(http.clone(), cx);
|
||||
// let user_store = cx.add_model(|cx| UserStore::new(client.clone(), http, cx));
|
||||
// cx.set_global(SettingsStore::test(cx));
|
||||
// theme::init((), cx);
|
||||
// language::init(cx);
|
||||
// editor::init(cx);
|
||||
// client::init(&client, cx);
|
||||
// channel::init(&client, user_store, cx);
|
||||
// });
|
||||
|
||||
let language_registry = Arc::new(LanguageRegistry::test());
|
||||
language_registry.add(Arc::new(Language::new(
|
||||
LanguageConfig {
|
||||
name: "Markdown".into(),
|
||||
..Default::default()
|
||||
},
|
||||
Some(tree_sitter_markdown::language()),
|
||||
)));
|
||||
// let language_registry = Arc::new(LanguageRegistry::test());
|
||||
// language_registry.add(Arc::new(Language::new(
|
||||
// LanguageConfig {
|
||||
// name: "Markdown".into(),
|
||||
// ..Default::default()
|
||||
// },
|
||||
// Some(tree_sitter_markdown::language()),
|
||||
// )));
|
||||
|
||||
let editor = cx.add_window(|cx| {
|
||||
MessageEditor::new(
|
||||
language_registry,
|
||||
ChannelStore::global(cx),
|
||||
cx.add_view(|cx| Editor::auto_height(4, cx)),
|
||||
cx,
|
||||
)
|
||||
});
|
||||
cx.foreground().run_until_parked();
|
||||
editor
|
||||
}
|
||||
}
|
||||
// let editor = cx.add_window(|cx| {
|
||||
// MessageEditor::new(
|
||||
// language_registry,
|
||||
// ChannelStore::global(cx),
|
||||
// cx.add_view(|cx| Editor::auto_height(4, cx)),
|
||||
// cx,
|
||||
// )
|
||||
// });
|
||||
// cx.foreground().run_until_parked();
|
||||
// editor
|
||||
// }
|
||||
// }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue