mirror of
https://github.com/zed-industries/zed.git
synced 2024-09-18 18:08:07 +03:00
Merge branch 'main' into zed2-breadcrumbs
This commit is contained in:
commit
13f4cc563c
2
Cargo.lock
generated
2
Cargo.lock
generated
@ -9987,7 +9987,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "tree-sitter"
|
name = "tree-sitter"
|
||||||
version = "0.20.10"
|
version = "0.20.10"
|
||||||
source = "git+https://github.com/tree-sitter/tree-sitter?rev=3b0159d25559b603af566ade3c83d930bf466db1#3b0159d25559b603af566ade3c83d930bf466db1"
|
source = "git+https://github.com/tree-sitter/tree-sitter?rev=b5f461a69bf3df7298b1903574d506179e6390b0#b5f461a69bf3df7298b1903574d506179e6390b0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cc",
|
"cc",
|
||||||
"regex",
|
"regex",
|
||||||
|
@ -202,7 +202,7 @@ tree-sitter-vue = {git = "https://github.com/zed-industries/tree-sitter-vue", re
|
|||||||
tree-sitter-uiua = {git = "https://github.com/shnarazk/tree-sitter-uiua", rev = "9260f11be5900beda4ee6d1a24ab8ddfaf5a19b2"}
|
tree-sitter-uiua = {git = "https://github.com/shnarazk/tree-sitter-uiua", rev = "9260f11be5900beda4ee6d1a24ab8ddfaf5a19b2"}
|
||||||
|
|
||||||
[patch.crates-io]
|
[patch.crates-io]
|
||||||
tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter", rev = "3b0159d25559b603af566ade3c83d930bf466db1" }
|
tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter", rev = "b5f461a69bf3df7298b1903574d506179e6390b0" }
|
||||||
async-task = { git = "https://github.com/zed-industries/async-task", rev = "341b57d6de98cdfd7b418567b8de2022ca993a6e" }
|
async-task = { git = "https://github.com/zed-industries/async-task", rev = "341b57d6de98cdfd7b418567b8de2022ca993a6e" }
|
||||||
|
|
||||||
# TODO - Remove when a version is released with this PR: https://github.com/servo/core-foundation-rs/pull/457
|
# TODO - Remove when a version is released with this PR: https://github.com/servo/core-foundation-rs/pull/457
|
||||||
|
@ -530,12 +530,17 @@
|
|||||||
"alt-cmd-shift-c": "project_panel::CopyRelativePath",
|
"alt-cmd-shift-c": "project_panel::CopyRelativePath",
|
||||||
"f2": "project_panel::Rename",
|
"f2": "project_panel::Rename",
|
||||||
"enter": "project_panel::Rename",
|
"enter": "project_panel::Rename",
|
||||||
"space": "project_panel::Open",
|
|
||||||
"backspace": "project_panel::Delete",
|
"backspace": "project_panel::Delete",
|
||||||
"alt-cmd-r": "project_panel::RevealInFinder",
|
"alt-cmd-r": "project_panel::RevealInFinder",
|
||||||
"alt-shift-f": "project_panel::NewSearchInDirectory"
|
"alt-shift-f": "project_panel::NewSearchInDirectory"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"context": "ProjectPanel && not_editing",
|
||||||
|
"bindings": {
|
||||||
|
"space": "project_panel::Open"
|
||||||
|
}
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"context": "CollabPanel && not_editing",
|
"context": "CollabPanel && not_editing",
|
||||||
"bindings": {
|
"bindings": {
|
||||||
|
@ -1218,6 +1218,31 @@ impl View for AssistantPanel {
|
|||||||
let style = &theme.assistant;
|
let style = &theme.assistant;
|
||||||
if let Some(api_key_editor) = self.api_key_editor.as_ref() {
|
if let Some(api_key_editor) = self.api_key_editor.as_ref() {
|
||||||
Flex::column()
|
Flex::column()
|
||||||
|
.with_child(
|
||||||
|
Text::new(
|
||||||
|
"To use the assistant panel or inline assistant, you need to add your OpenAI api key.",
|
||||||
|
style.api_key_prompt.text.clone(),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
.with_child(
|
||||||
|
Text::new(
|
||||||
|
" - Having a subscription for another service like GitHub Copilot won't work.",
|
||||||
|
style.api_key_prompt.text.clone(),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
.with_child(
|
||||||
|
Text::new(
|
||||||
|
" - You can create a api key at: platform.openai.com/api-keys",
|
||||||
|
style.api_key_prompt.text.clone(),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
.with_child(
|
||||||
|
Text::new(
|
||||||
|
" ",
|
||||||
|
style.api_key_prompt.text.clone(),
|
||||||
|
)
|
||||||
|
.aligned(),
|
||||||
|
)
|
||||||
.with_child(
|
.with_child(
|
||||||
Text::new(
|
Text::new(
|
||||||
"Paste your OpenAI API key and press Enter to use the assistant",
|
"Paste your OpenAI API key and press Enter to use the assistant",
|
||||||
@ -1231,6 +1256,20 @@ impl View for AssistantPanel {
|
|||||||
.with_style(style.api_key_editor.container)
|
.with_style(style.api_key_editor.container)
|
||||||
.aligned(),
|
.aligned(),
|
||||||
)
|
)
|
||||||
|
.with_child(
|
||||||
|
Text::new(
|
||||||
|
" ",
|
||||||
|
style.api_key_prompt.text.clone(),
|
||||||
|
)
|
||||||
|
.aligned(),
|
||||||
|
)
|
||||||
|
.with_child(
|
||||||
|
Text::new(
|
||||||
|
"Click on the Z button in the status bar to close this panel.",
|
||||||
|
style.api_key_prompt.text.clone(),
|
||||||
|
)
|
||||||
|
.aligned(),
|
||||||
|
)
|
||||||
.contained()
|
.contained()
|
||||||
.with_style(style.api_key_prompt.container)
|
.with_style(style.api_key_prompt.container)
|
||||||
.aligned()
|
.aligned()
|
||||||
|
@ -2511,7 +2511,7 @@ impl CollabPanel {
|
|||||||
} else {
|
} else {
|
||||||
el.child(
|
el.child(
|
||||||
ListHeader::new(text)
|
ListHeader::new(text)
|
||||||
.when_some(button, |el, button| el.right_button(button))
|
.when_some(button, |el, button| el.meta(button))
|
||||||
.selected(is_selected),
|
.selected(is_selected),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -37,7 +37,7 @@ use gpui::{
|
|||||||
};
|
};
|
||||||
use project::Project;
|
use project::Project;
|
||||||
use theme::ActiveTheme;
|
use theme::ActiveTheme;
|
||||||
use ui::{h_stack, prelude::*, Avatar, Button, ButtonStyle2, IconButton, KeyBinding, Tooltip};
|
use ui::{h_stack, prelude::*, Avatar, Button, ButtonStyle, IconButton, KeyBinding, Tooltip};
|
||||||
use util::ResultExt;
|
use util::ResultExt;
|
||||||
use workspace::{notifications::NotifyResultExt, Workspace};
|
use workspace::{notifications::NotifyResultExt, Workspace};
|
||||||
|
|
||||||
@ -154,7 +154,7 @@ impl Render for CollabTitlebarItem {
|
|||||||
.id("project_owner_indicator")
|
.id("project_owner_indicator")
|
||||||
.child(
|
.child(
|
||||||
Button::new("player", "player")
|
Button::new("player", "player")
|
||||||
.style(ButtonStyle2::Subtle)
|
.style(ButtonStyle::Subtle)
|
||||||
.color(Some(Color::Player(0))),
|
.color(Some(Color::Player(0))),
|
||||||
)
|
)
|
||||||
.tooltip(move |cx| Tooltip::text("Toggle following", cx)),
|
.tooltip(move |cx| Tooltip::text("Toggle following", cx)),
|
||||||
@ -167,7 +167,7 @@ impl Render for CollabTitlebarItem {
|
|||||||
.id("titlebar_project_menu_button")
|
.id("titlebar_project_menu_button")
|
||||||
.child(
|
.child(
|
||||||
Button::new("project_name", "project_name")
|
Button::new("project_name", "project_name")
|
||||||
.style(ButtonStyle2::Subtle),
|
.style(ButtonStyle::Subtle),
|
||||||
)
|
)
|
||||||
.tooltip(move |cx| Tooltip::text("Recent Projects", cx)),
|
.tooltip(move |cx| Tooltip::text("Recent Projects", cx)),
|
||||||
)
|
)
|
||||||
@ -179,7 +179,7 @@ impl Render for CollabTitlebarItem {
|
|||||||
.id("titlebar_git_menu_button")
|
.id("titlebar_git_menu_button")
|
||||||
.child(
|
.child(
|
||||||
Button::new("branch_name", "branch_name")
|
Button::new("branch_name", "branch_name")
|
||||||
.style(ButtonStyle2::Subtle)
|
.style(ButtonStyle::Subtle)
|
||||||
.color(Some(Color::Muted)),
|
.color(Some(Color::Muted)),
|
||||||
)
|
)
|
||||||
.tooltip(move |cx| {
|
.tooltip(move |cx| {
|
||||||
|
@ -11,7 +11,7 @@ use gpui::{
|
|||||||
};
|
};
|
||||||
use picker::{Picker, PickerDelegate};
|
use picker::{Picker, PickerDelegate};
|
||||||
|
|
||||||
use ui::{h_stack, v_stack, HighlightedLabel, KeyBinding, ListItem};
|
use ui::{h_stack, prelude::*, v_stack, HighlightedLabel, KeyBinding, ListItem};
|
||||||
use util::{
|
use util::{
|
||||||
channel::{parse_zed_link, ReleaseChannel, RELEASE_CHANNEL},
|
channel::{parse_zed_link, ReleaseChannel, RELEASE_CHANNEL},
|
||||||
ResultExt,
|
ResultExt,
|
||||||
|
@ -162,7 +162,7 @@ impl WrapMap {
|
|||||||
{
|
{
|
||||||
let tab_snapshot = new_snapshot.tab_snapshot.clone();
|
let tab_snapshot = new_snapshot.tab_snapshot.clone();
|
||||||
let range = TabPoint::zero()..tab_snapshot.max_point();
|
let range = TabPoint::zero()..tab_snapshot.max_point();
|
||||||
let edits = new_snapshot
|
edits = new_snapshot
|
||||||
.update(
|
.update(
|
||||||
tab_snapshot,
|
tab_snapshot,
|
||||||
&[TabEdit {
|
&[TabEdit {
|
||||||
|
@ -63,6 +63,7 @@ use language::{
|
|||||||
use lazy_static::lazy_static;
|
use lazy_static::lazy_static;
|
||||||
use link_go_to_definition::{GoToDefinitionLink, InlayHighlight, LinkGoToDefinitionState};
|
use link_go_to_definition::{GoToDefinitionLink, InlayHighlight, LinkGoToDefinitionState};
|
||||||
use lsp::{DiagnosticSeverity, LanguageServerId};
|
use lsp::{DiagnosticSeverity, LanguageServerId};
|
||||||
|
use mouse_context_menu::MouseContextMenu;
|
||||||
use movement::TextLayoutDetails;
|
use movement::TextLayoutDetails;
|
||||||
use multi_buffer::ToOffsetUtf16;
|
use multi_buffer::ToOffsetUtf16;
|
||||||
pub use multi_buffer::{
|
pub use multi_buffer::{
|
||||||
@ -406,133 +407,17 @@ pub fn init_settings(cx: &mut AppContext) {
|
|||||||
|
|
||||||
pub fn init(cx: &mut AppContext) {
|
pub fn init(cx: &mut AppContext) {
|
||||||
init_settings(cx);
|
init_settings(cx);
|
||||||
// cx.register_action_type(Editor::new_file);
|
|
||||||
// cx.register_action_type(Editor::new_file_in_direction);
|
|
||||||
// cx.register_action_type(Editor::cancel);
|
|
||||||
// cx.register_action_type(Editor::newline);
|
|
||||||
// cx.register_action_type(Editor::newline_above);
|
|
||||||
// cx.register_action_type(Editor::newline_below);
|
|
||||||
// cx.register_action_type(Editor::backspace);
|
|
||||||
// cx.register_action_type(Editor::delete);
|
|
||||||
// cx.register_action_type(Editor::tab);
|
|
||||||
// cx.register_action_type(Editor::tab_prev);
|
|
||||||
// cx.register_action_type(Editor::indent);
|
|
||||||
// cx.register_action_type(Editor::outdent);
|
|
||||||
// cx.register_action_type(Editor::delete_line);
|
|
||||||
// cx.register_action_type(Editor::join_lines);
|
|
||||||
// cx.register_action_type(Editor::sort_lines_case_sensitive);
|
|
||||||
// cx.register_action_type(Editor::sort_lines_case_insensitive);
|
|
||||||
// cx.register_action_type(Editor::reverse_lines);
|
|
||||||
// cx.register_action_type(Editor::shuffle_lines);
|
|
||||||
// cx.register_action_type(Editor::convert_to_upper_case);
|
|
||||||
// cx.register_action_type(Editor::convert_to_lower_case);
|
|
||||||
// cx.register_action_type(Editor::convert_to_title_case);
|
|
||||||
// cx.register_action_type(Editor::convert_to_snake_case);
|
|
||||||
// cx.register_action_type(Editor::convert_to_kebab_case);
|
|
||||||
// cx.register_action_type(Editor::convert_to_upper_camel_case);
|
|
||||||
// cx.register_action_type(Editor::convert_to_lower_camel_case);
|
|
||||||
// cx.register_action_type(Editor::delete_to_previous_word_start);
|
|
||||||
// cx.register_action_type(Editor::delete_to_previous_subword_start);
|
|
||||||
// cx.register_action_type(Editor::delete_to_next_word_end);
|
|
||||||
// cx.register_action_type(Editor::delete_to_next_subword_end);
|
|
||||||
// cx.register_action_type(Editor::delete_to_beginning_of_line);
|
|
||||||
// cx.register_action_type(Editor::delete_to_end_of_line);
|
|
||||||
// cx.register_action_type(Editor::cut_to_end_of_line);
|
|
||||||
// cx.register_action_type(Editor::duplicate_line);
|
|
||||||
// cx.register_action_type(Editor::move_line_up);
|
|
||||||
// cx.register_action_type(Editor::move_line_down);
|
|
||||||
// cx.register_action_type(Editor::transpose);
|
|
||||||
// cx.register_action_type(Editor::cut);
|
|
||||||
// cx.register_action_type(Editor::copy);
|
|
||||||
// cx.register_action_type(Editor::paste);
|
|
||||||
// cx.register_action_type(Editor::undo);
|
|
||||||
// cx.register_action_type(Editor::redo);
|
|
||||||
// cx.register_action_type(Editor::move_page_up);
|
|
||||||
// cx.register_action_type::<MoveDown>();
|
|
||||||
// cx.register_action_type(Editor::move_page_down);
|
|
||||||
// cx.register_action_type(Editor::next_screen);
|
|
||||||
// cx.register_action_type::<MoveLeft>();
|
|
||||||
// cx.register_action_type::<MoveRight>();
|
|
||||||
// cx.register_action_type(Editor::move_to_previous_word_start);
|
|
||||||
// cx.register_action_type(Editor::move_to_previous_subword_start);
|
|
||||||
// cx.register_action_type(Editor::move_to_next_word_end);
|
|
||||||
// cx.register_action_type(Editor::move_to_next_subword_end);
|
|
||||||
// cx.register_action_type(Editor::move_to_beginning_of_line);
|
|
||||||
// cx.register_action_type(Editor::move_to_end_of_line);
|
|
||||||
// cx.register_action_type(Editor::move_to_start_of_paragraph);
|
|
||||||
// cx.register_action_type(Editor::move_to_end_of_paragraph);
|
|
||||||
// cx.register_action_type(Editor::move_to_beginning);
|
|
||||||
// cx.register_action_type(Editor::move_to_end);
|
|
||||||
// cx.register_action_type(Editor::select_up);
|
|
||||||
// cx.register_action_type(Editor::select_down);
|
|
||||||
// cx.register_action_type(Editor::select_left);
|
|
||||||
// cx.register_action_type(Editor::select_right);
|
|
||||||
// cx.register_action_type(Editor::select_to_previous_word_start);
|
|
||||||
// cx.register_action_type(Editor::select_to_previous_subword_start);
|
|
||||||
// cx.register_action_type(Editor::select_to_next_word_end);
|
|
||||||
// cx.register_action_type(Editor::select_to_next_subword_end);
|
|
||||||
// cx.register_action_type(Editor::select_to_beginning_of_line);
|
|
||||||
// cx.register_action_type(Editor::select_to_end_of_line);
|
|
||||||
// cx.register_action_type(Editor::select_to_start_of_paragraph);
|
|
||||||
// cx.register_action_type(Editor::select_to_end_of_paragraph);
|
|
||||||
// cx.register_action_type(Editor::select_to_beginning);
|
|
||||||
// cx.register_action_type(Editor::select_to_end);
|
|
||||||
// cx.register_action_type(Editor::select_all);
|
|
||||||
// cx.register_action_type(Editor::select_all_matches);
|
|
||||||
// cx.register_action_type(Editor::select_line);
|
|
||||||
// cx.register_action_type(Editor::split_selection_into_lines);
|
|
||||||
// cx.register_action_type(Editor::add_selection_above);
|
|
||||||
// cx.register_action_type(Editor::add_selection_below);
|
|
||||||
// cx.register_action_type(Editor::select_next);
|
|
||||||
// cx.register_action_type(Editor::select_previous);
|
|
||||||
// cx.register_action_type(Editor::toggle_comments);
|
|
||||||
// cx.register_action_type(Editor::select_larger_syntax_node);
|
|
||||||
// cx.register_action_type(Editor::select_smaller_syntax_node);
|
|
||||||
// cx.register_action_type(Editor::move_to_enclosing_bracket);
|
|
||||||
// cx.register_action_type(Editor::undo_selection);
|
|
||||||
// cx.register_action_type(Editor::redo_selection);
|
|
||||||
// cx.register_action_type(Editor::go_to_diagnostic);
|
|
||||||
// cx.register_action_type(Editor::go_to_prev_diagnostic);
|
|
||||||
// cx.register_action_type(Editor::go_to_hunk);
|
|
||||||
// cx.register_action_type(Editor::go_to_prev_hunk);
|
|
||||||
// cx.register_action_type(Editor::go_to_definition);
|
|
||||||
// cx.register_action_type(Editor::go_to_definition_split);
|
|
||||||
// cx.register_action_type(Editor::go_to_type_definition);
|
|
||||||
// cx.register_action_type(Editor::go_to_type_definition_split);
|
|
||||||
// cx.register_action_type(Editor::fold);
|
|
||||||
// cx.register_action_type(Editor::fold_at);
|
|
||||||
// cx.register_action_type(Editor::unfold_lines);
|
|
||||||
// cx.register_action_type(Editor::unfold_at);
|
|
||||||
// cx.register_action_type(Editor::gutter_hover);
|
|
||||||
// cx.register_action_type(Editor::fold_selected_ranges);
|
|
||||||
// cx.register_action_type(Editor::show_completions);
|
|
||||||
// cx.register_action_type(Editor::toggle_code_actions);
|
|
||||||
// cx.register_action_type(Editor::open_excerpts);
|
|
||||||
// cx.register_action_type(Editor::toggle_soft_wrap);
|
|
||||||
// cx.register_action_type(Editor::toggle_inlay_hints);
|
|
||||||
// cx.register_action_type(Editor::reveal_in_finder);
|
|
||||||
// cx.register_action_type(Editor::copy_path);
|
|
||||||
// cx.register_action_type(Editor::copy_relative_path);
|
|
||||||
// cx.register_action_type(Editor::copy_highlight_json);
|
|
||||||
// cx.add_async_action(Editor::format);
|
|
||||||
// cx.register_action_type(Editor::restart_language_server);
|
|
||||||
// cx.register_action_type(Editor::show_character_palette);
|
|
||||||
// cx.add_async_action(Editor::confirm_completion);
|
|
||||||
// cx.add_async_action(Editor::confirm_code_action);
|
|
||||||
// cx.add_async_action(Editor::rename);
|
|
||||||
// cx.add_async_action(Editor::confirm_rename);
|
|
||||||
// cx.add_async_action(Editor::find_all_references);
|
|
||||||
// cx.register_action_type(Editor::next_copilot_suggestion);
|
|
||||||
// cx.register_action_type(Editor::previous_copilot_suggestion);
|
|
||||||
// cx.register_action_type(Editor::copilot_suggest);
|
|
||||||
// cx.register_action_type(Editor::context_menu_first);
|
|
||||||
// cx.register_action_type(Editor::context_menu_prev);
|
|
||||||
// cx.register_action_type(Editor::context_menu_next);
|
|
||||||
// cx.register_action_type(Editor::context_menu_last);
|
|
||||||
|
|
||||||
workspace::register_project_item::<Editor>(cx);
|
workspace::register_project_item::<Editor>(cx);
|
||||||
workspace::register_followable_item::<Editor>(cx);
|
workspace::register_followable_item::<Editor>(cx);
|
||||||
workspace::register_deserializable_item::<Editor>(cx);
|
workspace::register_deserializable_item::<Editor>(cx);
|
||||||
|
cx.observe_new_views(
|
||||||
|
|workspace: &mut Workspace, cx: &mut ViewContext<Workspace>| {
|
||||||
|
workspace.register_action(Editor::new_file);
|
||||||
|
workspace.register_action(Editor::new_file_in_direction);
|
||||||
|
},
|
||||||
|
)
|
||||||
|
.detach();
|
||||||
}
|
}
|
||||||
|
|
||||||
trait InvalidationRegion {
|
trait InvalidationRegion {
|
||||||
@ -620,8 +505,6 @@ pub struct Editor {
|
|||||||
ime_transaction: Option<TransactionId>,
|
ime_transaction: Option<TransactionId>,
|
||||||
active_diagnostics: Option<ActiveDiagnosticGroup>,
|
active_diagnostics: Option<ActiveDiagnosticGroup>,
|
||||||
soft_wrap_mode_override: Option<language_settings::SoftWrap>,
|
soft_wrap_mode_override: Option<language_settings::SoftWrap>,
|
||||||
// get_field_editor_theme: Option<Arc<GetFieldEditorTheme>>,
|
|
||||||
// override_text_style: Option<Box<OverrideTextStyle>>,
|
|
||||||
project: Option<Model<Project>>,
|
project: Option<Model<Project>>,
|
||||||
collaboration_hub: Option<Box<dyn CollaborationHub>>,
|
collaboration_hub: Option<Box<dyn CollaborationHub>>,
|
||||||
blink_manager: Model<BlinkManager>,
|
blink_manager: Model<BlinkManager>,
|
||||||
@ -635,7 +518,7 @@ pub struct Editor {
|
|||||||
inlay_background_highlights: TreeMap<Option<TypeId>, InlayBackgroundHighlight>,
|
inlay_background_highlights: TreeMap<Option<TypeId>, InlayBackgroundHighlight>,
|
||||||
nav_history: Option<ItemNavHistory>,
|
nav_history: Option<ItemNavHistory>,
|
||||||
context_menu: RwLock<Option<ContextMenu>>,
|
context_menu: RwLock<Option<ContextMenu>>,
|
||||||
// mouse_context_menu: View<context_menu::ContextMenu>,
|
mouse_context_menu: Option<MouseContextMenu>,
|
||||||
completion_tasks: Vec<(CompletionId, Task<Option<()>>)>,
|
completion_tasks: Vec<(CompletionId, Task<Option<()>>)>,
|
||||||
next_completion_id: CompletionId,
|
next_completion_id: CompletionId,
|
||||||
available_code_actions: Option<(Model<Buffer>, Arc<[CodeAction]>)>,
|
available_code_actions: Option<(Model<Buffer>, Arc<[CodeAction]>)>,
|
||||||
@ -1729,21 +1612,11 @@ impl Editor {
|
|||||||
// Self::new(EditorMode::Full, buffer, None, field_editor_style, cx)
|
// Self::new(EditorMode::Full, buffer, None, field_editor_style, cx)
|
||||||
// }
|
// }
|
||||||
|
|
||||||
// pub fn auto_height(
|
pub fn auto_height(max_lines: usize, cx: &mut ViewContext<Self>) -> Self {
|
||||||
// max_lines: usize,
|
let buffer = cx.build_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), String::new()));
|
||||||
// field_editor_style: Option<Arc<GetFieldEditorTheme>>,
|
let buffer = cx.build_model(|cx| MultiBuffer::singleton(buffer, cx));
|
||||||
// cx: &mut ViewContext<Self>,
|
Self::new(EditorMode::AutoHeight { max_lines }, buffer, None, cx)
|
||||||
// ) -> Self {
|
}
|
||||||
// let buffer = cx.build_model(|cx| Buffer::new(0, cx.model_id() as u64, String::new()));
|
|
||||||
// let buffer = cx.build_model(|cx| MultiBuffer::singleton(buffer, cx));
|
|
||||||
// Self::new(
|
|
||||||
// EditorMode::AutoHeight { max_lines },
|
|
||||||
// buffer,
|
|
||||||
// None,
|
|
||||||
// field_editor_style,
|
|
||||||
// cx,
|
|
||||||
// )
|
|
||||||
// }
|
|
||||||
|
|
||||||
pub fn for_buffer(
|
pub fn for_buffer(
|
||||||
buffer: Model<Buffer>,
|
buffer: Model<Buffer>,
|
||||||
@ -1763,14 +1636,7 @@ impl Editor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn clone(&self, cx: &mut ViewContext<Self>) -> Self {
|
pub fn clone(&self, cx: &mut ViewContext<Self>) -> Self {
|
||||||
let mut clone = Self::new(
|
let mut clone = Self::new(self.mode, self.buffer.clone(), self.project.clone(), cx);
|
||||||
self.mode,
|
|
||||||
self.buffer.clone(),
|
|
||||||
self.project.clone(),
|
|
||||||
// todo!
|
|
||||||
// self.get_field_editor_theme.clone(),
|
|
||||||
cx,
|
|
||||||
);
|
|
||||||
self.display_map.update(cx, |display_map, cx| {
|
self.display_map.update(cx, |display_map, cx| {
|
||||||
let snapshot = display_map.snapshot(cx);
|
let snapshot = display_map.snapshot(cx);
|
||||||
clone.display_map.update(cx, |display_map, cx| {
|
clone.display_map.update(cx, |display_map, cx| {
|
||||||
@ -1787,17 +1653,11 @@ impl Editor {
|
|||||||
mode: EditorMode,
|
mode: EditorMode,
|
||||||
buffer: Model<MultiBuffer>,
|
buffer: Model<MultiBuffer>,
|
||||||
project: Option<Model<Project>>,
|
project: Option<Model<Project>>,
|
||||||
// todo!()
|
|
||||||
// get_field_editor_theme: Option<Arc<GetFieldEditorTheme>>,
|
|
||||||
cx: &mut ViewContext<Self>,
|
cx: &mut ViewContext<Self>,
|
||||||
) -> Self {
|
) -> Self {
|
||||||
// let editor_view_id = cx.view_id();
|
|
||||||
let style = cx.text_style();
|
let style = cx.text_style();
|
||||||
let font_size = style.font_size.to_pixels(cx.rem_size());
|
let font_size = style.font_size.to_pixels(cx.rem_size());
|
||||||
let display_map = cx.build_model(|cx| {
|
let display_map = cx.build_model(|cx| {
|
||||||
// todo!()
|
|
||||||
// let settings = settings::get::<ThemeSettings>(cx);
|
|
||||||
// let style = build_style(settings, get_field_editor_theme.as_deref(), None, cx);
|
|
||||||
DisplayMap::new(buffer.clone(), style.font(), font_size, None, 2, 1, cx)
|
DisplayMap::new(buffer.clone(), style.font(), font_size, None, 2, 1, cx)
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -1853,7 +1713,6 @@ impl Editor {
|
|||||||
ime_transaction: Default::default(),
|
ime_transaction: Default::default(),
|
||||||
active_diagnostics: None,
|
active_diagnostics: None,
|
||||||
soft_wrap_mode_override,
|
soft_wrap_mode_override,
|
||||||
// get_field_editor_theme,
|
|
||||||
collaboration_hub: project.clone().map(|project| Box::new(project) as _),
|
collaboration_hub: project.clone().map(|project| Box::new(project) as _),
|
||||||
project,
|
project,
|
||||||
blink_manager: blink_manager.clone(),
|
blink_manager: blink_manager.clone(),
|
||||||
@ -1867,8 +1726,7 @@ impl Editor {
|
|||||||
inlay_background_highlights: Default::default(),
|
inlay_background_highlights: Default::default(),
|
||||||
nav_history: None,
|
nav_history: None,
|
||||||
context_menu: RwLock::new(None),
|
context_menu: RwLock::new(None),
|
||||||
// mouse_context_menu: cx
|
mouse_context_menu: None,
|
||||||
// .add_view(|cx| context_menu::ContextMenu::new(editor_view_id, cx)),
|
|
||||||
completion_tasks: Default::default(),
|
completion_tasks: Default::default(),
|
||||||
next_completion_id: 0,
|
next_completion_id: 0,
|
||||||
next_inlay_id: 0,
|
next_inlay_id: 0,
|
||||||
@ -1877,7 +1735,6 @@ impl Editor {
|
|||||||
document_highlights_task: Default::default(),
|
document_highlights_task: Default::default(),
|
||||||
pending_rename: Default::default(),
|
pending_rename: Default::default(),
|
||||||
searchable: true,
|
searchable: true,
|
||||||
// override_text_style: None,
|
|
||||||
cursor_shape: Default::default(),
|
cursor_shape: Default::default(),
|
||||||
autoindent_mode: Some(AutoindentMode::EachLine),
|
autoindent_mode: Some(AutoindentMode::EachLine),
|
||||||
collapse_matches: false,
|
collapse_matches: false,
|
||||||
@ -1995,25 +1852,25 @@ impl Editor {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// pub fn new_file_in_direction(
|
pub fn new_file_in_direction(
|
||||||
// workspace: &mut Workspace,
|
workspace: &mut Workspace,
|
||||||
// action: &workspace::NewFileInDirection,
|
action: &workspace::NewFileInDirection,
|
||||||
// cx: &mut ViewContext<Workspace>,
|
cx: &mut ViewContext<Workspace>,
|
||||||
// ) {
|
) {
|
||||||
// let project = workspace.project().clone();
|
let project = workspace.project().clone();
|
||||||
// if project.read(cx).is_remote() {
|
if project.read(cx).is_remote() {
|
||||||
// cx.propagate();
|
cx.propagate();
|
||||||
// } else if let Some(buffer) = project
|
} else if let Some(buffer) = project
|
||||||
// .update(cx, |project, cx| project.create_buffer("", None, cx))
|
.update(cx, |project, cx| project.create_buffer("", None, cx))
|
||||||
// .log_err()
|
.log_err()
|
||||||
// {
|
{
|
||||||
// workspace.split_item(
|
workspace.split_item(
|
||||||
// action.0,
|
action.0,
|
||||||
// Box::new(cx.add_view(|cx| Editor::for_buffer(buffer, Some(project.clone()), cx))),
|
Box::new(cx.build_view(|cx| Editor::for_buffer(buffer, Some(project.clone()), cx))),
|
||||||
// cx,
|
cx,
|
||||||
// );
|
);
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
|
|
||||||
pub fn replica_id(&self, cx: &AppContext) -> ReplicaId {
|
pub fn replica_id(&self, cx: &AppContext) -> ReplicaId {
|
||||||
self.buffer.read(cx).replica_id()
|
self.buffer.read(cx).replica_id()
|
||||||
@ -8369,6 +8226,18 @@ impl Editor {
|
|||||||
cx.notify();
|
cx.notify();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn set_style(&mut self, style: EditorStyle, cx: &mut ViewContext<Self>) {
|
||||||
|
let rem_size = cx.rem_size();
|
||||||
|
self.display_map.update(cx, |map, cx| {
|
||||||
|
map.set_font(
|
||||||
|
style.text.font(),
|
||||||
|
style.text.font_size.to_pixels(rem_size),
|
||||||
|
cx,
|
||||||
|
)
|
||||||
|
});
|
||||||
|
self.style = Some(style);
|
||||||
|
}
|
||||||
|
|
||||||
pub fn set_wrap_width(&self, width: Option<Pixels>, cx: &mut AppContext) -> bool {
|
pub fn set_wrap_width(&self, width: Option<Pixels>, cx: &mut AppContext) -> bool {
|
||||||
self.display_map
|
self.display_map
|
||||||
.update(cx, |map, cx| map.set_wrap_width(width, cx))
|
.update(cx, |map, cx| map.set_wrap_width(width, cx))
|
||||||
@ -8791,62 +8660,56 @@ impl Editor {
|
|||||||
// self.searchable
|
// self.searchable
|
||||||
// }
|
// }
|
||||||
|
|
||||||
// fn open_excerpts(workspace: &mut Workspace, _: &OpenExcerpts, cx: &mut ViewContext<Workspace>) {
|
fn open_excerpts(&mut self, _: &OpenExcerpts, cx: &mut ViewContext<Self>) {
|
||||||
// let active_item = workspace.active_item(cx);
|
let buffer = self.buffer.read(cx);
|
||||||
// let editor_handle = if let Some(editor) = active_item
|
if buffer.is_singleton() {
|
||||||
// .as_ref()
|
cx.propagate();
|
||||||
// .and_then(|item| item.act_as::<Self>(cx))
|
return;
|
||||||
// {
|
}
|
||||||
// editor
|
|
||||||
// } else {
|
|
||||||
// cx.propagate();
|
|
||||||
// return;
|
|
||||||
// };
|
|
||||||
|
|
||||||
// let editor = editor_handle.read(cx);
|
let Some(workspace) = self.workspace() else {
|
||||||
// let buffer = editor.buffer.read(cx);
|
cx.propagate();
|
||||||
// if buffer.is_singleton() {
|
return;
|
||||||
// cx.propagate();
|
};
|
||||||
// return;
|
|
||||||
// }
|
|
||||||
|
|
||||||
// let mut new_selections_by_buffer = HashMap::default();
|
let mut new_selections_by_buffer = HashMap::default();
|
||||||
// for selection in editor.selections.all::<usize>(cx) {
|
for selection in self.selections.all::<usize>(cx) {
|
||||||
// for (buffer, mut range, _) in
|
for (buffer, mut range, _) in
|
||||||
// buffer.range_to_buffer_ranges(selection.start..selection.end, cx)
|
buffer.range_to_buffer_ranges(selection.start..selection.end, cx)
|
||||||
// {
|
{
|
||||||
// if selection.reversed {
|
if selection.reversed {
|
||||||
// mem::swap(&mut range.start, &mut range.end);
|
mem::swap(&mut range.start, &mut range.end);
|
||||||
// }
|
}
|
||||||
// new_selections_by_buffer
|
new_selections_by_buffer
|
||||||
// .entry(buffer)
|
.entry(buffer)
|
||||||
// .or_insert(Vec::new())
|
.or_insert(Vec::new())
|
||||||
// .push(range)
|
.push(range)
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
|
|
||||||
// editor_handle.update(cx, |editor, cx| {
|
self.push_to_nav_history(self.selections.newest_anchor().head(), None, cx);
|
||||||
// editor.push_to_nav_history(editor.selections.newest_anchor().head(), None, cx);
|
|
||||||
// });
|
|
||||||
// let pane = workspace.active_pane().clone();
|
|
||||||
// pane.update(cx, |pane, _| pane.disable_history());
|
|
||||||
|
|
||||||
// // We defer the pane interaction because we ourselves are a workspace item
|
// We defer the pane interaction because we ourselves are a workspace item
|
||||||
// // and activating a new item causes the pane to call a method on us reentrantly,
|
// and activating a new item causes the pane to call a method on us reentrantly,
|
||||||
// // which panics if we're on the stack.
|
// which panics if we're on the stack.
|
||||||
// cx.defer(move |workspace, cx| {
|
cx.window_context().defer(move |cx| {
|
||||||
// for (buffer, ranges) in new_selections_by_buffer.into_iter() {
|
workspace.update(cx, |workspace, cx| {
|
||||||
// let editor = workspace.open_project_item::<Self>(buffer, cx);
|
let pane = workspace.active_pane().clone();
|
||||||
// editor.update(cx, |editor, cx| {
|
pane.update(cx, |pane, _| pane.disable_history());
|
||||||
// editor.change_selections(Some(Autoscroll::newest()), cx, |s| {
|
|
||||||
// s.select_ranges(ranges);
|
|
||||||
// });
|
|
||||||
// });
|
|
||||||
// }
|
|
||||||
|
|
||||||
// pane.update(cx, |pane, _| pane.enable_history());
|
for (buffer, ranges) in new_selections_by_buffer.into_iter() {
|
||||||
// });
|
let editor = workspace.open_project_item::<Self>(buffer, cx);
|
||||||
// }
|
editor.update(cx, |editor, cx| {
|
||||||
|
editor.change_selections(Some(Autoscroll::newest()), cx, |s| {
|
||||||
|
s.select_ranges(ranges);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
pane.update(cx, |pane, _| pane.enable_history());
|
||||||
|
})
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
fn jump(
|
fn jump(
|
||||||
&mut self,
|
&mut self,
|
||||||
@ -9392,7 +9255,7 @@ impl Render for Editor {
|
|||||||
fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
|
fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
|
||||||
let settings = ThemeSettings::get_global(cx);
|
let settings = ThemeSettings::get_global(cx);
|
||||||
let text_style = match self.mode {
|
let text_style = match self.mode {
|
||||||
EditorMode::SingleLine => TextStyle {
|
EditorMode::SingleLine | EditorMode::AutoHeight { .. } => TextStyle {
|
||||||
color: cx.theme().colors().text,
|
color: cx.theme().colors().text,
|
||||||
font_family: settings.ui_font.family.clone(),
|
font_family: settings.ui_font.family.clone(),
|
||||||
font_features: settings.ui_font.features,
|
font_features: settings.ui_font.features,
|
||||||
@ -9405,8 +9268,6 @@ impl Render for Editor {
|
|||||||
white_space: WhiteSpace::Normal,
|
white_space: WhiteSpace::Normal,
|
||||||
},
|
},
|
||||||
|
|
||||||
EditorMode::AutoHeight { max_lines } => todo!(),
|
|
||||||
|
|
||||||
EditorMode::Full => TextStyle {
|
EditorMode::Full => TextStyle {
|
||||||
color: cx.theme().colors().text,
|
color: cx.theme().colors().text,
|
||||||
font_family: settings.buffer_font.family.clone(),
|
font_family: settings.buffer_font.family.clone(),
|
||||||
@ -9441,106 +9302,6 @@ impl Render for Editor {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// impl View for Editor {
|
|
||||||
// fn render(&mut self, cx: &mut ViewContext<Self>) -> AnyElement<Self> {
|
|
||||||
// let style = self.style(cx);
|
|
||||||
// let font_changed = self.display_map.update(cx, |map, cx| {
|
|
||||||
// map.set_fold_ellipses_color(style.folds.ellipses.text_color);
|
|
||||||
// map.set_font_with_size(style.text.font_id, style.text.font_size, cx)
|
|
||||||
// });
|
|
||||||
|
|
||||||
// if font_changed {
|
|
||||||
// cx.defer(move |editor, cx: &mut ViewContext<Editor>| {
|
|
||||||
// hide_hover(editor, cx);
|
|
||||||
// hide_link_definition(editor, cx);
|
|
||||||
// });
|
|
||||||
// }
|
|
||||||
|
|
||||||
// Stack::new()
|
|
||||||
// .with_child(EditorElement::new(style.clone()))
|
|
||||||
// .with_child(ChildView::new(&self.mouse_context_menu, cx))
|
|
||||||
// .into_any()
|
|
||||||
// }
|
|
||||||
|
|
||||||
// fn ui_name() -> &'static str {
|
|
||||||
// "Editor"
|
|
||||||
// }
|
|
||||||
|
|
||||||
// fn focus_in(&mut self, focused: AnyView, cx: &mut ViewContext<Self>) {
|
|
||||||
// if cx.is_self_focused() {
|
|
||||||
// let focused_event = EditorFocused(cx.handle());
|
|
||||||
// cx.emit(Event::Focused);
|
|
||||||
// cx.emit_global(focused_event);
|
|
||||||
// }
|
|
||||||
// if let Some(rename) = self.pending_rename.as_ref() {
|
|
||||||
// cx.focus(&rename.editor);
|
|
||||||
// } else if cx.is_self_focused() || !focused.is::<Editor>() {
|
|
||||||
// if !self.focused {
|
|
||||||
// self.blink_manager.update(cx, BlinkManager::enable);
|
|
||||||
// }
|
|
||||||
// self.focused = true;
|
|
||||||
// self.buffer.update(cx, |buffer, cx| {
|
|
||||||
// buffer.finalize_last_transaction(cx);
|
|
||||||
// if self.leader_peer_id.is_none() {
|
|
||||||
// buffer.set_active_selections(
|
|
||||||
// &self.selections.disjoint_anchors(),
|
|
||||||
// self.selections.line_mode,
|
|
||||||
// self.cursor_shape,
|
|
||||||
// cx,
|
|
||||||
// );
|
|
||||||
// }
|
|
||||||
// });
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
// fn focus_out(&mut self, _: AnyView, cx: &mut ViewContext<Self>) {
|
|
||||||
// let blurred_event = EditorBlurred(cx.handle());
|
|
||||||
// cx.emit_global(blurred_event);
|
|
||||||
// self.focused = false;
|
|
||||||
// self.blink_manager.update(cx, BlinkManager::disable);
|
|
||||||
// self.buffer
|
|
||||||
// .update(cx, |buffer, cx| buffer.remove_active_selections(cx));
|
|
||||||
// self.hide_context_menu(cx);
|
|
||||||
// hide_hover(self, cx);
|
|
||||||
// cx.emit(Event::Blurred);
|
|
||||||
// cx.notify();
|
|
||||||
// }
|
|
||||||
|
|
||||||
// fn modifiers_changed(
|
|
||||||
// &mut self,
|
|
||||||
// event: &gpui::platform::ModifiersChangedEvent,
|
|
||||||
// cx: &mut ViewContext<Self>,
|
|
||||||
// ) -> bool {
|
|
||||||
// let pending_selection = self.has_pending_selection();
|
|
||||||
|
|
||||||
// if let Some(point) = &self.link_go_to_definition_state.last_trigger_point {
|
|
||||||
// if event.cmd && !pending_selection {
|
|
||||||
// let point = point.clone();
|
|
||||||
// let snapshot = self.snapshot(cx);
|
|
||||||
// let kind = point.definition_kind(event.shift);
|
|
||||||
|
|
||||||
// show_link_definition(kind, self, point, snapshot, cx);
|
|
||||||
// return false;
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
// {
|
|
||||||
// if self.link_go_to_definition_state.symbol_range.is_some()
|
|
||||||
// || !self.link_go_to_definition_state.definitions.is_empty()
|
|
||||||
// {
|
|
||||||
// self.link_go_to_definition_state.symbol_range.take();
|
|
||||||
// self.link_go_to_definition_state.definitions.clear();
|
|
||||||
// cx.notify();
|
|
||||||
// }
|
|
||||||
|
|
||||||
// self.link_go_to_definition_state.task = None;
|
|
||||||
|
|
||||||
// self.clear_highlights::<LinkGoToDefinitionState>(cx);
|
|
||||||
// }
|
|
||||||
|
|
||||||
// false
|
|
||||||
// }
|
|
||||||
|
|
||||||
impl InputHandler for Editor {
|
impl InputHandler for Editor {
|
||||||
fn text_for_range(
|
fn text_for_range(
|
||||||
&mut self,
|
&mut self,
|
||||||
@ -9787,72 +9548,6 @@ impl InputHandler for Editor {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// fn build_style(
|
|
||||||
// settings: &ThemeSettings,
|
|
||||||
// get_field_editor_theme: Option<&GetFieldEditorTheme>,
|
|
||||||
// override_text_style: Option<&OverrideTextStyle>,
|
|
||||||
// cx: &mut AppContext,
|
|
||||||
// ) -> EditorStyle {
|
|
||||||
// let font_cache = cx.font_cache();
|
|
||||||
// let line_height_scalar = settings.line_height();
|
|
||||||
// let theme_id = settings.theme.meta.id;
|
|
||||||
// let mut theme = settings.theme.editor.clone();
|
|
||||||
// let mut style = if let Some(get_field_editor_theme) = get_field_editor_theme {
|
|
||||||
// let field_editor_theme = get_field_editor_theme(&settings.theme);
|
|
||||||
// theme.text_color = field_editor_theme.text.color;
|
|
||||||
// theme.selection = field_editor_theme.selection;
|
|
||||||
// theme.background = field_editor_theme
|
|
||||||
// .container
|
|
||||||
// .background_color
|
|
||||||
// .unwrap_or_default();
|
|
||||||
// EditorStyle {
|
|
||||||
// text: field_editor_theme.text,
|
|
||||||
// placeholder_text: field_editor_theme.placeholder_text,
|
|
||||||
// line_height_scalar,
|
|
||||||
// theme,
|
|
||||||
// theme_id,
|
|
||||||
// }
|
|
||||||
// } else {
|
|
||||||
// todo!();
|
|
||||||
// // let font_family_id = settings.buffer_font_family;
|
|
||||||
// // let font_family_name = cx.font_cache().family_name(font_family_id).unwrap();
|
|
||||||
// // let font_properties = Default::default();
|
|
||||||
// // let font_id = font_cache
|
|
||||||
// // .select_font(font_family_id, &font_properties)
|
|
||||||
// // .unwrap();
|
|
||||||
// // let font_size = settings.buffer_font_size(cx);
|
|
||||||
// // EditorStyle {
|
|
||||||
// // text: TextStyle {
|
|
||||||
// // color: settings.theme.editor.text_color,
|
|
||||||
// // font_family_name,
|
|
||||||
// // font_family_id,
|
|
||||||
// // font_id,
|
|
||||||
// // font_size,
|
|
||||||
// // font_properties,
|
|
||||||
// // underline: Default::default(),
|
|
||||||
// // soft_wrap: false,
|
|
||||||
// // },
|
|
||||||
// // placeholder_text: None,
|
|
||||||
// // line_height_scalar,
|
|
||||||
// // theme,
|
|
||||||
// // theme_id,
|
|
||||||
// // }
|
|
||||||
// };
|
|
||||||
|
|
||||||
// if let Some(highlight_style) = override_text_style.and_then(|build_style| build_style(&style)) {
|
|
||||||
// if let Some(highlighted) = style
|
|
||||||
// .text
|
|
||||||
// .clone()
|
|
||||||
// .highlight(highlight_style, font_cache)
|
|
||||||
// .log_err()
|
|
||||||
// {
|
|
||||||
// style.text = highlighted;
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
// style
|
|
||||||
// }
|
|
||||||
|
|
||||||
trait SelectionExt {
|
trait SelectionExt {
|
||||||
fn offset_range(&self, buffer: &MultiBufferSnapshot) -> Range<usize>;
|
fn offset_range(&self, buffer: &MultiBufferSnapshot) -> Range<usize>;
|
||||||
fn point_range(&self, buffer: &MultiBufferSnapshot) -> Range<Point>;
|
fn point_range(&self, buffer: &MultiBufferSnapshot) -> Range<Point>;
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -4,13 +4,14 @@ use crate::{
|
|||||||
EditorEvent, EditorSettings, ExcerptId, ExcerptRange, MultiBuffer, MultiBufferSnapshot,
|
EditorEvent, EditorSettings, ExcerptId, ExcerptRange, MultiBuffer, MultiBufferSnapshot,
|
||||||
NavigationData, ToPoint as _,
|
NavigationData, ToPoint as _,
|
||||||
};
|
};
|
||||||
use anyhow::{anyhow, Context, Result};
|
use anyhow::{anyhow, Context as _, Result};
|
||||||
use collections::HashSet;
|
use collections::HashSet;
|
||||||
use futures::future::try_join_all;
|
use futures::future::try_join_all;
|
||||||
use gpui::{
|
use gpui::{
|
||||||
div, point, AnyElement, AppContext, AsyncAppContext, Entity, EntityId, EventEmitter,
|
div, point, AnyElement, AppContext, AsyncAppContext, AsyncWindowContext, Context, Div, Entity,
|
||||||
FocusHandle, Model, ParentElement, Pixels, SharedString, Styled, Subscription, Task, View,
|
EntityId, EventEmitter, FocusHandle, IntoElement, Model, ParentElement, Pixels, Render,
|
||||||
ViewContext, VisualContext, WeakView, WindowContext,
|
SharedString, Styled, Subscription, Task, View, ViewContext, VisualContext, WeakView,
|
||||||
|
WindowContext,
|
||||||
};
|
};
|
||||||
use language::{
|
use language::{
|
||||||
proto::serialize_anchor as serialize_text_anchor, Bias, Buffer, CharKind, OffsetRangeExt,
|
proto::serialize_anchor as serialize_text_anchor, Bias, Buffer, CharKind, OffsetRangeExt,
|
||||||
@ -20,6 +21,7 @@ use project::{search::SearchQuery, FormatTrigger, Item as _, Project, ProjectPat
|
|||||||
use rpc::proto::{self, update_view, PeerId};
|
use rpc::proto::{self, update_view, PeerId};
|
||||||
use settings::Settings;
|
use settings::Settings;
|
||||||
use smallvec::SmallVec;
|
use smallvec::SmallVec;
|
||||||
|
use std::fmt::Write;
|
||||||
use std::{
|
use std::{
|
||||||
borrow::Cow,
|
borrow::Cow,
|
||||||
cmp::{self, Ordering},
|
cmp::{self, Ordering},
|
||||||
@ -31,8 +33,11 @@ use std::{
|
|||||||
use text::Selection;
|
use text::Selection;
|
||||||
use theme::{ActiveTheme, Theme};
|
use theme::{ActiveTheme, Theme};
|
||||||
use ui::{Color, Label};
|
use ui::{Color, Label};
|
||||||
use util::{paths::PathExt, ResultExt, TryFutureExt};
|
use util::{paths::PathExt, paths::FILE_ROW_COLUMN_DELIMITER, ResultExt, TryFutureExt};
|
||||||
use workspace::item::{BreadcrumbText, FollowEvent, FollowableEvents, FollowableItemHandle};
|
use workspace::{
|
||||||
|
item::{BreadcrumbText, FollowEvent, FollowableEvents, FollowableItemHandle},
|
||||||
|
StatusItemView,
|
||||||
|
};
|
||||||
use workspace::{
|
use workspace::{
|
||||||
item::{FollowableItem, Item, ItemEvent, ItemHandle, ProjectItem},
|
item::{FollowableItem, Item, ItemEvent, ItemHandle, ProjectItem},
|
||||||
searchable::{Direction, SearchEvent, SearchableItem, SearchableItemHandle},
|
searchable::{Direction, SearchEvent, SearchableItem, SearchableItemHandle},
|
||||||
@ -71,110 +76,108 @@ impl FollowableItem for Editor {
|
|||||||
workspace: View<Workspace>,
|
workspace: View<Workspace>,
|
||||||
remote_id: ViewId,
|
remote_id: ViewId,
|
||||||
state: &mut Option<proto::view::Variant>,
|
state: &mut Option<proto::view::Variant>,
|
||||||
cx: &mut AppContext,
|
cx: &mut WindowContext,
|
||||||
) -> Option<Task<Result<View<Self>>>> {
|
) -> Option<Task<Result<View<Self>>>> {
|
||||||
todo!()
|
let project = workspace.read(cx).project().to_owned();
|
||||||
|
let Some(proto::view::Variant::Editor(_)) = state else {
|
||||||
|
return None;
|
||||||
|
};
|
||||||
|
let Some(proto::view::Variant::Editor(state)) = state.take() else {
|
||||||
|
unreachable!()
|
||||||
|
};
|
||||||
|
|
||||||
|
let client = project.read(cx).client();
|
||||||
|
let replica_id = project.read(cx).replica_id();
|
||||||
|
let buffer_ids = state
|
||||||
|
.excerpts
|
||||||
|
.iter()
|
||||||
|
.map(|excerpt| excerpt.buffer_id)
|
||||||
|
.collect::<HashSet<_>>();
|
||||||
|
let buffers = project.update(cx, |project, cx| {
|
||||||
|
buffer_ids
|
||||||
|
.iter()
|
||||||
|
.map(|id| project.open_buffer_by_id(*id, cx))
|
||||||
|
.collect::<Vec<_>>()
|
||||||
|
});
|
||||||
|
|
||||||
|
let pane = pane.downgrade();
|
||||||
|
Some(cx.spawn(|mut cx| async move {
|
||||||
|
let mut buffers = futures::future::try_join_all(buffers).await?;
|
||||||
|
let editor = pane.update(&mut cx, |pane, cx| {
|
||||||
|
let mut editors = pane.items_of_type::<Self>();
|
||||||
|
editors.find(|editor| {
|
||||||
|
let ids_match = editor.remote_id(&client, cx) == Some(remote_id);
|
||||||
|
let singleton_buffer_matches = state.singleton
|
||||||
|
&& buffers.first()
|
||||||
|
== editor.read(cx).buffer.read(cx).as_singleton().as_ref();
|
||||||
|
ids_match || singleton_buffer_matches
|
||||||
|
})
|
||||||
|
})?;
|
||||||
|
|
||||||
|
let editor = if let Some(editor) = editor {
|
||||||
|
editor
|
||||||
|
} else {
|
||||||
|
pane.update(&mut cx, |_, cx| {
|
||||||
|
let multibuffer = cx.build_model(|cx| {
|
||||||
|
let mut multibuffer;
|
||||||
|
if state.singleton && buffers.len() == 1 {
|
||||||
|
multibuffer = MultiBuffer::singleton(buffers.pop().unwrap(), cx)
|
||||||
|
} else {
|
||||||
|
multibuffer = MultiBuffer::new(replica_id);
|
||||||
|
let mut excerpts = state.excerpts.into_iter().peekable();
|
||||||
|
while let Some(excerpt) = excerpts.peek() {
|
||||||
|
let buffer_id = excerpt.buffer_id;
|
||||||
|
let buffer_excerpts = iter::from_fn(|| {
|
||||||
|
let excerpt = excerpts.peek()?;
|
||||||
|
(excerpt.buffer_id == buffer_id)
|
||||||
|
.then(|| excerpts.next().unwrap())
|
||||||
|
});
|
||||||
|
let buffer =
|
||||||
|
buffers.iter().find(|b| b.read(cx).remote_id() == buffer_id);
|
||||||
|
if let Some(buffer) = buffer {
|
||||||
|
multibuffer.push_excerpts(
|
||||||
|
buffer.clone(),
|
||||||
|
buffer_excerpts.filter_map(deserialize_excerpt_range),
|
||||||
|
cx,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
if let Some(title) = &state.title {
|
||||||
|
multibuffer = multibuffer.with_title(title.clone())
|
||||||
|
}
|
||||||
|
|
||||||
|
multibuffer
|
||||||
|
});
|
||||||
|
|
||||||
|
cx.build_view(|cx| {
|
||||||
|
let mut editor =
|
||||||
|
Editor::for_multibuffer(multibuffer, Some(project.clone()), cx);
|
||||||
|
editor.remote_id = Some(remote_id);
|
||||||
|
editor
|
||||||
|
})
|
||||||
|
})?
|
||||||
|
};
|
||||||
|
|
||||||
|
update_editor_from_message(
|
||||||
|
editor.downgrade(),
|
||||||
|
project,
|
||||||
|
proto::update_view::Editor {
|
||||||
|
selections: state.selections,
|
||||||
|
pending_selection: state.pending_selection,
|
||||||
|
scroll_top_anchor: state.scroll_top_anchor,
|
||||||
|
scroll_x: state.scroll_x,
|
||||||
|
scroll_y: state.scroll_y,
|
||||||
|
..Default::default()
|
||||||
|
},
|
||||||
|
&mut cx,
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
Ok(editor)
|
||||||
|
}))
|
||||||
}
|
}
|
||||||
// let project = workspace.read(cx).project().to_owned();
|
|
||||||
// let Some(proto::view::Variant::Editor(_)) = state else {
|
|
||||||
// return None;
|
|
||||||
// };
|
|
||||||
// let Some(proto::view::Variant::Editor(state)) = state.take() else {
|
|
||||||
// unreachable!()
|
|
||||||
// };
|
|
||||||
|
|
||||||
// let client = project.read(cx).client();
|
|
||||||
// let replica_id = project.read(cx).replica_id();
|
|
||||||
// let buffer_ids = state
|
|
||||||
// .excerpts
|
|
||||||
// .iter()
|
|
||||||
// .map(|excerpt| excerpt.buffer_id)
|
|
||||||
// .collect::<HashSet<_>>();
|
|
||||||
// let buffers = project.update(cx, |project, cx| {
|
|
||||||
// buffer_ids
|
|
||||||
// .iter()
|
|
||||||
// .map(|id| project.open_buffer_by_id(*id, cx))
|
|
||||||
// .collect::<Vec<_>>()
|
|
||||||
// });
|
|
||||||
|
|
||||||
// let pane = pane.downgrade();
|
|
||||||
// Some(cx.spawn(|mut cx| async move {
|
|
||||||
// let mut buffers = futures::future::try_join_all(buffers).await?;
|
|
||||||
// let editor = pane.read_with(&cx, |pane, cx| {
|
|
||||||
// let mut editors = pane.items_of_type::<Self>();
|
|
||||||
// editors.find(|editor| {
|
|
||||||
// let ids_match = editor.remote_id(&client, cx) == Some(remote_id);
|
|
||||||
// let singleton_buffer_matches = state.singleton
|
|
||||||
// && buffers.first()
|
|
||||||
// == editor.read(cx).buffer.read(cx).as_singleton().as_ref();
|
|
||||||
// ids_match || singleton_buffer_matches
|
|
||||||
// })
|
|
||||||
// })?;
|
|
||||||
|
|
||||||
// let editor = if let Some(editor) = editor {
|
|
||||||
// editor
|
|
||||||
// } else {
|
|
||||||
// pane.update(&mut cx, |_, cx| {
|
|
||||||
// let multibuffer = cx.add_model(|cx| {
|
|
||||||
// let mut multibuffer;
|
|
||||||
// if state.singleton && buffers.len() == 1 {
|
|
||||||
// multibuffer = MultiBuffer::singleton(buffers.pop().unwrap(), cx)
|
|
||||||
// } else {
|
|
||||||
// multibuffer = MultiBuffer::new(replica_id);
|
|
||||||
// let mut excerpts = state.excerpts.into_iter().peekable();
|
|
||||||
// while let Some(excerpt) = excerpts.peek() {
|
|
||||||
// let buffer_id = excerpt.buffer_id;
|
|
||||||
// let buffer_excerpts = iter::from_fn(|| {
|
|
||||||
// let excerpt = excerpts.peek()?;
|
|
||||||
// (excerpt.buffer_id == buffer_id)
|
|
||||||
// .then(|| excerpts.next().unwrap())
|
|
||||||
// });
|
|
||||||
// let buffer =
|
|
||||||
// buffers.iter().find(|b| b.read(cx).remote_id() == buffer_id);
|
|
||||||
// if let Some(buffer) = buffer {
|
|
||||||
// multibuffer.push_excerpts(
|
|
||||||
// buffer.clone(),
|
|
||||||
// buffer_excerpts.filter_map(deserialize_excerpt_range),
|
|
||||||
// cx,
|
|
||||||
// );
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// };
|
|
||||||
|
|
||||||
// if let Some(title) = &state.title {
|
|
||||||
// multibuffer = multibuffer.with_title(title.clone())
|
|
||||||
// }
|
|
||||||
|
|
||||||
// multibuffer
|
|
||||||
// });
|
|
||||||
|
|
||||||
// cx.add_view(|cx| {
|
|
||||||
// let mut editor =
|
|
||||||
// Editor::for_multibuffer(multibuffer, Some(project.clone()), cx);
|
|
||||||
// editor.remote_id = Some(remote_id);
|
|
||||||
// editor
|
|
||||||
// })
|
|
||||||
// })?
|
|
||||||
// };
|
|
||||||
|
|
||||||
// update_editor_from_message(
|
|
||||||
// editor.downgrade(),
|
|
||||||
// project,
|
|
||||||
// proto::update_view::Editor {
|
|
||||||
// selections: state.selections,
|
|
||||||
// pending_selection: state.pending_selection,
|
|
||||||
// scroll_top_anchor: state.scroll_top_anchor,
|
|
||||||
// scroll_x: state.scroll_x,
|
|
||||||
// scroll_y: state.scroll_y,
|
|
||||||
// ..Default::default()
|
|
||||||
// },
|
|
||||||
// &mut cx,
|
|
||||||
// )
|
|
||||||
// .await?;
|
|
||||||
|
|
||||||
// Ok(editor)
|
|
||||||
// }))
|
|
||||||
// }
|
|
||||||
|
|
||||||
fn set_leader_peer_id(&mut self, leader_peer_id: Option<PeerId>, cx: &mut ViewContext<Self>) {
|
fn set_leader_peer_id(&mut self, leader_peer_id: Option<PeerId>, cx: &mut ViewContext<Self>) {
|
||||||
self.leader_peer_id = leader_peer_id;
|
self.leader_peer_id = leader_peer_id;
|
||||||
@ -195,7 +198,7 @@ impl FollowableItem for Editor {
|
|||||||
cx.notify();
|
cx.notify();
|
||||||
}
|
}
|
||||||
|
|
||||||
fn to_state_proto(&self, cx: &AppContext) -> Option<proto::view::Variant> {
|
fn to_state_proto(&self, cx: &WindowContext) -> Option<proto::view::Variant> {
|
||||||
let buffer = self.buffer.read(cx);
|
let buffer = self.buffer.read(cx);
|
||||||
let scroll_anchor = self.scroll_manager.anchor();
|
let scroll_anchor = self.scroll_manager.anchor();
|
||||||
let excerpts = buffer
|
let excerpts = buffer
|
||||||
@ -242,7 +245,7 @@ impl FollowableItem for Editor {
|
|||||||
&self,
|
&self,
|
||||||
event: &Self::FollowableEvent,
|
event: &Self::FollowableEvent,
|
||||||
update: &mut Option<proto::update_view::Variant>,
|
update: &mut Option<proto::update_view::Variant>,
|
||||||
cx: &AppContext,
|
cx: &WindowContext,
|
||||||
) -> bool {
|
) -> bool {
|
||||||
let update =
|
let update =
|
||||||
update.get_or_insert_with(|| proto::update_view::Variant::Editor(Default::default()));
|
update.get_or_insert_with(|| proto::update_view::Variant::Editor(Default::default()));
|
||||||
@ -315,7 +318,7 @@ impl FollowableItem for Editor {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
fn is_project_item(&self, _cx: &AppContext) -> bool {
|
fn is_project_item(&self, _cx: &WindowContext) -> bool {
|
||||||
true
|
true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -324,132 +327,129 @@ async fn update_editor_from_message(
|
|||||||
this: WeakView<Editor>,
|
this: WeakView<Editor>,
|
||||||
project: Model<Project>,
|
project: Model<Project>,
|
||||||
message: proto::update_view::Editor,
|
message: proto::update_view::Editor,
|
||||||
cx: &mut AsyncAppContext,
|
cx: &mut AsyncWindowContext,
|
||||||
) -> Result<()> {
|
) -> Result<()> {
|
||||||
todo!()
|
// Open all of the buffers of which excerpts were added to the editor.
|
||||||
|
let inserted_excerpt_buffer_ids = message
|
||||||
|
.inserted_excerpts
|
||||||
|
.iter()
|
||||||
|
.filter_map(|insertion| Some(insertion.excerpt.as_ref()?.buffer_id))
|
||||||
|
.collect::<HashSet<_>>();
|
||||||
|
let inserted_excerpt_buffers = project.update(cx, |project, cx| {
|
||||||
|
inserted_excerpt_buffer_ids
|
||||||
|
.into_iter()
|
||||||
|
.map(|id| project.open_buffer_by_id(id, cx))
|
||||||
|
.collect::<Vec<_>>()
|
||||||
|
})?;
|
||||||
|
let _inserted_excerpt_buffers = try_join_all(inserted_excerpt_buffers).await?;
|
||||||
|
|
||||||
|
// Update the editor's excerpts.
|
||||||
|
this.update(cx, |editor, cx| {
|
||||||
|
editor.buffer.update(cx, |multibuffer, cx| {
|
||||||
|
let mut removed_excerpt_ids = message
|
||||||
|
.deleted_excerpts
|
||||||
|
.into_iter()
|
||||||
|
.map(ExcerptId::from_proto)
|
||||||
|
.collect::<Vec<_>>();
|
||||||
|
removed_excerpt_ids.sort_by({
|
||||||
|
let multibuffer = multibuffer.read(cx);
|
||||||
|
move |a, b| a.cmp(&b, &multibuffer)
|
||||||
|
});
|
||||||
|
|
||||||
|
let mut insertions = message.inserted_excerpts.into_iter().peekable();
|
||||||
|
while let Some(insertion) = insertions.next() {
|
||||||
|
let Some(excerpt) = insertion.excerpt else {
|
||||||
|
continue;
|
||||||
|
};
|
||||||
|
let Some(previous_excerpt_id) = insertion.previous_excerpt_id else {
|
||||||
|
continue;
|
||||||
|
};
|
||||||
|
let buffer_id = excerpt.buffer_id;
|
||||||
|
let Some(buffer) = project.read(cx).buffer_for_id(buffer_id) else {
|
||||||
|
continue;
|
||||||
|
};
|
||||||
|
|
||||||
|
let adjacent_excerpts = iter::from_fn(|| {
|
||||||
|
let insertion = insertions.peek()?;
|
||||||
|
if insertion.previous_excerpt_id.is_none()
|
||||||
|
&& insertion.excerpt.as_ref()?.buffer_id == buffer_id
|
||||||
|
{
|
||||||
|
insertions.next()?.excerpt
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
multibuffer.insert_excerpts_with_ids_after(
|
||||||
|
ExcerptId::from_proto(previous_excerpt_id),
|
||||||
|
buffer,
|
||||||
|
[excerpt]
|
||||||
|
.into_iter()
|
||||||
|
.chain(adjacent_excerpts)
|
||||||
|
.filter_map(|excerpt| {
|
||||||
|
Some((
|
||||||
|
ExcerptId::from_proto(excerpt.id),
|
||||||
|
deserialize_excerpt_range(excerpt)?,
|
||||||
|
))
|
||||||
|
}),
|
||||||
|
cx,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
multibuffer.remove_excerpts(removed_excerpt_ids, cx);
|
||||||
|
});
|
||||||
|
})?;
|
||||||
|
|
||||||
|
// Deserialize the editor state.
|
||||||
|
let (selections, pending_selection, scroll_top_anchor) = this.update(cx, |editor, cx| {
|
||||||
|
let buffer = editor.buffer.read(cx).read(cx);
|
||||||
|
let selections = message
|
||||||
|
.selections
|
||||||
|
.into_iter()
|
||||||
|
.filter_map(|selection| deserialize_selection(&buffer, selection))
|
||||||
|
.collect::<Vec<_>>();
|
||||||
|
let pending_selection = message
|
||||||
|
.pending_selection
|
||||||
|
.and_then(|selection| deserialize_selection(&buffer, selection));
|
||||||
|
let scroll_top_anchor = message
|
||||||
|
.scroll_top_anchor
|
||||||
|
.and_then(|anchor| deserialize_anchor(&buffer, anchor));
|
||||||
|
anyhow::Ok((selections, pending_selection, scroll_top_anchor))
|
||||||
|
})??;
|
||||||
|
|
||||||
|
// Wait until the buffer has received all of the operations referenced by
|
||||||
|
// the editor's new state.
|
||||||
|
this.update(cx, |editor, cx| {
|
||||||
|
editor.buffer.update(cx, |buffer, cx| {
|
||||||
|
buffer.wait_for_anchors(
|
||||||
|
selections
|
||||||
|
.iter()
|
||||||
|
.chain(pending_selection.as_ref())
|
||||||
|
.flat_map(|selection| [selection.start, selection.end])
|
||||||
|
.chain(scroll_top_anchor),
|
||||||
|
cx,
|
||||||
|
)
|
||||||
|
})
|
||||||
|
})?
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
// Update the editor's state.
|
||||||
|
this.update(cx, |editor, cx| {
|
||||||
|
if !selections.is_empty() || pending_selection.is_some() {
|
||||||
|
editor.set_selections_from_remote(selections, pending_selection, cx);
|
||||||
|
editor.request_autoscroll_remotely(Autoscroll::newest(), cx);
|
||||||
|
} else if let Some(scroll_top_anchor) = scroll_top_anchor {
|
||||||
|
editor.set_scroll_anchor_remote(
|
||||||
|
ScrollAnchor {
|
||||||
|
anchor: scroll_top_anchor,
|
||||||
|
offset: point(message.scroll_x, message.scroll_y),
|
||||||
|
},
|
||||||
|
cx,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
})?;
|
||||||
|
Ok(())
|
||||||
}
|
}
|
||||||
// Previous implementation of the above
|
|
||||||
// // Open all of the buffers of which excerpts were added to the editor.
|
|
||||||
// let inserted_excerpt_buffer_ids = message
|
|
||||||
// .inserted_excerpts
|
|
||||||
// .iter()
|
|
||||||
// .filter_map(|insertion| Some(insertion.excerpt.as_ref()?.buffer_id))
|
|
||||||
// .collect::<HashSet<_>>();
|
|
||||||
// let inserted_excerpt_buffers = project.update(cx, |project, cx| {
|
|
||||||
// inserted_excerpt_buffer_ids
|
|
||||||
// .into_iter()
|
|
||||||
// .map(|id| project.open_buffer_by_id(id, cx))
|
|
||||||
// .collect::<Vec<_>>()
|
|
||||||
// })?;
|
|
||||||
// let _inserted_excerpt_buffers = try_join_all(inserted_excerpt_buffers).await?;
|
|
||||||
|
|
||||||
// // Update the editor's excerpts.
|
|
||||||
// this.update(cx, |editor, cx| {
|
|
||||||
// editor.buffer.update(cx, |multibuffer, cx| {
|
|
||||||
// let mut removed_excerpt_ids = message
|
|
||||||
// .deleted_excerpts
|
|
||||||
// .into_iter()
|
|
||||||
// .map(ExcerptId::from_proto)
|
|
||||||
// .collect::<Vec<_>>();
|
|
||||||
// removed_excerpt_ids.sort_by({
|
|
||||||
// let multibuffer = multibuffer.read(cx);
|
|
||||||
// move |a, b| a.cmp(&b, &multibuffer)
|
|
||||||
// });
|
|
||||||
|
|
||||||
// let mut insertions = message.inserted_excerpts.into_iter().peekable();
|
|
||||||
// while let Some(insertion) = insertions.next() {
|
|
||||||
// let Some(excerpt) = insertion.excerpt else {
|
|
||||||
// continue;
|
|
||||||
// };
|
|
||||||
// let Some(previous_excerpt_id) = insertion.previous_excerpt_id else {
|
|
||||||
// continue;
|
|
||||||
// };
|
|
||||||
// let buffer_id = excerpt.buffer_id;
|
|
||||||
// let Some(buffer) = project.read(cx).buffer_for_id(buffer_id) else {
|
|
||||||
// continue;
|
|
||||||
// };
|
|
||||||
|
|
||||||
// let adjacent_excerpts = iter::from_fn(|| {
|
|
||||||
// let insertion = insertions.peek()?;
|
|
||||||
// if insertion.previous_excerpt_id.is_none()
|
|
||||||
// && insertion.excerpt.as_ref()?.buffer_id == buffer_id
|
|
||||||
// {
|
|
||||||
// insertions.next()?.excerpt
|
|
||||||
// } else {
|
|
||||||
// None
|
|
||||||
// }
|
|
||||||
// });
|
|
||||||
|
|
||||||
// multibuffer.insert_excerpts_with_ids_after(
|
|
||||||
// ExcerptId::from_proto(previous_excerpt_id),
|
|
||||||
// buffer,
|
|
||||||
// [excerpt]
|
|
||||||
// .into_iter()
|
|
||||||
// .chain(adjacent_excerpts)
|
|
||||||
// .filter_map(|excerpt| {
|
|
||||||
// Some((
|
|
||||||
// ExcerptId::from_proto(excerpt.id),
|
|
||||||
// deserialize_excerpt_range(excerpt)?,
|
|
||||||
// ))
|
|
||||||
// }),
|
|
||||||
// cx,
|
|
||||||
// );
|
|
||||||
// }
|
|
||||||
|
|
||||||
// multibuffer.remove_excerpts(removed_excerpt_ids, cx);
|
|
||||||
// });
|
|
||||||
// })?;
|
|
||||||
|
|
||||||
// // Deserialize the editor state.
|
|
||||||
// let (selections, pending_selection, scroll_top_anchor) = this.update(cx, |editor, cx| {
|
|
||||||
// let buffer = editor.buffer.read(cx).read(cx);
|
|
||||||
// let selections = message
|
|
||||||
// .selections
|
|
||||||
// .into_iter()
|
|
||||||
// .filter_map(|selection| deserialize_selection(&buffer, selection))
|
|
||||||
// .collect::<Vec<_>>();
|
|
||||||
// let pending_selection = message
|
|
||||||
// .pending_selection
|
|
||||||
// .and_then(|selection| deserialize_selection(&buffer, selection));
|
|
||||||
// let scroll_top_anchor = message
|
|
||||||
// .scroll_top_anchor
|
|
||||||
// .and_then(|anchor| deserialize_anchor(&buffer, anchor));
|
|
||||||
// anyhow::Ok((selections, pending_selection, scroll_top_anchor))
|
|
||||||
// })??;
|
|
||||||
|
|
||||||
// // Wait until the buffer has received all of the operations referenced by
|
|
||||||
// // the editor's new state.
|
|
||||||
// this.update(cx, |editor, cx| {
|
|
||||||
// editor.buffer.update(cx, |buffer, cx| {
|
|
||||||
// buffer.wait_for_anchors(
|
|
||||||
// selections
|
|
||||||
// .iter()
|
|
||||||
// .chain(pending_selection.as_ref())
|
|
||||||
// .flat_map(|selection| [selection.start, selection.end])
|
|
||||||
// .chain(scroll_top_anchor),
|
|
||||||
// cx,
|
|
||||||
// )
|
|
||||||
// })
|
|
||||||
// })?
|
|
||||||
// .await?;
|
|
||||||
|
|
||||||
// // Update the editor's state.
|
|
||||||
// this.update(cx, |editor, cx| {
|
|
||||||
// if !selections.is_empty() || pending_selection.is_some() {
|
|
||||||
// editor.set_selections_from_remote(selections, pending_selection, cx);
|
|
||||||
// editor.request_autoscroll_remotely(Autoscroll::newest(), cx);
|
|
||||||
// } else if let Some(scroll_top_anchor) = scroll_top_anchor {
|
|
||||||
// editor.set_scroll_anchor_remote(
|
|
||||||
// ScrollAnchor {
|
|
||||||
// anchor: scroll_top_anchor,
|
|
||||||
// offset: point(message.scroll_x, message.scroll_y),
|
|
||||||
// },
|
|
||||||
// cx,
|
|
||||||
// );
|
|
||||||
// }
|
|
||||||
// })?;
|
|
||||||
// Ok(())
|
|
||||||
// }
|
|
||||||
|
|
||||||
fn serialize_excerpt(
|
fn serialize_excerpt(
|
||||||
buffer_id: u64,
|
buffer_id: u64,
|
||||||
@ -529,39 +529,38 @@ fn deserialize_anchor(buffer: &MultiBufferSnapshot, anchor: proto::EditorAnchor)
|
|||||||
|
|
||||||
impl Item for Editor {
|
impl Item for Editor {
|
||||||
fn navigate(&mut self, data: Box<dyn std::any::Any>, cx: &mut ViewContext<Self>) -> bool {
|
fn navigate(&mut self, data: Box<dyn std::any::Any>, cx: &mut ViewContext<Self>) -> bool {
|
||||||
todo!();
|
if let Ok(data) = data.downcast::<NavigationData>() {
|
||||||
// if let Ok(data) = data.downcast::<NavigationData>() {
|
let newest_selection = self.selections.newest::<Point>(cx);
|
||||||
// let newest_selection = self.selections.newest::<Point>(cx);
|
let buffer = self.buffer.read(cx).read(cx);
|
||||||
// let buffer = self.buffer.read(cx).read(cx);
|
let offset = if buffer.can_resolve(&data.cursor_anchor) {
|
||||||
// let offset = if buffer.can_resolve(&data.cursor_anchor) {
|
data.cursor_anchor.to_point(&buffer)
|
||||||
// data.cursor_anchor.to_point(&buffer)
|
} else {
|
||||||
// } else {
|
buffer.clip_point(data.cursor_position, Bias::Left)
|
||||||
// buffer.clip_point(data.cursor_position, Bias::Left)
|
};
|
||||||
// };
|
|
||||||
|
|
||||||
// let mut scroll_anchor = data.scroll_anchor;
|
let mut scroll_anchor = data.scroll_anchor;
|
||||||
// if !buffer.can_resolve(&scroll_anchor.anchor) {
|
if !buffer.can_resolve(&scroll_anchor.anchor) {
|
||||||
// scroll_anchor.anchor = buffer.anchor_before(
|
scroll_anchor.anchor = buffer.anchor_before(
|
||||||
// buffer.clip_point(Point::new(data.scroll_top_row, 0), Bias::Left),
|
buffer.clip_point(Point::new(data.scroll_top_row, 0), Bias::Left),
|
||||||
// );
|
);
|
||||||
// }
|
}
|
||||||
|
|
||||||
// drop(buffer);
|
drop(buffer);
|
||||||
|
|
||||||
// if newest_selection.head() == offset {
|
if newest_selection.head() == offset {
|
||||||
// false
|
false
|
||||||
// } else {
|
} else {
|
||||||
// let nav_history = self.nav_history.take();
|
let nav_history = self.nav_history.take();
|
||||||
// self.set_scroll_anchor(scroll_anchor, cx);
|
self.set_scroll_anchor(scroll_anchor, cx);
|
||||||
// self.change_selections(Some(Autoscroll::fit()), cx, |s| {
|
self.change_selections(Some(Autoscroll::fit()), cx, |s| {
|
||||||
// s.select_ranges([offset..offset])
|
s.select_ranges([offset..offset])
|
||||||
// });
|
});
|
||||||
// self.nav_history = nav_history;
|
self.nav_history = nav_history;
|
||||||
// true
|
true
|
||||||
// }
|
}
|
||||||
// } else {
|
} else {
|
||||||
// false
|
false
|
||||||
// }
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn tab_tooltip_text(&self, cx: &AppContext) -> Option<SharedString> {
|
fn tab_tooltip_text(&self, cx: &AppContext) -> Option<SharedString> {
|
||||||
@ -768,7 +767,7 @@ impl Item for Editor {
|
|||||||
let cursor = self.selections.newest_anchor().head();
|
let cursor = self.selections.newest_anchor().head();
|
||||||
let multibuffer = &self.buffer().read(cx);
|
let multibuffer = &self.buffer().read(cx);
|
||||||
let (buffer_id, symbols) =
|
let (buffer_id, symbols) =
|
||||||
multibuffer.symbols_containing(cursor, Some(&cx.theme().styles.syntax), cx)?;
|
multibuffer.symbols_containing(cursor, Some(&variant.syntax()), cx)?;
|
||||||
let buffer = multibuffer.buffer(buffer_id)?;
|
let buffer = multibuffer.buffer(buffer_id)?;
|
||||||
|
|
||||||
let buffer = buffer.read(cx);
|
let buffer = buffer.read(cx);
|
||||||
@ -788,19 +787,9 @@ impl Item for Editor {
|
|||||||
text: filename,
|
text: filename,
|
||||||
highlights: None,
|
highlights: None,
|
||||||
}];
|
}];
|
||||||
breadcrumbs.extend(symbols.into_iter().map(|symbol| {
|
breadcrumbs.extend(symbols.into_iter().map(|symbol| BreadcrumbText {
|
||||||
// eprintln!(
|
text: symbol.text,
|
||||||
// "ranges: {:?}",
|
highlights: Some(symbol.highlight_ranges),
|
||||||
// symbol
|
|
||||||
// .highlight_ranges
|
|
||||||
// .iter()
|
|
||||||
// .map(|range| &symbol.text[range.0.clone()])
|
|
||||||
// .collect::<Vec<_>>()
|
|
||||||
// );
|
|
||||||
BreadcrumbText {
|
|
||||||
text: symbol.text,
|
|
||||||
highlights: Some(symbol.highlight_ranges),
|
|
||||||
}
|
|
||||||
}));
|
}));
|
||||||
Some(breadcrumbs)
|
Some(breadcrumbs)
|
||||||
}
|
}
|
||||||
@ -1129,86 +1118,78 @@ pub struct CursorPosition {
|
|||||||
_observe_active_editor: Option<Subscription>,
|
_observe_active_editor: Option<Subscription>,
|
||||||
}
|
}
|
||||||
|
|
||||||
// impl Default for CursorPosition {
|
impl Default for CursorPosition {
|
||||||
// fn default() -> Self {
|
fn default() -> Self {
|
||||||
// Self::new()
|
Self::new()
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
|
|
||||||
// impl CursorPosition {
|
impl CursorPosition {
|
||||||
// pub fn new() -> Self {
|
pub fn new() -> Self {
|
||||||
// Self {
|
Self {
|
||||||
// position: None,
|
position: None,
|
||||||
// selected_count: 0,
|
selected_count: 0,
|
||||||
// _observe_active_editor: None,
|
_observe_active_editor: None,
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
|
|
||||||
// fn update_position(&mut self, editor: View<Editor>, cx: &mut ViewContext<Self>) {
|
fn update_position(&mut self, editor: View<Editor>, cx: &mut ViewContext<Self>) {
|
||||||
// let editor = editor.read(cx);
|
let editor = editor.read(cx);
|
||||||
// let buffer = editor.buffer().read(cx).snapshot(cx);
|
let buffer = editor.buffer().read(cx).snapshot(cx);
|
||||||
|
|
||||||
// self.selected_count = 0;
|
self.selected_count = 0;
|
||||||
// let mut last_selection: Option<Selection<usize>> = None;
|
let mut last_selection: Option<Selection<usize>> = None;
|
||||||
// for selection in editor.selections.all::<usize>(cx) {
|
for selection in editor.selections.all::<usize>(cx) {
|
||||||
// self.selected_count += selection.end - selection.start;
|
self.selected_count += selection.end - selection.start;
|
||||||
// if last_selection
|
if last_selection
|
||||||
// .as_ref()
|
.as_ref()
|
||||||
// .map_or(true, |last_selection| selection.id > last_selection.id)
|
.map_or(true, |last_selection| selection.id > last_selection.id)
|
||||||
// {
|
{
|
||||||
// last_selection = Some(selection);
|
last_selection = Some(selection);
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
// self.position = last_selection.map(|s| s.head().to_point(&buffer));
|
self.position = last_selection.map(|s| s.head().to_point(&buffer));
|
||||||
|
|
||||||
// cx.notify();
|
cx.notify();
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
|
|
||||||
// impl Entity for CursorPosition {
|
impl Render for CursorPosition {
|
||||||
// type Event = ();
|
type Element = Div;
|
||||||
// }
|
|
||||||
|
|
||||||
// impl View for CursorPosition {
|
fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
|
||||||
// fn ui_name() -> &'static str {
|
div().when_some(self.position, |el, position| {
|
||||||
// "CursorPosition"
|
let mut text = format!(
|
||||||
// }
|
"{}{FILE_ROW_COLUMN_DELIMITER}{}",
|
||||||
|
position.row + 1,
|
||||||
|
position.column + 1
|
||||||
|
);
|
||||||
|
if self.selected_count > 0 {
|
||||||
|
write!(text, " ({} selected)", self.selected_count).unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
// fn render(&mut self, cx: &mut ViewContext<Self>) -> AnyElement<Self> {
|
el.child(Label::new(text))
|
||||||
// if let Some(position) = self.position {
|
})
|
||||||
// let theme = &theme::current(cx).workspace.status_bar;
|
}
|
||||||
// let mut text = format!(
|
}
|
||||||
// "{}{FILE_ROW_COLUMN_DELIMITER}{}",
|
|
||||||
// position.row + 1,
|
|
||||||
// position.column + 1
|
|
||||||
// );
|
|
||||||
// if self.selected_count > 0 {
|
|
||||||
// write!(text, " ({} selected)", self.selected_count).unwrap();
|
|
||||||
// }
|
|
||||||
// Label::new(text, theme.cursor_position.clone()).into_any()
|
|
||||||
// } else {
|
|
||||||
// Empty::new().into_any()
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
// impl StatusItemView for CursorPosition {
|
impl StatusItemView for CursorPosition {
|
||||||
// fn set_active_pane_item(
|
fn set_active_pane_item(
|
||||||
// &mut self,
|
&mut self,
|
||||||
// active_pane_item: Option<&dyn ItemHandle>,
|
active_pane_item: Option<&dyn ItemHandle>,
|
||||||
// cx: &mut ViewContext<Self>,
|
cx: &mut ViewContext<Self>,
|
||||||
// ) {
|
) {
|
||||||
// if let Some(editor) = active_pane_item.and_then(|item| item.act_as::<Editor>(cx)) {
|
if let Some(editor) = active_pane_item.and_then(|item| item.act_as::<Editor>(cx)) {
|
||||||
// self._observe_active_editor = Some(cx.observe(&editor, Self::update_position));
|
self._observe_active_editor = Some(cx.observe(&editor, Self::update_position));
|
||||||
// self.update_position(editor, cx);
|
self.update_position(editor, cx);
|
||||||
// } else {
|
} else {
|
||||||
// self.position = None;
|
self.position = None;
|
||||||
// self._observe_active_editor = None;
|
self._observe_active_editor = None;
|
||||||
// }
|
}
|
||||||
|
|
||||||
// cx.notify();
|
cx.notify();
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
|
|
||||||
fn path_for_buffer<'a>(
|
fn path_for_buffer<'a>(
|
||||||
buffer: &Model<MultiBuffer>,
|
buffer: &Model<MultiBuffer>,
|
||||||
|
@ -1,5 +1,14 @@
|
|||||||
use crate::{DisplayPoint, Editor, EditorMode, SelectMode};
|
use crate::{
|
||||||
use gpui::{Pixels, Point, ViewContext};
|
DisplayPoint, Editor, EditorMode, FindAllReferences, GoToDefinition, GoToTypeDefinition,
|
||||||
|
Rename, RevealInFinder, SelectMode, ToggleCodeActions,
|
||||||
|
};
|
||||||
|
use gpui::{DismissEvent, Pixels, Point, Subscription, View, ViewContext};
|
||||||
|
|
||||||
|
pub struct MouseContextMenu {
|
||||||
|
pub(crate) position: Point<Pixels>,
|
||||||
|
pub(crate) context_menu: View<ui::ContextMenu>,
|
||||||
|
_subscription: Subscription,
|
||||||
|
}
|
||||||
|
|
||||||
pub fn deploy_context_menu(
|
pub fn deploy_context_menu(
|
||||||
editor: &mut Editor,
|
editor: &mut Editor,
|
||||||
@ -7,50 +16,57 @@ pub fn deploy_context_menu(
|
|||||||
point: DisplayPoint,
|
point: DisplayPoint,
|
||||||
cx: &mut ViewContext<Editor>,
|
cx: &mut ViewContext<Editor>,
|
||||||
) {
|
) {
|
||||||
todo!();
|
if !editor.is_focused(cx) {
|
||||||
|
editor.focus(cx);
|
||||||
|
}
|
||||||
|
|
||||||
// if !editor.focused {
|
// Don't show context menu for inline editors
|
||||||
// cx.focus_self();
|
if editor.mode() != EditorMode::Full {
|
||||||
// }
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// // Don't show context menu for inline editors
|
// Don't show the context menu if there isn't a project associated with this editor
|
||||||
// if editor.mode() != EditorMode::Full {
|
if editor.project.is_none() {
|
||||||
// return;
|
return;
|
||||||
// }
|
}
|
||||||
|
|
||||||
// // Don't show the context menu if there isn't a project associated with this editor
|
// Move the cursor to the clicked location so that dispatched actions make sense
|
||||||
// if editor.project.is_none() {
|
editor.change_selections(None, cx, |s| {
|
||||||
// return;
|
s.clear_disjoint();
|
||||||
// }
|
s.set_pending_display_range(point..point, SelectMode::Character);
|
||||||
|
});
|
||||||
|
|
||||||
// // Move the cursor to the clicked location so that dispatched actions make sense
|
let context_menu = ui::ContextMenu::build(cx, |menu, cx| {
|
||||||
// editor.change_selections(None, cx, |s| {
|
menu.action("Rename Symbol", Box::new(Rename), cx)
|
||||||
// s.clear_disjoint();
|
.action("Go to Definition", Box::new(GoToDefinition), cx)
|
||||||
// s.set_pending_display_range(point..point, SelectMode::Character);
|
.action("Go to Type Definition", Box::new(GoToTypeDefinition), cx)
|
||||||
// });
|
.action("Find All References", Box::new(FindAllReferences), cx)
|
||||||
|
.action(
|
||||||
|
"Code Actions",
|
||||||
|
Box::new(ToggleCodeActions {
|
||||||
|
deployed_from_indicator: false,
|
||||||
|
}),
|
||||||
|
cx,
|
||||||
|
)
|
||||||
|
.separator()
|
||||||
|
.action("Reveal in Finder", Box::new(RevealInFinder), cx)
|
||||||
|
});
|
||||||
|
let context_menu_focus = context_menu.focus_handle(cx);
|
||||||
|
cx.focus(&context_menu_focus);
|
||||||
|
|
||||||
// editor.mouse_context_menu.update(cx, |menu, cx| {
|
let _subscription = cx.subscribe(&context_menu, move |this, _, event: &DismissEvent, cx| {
|
||||||
// menu.show(
|
this.mouse_context_menu.take();
|
||||||
// position,
|
if context_menu_focus.contains_focused(cx) {
|
||||||
// AnchorCorner::TopLeft,
|
this.focus(cx);
|
||||||
// vec![
|
}
|
||||||
// ContextMenuItem::action("Rename Symbol", Rename),
|
});
|
||||||
// ContextMenuItem::action("Go to Definition", GoToDefinition),
|
|
||||||
// ContextMenuItem::action("Go to Type Definition", GoToTypeDefinition),
|
editor.mouse_context_menu = Some(MouseContextMenu {
|
||||||
// ContextMenuItem::action("Find All References", FindAllReferences),
|
position,
|
||||||
// ContextMenuItem::action(
|
context_menu,
|
||||||
// "Code Actions",
|
_subscription,
|
||||||
// ToggleCodeActions {
|
});
|
||||||
// deployed_from_indicator: false,
|
cx.notify();
|
||||||
// },
|
|
||||||
// ),
|
|
||||||
// ContextMenuItem::Separator,
|
|
||||||
// ContextMenuItem::action("Reveal in Finder", RevealInFinder),
|
|
||||||
// ],
|
|
||||||
// cx,
|
|
||||||
// );
|
|
||||||
// });
|
|
||||||
// cx.notify();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// #[cfg(test)]
|
// #[cfg(test)]
|
||||||
|
@ -315,14 +315,11 @@ impl SelectionsCollection {
|
|||||||
|
|
||||||
let line = display_map.layout_row(row, &text_layout_details);
|
let line = display_map.layout_row(row, &text_layout_details);
|
||||||
|
|
||||||
dbg!("****START COL****");
|
|
||||||
let start_col = line.closest_index_for_x(positions.start) as u32;
|
let start_col = line.closest_index_for_x(positions.start) as u32;
|
||||||
if start_col < line_len || (is_empty && positions.start == line.width) {
|
if start_col < line_len || (is_empty && positions.start == line.width) {
|
||||||
let start = DisplayPoint::new(row, start_col);
|
let start = DisplayPoint::new(row, start_col);
|
||||||
dbg!("****END COL****");
|
|
||||||
let end_col = line.closest_index_for_x(positions.end) as u32;
|
let end_col = line.closest_index_for_x(positions.end) as u32;
|
||||||
let end = DisplayPoint::new(row, end_col);
|
let end = DisplayPoint::new(row, end_col);
|
||||||
dbg!(start_col, end_col);
|
|
||||||
|
|
||||||
Some(Selection {
|
Some(Selection {
|
||||||
id: post_inc(&mut self.next_selection_id),
|
id: post_inc(&mut self.next_selection_id),
|
||||||
|
@ -15,7 +15,7 @@ use std::{
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
use text::Point;
|
use text::Point;
|
||||||
use ui::{v_stack, HighlightedLabel, ListItem};
|
use ui::{prelude::*, v_stack, HighlightedLabel, ListItem};
|
||||||
use util::{paths::PathLikeWithPosition, post_inc, ResultExt};
|
use util::{paths::PathLikeWithPosition, post_inc, ResultExt};
|
||||||
use workspace::Workspace;
|
use workspace::Workspace;
|
||||||
|
|
||||||
@ -1256,7 +1256,7 @@ mod tests {
|
|||||||
//
|
//
|
||||||
// TODO: without closing, the opened items do not propagate their history changes for some reason
|
// TODO: without closing, the opened items do not propagate their history changes for some reason
|
||||||
// it does work in real app though, only tests do not propagate.
|
// it does work in real app though, only tests do not propagate.
|
||||||
workspace.update(cx, |_, cx| dbg!(cx.focused()));
|
workspace.update(cx, |_, cx| cx.focused());
|
||||||
|
|
||||||
let initial_history = open_close_queried_buffer("fir", 1, "first.rs", &workspace, cx).await;
|
let initial_history = open_close_queried_buffer("fir", 1, "first.rs", &workspace, cx).await;
|
||||||
assert!(
|
assert!(
|
||||||
|
@ -2,8 +2,8 @@ use crate::{
|
|||||||
div, Action, AnyView, AnyWindowHandle, AppCell, AppContext, AsyncAppContext,
|
div, Action, AnyView, AnyWindowHandle, AppCell, AppContext, AsyncAppContext,
|
||||||
BackgroundExecutor, Context, Div, Entity, EventEmitter, ForegroundExecutor, InputEvent,
|
BackgroundExecutor, Context, Div, Entity, EventEmitter, ForegroundExecutor, InputEvent,
|
||||||
KeyDownEvent, Keystroke, Model, ModelContext, Render, Result, Task, TestDispatcher,
|
KeyDownEvent, Keystroke, Model, ModelContext, Render, Result, Task, TestDispatcher,
|
||||||
TestPlatform, TestWindow, View, ViewContext, VisualContext, WindowContext, WindowHandle,
|
TestPlatform, TestWindow, TestWindowHandlers, View, ViewContext, VisualContext, WindowContext,
|
||||||
WindowOptions,
|
WindowHandle, WindowOptions,
|
||||||
};
|
};
|
||||||
use anyhow::{anyhow, bail};
|
use anyhow::{anyhow, bail};
|
||||||
use futures::{Stream, StreamExt};
|
use futures::{Stream, StreamExt};
|
||||||
@ -502,6 +502,19 @@ impl<'a> VisualTestContext<'a> {
|
|||||||
self.cx.dispatch_action(self.window, action)
|
self.cx.dispatch_action(self.window, action)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn window_title(&mut self) -> Option<String> {
|
||||||
|
self.cx
|
||||||
|
.update_window(self.window, |_, cx| {
|
||||||
|
cx.window
|
||||||
|
.platform_window
|
||||||
|
.as_test()
|
||||||
|
.unwrap()
|
||||||
|
.window_title
|
||||||
|
.clone()
|
||||||
|
})
|
||||||
|
.unwrap()
|
||||||
|
}
|
||||||
|
|
||||||
pub fn simulate_keystrokes(&mut self, keystrokes: &str) {
|
pub fn simulate_keystrokes(&mut self, keystrokes: &str) {
|
||||||
self.cx.simulate_keystrokes(self.window, keystrokes)
|
self.cx.simulate_keystrokes(self.window, keystrokes)
|
||||||
}
|
}
|
||||||
@ -509,6 +522,39 @@ impl<'a> VisualTestContext<'a> {
|
|||||||
pub fn simulate_input(&mut self, input: &str) {
|
pub fn simulate_input(&mut self, input: &str) {
|
||||||
self.cx.simulate_input(self.window, input)
|
self.cx.simulate_input(self.window, input)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn simulate_activation(&mut self) {
|
||||||
|
self.simulate_window_events(&mut |handlers| {
|
||||||
|
handlers
|
||||||
|
.active_status_change
|
||||||
|
.iter_mut()
|
||||||
|
.for_each(|f| f(true));
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn simulate_deactivation(&mut self) {
|
||||||
|
self.simulate_window_events(&mut |handlers| {
|
||||||
|
handlers
|
||||||
|
.active_status_change
|
||||||
|
.iter_mut()
|
||||||
|
.for_each(|f| f(false));
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
fn simulate_window_events(&mut self, f: &mut dyn FnMut(&mut TestWindowHandlers)) {
|
||||||
|
let handlers = self
|
||||||
|
.cx
|
||||||
|
.update_window(self.window, |_, cx| {
|
||||||
|
cx.window
|
||||||
|
.platform_window
|
||||||
|
.as_test()
|
||||||
|
.unwrap()
|
||||||
|
.handlers
|
||||||
|
.clone()
|
||||||
|
})
|
||||||
|
.unwrap();
|
||||||
|
f(&mut *handlers.lock());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a> Context for VisualTestContext<'a> {
|
impl<'a> Context for VisualTestContext<'a> {
|
||||||
|
@ -166,7 +166,6 @@ impl TextState {
|
|||||||
runs: Option<Vec<TextRun>>,
|
runs: Option<Vec<TextRun>>,
|
||||||
cx: &mut WindowContext,
|
cx: &mut WindowContext,
|
||||||
) -> LayoutId {
|
) -> LayoutId {
|
||||||
let text_system = cx.text_system().clone();
|
|
||||||
let text_style = cx.text_style();
|
let text_style = cx.text_style();
|
||||||
let font_size = text_style.font_size.to_pixels(cx.rem_size());
|
let font_size = text_style.font_size.to_pixels(cx.rem_size());
|
||||||
let line_height = text_style
|
let line_height = text_style
|
||||||
@ -174,18 +173,16 @@ impl TextState {
|
|||||||
.to_pixels(font_size.into(), cx.rem_size());
|
.to_pixels(font_size.into(), cx.rem_size());
|
||||||
let text = SharedString::from(text);
|
let text = SharedString::from(text);
|
||||||
|
|
||||||
let rem_size = cx.rem_size();
|
|
||||||
|
|
||||||
let runs = if let Some(runs) = runs {
|
let runs = if let Some(runs) = runs {
|
||||||
runs
|
runs
|
||||||
} else {
|
} else {
|
||||||
vec![text_style.to_run(text.len())]
|
vec![text_style.to_run(text.len())]
|
||||||
};
|
};
|
||||||
|
|
||||||
let layout_id = cx.request_measured_layout(Default::default(), rem_size, {
|
let layout_id = cx.request_measured_layout(Default::default(), {
|
||||||
let element_state = self.clone();
|
let element_state = self.clone();
|
||||||
|
|
||||||
move |known_dimensions, available_space| {
|
move |known_dimensions, available_space, cx| {
|
||||||
let wrap_width = if text_style.white_space == WhiteSpace::Normal {
|
let wrap_width = if text_style.white_space == WhiteSpace::Normal {
|
||||||
known_dimensions.width.or(match available_space.width {
|
known_dimensions.width.or(match available_space.width {
|
||||||
crate::AvailableSpace::Definite(x) => Some(x),
|
crate::AvailableSpace::Definite(x) => Some(x),
|
||||||
@ -203,7 +200,8 @@ impl TextState {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let Some(lines) = text_system
|
let Some(lines) = cx
|
||||||
|
.text_system()
|
||||||
.shape_text(
|
.shape_text(
|
||||||
&text, font_size, &runs, wrap_width, // Wrap if we know the width.
|
&text, font_size, &runs, wrap_width, // Wrap if we know the width.
|
||||||
)
|
)
|
||||||
|
@ -109,7 +109,6 @@ impl Element for UniformList {
|
|||||||
cx: &mut WindowContext,
|
cx: &mut WindowContext,
|
||||||
) -> (LayoutId, Self::State) {
|
) -> (LayoutId, Self::State) {
|
||||||
let max_items = self.item_count;
|
let max_items = self.item_count;
|
||||||
let rem_size = cx.rem_size();
|
|
||||||
let item_size = state
|
let item_size = state
|
||||||
.as_ref()
|
.as_ref()
|
||||||
.map(|s| s.item_size)
|
.map(|s| s.item_size)
|
||||||
@ -120,9 +119,7 @@ impl Element for UniformList {
|
|||||||
.layout(state.map(|s| s.interactive), cx, |style, cx| {
|
.layout(state.map(|s| s.interactive), cx, |style, cx| {
|
||||||
cx.request_measured_layout(
|
cx.request_measured_layout(
|
||||||
style,
|
style,
|
||||||
rem_size,
|
move |known_dimensions, available_space, _cx| {
|
||||||
move |known_dimensions: Size<Option<Pixels>>,
|
|
||||||
available_space: Size<AvailableSpace>| {
|
|
||||||
let desired_height = item_size.height * max_items;
|
let desired_height = item_size.height * max_items;
|
||||||
let width =
|
let width =
|
||||||
known_dimensions
|
known_dimensions
|
||||||
|
@ -655,6 +655,20 @@ pub struct Corners<T: Clone + Default + Debug> {
|
|||||||
pub bottom_left: T,
|
pub bottom_left: T,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl<T> Corners<T>
|
||||||
|
where
|
||||||
|
T: Clone + Default + Debug,
|
||||||
|
{
|
||||||
|
pub fn all(value: T) -> Self {
|
||||||
|
Self {
|
||||||
|
top_left: value.clone(),
|
||||||
|
top_right: value.clone(),
|
||||||
|
bottom_right: value.clone(),
|
||||||
|
bottom_left: value,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl Corners<AbsoluteLength> {
|
impl Corners<AbsoluteLength> {
|
||||||
pub fn to_pixels(&self, size: Size<Pixels>, rem_size: Pixels) -> Corners<Pixels> {
|
pub fn to_pixels(&self, size: Size<Pixels>, rem_size: Pixels) -> Corners<Pixels> {
|
||||||
let max = size.width.max(size.height) / 2.;
|
let max = size.width.max(size.height) / 2.;
|
||||||
|
@ -158,6 +158,11 @@ pub(crate) trait PlatformWindow {
|
|||||||
fn draw(&self, scene: Scene);
|
fn draw(&self, scene: Scene);
|
||||||
|
|
||||||
fn sprite_atlas(&self) -> Arc<dyn PlatformAtlas>;
|
fn sprite_atlas(&self) -> Arc<dyn PlatformAtlas>;
|
||||||
|
|
||||||
|
#[cfg(any(test, feature = "test-support"))]
|
||||||
|
fn as_test(&self) -> Option<&TestWindow> {
|
||||||
|
None
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub trait PlatformDispatcher: Send + Sync {
|
pub trait PlatformDispatcher: Send + Sync {
|
||||||
|
@ -189,13 +189,9 @@ impl Platform for TestPlatform {
|
|||||||
unimplemented!()
|
unimplemented!()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn on_become_active(&self, _callback: Box<dyn FnMut()>) {
|
fn on_become_active(&self, _callback: Box<dyn FnMut()>) {}
|
||||||
unimplemented!()
|
|
||||||
}
|
|
||||||
|
|
||||||
fn on_resign_active(&self, _callback: Box<dyn FnMut()>) {
|
fn on_resign_active(&self, _callback: Box<dyn FnMut()>) {}
|
||||||
unimplemented!()
|
|
||||||
}
|
|
||||||
|
|
||||||
fn on_quit(&self, _callback: Box<dyn FnMut()>) {}
|
fn on_quit(&self, _callback: Box<dyn FnMut()>) {}
|
||||||
|
|
||||||
|
@ -11,19 +11,20 @@ use std::{
|
|||||||
};
|
};
|
||||||
|
|
||||||
#[derive(Default)]
|
#[derive(Default)]
|
||||||
struct Handlers {
|
pub(crate) struct TestWindowHandlers {
|
||||||
active_status_change: Vec<Box<dyn FnMut(bool)>>,
|
pub(crate) active_status_change: Vec<Box<dyn FnMut(bool)>>,
|
||||||
input: Vec<Box<dyn FnMut(crate::InputEvent) -> bool>>,
|
pub(crate) input: Vec<Box<dyn FnMut(crate::InputEvent) -> bool>>,
|
||||||
moved: Vec<Box<dyn FnMut()>>,
|
pub(crate) moved: Vec<Box<dyn FnMut()>>,
|
||||||
resize: Vec<Box<dyn FnMut(Size<Pixels>, f32)>>,
|
pub(crate) resize: Vec<Box<dyn FnMut(Size<Pixels>, f32)>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct TestWindow {
|
pub struct TestWindow {
|
||||||
bounds: WindowBounds,
|
bounds: WindowBounds,
|
||||||
current_scene: Mutex<Option<Scene>>,
|
current_scene: Mutex<Option<Scene>>,
|
||||||
display: Rc<dyn PlatformDisplay>,
|
display: Rc<dyn PlatformDisplay>,
|
||||||
|
pub(crate) window_title: Option<String>,
|
||||||
pub(crate) input_handler: Option<Arc<Mutex<Box<dyn PlatformInputHandler>>>>,
|
pub(crate) input_handler: Option<Arc<Mutex<Box<dyn PlatformInputHandler>>>>,
|
||||||
handlers: Mutex<Handlers>,
|
pub(crate) handlers: Arc<Mutex<TestWindowHandlers>>,
|
||||||
platform: Weak<TestPlatform>,
|
platform: Weak<TestPlatform>,
|
||||||
sprite_atlas: Arc<dyn PlatformAtlas>,
|
sprite_atlas: Arc<dyn PlatformAtlas>,
|
||||||
}
|
}
|
||||||
@ -42,6 +43,7 @@ impl TestWindow {
|
|||||||
input_handler: None,
|
input_handler: None,
|
||||||
sprite_atlas: Arc::new(TestAtlas::new()),
|
sprite_atlas: Arc::new(TestAtlas::new()),
|
||||||
handlers: Default::default(),
|
handlers: Default::default(),
|
||||||
|
window_title: Default::default(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -100,8 +102,8 @@ impl PlatformWindow for TestWindow {
|
|||||||
todo!()
|
todo!()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn set_title(&mut self, _title: &str) {
|
fn set_title(&mut self, title: &str) {
|
||||||
todo!()
|
self.window_title = Some(title.to_owned());
|
||||||
}
|
}
|
||||||
|
|
||||||
fn set_edited(&mut self, _edited: bool) {
|
fn set_edited(&mut self, _edited: bool) {
|
||||||
@ -167,6 +169,10 @@ impl PlatformWindow for TestWindow {
|
|||||||
fn sprite_atlas(&self) -> sync::Arc<dyn crate::PlatformAtlas> {
|
fn sprite_atlas(&self) -> sync::Arc<dyn crate::PlatformAtlas> {
|
||||||
self.sprite_atlas.clone()
|
self.sprite_atlas.clone()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn as_test(&self) -> Option<&TestWindow> {
|
||||||
|
Some(self)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct TestAtlasState {
|
pub struct TestAtlasState {
|
||||||
|
@ -1,4 +1,7 @@
|
|||||||
use super::{AbsoluteLength, Bounds, DefiniteLength, Edges, Length, Pixels, Point, Size, Style};
|
use crate::{
|
||||||
|
AbsoluteLength, Bounds, DefiniteLength, Edges, Length, Pixels, Point, Size, Style,
|
||||||
|
WindowContext,
|
||||||
|
};
|
||||||
use collections::{HashMap, HashSet};
|
use collections::{HashMap, HashSet};
|
||||||
use smallvec::SmallVec;
|
use smallvec::SmallVec;
|
||||||
use std::fmt::Debug;
|
use std::fmt::Debug;
|
||||||
@ -9,13 +12,21 @@ use taffy::{
|
|||||||
Taffy,
|
Taffy,
|
||||||
};
|
};
|
||||||
|
|
||||||
type Measureable = dyn Fn(Size<Option<Pixels>>, Size<AvailableSpace>) -> Size<Pixels> + Send + Sync;
|
|
||||||
|
|
||||||
pub struct TaffyLayoutEngine {
|
pub struct TaffyLayoutEngine {
|
||||||
taffy: Taffy<Box<Measureable>>,
|
taffy: Taffy,
|
||||||
children_to_parents: HashMap<LayoutId, LayoutId>,
|
children_to_parents: HashMap<LayoutId, LayoutId>,
|
||||||
absolute_layout_bounds: HashMap<LayoutId, Bounds<Pixels>>,
|
absolute_layout_bounds: HashMap<LayoutId, Bounds<Pixels>>,
|
||||||
computed_layouts: HashSet<LayoutId>,
|
computed_layouts: HashSet<LayoutId>,
|
||||||
|
nodes_to_measure: HashMap<
|
||||||
|
LayoutId,
|
||||||
|
Box<
|
||||||
|
dyn FnMut(
|
||||||
|
Size<Option<Pixels>>,
|
||||||
|
Size<AvailableSpace>,
|
||||||
|
&mut WindowContext,
|
||||||
|
) -> Size<Pixels>,
|
||||||
|
>,
|
||||||
|
>,
|
||||||
}
|
}
|
||||||
|
|
||||||
static EXPECT_MESSAGE: &'static str =
|
static EXPECT_MESSAGE: &'static str =
|
||||||
@ -28,6 +39,7 @@ impl TaffyLayoutEngine {
|
|||||||
children_to_parents: HashMap::default(),
|
children_to_parents: HashMap::default(),
|
||||||
absolute_layout_bounds: HashMap::default(),
|
absolute_layout_bounds: HashMap::default(),
|
||||||
computed_layouts: HashSet::default(),
|
computed_layouts: HashSet::default(),
|
||||||
|
nodes_to_measure: HashMap::default(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -36,6 +48,7 @@ impl TaffyLayoutEngine {
|
|||||||
self.children_to_parents.clear();
|
self.children_to_parents.clear();
|
||||||
self.absolute_layout_bounds.clear();
|
self.absolute_layout_bounds.clear();
|
||||||
self.computed_layouts.clear();
|
self.computed_layouts.clear();
|
||||||
|
self.nodes_to_measure.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn request_layout(
|
pub fn request_layout(
|
||||||
@ -65,18 +78,18 @@ impl TaffyLayoutEngine {
|
|||||||
&mut self,
|
&mut self,
|
||||||
style: Style,
|
style: Style,
|
||||||
rem_size: Pixels,
|
rem_size: Pixels,
|
||||||
measure: impl Fn(Size<Option<Pixels>>, Size<AvailableSpace>) -> Size<Pixels>
|
measure: impl FnMut(Size<Option<Pixels>>, Size<AvailableSpace>, &mut WindowContext) -> Size<Pixels>
|
||||||
+ Send
|
|
||||||
+ Sync
|
|
||||||
+ 'static,
|
+ 'static,
|
||||||
) -> LayoutId {
|
) -> LayoutId {
|
||||||
let style = style.to_taffy(rem_size);
|
let style = style.to_taffy(rem_size);
|
||||||
|
|
||||||
let measurable = Box::new(measure);
|
let layout_id = self
|
||||||
self.taffy
|
.taffy
|
||||||
.new_leaf_with_context(style, measurable)
|
.new_leaf_with_context(style, ())
|
||||||
.expect(EXPECT_MESSAGE)
|
.expect(EXPECT_MESSAGE)
|
||||||
.into()
|
.into();
|
||||||
|
self.nodes_to_measure.insert(layout_id, Box::new(measure));
|
||||||
|
layout_id
|
||||||
}
|
}
|
||||||
|
|
||||||
// Used to understand performance
|
// Used to understand performance
|
||||||
@ -126,7 +139,12 @@ impl TaffyLayoutEngine {
|
|||||||
Ok(edges)
|
Ok(edges)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn compute_layout(&mut self, id: LayoutId, available_space: Size<AvailableSpace>) {
|
pub fn compute_layout(
|
||||||
|
&mut self,
|
||||||
|
id: LayoutId,
|
||||||
|
available_space: Size<AvailableSpace>,
|
||||||
|
cx: &mut WindowContext,
|
||||||
|
) {
|
||||||
// Leaving this here until we have a better instrumentation approach.
|
// Leaving this here until we have a better instrumentation approach.
|
||||||
// println!("Laying out {} children", self.count_all_children(id)?);
|
// println!("Laying out {} children", self.count_all_children(id)?);
|
||||||
// println!("Max layout depth: {}", self.max_depth(0, id)?);
|
// println!("Max layout depth: {}", self.max_depth(0, id)?);
|
||||||
@ -159,8 +177,8 @@ impl TaffyLayoutEngine {
|
|||||||
.compute_layout_with_measure(
|
.compute_layout_with_measure(
|
||||||
id.into(),
|
id.into(),
|
||||||
available_space.into(),
|
available_space.into(),
|
||||||
|known_dimensions, available_space, _node_id, context| {
|
|known_dimensions, available_space, node_id, _context| {
|
||||||
let Some(measure) = context else {
|
let Some(measure) = self.nodes_to_measure.get_mut(&node_id.into()) else {
|
||||||
return taffy::geometry::Size::default();
|
return taffy::geometry::Size::default();
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -169,10 +187,11 @@ impl TaffyLayoutEngine {
|
|||||||
height: known_dimensions.height.map(Pixels),
|
height: known_dimensions.height.map(Pixels),
|
||||||
};
|
};
|
||||||
|
|
||||||
measure(known_dimensions, available_space.into()).into()
|
measure(known_dimensions, available_space.into(), cx).into()
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
.expect(EXPECT_MESSAGE);
|
.expect(EXPECT_MESSAGE);
|
||||||
|
|
||||||
// println!("compute_layout took {:?}", started_at.elapsed());
|
// println!("compute_layout took {:?}", started_at.elapsed());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -209,9 +209,7 @@ impl AnyView {
|
|||||||
) {
|
) {
|
||||||
cx.with_absolute_element_offset(origin, |cx| {
|
cx.with_absolute_element_offset(origin, |cx| {
|
||||||
let (layout_id, rendered_element) = (self.layout)(self, cx);
|
let (layout_id, rendered_element) = (self.layout)(self, cx);
|
||||||
cx.window
|
cx.compute_layout(layout_id, available_space);
|
||||||
.layout_engine
|
|
||||||
.compute_layout(layout_id, available_space);
|
|
||||||
(self.paint)(self, rendered_element, cx);
|
(self.paint)(self, rendered_element, cx);
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@ -240,6 +238,10 @@ impl Element for AnyView {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn paint(self, _: Bounds<Pixels>, state: &mut Self::State, cx: &mut WindowContext) {
|
fn paint(self, _: Bounds<Pixels>, state: &mut Self::State, cx: &mut WindowContext) {
|
||||||
|
debug_assert!(
|
||||||
|
state.is_some(),
|
||||||
|
"state is None. Did you include an AnyView twice in the tree?"
|
||||||
|
);
|
||||||
(self.paint)(&self, state.take().unwrap(), cx)
|
(self.paint)(&self, state.take().unwrap(), cx)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -209,7 +209,7 @@ pub struct Window {
|
|||||||
sprite_atlas: Arc<dyn PlatformAtlas>,
|
sprite_atlas: Arc<dyn PlatformAtlas>,
|
||||||
rem_size: Pixels,
|
rem_size: Pixels,
|
||||||
viewport_size: Size<Pixels>,
|
viewport_size: Size<Pixels>,
|
||||||
pub(crate) layout_engine: TaffyLayoutEngine,
|
layout_engine: Option<TaffyLayoutEngine>,
|
||||||
pub(crate) root_view: Option<AnyView>,
|
pub(crate) root_view: Option<AnyView>,
|
||||||
pub(crate) element_id_stack: GlobalElementId,
|
pub(crate) element_id_stack: GlobalElementId,
|
||||||
pub(crate) previous_frame: Frame,
|
pub(crate) previous_frame: Frame,
|
||||||
@ -327,7 +327,7 @@ impl Window {
|
|||||||
sprite_atlas,
|
sprite_atlas,
|
||||||
rem_size: px(16.),
|
rem_size: px(16.),
|
||||||
viewport_size: content_size,
|
viewport_size: content_size,
|
||||||
layout_engine: TaffyLayoutEngine::new(),
|
layout_engine: Some(TaffyLayoutEngine::new()),
|
||||||
root_view: None,
|
root_view: None,
|
||||||
element_id_stack: GlobalElementId::default(),
|
element_id_stack: GlobalElementId::default(),
|
||||||
previous_frame: Frame::new(DispatchTree::new(cx.keymap.clone(), cx.actions.clone())),
|
previous_frame: Frame::new(DispatchTree::new(cx.keymap.clone(), cx.actions.clone())),
|
||||||
@ -606,9 +606,11 @@ impl<'a> WindowContext<'a> {
|
|||||||
self.app.layout_id_buffer.extend(children.into_iter());
|
self.app.layout_id_buffer.extend(children.into_iter());
|
||||||
let rem_size = self.rem_size();
|
let rem_size = self.rem_size();
|
||||||
|
|
||||||
self.window
|
self.window.layout_engine.as_mut().unwrap().request_layout(
|
||||||
.layout_engine
|
style,
|
||||||
.request_layout(style, rem_size, &self.app.layout_id_buffer)
|
rem_size,
|
||||||
|
&self.app.layout_id_buffer,
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Add a node to the layout tree for the current frame. Instead of taking a `Style` and children,
|
/// Add a node to the layout tree for the current frame. Instead of taking a `Style` and children,
|
||||||
@ -618,22 +620,25 @@ impl<'a> WindowContext<'a> {
|
|||||||
/// The given closure is invoked at layout time with the known dimensions and available space and
|
/// The given closure is invoked at layout time with the known dimensions and available space and
|
||||||
/// returns a `Size`.
|
/// returns a `Size`.
|
||||||
pub fn request_measured_layout<
|
pub fn request_measured_layout<
|
||||||
F: Fn(Size<Option<Pixels>>, Size<AvailableSpace>) -> Size<Pixels> + Send + Sync + 'static,
|
F: FnMut(Size<Option<Pixels>>, Size<AvailableSpace>, &mut WindowContext) -> Size<Pixels>
|
||||||
|
+ 'static,
|
||||||
>(
|
>(
|
||||||
&mut self,
|
&mut self,
|
||||||
style: Style,
|
style: Style,
|
||||||
rem_size: Pixels,
|
|
||||||
measure: F,
|
measure: F,
|
||||||
) -> LayoutId {
|
) -> LayoutId {
|
||||||
|
let rem_size = self.rem_size();
|
||||||
self.window
|
self.window
|
||||||
.layout_engine
|
.layout_engine
|
||||||
|
.as_mut()
|
||||||
|
.unwrap()
|
||||||
.request_measured_layout(style, rem_size, measure)
|
.request_measured_layout(style, rem_size, measure)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn compute_layout(&mut self, layout_id: LayoutId, available_space: Size<AvailableSpace>) {
|
pub fn compute_layout(&mut self, layout_id: LayoutId, available_space: Size<AvailableSpace>) {
|
||||||
self.window
|
let mut layout_engine = self.window.layout_engine.take().unwrap();
|
||||||
.layout_engine
|
layout_engine.compute_layout(layout_id, available_space, self);
|
||||||
.compute_layout(layout_id, available_space)
|
self.window.layout_engine = Some(layout_engine);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Obtain the bounds computed for the given LayoutId relative to the window. This method should not
|
/// Obtain the bounds computed for the given LayoutId relative to the window. This method should not
|
||||||
@ -643,6 +648,8 @@ impl<'a> WindowContext<'a> {
|
|||||||
let mut bounds = self
|
let mut bounds = self
|
||||||
.window
|
.window
|
||||||
.layout_engine
|
.layout_engine
|
||||||
|
.as_mut()
|
||||||
|
.unwrap()
|
||||||
.layout_bounds(layout_id)
|
.layout_bounds(layout_id)
|
||||||
.map(Into::into);
|
.map(Into::into);
|
||||||
bounds.origin += self.element_offset();
|
bounds.origin += self.element_offset();
|
||||||
@ -678,6 +685,10 @@ impl<'a> WindowContext<'a> {
|
|||||||
self.window.platform_window.zoom();
|
self.window.platform_window.zoom();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn set_window_title(&mut self, title: &str) {
|
||||||
|
self.window.platform_window.set_title(title);
|
||||||
|
}
|
||||||
|
|
||||||
pub fn display(&self) -> Option<Rc<dyn PlatformDisplay>> {
|
pub fn display(&self) -> Option<Rc<dyn PlatformDisplay>> {
|
||||||
self.platform
|
self.platform
|
||||||
.displays()
|
.displays()
|
||||||
@ -1189,7 +1200,7 @@ impl<'a> WindowContext<'a> {
|
|||||||
self.text_system().start_frame();
|
self.text_system().start_frame();
|
||||||
|
|
||||||
let window = &mut *self.window;
|
let window = &mut *self.window;
|
||||||
window.layout_engine.clear();
|
window.layout_engine.as_mut().unwrap().clear();
|
||||||
|
|
||||||
mem::swap(&mut window.previous_frame, &mut window.current_frame);
|
mem::swap(&mut window.previous_frame, &mut window.current_frame);
|
||||||
let frame = &mut window.current_frame;
|
let frame = &mut window.current_frame;
|
||||||
|
@ -1627,9 +1627,21 @@ impl View for ProjectPanel {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn update_keymap_context(&self, keymap: &mut KeymapContext, _: &AppContext) {
|
fn update_keymap_context(&self, keymap: &mut KeymapContext, cx: &AppContext) {
|
||||||
Self::reset_to_default_keymap_context(keymap);
|
Self::reset_to_default_keymap_context(keymap);
|
||||||
keymap.add_identifier("menu");
|
keymap.add_identifier("menu");
|
||||||
|
|
||||||
|
if let Some(window) = cx.active_window() {
|
||||||
|
window.read_with(cx, |cx| {
|
||||||
|
let identifier = if self.filename_editor.is_focused(cx) {
|
||||||
|
"editing"
|
||||||
|
} else {
|
||||||
|
"not_editing"
|
||||||
|
};
|
||||||
|
|
||||||
|
keymap.add_identifier(identifier);
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn focus_in(&mut self, _: gpui::AnyViewHandle, cx: &mut ViewContext<Self>) {
|
fn focus_in(&mut self, _: gpui::AnyViewHandle, cx: &mut ViewContext<Self>) {
|
||||||
|
@ -10,9 +10,9 @@ use anyhow::{anyhow, Result};
|
|||||||
use gpui::{
|
use gpui::{
|
||||||
actions, div, overlay, px, uniform_list, Action, AppContext, AssetSource, AsyncWindowContext,
|
actions, div, overlay, px, uniform_list, Action, AppContext, AssetSource, AsyncWindowContext,
|
||||||
ClipboardItem, DismissEvent, Div, EventEmitter, FocusHandle, Focusable, FocusableView,
|
ClipboardItem, DismissEvent, Div, EventEmitter, FocusHandle, Focusable, FocusableView,
|
||||||
InteractiveElement, Model, MouseButton, MouseDownEvent, ParentElement, Pixels, Point,
|
InteractiveElement, KeyContext, Model, MouseButton, MouseDownEvent, ParentElement, Pixels,
|
||||||
PromptLevel, Render, Stateful, Styled, Subscription, Task, UniformListScrollHandle, View,
|
Point, PromptLevel, Render, Stateful, Styled, Subscription, Task, UniformListScrollHandle,
|
||||||
ViewContext, VisualContext as _, WeakView, WindowContext,
|
View, ViewContext, VisualContext as _, WeakView, WindowContext,
|
||||||
};
|
};
|
||||||
use menu::{Confirm, SelectNext, SelectPrev};
|
use menu::{Confirm, SelectNext, SelectPrev};
|
||||||
use project::{
|
use project::{
|
||||||
@ -29,8 +29,7 @@ use std::{
|
|||||||
path::Path,
|
path::Path,
|
||||||
sync::Arc,
|
sync::Arc,
|
||||||
};
|
};
|
||||||
use theme::ActiveTheme as _;
|
use ui::{prelude::*, v_stack, ContextMenu, IconElement, Label, ListItem};
|
||||||
use ui::{v_stack, ContextMenu, IconElement, Label, ListItem};
|
|
||||||
use unicase::UniCase;
|
use unicase::UniCase;
|
||||||
use util::{maybe, ResultExt, TryFutureExt};
|
use util::{maybe, ResultExt, TryFutureExt};
|
||||||
use workspace::{
|
use workspace::{
|
||||||
@ -1421,6 +1420,22 @@ impl ProjectPanel {
|
|||||||
// );
|
// );
|
||||||
// })
|
// })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn dispatch_context(&self, cx: &ViewContext<Self>) -> KeyContext {
|
||||||
|
let mut dispatch_context = KeyContext::default();
|
||||||
|
dispatch_context.add("ProjectPanel");
|
||||||
|
dispatch_context.add("menu");
|
||||||
|
|
||||||
|
let identifier = if self.filename_editor.focus_handle(cx).is_focused(cx) {
|
||||||
|
"editing"
|
||||||
|
} else {
|
||||||
|
"not_editing"
|
||||||
|
};
|
||||||
|
|
||||||
|
dispatch_context.add(identifier);
|
||||||
|
|
||||||
|
dispatch_context
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Render for ProjectPanel {
|
impl Render for ProjectPanel {
|
||||||
@ -1434,7 +1449,7 @@ impl Render for ProjectPanel {
|
|||||||
.id("project-panel")
|
.id("project-panel")
|
||||||
.size_full()
|
.size_full()
|
||||||
.relative()
|
.relative()
|
||||||
.key_context("ProjectPanel")
|
.key_context(self.dispatch_context(cx))
|
||||||
.on_action(cx.listener(Self::select_next))
|
.on_action(cx.listener(Self::select_next))
|
||||||
.on_action(cx.listener(Self::select_prev))
|
.on_action(cx.listener(Self::select_prev))
|
||||||
.on_action(cx.listener(Self::expand_selected_entry))
|
.on_action(cx.listener(Self::expand_selected_entry))
|
||||||
@ -2845,7 +2860,7 @@ mod tests {
|
|||||||
let worktree = worktree.read(cx);
|
let worktree = worktree.read(cx);
|
||||||
if let Ok(relative_path) = path.strip_prefix(worktree.root_name()) {
|
if let Ok(relative_path) = path.strip_prefix(worktree.root_name()) {
|
||||||
let entry_id = worktree.entry_for_path(relative_path).unwrap().id;
|
let entry_id = worktree.entry_for_path(relative_path).unwrap().id;
|
||||||
panel.selection = Some(Selection {
|
panel.selection = Some(crate::Selection {
|
||||||
worktree_id: worktree.id(),
|
worktree_id: worktree.id(),
|
||||||
entry_id,
|
entry_id,
|
||||||
});
|
});
|
||||||
|
@ -4,7 +4,7 @@ use gpui::{actions, Action, AppContext, IntoElement};
|
|||||||
pub use mode::SearchMode;
|
pub use mode::SearchMode;
|
||||||
use project::search::SearchQuery;
|
use project::search::SearchQuery;
|
||||||
use ui::prelude::*;
|
use ui::prelude::*;
|
||||||
use ui::{ButtonStyle2, Icon, IconButton};
|
use ui::{ButtonStyle, Icon, IconButton};
|
||||||
//pub use project_search::{ProjectSearchBar, ProjectSearchView};
|
//pub use project_search::{ProjectSearchBar, ProjectSearchView};
|
||||||
// use theme::components::{
|
// use theme::components::{
|
||||||
// action_button::Button, svg::Svg, ComponentExt, IconButtonStyle, ToggleIconButtonStyle,
|
// action_button::Button, svg::Svg, ComponentExt, IconButtonStyle, ToggleIconButtonStyle,
|
||||||
@ -91,8 +91,8 @@ impl SearchOptions {
|
|||||||
cx.dispatch_action(action.boxed_clone());
|
cx.dispatch_action(action.boxed_clone());
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.style(ButtonStyle2::Subtle)
|
.style(ButtonStyle::Subtle)
|
||||||
.when(active, |button| button.style(ButtonStyle2::Filled))
|
.when(active, |button| button.style(ButtonStyle::Filled))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -103,8 +103,8 @@ fn toggle_replace_button(active: bool) -> impl IntoElement {
|
|||||||
cx.dispatch_action(Box::new(ToggleReplace));
|
cx.dispatch_action(Box::new(ToggleReplace));
|
||||||
cx.notify();
|
cx.notify();
|
||||||
})
|
})
|
||||||
.style(ButtonStyle2::Subtle)
|
.style(ButtonStyle::Subtle)
|
||||||
.when(active, |button| button.style(ButtonStyle2::Filled))
|
.when(active, |button| button.style(ButtonStyle::Filled))
|
||||||
}
|
}
|
||||||
|
|
||||||
fn render_replace_button(
|
fn render_replace_button(
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
mod auto_height_editor;
|
||||||
mod focus;
|
mod focus;
|
||||||
mod kitchen_sink;
|
mod kitchen_sink;
|
||||||
mod picker;
|
mod picker;
|
||||||
@ -5,6 +6,7 @@ mod scroll;
|
|||||||
mod text;
|
mod text;
|
||||||
mod z_index;
|
mod z_index;
|
||||||
|
|
||||||
|
pub use auto_height_editor::*;
|
||||||
pub use focus::*;
|
pub use focus::*;
|
||||||
pub use kitchen_sink::*;
|
pub use kitchen_sink::*;
|
||||||
pub use picker::*;
|
pub use picker::*;
|
||||||
|
34
crates/storybook2/src/stories/auto_height_editor.rs
Normal file
34
crates/storybook2/src/stories/auto_height_editor.rs
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
use editor::Editor;
|
||||||
|
use gpui::{
|
||||||
|
div, white, Div, KeyBinding, ParentElement, Render, Styled, View, ViewContext, VisualContext,
|
||||||
|
WindowContext,
|
||||||
|
};
|
||||||
|
|
||||||
|
pub struct AutoHeightEditorStory {
|
||||||
|
editor: View<Editor>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl AutoHeightEditorStory {
|
||||||
|
pub fn new(cx: &mut WindowContext) -> View<Self> {
|
||||||
|
cx.bind_keys([KeyBinding::new("enter", editor::Newline, Some("Editor"))]);
|
||||||
|
cx.build_view(|cx| Self {
|
||||||
|
editor: cx.build_view(|cx| {
|
||||||
|
let mut editor = Editor::auto_height(3, cx);
|
||||||
|
editor.set_soft_wrap_mode(language::language_settings::SoftWrap::EditorWidth, cx);
|
||||||
|
editor
|
||||||
|
}),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Render for AutoHeightEditorStory {
|
||||||
|
type Element = Div;
|
||||||
|
|
||||||
|
fn render(&mut self, _cx: &mut ViewContext<Self>) -> Self::Element {
|
||||||
|
div()
|
||||||
|
.size_full()
|
||||||
|
.bg(white())
|
||||||
|
.text_sm()
|
||||||
|
.child(div().w_32().bg(gpui::black()).child(self.editor.clone()))
|
||||||
|
}
|
||||||
|
}
|
@ -12,6 +12,7 @@ use ui::prelude::*;
|
|||||||
#[derive(Debug, PartialEq, Eq, Clone, Copy, strum::Display, EnumString, EnumIter)]
|
#[derive(Debug, PartialEq, Eq, Clone, Copy, strum::Display, EnumString, EnumIter)]
|
||||||
#[strum(serialize_all = "snake_case")]
|
#[strum(serialize_all = "snake_case")]
|
||||||
pub enum ComponentStory {
|
pub enum ComponentStory {
|
||||||
|
AutoHeightEditor,
|
||||||
Avatar,
|
Avatar,
|
||||||
Button,
|
Button,
|
||||||
Checkbox,
|
Checkbox,
|
||||||
@ -23,6 +24,7 @@ pub enum ComponentStory {
|
|||||||
Keybinding,
|
Keybinding,
|
||||||
Label,
|
Label,
|
||||||
List,
|
List,
|
||||||
|
ListHeader,
|
||||||
ListItem,
|
ListItem,
|
||||||
Scroll,
|
Scroll,
|
||||||
Text,
|
Text,
|
||||||
@ -33,6 +35,7 @@ pub enum ComponentStory {
|
|||||||
impl ComponentStory {
|
impl ComponentStory {
|
||||||
pub fn story(&self, cx: &mut WindowContext) -> AnyView {
|
pub fn story(&self, cx: &mut WindowContext) -> AnyView {
|
||||||
match self {
|
match self {
|
||||||
|
Self::AutoHeightEditor => AutoHeightEditorStory::new(cx).into(),
|
||||||
Self::Avatar => cx.build_view(|_| ui::AvatarStory).into(),
|
Self::Avatar => cx.build_view(|_| ui::AvatarStory).into(),
|
||||||
Self::Button => cx.build_view(|_| ui::ButtonStory).into(),
|
Self::Button => cx.build_view(|_| ui::ButtonStory).into(),
|
||||||
Self::Checkbox => cx.build_view(|_| ui::CheckboxStory).into(),
|
Self::Checkbox => cx.build_view(|_| ui::CheckboxStory).into(),
|
||||||
@ -44,6 +47,7 @@ impl ComponentStory {
|
|||||||
Self::Keybinding => cx.build_view(|_| ui::KeybindingStory).into(),
|
Self::Keybinding => cx.build_view(|_| ui::KeybindingStory).into(),
|
||||||
Self::Label => cx.build_view(|_| ui::LabelStory).into(),
|
Self::Label => cx.build_view(|_| ui::LabelStory).into(),
|
||||||
Self::List => cx.build_view(|_| ui::ListStory).into(),
|
Self::List => cx.build_view(|_| ui::ListStory).into(),
|
||||||
|
Self::ListHeader => cx.build_view(|_| ui::ListHeaderStory).into(),
|
||||||
Self::ListItem => cx.build_view(|_| ui::ListItemStory).into(),
|
Self::ListItem => cx.build_view(|_| ui::ListItemStory).into(),
|
||||||
Self::Scroll => ScrollStory::view(cx).into(),
|
Self::Scroll => ScrollStory::view(cx).into(),
|
||||||
Self::Text => TextStory::view(cx).into(),
|
Self::Text => TextStory::view(cx).into(),
|
||||||
|
@ -2,14 +2,14 @@ use feature_flags::FeatureFlagAppExt;
|
|||||||
use fs::Fs;
|
use fs::Fs;
|
||||||
use fuzzy::{match_strings, StringMatch, StringMatchCandidate};
|
use fuzzy::{match_strings, StringMatch, StringMatchCandidate};
|
||||||
use gpui::{
|
use gpui::{
|
||||||
actions, AppContext, DismissEvent, EventEmitter, FocusableView, ParentElement, Render,
|
actions, AppContext, DismissEvent, EventEmitter, FocusableView, Render, SharedString, View,
|
||||||
SharedString, View, ViewContext, VisualContext, WeakView,
|
ViewContext, VisualContext, WeakView,
|
||||||
};
|
};
|
||||||
use picker::{Picker, PickerDelegate};
|
use picker::{Picker, PickerDelegate};
|
||||||
use settings::{update_settings_file, SettingsStore};
|
use settings::{update_settings_file, SettingsStore};
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
use theme::{ActiveTheme, Theme, ThemeRegistry, ThemeSettings};
|
use theme::{Theme, ThemeRegistry, ThemeSettings};
|
||||||
use ui::ListItem;
|
use ui::{prelude::*, ListItem};
|
||||||
use util::ResultExt;
|
use util::ResultExt;
|
||||||
use workspace::{ui::HighlightedLabel, Workspace};
|
use workspace::{ui::HighlightedLabel, Workspace};
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
use gpui::AnyView;
|
use gpui::AnyView;
|
||||||
|
|
||||||
use crate::prelude::*;
|
use crate::prelude::*;
|
||||||
use crate::{ButtonCommon, ButtonLike, ButtonSize2, ButtonStyle2, Label, LineHeightStyle};
|
use crate::{ButtonCommon, ButtonLike, ButtonSize, ButtonStyle, Label, LineHeightStyle};
|
||||||
|
|
||||||
#[derive(IntoElement)]
|
#[derive(IntoElement)]
|
||||||
pub struct Button {
|
pub struct Button {
|
||||||
@ -54,12 +54,12 @@ impl ButtonCommon for Button {
|
|||||||
self.base.id()
|
self.base.id()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn style(mut self, style: ButtonStyle2) -> Self {
|
fn style(mut self, style: ButtonStyle) -> Self {
|
||||||
self.base = self.base.style(style);
|
self.base = self.base.style(style);
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
fn size(mut self, size: ButtonSize2) -> Self {
|
fn size(mut self, size: ButtonSize) -> Self {
|
||||||
self.base = self.base.size(size);
|
self.base = self.base.size(size);
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
@ -79,7 +79,7 @@ impl RenderOnce for Button {
|
|||||||
} else if self.base.selected {
|
} else if self.base.selected {
|
||||||
Color::Selected
|
Color::Selected
|
||||||
} else {
|
} else {
|
||||||
Color::Default
|
self.label_color.unwrap_or_default()
|
||||||
};
|
};
|
||||||
|
|
||||||
self.base.child(
|
self.base.child(
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
use gpui::{rems, AnyElement, AnyView, ClickEvent, Div, Hsla, Rems, Stateful};
|
use gpui::{rems, transparent_black, AnyElement, AnyView, ClickEvent, Div, Hsla, Rems, Stateful};
|
||||||
use smallvec::SmallVec;
|
use smallvec::SmallVec;
|
||||||
|
|
||||||
use crate::h_stack;
|
use crate::h_stack;
|
||||||
@ -6,13 +6,13 @@ use crate::prelude::*;
|
|||||||
|
|
||||||
pub trait ButtonCommon: Clickable + Disableable {
|
pub trait ButtonCommon: Clickable + Disableable {
|
||||||
fn id(&self) -> &ElementId;
|
fn id(&self) -> &ElementId;
|
||||||
fn style(self, style: ButtonStyle2) -> Self;
|
fn style(self, style: ButtonStyle) -> Self;
|
||||||
fn size(self, size: ButtonSize2) -> Self;
|
fn size(self, size: ButtonSize) -> Self;
|
||||||
fn tooltip(self, tooltip: impl Fn(&mut WindowContext) -> AnyView + 'static) -> Self;
|
fn tooltip(self, tooltip: impl Fn(&mut WindowContext) -> AnyView + 'static) -> Self;
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, Default)]
|
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, Default)]
|
||||||
pub enum ButtonStyle2 {
|
pub enum ButtonStyle {
|
||||||
#[default]
|
#[default]
|
||||||
Filled,
|
Filled,
|
||||||
// Tinted,
|
// Tinted,
|
||||||
@ -21,54 +21,57 @@ pub enum ButtonStyle2 {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
pub struct ButtonStyle {
|
pub(crate) struct ButtonLikeStyles {
|
||||||
pub background: Hsla,
|
pub background: Hsla,
|
||||||
|
#[allow(unused)]
|
||||||
pub border_color: Hsla,
|
pub border_color: Hsla,
|
||||||
|
#[allow(unused)]
|
||||||
pub label_color: Hsla,
|
pub label_color: Hsla,
|
||||||
|
#[allow(unused)]
|
||||||
pub icon_color: Hsla,
|
pub icon_color: Hsla,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl ButtonStyle2 {
|
impl ButtonStyle {
|
||||||
pub fn enabled(self, cx: &mut WindowContext) -> ButtonStyle {
|
pub(crate) fn enabled(self, cx: &mut WindowContext) -> ButtonLikeStyles {
|
||||||
match self {
|
match self {
|
||||||
ButtonStyle2::Filled => ButtonStyle {
|
ButtonStyle::Filled => ButtonLikeStyles {
|
||||||
background: cx.theme().colors().element_background,
|
background: cx.theme().colors().element_background,
|
||||||
border_color: gpui::transparent_black(),
|
border_color: transparent_black(),
|
||||||
label_color: Color::Default.color(cx),
|
label_color: Color::Default.color(cx),
|
||||||
icon_color: Color::Default.color(cx),
|
icon_color: Color::Default.color(cx),
|
||||||
},
|
},
|
||||||
ButtonStyle2::Subtle => ButtonStyle {
|
ButtonStyle::Subtle => ButtonLikeStyles {
|
||||||
background: cx.theme().colors().ghost_element_background,
|
background: cx.theme().colors().ghost_element_background,
|
||||||
border_color: gpui::transparent_black(),
|
border_color: transparent_black(),
|
||||||
label_color: Color::Default.color(cx),
|
label_color: Color::Default.color(cx),
|
||||||
icon_color: Color::Default.color(cx),
|
icon_color: Color::Default.color(cx),
|
||||||
},
|
},
|
||||||
ButtonStyle2::Transparent => ButtonStyle {
|
ButtonStyle::Transparent => ButtonLikeStyles {
|
||||||
background: gpui::transparent_black(),
|
background: transparent_black(),
|
||||||
border_color: gpui::transparent_black(),
|
border_color: transparent_black(),
|
||||||
label_color: Color::Default.color(cx),
|
label_color: Color::Default.color(cx),
|
||||||
icon_color: Color::Default.color(cx),
|
icon_color: Color::Default.color(cx),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn hovered(self, cx: &mut WindowContext) -> ButtonStyle {
|
pub(crate) fn hovered(self, cx: &mut WindowContext) -> ButtonLikeStyles {
|
||||||
match self {
|
match self {
|
||||||
ButtonStyle2::Filled => ButtonStyle {
|
ButtonStyle::Filled => ButtonLikeStyles {
|
||||||
background: cx.theme().colors().element_hover,
|
background: cx.theme().colors().element_hover,
|
||||||
border_color: gpui::transparent_black(),
|
border_color: transparent_black(),
|
||||||
label_color: Color::Default.color(cx),
|
label_color: Color::Default.color(cx),
|
||||||
icon_color: Color::Default.color(cx),
|
icon_color: Color::Default.color(cx),
|
||||||
},
|
},
|
||||||
ButtonStyle2::Subtle => ButtonStyle {
|
ButtonStyle::Subtle => ButtonLikeStyles {
|
||||||
background: cx.theme().colors().ghost_element_hover,
|
background: cx.theme().colors().ghost_element_hover,
|
||||||
border_color: gpui::transparent_black(),
|
border_color: transparent_black(),
|
||||||
label_color: Color::Default.color(cx),
|
label_color: Color::Default.color(cx),
|
||||||
icon_color: Color::Default.color(cx),
|
icon_color: Color::Default.color(cx),
|
||||||
},
|
},
|
||||||
ButtonStyle2::Transparent => ButtonStyle {
|
ButtonStyle::Transparent => ButtonLikeStyles {
|
||||||
background: gpui::transparent_black(),
|
background: transparent_black(),
|
||||||
border_color: gpui::transparent_black(),
|
border_color: transparent_black(),
|
||||||
// TODO: These are not great
|
// TODO: These are not great
|
||||||
label_color: Color::Muted.color(cx),
|
label_color: Color::Muted.color(cx),
|
||||||
// TODO: These are not great
|
// TODO: These are not great
|
||||||
@ -77,23 +80,23 @@ impl ButtonStyle2 {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn active(self, cx: &mut WindowContext) -> ButtonStyle {
|
pub(crate) fn active(self, cx: &mut WindowContext) -> ButtonLikeStyles {
|
||||||
match self {
|
match self {
|
||||||
ButtonStyle2::Filled => ButtonStyle {
|
ButtonStyle::Filled => ButtonLikeStyles {
|
||||||
background: cx.theme().colors().element_active,
|
background: cx.theme().colors().element_active,
|
||||||
border_color: gpui::transparent_black(),
|
border_color: transparent_black(),
|
||||||
label_color: Color::Default.color(cx),
|
label_color: Color::Default.color(cx),
|
||||||
icon_color: Color::Default.color(cx),
|
icon_color: Color::Default.color(cx),
|
||||||
},
|
},
|
||||||
ButtonStyle2::Subtle => ButtonStyle {
|
ButtonStyle::Subtle => ButtonLikeStyles {
|
||||||
background: cx.theme().colors().ghost_element_active,
|
background: cx.theme().colors().ghost_element_active,
|
||||||
border_color: gpui::transparent_black(),
|
border_color: transparent_black(),
|
||||||
label_color: Color::Default.color(cx),
|
label_color: Color::Default.color(cx),
|
||||||
icon_color: Color::Default.color(cx),
|
icon_color: Color::Default.color(cx),
|
||||||
},
|
},
|
||||||
ButtonStyle2::Transparent => ButtonStyle {
|
ButtonStyle::Transparent => ButtonLikeStyles {
|
||||||
background: gpui::transparent_black(),
|
background: transparent_black(),
|
||||||
border_color: gpui::transparent_black(),
|
border_color: transparent_black(),
|
||||||
// TODO: These are not great
|
// TODO: These are not great
|
||||||
label_color: Color::Muted.color(cx),
|
label_color: Color::Muted.color(cx),
|
||||||
// TODO: These are not great
|
// TODO: These are not great
|
||||||
@ -102,22 +105,23 @@ impl ButtonStyle2 {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn focused(self, cx: &mut WindowContext) -> ButtonStyle {
|
#[allow(unused)]
|
||||||
|
pub(crate) fn focused(self, cx: &mut WindowContext) -> ButtonLikeStyles {
|
||||||
match self {
|
match self {
|
||||||
ButtonStyle2::Filled => ButtonStyle {
|
ButtonStyle::Filled => ButtonLikeStyles {
|
||||||
background: cx.theme().colors().element_background,
|
background: cx.theme().colors().element_background,
|
||||||
border_color: cx.theme().colors().border_focused,
|
border_color: cx.theme().colors().border_focused,
|
||||||
label_color: Color::Default.color(cx),
|
label_color: Color::Default.color(cx),
|
||||||
icon_color: Color::Default.color(cx),
|
icon_color: Color::Default.color(cx),
|
||||||
},
|
},
|
||||||
ButtonStyle2::Subtle => ButtonStyle {
|
ButtonStyle::Subtle => ButtonLikeStyles {
|
||||||
background: cx.theme().colors().ghost_element_background,
|
background: cx.theme().colors().ghost_element_background,
|
||||||
border_color: cx.theme().colors().border_focused,
|
border_color: cx.theme().colors().border_focused,
|
||||||
label_color: Color::Default.color(cx),
|
label_color: Color::Default.color(cx),
|
||||||
icon_color: Color::Default.color(cx),
|
icon_color: Color::Default.color(cx),
|
||||||
},
|
},
|
||||||
ButtonStyle2::Transparent => ButtonStyle {
|
ButtonStyle::Transparent => ButtonLikeStyles {
|
||||||
background: gpui::transparent_black(),
|
background: transparent_black(),
|
||||||
border_color: cx.theme().colors().border_focused,
|
border_color: cx.theme().colors().border_focused,
|
||||||
label_color: Color::Accent.color(cx),
|
label_color: Color::Accent.color(cx),
|
||||||
icon_color: Color::Accent.color(cx),
|
icon_color: Color::Accent.color(cx),
|
||||||
@ -125,23 +129,23 @@ impl ButtonStyle2 {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn disabled(self, cx: &mut WindowContext) -> ButtonStyle {
|
pub(crate) fn disabled(self, cx: &mut WindowContext) -> ButtonLikeStyles {
|
||||||
match self {
|
match self {
|
||||||
ButtonStyle2::Filled => ButtonStyle {
|
ButtonStyle::Filled => ButtonLikeStyles {
|
||||||
background: cx.theme().colors().element_disabled,
|
background: cx.theme().colors().element_disabled,
|
||||||
border_color: cx.theme().colors().border_disabled,
|
border_color: cx.theme().colors().border_disabled,
|
||||||
label_color: Color::Disabled.color(cx),
|
label_color: Color::Disabled.color(cx),
|
||||||
icon_color: Color::Disabled.color(cx),
|
icon_color: Color::Disabled.color(cx),
|
||||||
},
|
},
|
||||||
ButtonStyle2::Subtle => ButtonStyle {
|
ButtonStyle::Subtle => ButtonLikeStyles {
|
||||||
background: cx.theme().colors().ghost_element_disabled,
|
background: cx.theme().colors().ghost_element_disabled,
|
||||||
border_color: cx.theme().colors().border_disabled,
|
border_color: cx.theme().colors().border_disabled,
|
||||||
label_color: Color::Disabled.color(cx),
|
label_color: Color::Disabled.color(cx),
|
||||||
icon_color: Color::Disabled.color(cx),
|
icon_color: Color::Disabled.color(cx),
|
||||||
},
|
},
|
||||||
ButtonStyle2::Transparent => ButtonStyle {
|
ButtonStyle::Transparent => ButtonLikeStyles {
|
||||||
background: gpui::transparent_black(),
|
background: transparent_black(),
|
||||||
border_color: gpui::transparent_black(),
|
border_color: transparent_black(),
|
||||||
label_color: Color::Disabled.color(cx),
|
label_color: Color::Disabled.color(cx),
|
||||||
icon_color: Color::Disabled.color(cx),
|
icon_color: Color::Disabled.color(cx),
|
||||||
},
|
},
|
||||||
@ -150,19 +154,19 @@ impl ButtonStyle2 {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Default, PartialEq, Clone, Copy)]
|
#[derive(Default, PartialEq, Clone, Copy)]
|
||||||
pub enum ButtonSize2 {
|
pub enum ButtonSize {
|
||||||
#[default]
|
#[default]
|
||||||
Default,
|
Default,
|
||||||
Compact,
|
Compact,
|
||||||
None,
|
None,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl ButtonSize2 {
|
impl ButtonSize {
|
||||||
fn height(self) -> Rems {
|
fn height(self) -> Rems {
|
||||||
match self {
|
match self {
|
||||||
ButtonSize2::Default => rems(22. / 16.),
|
ButtonSize::Default => rems(22. / 16.),
|
||||||
ButtonSize2::Compact => rems(18. / 16.),
|
ButtonSize::Compact => rems(18. / 16.),
|
||||||
ButtonSize2::None => rems(16. / 16.),
|
ButtonSize::None => rems(16. / 16.),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -170,10 +174,10 @@ impl ButtonSize2 {
|
|||||||
#[derive(IntoElement)]
|
#[derive(IntoElement)]
|
||||||
pub struct ButtonLike {
|
pub struct ButtonLike {
|
||||||
id: ElementId,
|
id: ElementId,
|
||||||
pub(super) style: ButtonStyle2,
|
pub(super) style: ButtonStyle,
|
||||||
pub(super) disabled: bool,
|
pub(super) disabled: bool,
|
||||||
pub(super) selected: bool,
|
pub(super) selected: bool,
|
||||||
size: ButtonSize2,
|
size: ButtonSize,
|
||||||
tooltip: Option<Box<dyn Fn(&mut WindowContext) -> AnyView>>,
|
tooltip: Option<Box<dyn Fn(&mut WindowContext) -> AnyView>>,
|
||||||
on_click: Option<Box<dyn Fn(&ClickEvent, &mut WindowContext) + 'static>>,
|
on_click: Option<Box<dyn Fn(&ClickEvent, &mut WindowContext) + 'static>>,
|
||||||
children: SmallVec<[AnyElement; 2]>,
|
children: SmallVec<[AnyElement; 2]>,
|
||||||
@ -183,10 +187,10 @@ impl ButtonLike {
|
|||||||
pub fn new(id: impl Into<ElementId>) -> Self {
|
pub fn new(id: impl Into<ElementId>) -> Self {
|
||||||
Self {
|
Self {
|
||||||
id: id.into(),
|
id: id.into(),
|
||||||
style: ButtonStyle2::default(),
|
style: ButtonStyle::default(),
|
||||||
disabled: false,
|
disabled: false,
|
||||||
selected: false,
|
selected: false,
|
||||||
size: ButtonSize2::Default,
|
size: ButtonSize::Default,
|
||||||
tooltip: None,
|
tooltip: None,
|
||||||
children: SmallVec::new(),
|
children: SmallVec::new(),
|
||||||
on_click: None,
|
on_click: None,
|
||||||
@ -220,12 +224,12 @@ impl ButtonCommon for ButtonLike {
|
|||||||
&self.id
|
&self.id
|
||||||
}
|
}
|
||||||
|
|
||||||
fn style(mut self, style: ButtonStyle2) -> Self {
|
fn style(mut self, style: ButtonStyle) -> Self {
|
||||||
self.style = style;
|
self.style = style;
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
fn size(mut self, size: ButtonSize2) -> Self {
|
fn size(mut self, size: ButtonSize) -> Self {
|
||||||
self.size = size;
|
self.size = size;
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
use gpui::{Action, AnyView};
|
use gpui::{Action, AnyView};
|
||||||
|
|
||||||
use crate::prelude::*;
|
use crate::prelude::*;
|
||||||
use crate::{ButtonCommon, ButtonLike, ButtonSize2, ButtonStyle2, Icon, IconElement, IconSize};
|
use crate::{ButtonCommon, ButtonLike, ButtonSize, ButtonStyle, Icon, IconElement, IconSize};
|
||||||
|
|
||||||
#[derive(IntoElement)]
|
#[derive(IntoElement)]
|
||||||
pub struct IconButton {
|
pub struct IconButton {
|
||||||
@ -65,12 +65,12 @@ impl ButtonCommon for IconButton {
|
|||||||
self.base.id()
|
self.base.id()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn style(mut self, style: ButtonStyle2) -> Self {
|
fn style(mut self, style: ButtonStyle) -> Self {
|
||||||
self.base = self.base.style(style);
|
self.base = self.base.style(style);
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
fn size(mut self, size: ButtonSize2) -> Self {
|
fn size(mut self, size: ButtonSize) -> Self {
|
||||||
self.base = self.base.size(size);
|
self.base = self.base.size(size);
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
@ -1,73 +1,11 @@
|
|||||||
|
mod list;
|
||||||
mod list_header;
|
mod list_header;
|
||||||
mod list_item;
|
mod list_item;
|
||||||
mod list_separator;
|
mod list_separator;
|
||||||
mod list_sub_header;
|
mod list_sub_header;
|
||||||
|
|
||||||
use gpui::{AnyElement, Div};
|
pub use list::*;
|
||||||
use smallvec::SmallVec;
|
|
||||||
|
|
||||||
use crate::prelude::*;
|
|
||||||
use crate::{v_stack, Label};
|
|
||||||
|
|
||||||
pub use list_header::*;
|
pub use list_header::*;
|
||||||
pub use list_item::*;
|
pub use list_item::*;
|
||||||
pub use list_separator::*;
|
pub use list_separator::*;
|
||||||
pub use list_sub_header::*;
|
pub use list_sub_header::*;
|
||||||
|
|
||||||
#[derive(IntoElement)]
|
|
||||||
pub struct List {
|
|
||||||
/// Message to display when the list is empty
|
|
||||||
/// Defaults to "No items"
|
|
||||||
empty_message: SharedString,
|
|
||||||
header: Option<ListHeader>,
|
|
||||||
toggle: Option<bool>,
|
|
||||||
children: SmallVec<[AnyElement; 2]>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl List {
|
|
||||||
pub fn new() -> Self {
|
|
||||||
Self {
|
|
||||||
empty_message: "No items".into(),
|
|
||||||
header: None,
|
|
||||||
toggle: None,
|
|
||||||
children: SmallVec::new(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn empty_message(mut self, empty_message: impl Into<SharedString>) -> Self {
|
|
||||||
self.empty_message = empty_message.into();
|
|
||||||
self
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn header(mut self, header: ListHeader) -> Self {
|
|
||||||
self.header = Some(header);
|
|
||||||
self
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn toggle(mut self, toggle: impl Into<Option<bool>>) -> Self {
|
|
||||||
self.toggle = toggle.into();
|
|
||||||
self
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl ParentElement for List {
|
|
||||||
fn children_mut(&mut self) -> &mut SmallVec<[AnyElement; 2]> {
|
|
||||||
&mut self.children
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl RenderOnce for List {
|
|
||||||
type Rendered = Div;
|
|
||||||
|
|
||||||
fn render(self, _cx: &mut WindowContext) -> Self::Rendered {
|
|
||||||
v_stack()
|
|
||||||
.w_full()
|
|
||||||
.py_1()
|
|
||||||
.children(self.header.map(|header| header))
|
|
||||||
.map(|this| match (self.children.is_empty(), self.toggle) {
|
|
||||||
(false, _) => this.children(self.children),
|
|
||||||
(true, Some(false)) => this,
|
|
||||||
(true, _) => this.child(Label::new(self.empty_message.clone()).color(Color::Muted)),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
60
crates/ui2/src/components/list/list.rs
Normal file
60
crates/ui2/src/components/list/list.rs
Normal file
@ -0,0 +1,60 @@
|
|||||||
|
use gpui::{AnyElement, Div};
|
||||||
|
use smallvec::SmallVec;
|
||||||
|
|
||||||
|
use crate::{prelude::*, v_stack, Label, ListHeader};
|
||||||
|
|
||||||
|
#[derive(IntoElement)]
|
||||||
|
pub struct List {
|
||||||
|
/// Message to display when the list is empty
|
||||||
|
/// Defaults to "No items"
|
||||||
|
empty_message: SharedString,
|
||||||
|
header: Option<ListHeader>,
|
||||||
|
toggle: Option<bool>,
|
||||||
|
children: SmallVec<[AnyElement; 2]>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl List {
|
||||||
|
pub fn new() -> Self {
|
||||||
|
Self {
|
||||||
|
empty_message: "No items".into(),
|
||||||
|
header: None,
|
||||||
|
toggle: None,
|
||||||
|
children: SmallVec::new(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn empty_message(mut self, empty_message: impl Into<SharedString>) -> Self {
|
||||||
|
self.empty_message = empty_message.into();
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn header(mut self, header: impl Into<Option<ListHeader>>) -> Self {
|
||||||
|
self.header = header.into();
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn toggle(mut self, toggle: impl Into<Option<bool>>) -> Self {
|
||||||
|
self.toggle = toggle.into();
|
||||||
|
self
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ParentElement for List {
|
||||||
|
fn children_mut(&mut self) -> &mut SmallVec<[AnyElement; 2]> {
|
||||||
|
&mut self.children
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl RenderOnce for List {
|
||||||
|
type Rendered = Div;
|
||||||
|
|
||||||
|
fn render(self, _cx: &mut WindowContext) -> Self::Rendered {
|
||||||
|
v_stack().w_full().py_1().children(self.header).map(|this| {
|
||||||
|
match (self.children.is_empty(), self.toggle) {
|
||||||
|
(false, _) => this.children(self.children),
|
||||||
|
(true, Some(false)) => this,
|
||||||
|
(true, _) => this.child(Label::new(self.empty_message.clone()).color(Color::Muted)),
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
@ -1,22 +1,16 @@
|
|||||||
use std::rc::Rc;
|
use std::rc::Rc;
|
||||||
|
|
||||||
use gpui::{ClickEvent, Div};
|
use gpui::{AnyElement, ClickEvent, Div};
|
||||||
|
use smallvec::SmallVec;
|
||||||
|
|
||||||
use crate::prelude::*;
|
use crate::prelude::*;
|
||||||
use crate::{h_stack, Disclosure, Icon, IconButton, IconElement, IconSize, Label};
|
use crate::{h_stack, Disclosure, Icon, IconElement, IconSize, Label};
|
||||||
|
|
||||||
pub enum ListHeaderMeta {
|
|
||||||
Tools(Vec<IconButton>),
|
|
||||||
// TODO: This should be a button
|
|
||||||
Button(Label),
|
|
||||||
Text(Label),
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(IntoElement)]
|
#[derive(IntoElement)]
|
||||||
pub struct ListHeader {
|
pub struct ListHeader {
|
||||||
label: SharedString,
|
label: SharedString,
|
||||||
left_icon: Option<Icon>,
|
left_icon: Option<Icon>,
|
||||||
meta: Option<ListHeaderMeta>,
|
meta: SmallVec<[AnyElement; 2]>,
|
||||||
toggle: Option<bool>,
|
toggle: Option<bool>,
|
||||||
on_toggle: Option<Rc<dyn Fn(&ClickEvent, &mut WindowContext) + 'static>>,
|
on_toggle: Option<Rc<dyn Fn(&ClickEvent, &mut WindowContext) + 'static>>,
|
||||||
inset: bool,
|
inset: bool,
|
||||||
@ -28,7 +22,7 @@ impl ListHeader {
|
|||||||
Self {
|
Self {
|
||||||
label: label.into(),
|
label: label.into(),
|
||||||
left_icon: None,
|
left_icon: None,
|
||||||
meta: None,
|
meta: SmallVec::new(),
|
||||||
inset: false,
|
inset: false,
|
||||||
toggle: None,
|
toggle: None,
|
||||||
on_toggle: None,
|
on_toggle: None,
|
||||||
@ -49,21 +43,19 @@ impl ListHeader {
|
|||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn left_icon(mut self, left_icon: Option<Icon>) -> Self {
|
pub fn left_icon(mut self, left_icon: impl Into<Option<Icon>>) -> Self {
|
||||||
self.left_icon = left_icon;
|
self.left_icon = left_icon.into();
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn right_button(self, button: IconButton) -> Self {
|
pub fn meta(mut self, meta: impl IntoElement) -> Self {
|
||||||
self.meta(Some(ListHeaderMeta::Tools(vec![button])))
|
self.meta.push(meta.into_any_element());
|
||||||
}
|
|
||||||
|
|
||||||
pub fn meta(mut self, meta: Option<ListHeaderMeta>) -> Self {
|
|
||||||
self.meta = meta;
|
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub fn selected(mut self, selected: bool) -> Self {
|
impl Selectable for ListHeader {
|
||||||
|
fn selected(mut self, selected: bool) -> Self {
|
||||||
self.selected = selected;
|
self.selected = selected;
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
@ -73,18 +65,6 @@ impl RenderOnce for ListHeader {
|
|||||||
type Rendered = Div;
|
type Rendered = Div;
|
||||||
|
|
||||||
fn render(self, cx: &mut WindowContext) -> Self::Rendered {
|
fn render(self, cx: &mut WindowContext) -> Self::Rendered {
|
||||||
let meta = match self.meta {
|
|
||||||
Some(ListHeaderMeta::Tools(icons)) => div().child(
|
|
||||||
h_stack()
|
|
||||||
.gap_2()
|
|
||||||
.items_center()
|
|
||||||
.children(icons.into_iter().map(|i| i.icon_color(Color::Muted))),
|
|
||||||
),
|
|
||||||
Some(ListHeaderMeta::Button(label)) => div().child(label),
|
|
||||||
Some(ListHeaderMeta::Text(label)) => div().child(label),
|
|
||||||
None => div(),
|
|
||||||
};
|
|
||||||
|
|
||||||
h_stack().w_full().relative().child(
|
h_stack().w_full().relative().child(
|
||||||
div()
|
div()
|
||||||
.h_5()
|
.h_5()
|
||||||
@ -118,7 +98,7 @@ impl RenderOnce for ListHeader {
|
|||||||
.map(|is_open| Disclosure::new(is_open).on_toggle(self.on_toggle)),
|
.map(|is_open| Disclosure::new(is_open).on_toggle(self.on_toggle)),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
.child(meta),
|
.child(h_stack().gap_2().items_center().children(self.meta)),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -83,11 +83,6 @@ impl ListItem {
|
|||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn selected(mut self, selected: bool) -> Self {
|
|
||||||
self.selected = selected;
|
|
||||||
self
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn left_child(mut self, left_content: impl IntoElement) -> Self {
|
pub fn left_child(mut self, left_content: impl IntoElement) -> Self {
|
||||||
self.left_slot = Some(left_content.into_any_element());
|
self.left_slot = Some(left_content.into_any_element());
|
||||||
self
|
self
|
||||||
@ -109,6 +104,13 @@ impl ListItem {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl Selectable for ListItem {
|
||||||
|
fn selected(mut self, selected: bool) -> Self {
|
||||||
|
self.selected = selected;
|
||||||
|
self
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl ParentElement for ListItem {
|
impl ParentElement for ListItem {
|
||||||
fn children_mut(&mut self) -> &mut SmallVec<[AnyElement; 2]> {
|
fn children_mut(&mut self) -> &mut SmallVec<[AnyElement; 2]> {
|
||||||
&mut self.children
|
&mut self.children
|
||||||
|
@ -8,6 +8,7 @@ mod icon_button;
|
|||||||
mod keybinding;
|
mod keybinding;
|
||||||
mod label;
|
mod label;
|
||||||
mod list;
|
mod list;
|
||||||
|
mod list_header;
|
||||||
mod list_item;
|
mod list_item;
|
||||||
|
|
||||||
pub use avatar::*;
|
pub use avatar::*;
|
||||||
@ -20,4 +21,5 @@ pub use icon_button::*;
|
|||||||
pub use keybinding::*;
|
pub use keybinding::*;
|
||||||
pub use label::*;
|
pub use label::*;
|
||||||
pub use list::*;
|
pub use list::*;
|
||||||
|
pub use list_header::*;
|
||||||
pub use list_item::*;
|
pub use list_item::*;
|
||||||
|
@ -2,7 +2,7 @@ use gpui::{Div, Render};
|
|||||||
use story::Story;
|
use story::Story;
|
||||||
|
|
||||||
use crate::prelude::*;
|
use crate::prelude::*;
|
||||||
use crate::{Button, ButtonStyle2};
|
use crate::{Button, ButtonStyle};
|
||||||
|
|
||||||
pub struct ButtonStory;
|
pub struct ButtonStory;
|
||||||
|
|
||||||
@ -14,9 +14,13 @@ impl Render for ButtonStory {
|
|||||||
.child(Story::title_for::<Button>())
|
.child(Story::title_for::<Button>())
|
||||||
.child(Story::label("Default"))
|
.child(Story::label("Default"))
|
||||||
.child(Button::new("default_filled", "Click me"))
|
.child(Button::new("default_filled", "Click me"))
|
||||||
|
.child(Story::label("Selected"))
|
||||||
|
.child(Button::new("selected_filled", "Click me").selected(true))
|
||||||
|
.child(Story::label("With `label_color`"))
|
||||||
|
.child(Button::new("filled_with_label_color", "Click me").color(Color::Created))
|
||||||
.child(Story::label("Default (Subtle)"))
|
.child(Story::label("Default (Subtle)"))
|
||||||
.child(Button::new("default_subtle", "Click me").style(ButtonStyle2::Subtle))
|
.child(Button::new("default_subtle", "Click me").style(ButtonStyle::Subtle))
|
||||||
.child(Story::label("Default (Transparent)"))
|
.child(Story::label("Default (Transparent)"))
|
||||||
.child(Button::new("default_transparent", "Click me").style(ButtonStyle2::Transparent))
|
.child(Button::new("default_transparent", "Click me").style(ButtonStyle::Transparent))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -22,12 +22,12 @@ impl Render for ListStory {
|
|||||||
.child(Story::label("With sections"))
|
.child(Story::label("With sections"))
|
||||||
.child(
|
.child(
|
||||||
List::new()
|
List::new()
|
||||||
.child(ListHeader::new("Fruits"))
|
.header(ListHeader::new("Produce"))
|
||||||
|
.child(ListSubHeader::new("Fruits"))
|
||||||
.child(ListItem::new("apple").child("Apple"))
|
.child(ListItem::new("apple").child("Apple"))
|
||||||
.child(ListItem::new("banana").child("Banana"))
|
.child(ListItem::new("banana").child("Banana"))
|
||||||
.child(ListItem::new("cherry").child("Cherry"))
|
.child(ListItem::new("cherry").child("Cherry"))
|
||||||
.child(ListSeparator)
|
.child(ListSeparator)
|
||||||
.child(ListHeader::new("Vegetables"))
|
|
||||||
.child(ListSubHeader::new("Root Vegetables"))
|
.child(ListSubHeader::new("Root Vegetables"))
|
||||||
.child(ListItem::new("carrot").child("Carrot"))
|
.child(ListItem::new("carrot").child("Carrot"))
|
||||||
.child(ListItem::new("potato").child("Potato"))
|
.child(ListItem::new("potato").child("Potato"))
|
||||||
|
33
crates/ui2/src/components/stories/list_header.rs
Normal file
33
crates/ui2/src/components/stories/list_header.rs
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
use gpui::{Div, Render};
|
||||||
|
use story::Story;
|
||||||
|
|
||||||
|
use crate::{prelude::*, IconButton};
|
||||||
|
use crate::{Icon, ListHeader};
|
||||||
|
|
||||||
|
pub struct ListHeaderStory;
|
||||||
|
|
||||||
|
impl Render for ListHeaderStory {
|
||||||
|
type Element = Div;
|
||||||
|
|
||||||
|
fn render(&mut self, _cx: &mut ViewContext<Self>) -> Self::Element {
|
||||||
|
Story::container()
|
||||||
|
.child(Story::title_for::<ListHeader>())
|
||||||
|
.child(Story::label("Default"))
|
||||||
|
.child(ListHeader::new("Section 1"))
|
||||||
|
.child(Story::label("With left icon"))
|
||||||
|
.child(ListHeader::new("Section 2").left_icon(Icon::Bell))
|
||||||
|
.child(Story::label("With left icon and meta"))
|
||||||
|
.child(
|
||||||
|
ListHeader::new("Section 3")
|
||||||
|
.left_icon(Icon::BellOff)
|
||||||
|
.meta(IconButton::new("action_1", Icon::Bolt)),
|
||||||
|
)
|
||||||
|
.child(Story::label("With multiple meta"))
|
||||||
|
.child(
|
||||||
|
ListHeader::new("Section 4")
|
||||||
|
.meta(IconButton::new("action_1", Icon::Bolt))
|
||||||
|
.meta(IconButton::new("action_2", Icon::ExclamationTriangle))
|
||||||
|
.meta(IconButton::new("action_3", Icon::Plus)),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
@ -1,12 +0,0 @@
|
|||||||
use gpui::{ImageSource, SharedString};
|
|
||||||
|
|
||||||
use crate::Icon;
|
|
||||||
|
|
||||||
/// A slot utility that provides a way to to pass either
|
|
||||||
/// an icon or an image to a component.
|
|
||||||
#[derive(Debug, Clone)]
|
|
||||||
pub enum GraphicSlot {
|
|
||||||
Icon(Icon),
|
|
||||||
Avatar(ImageSource),
|
|
||||||
PublicActor(SharedString),
|
|
||||||
}
|
|
@ -18,7 +18,6 @@ mod disableable;
|
|||||||
mod fixed;
|
mod fixed;
|
||||||
pub mod prelude;
|
pub mod prelude;
|
||||||
mod selectable;
|
mod selectable;
|
||||||
mod slot;
|
|
||||||
mod styled_ext;
|
mod styled_ext;
|
||||||
mod styles;
|
mod styles;
|
||||||
pub mod utils;
|
pub mod utils;
|
||||||
@ -29,6 +28,5 @@ pub use disableable::*;
|
|||||||
pub use fixed::*;
|
pub use fixed::*;
|
||||||
pub use prelude::*;
|
pub use prelude::*;
|
||||||
pub use selectable::*;
|
pub use selectable::*;
|
||||||
pub use slot::*;
|
|
||||||
pub use styled_ext::*;
|
pub use styled_ext::*;
|
||||||
pub use styles::*;
|
pub use styles::*;
|
||||||
|
@ -1,14 +1,14 @@
|
|||||||
use super::base_keymap_setting::BaseKeymap;
|
use super::base_keymap_setting::BaseKeymap;
|
||||||
use fuzzy::{match_strings, StringMatch, StringMatchCandidate};
|
use fuzzy::{match_strings, StringMatch, StringMatchCandidate};
|
||||||
use gpui::{
|
use gpui::{
|
||||||
actions, AppContext, DismissEvent, EventEmitter, FocusableView, ParentElement, Render, Task,
|
actions, AppContext, DismissEvent, EventEmitter, FocusableView, Render, Task, View,
|
||||||
View, ViewContext, VisualContext, WeakView,
|
ViewContext, VisualContext, WeakView,
|
||||||
};
|
};
|
||||||
use picker::{Picker, PickerDelegate};
|
use picker::{Picker, PickerDelegate};
|
||||||
use project::Fs;
|
use project::Fs;
|
||||||
use settings::{update_settings_file, Settings};
|
use settings::{update_settings_file, Settings};
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
use ui::ListItem;
|
use ui::{prelude::*, ListItem};
|
||||||
use util::ResultExt;
|
use util::ResultExt;
|
||||||
use workspace::{ui::HighlightedLabel, Workspace};
|
use workspace::{ui::HighlightedLabel, Workspace};
|
||||||
|
|
||||||
|
@ -10,29 +10,29 @@ doctest = false
|
|||||||
|
|
||||||
[features]
|
[features]
|
||||||
test-support = [
|
test-support = [
|
||||||
"call2/test-support",
|
"call/test-support",
|
||||||
"client2/test-support",
|
"client/test-support",
|
||||||
"project2/test-support",
|
"project/test-support",
|
||||||
"settings2/test-support",
|
"settings/test-support",
|
||||||
"gpui/test-support",
|
"gpui/test-support",
|
||||||
"fs2/test-support"
|
"fs/test-support"
|
||||||
]
|
]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
db2 = { path = "../db2" }
|
db = { path = "../db2", package = "db2" }
|
||||||
client2 = { path = "../client2" }
|
client = { path = "../client2", package = "client2" }
|
||||||
collections = { path = "../collections" }
|
collections = { path = "../collections" }
|
||||||
# context_menu = { path = "../context_menu" }
|
# context_menu = { path = "../context_menu" }
|
||||||
fs2 = { path = "../fs2" }
|
fs = { path = "../fs2", package = "fs2" }
|
||||||
gpui = { package = "gpui2", path = "../gpui2" }
|
gpui = { package = "gpui2", path = "../gpui2" }
|
||||||
install_cli2 = { path = "../install_cli2" }
|
install_cli = { path = "../install_cli2", package = "install_cli2" }
|
||||||
language2 = { path = "../language2" }
|
language = { path = "../language2", package = "language2" }
|
||||||
#menu = { path = "../menu" }
|
#menu = { path = "../menu" }
|
||||||
node_runtime = { path = "../node_runtime" }
|
node_runtime = { path = "../node_runtime" }
|
||||||
project2 = { path = "../project2" }
|
project = { path = "../project2", package = "project2" }
|
||||||
settings2 = { path = "../settings2" }
|
settings = { path = "../settings2", package = "settings2" }
|
||||||
terminal2 = { path = "../terminal2" }
|
terminal = { path = "../terminal2", package = "terminal2" }
|
||||||
theme2 = { path = "../theme2" }
|
theme = { path = "../theme2", package = "theme2" }
|
||||||
util = { path = "../util" }
|
util = { path = "../util" }
|
||||||
ui = { package = "ui2", path = "../ui2" }
|
ui = { package = "ui2", path = "../ui2" }
|
||||||
|
|
||||||
@ -54,13 +54,13 @@ smallvec.workspace = true
|
|||||||
uuid.workspace = true
|
uuid.workspace = true
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
call2 = { path = "../call2", features = ["test-support"] }
|
call = { path = "../call2", package = "call2", features = ["test-support"] }
|
||||||
client2 = { path = "../client2", features = ["test-support"] }
|
client = { path = "../client2", package = "client2", features = ["test-support"] }
|
||||||
gpui = { package = "gpui2", path = "../gpui2", features = ["test-support"] }
|
gpui = { path = "../gpui2", package = "gpui2", features = ["test-support"] }
|
||||||
project2 = { path = "../project2", features = ["test-support"] }
|
project = { path = "../project2", package = "project2", features = ["test-support"] }
|
||||||
settings2 = { path = "../settings2", features = ["test-support"] }
|
settings = { path = "../settings2", package = "settings2", features = ["test-support"] }
|
||||||
fs2 = { path = "../fs2", features = ["test-support"] }
|
fs = { path = "../fs2", package = "fs2", features = ["test-support"] }
|
||||||
db2 = { path = "../db2", features = ["test-support"] }
|
db = { path = "../db2", package = "db2", features = ["test-support"] }
|
||||||
|
|
||||||
indoc.workspace = true
|
indoc.workspace = true
|
||||||
env_logger.workspace = true
|
env_logger.workspace = true
|
||||||
|
@ -7,7 +7,7 @@ use crate::{
|
|||||||
ViewId, Workspace, WorkspaceId,
|
ViewId, Workspace, WorkspaceId,
|
||||||
};
|
};
|
||||||
use anyhow::Result;
|
use anyhow::Result;
|
||||||
use client2::{
|
use client::{
|
||||||
proto::{self, PeerId},
|
proto::{self, PeerId},
|
||||||
Client,
|
Client,
|
||||||
};
|
};
|
||||||
@ -16,10 +16,10 @@ use gpui::{
|
|||||||
HighlightStyle, Model, Pixels, Point, SharedString, Task, View, ViewContext, WeakView,
|
HighlightStyle, Model, Pixels, Point, SharedString, Task, View, ViewContext, WeakView,
|
||||||
WindowContext,
|
WindowContext,
|
||||||
};
|
};
|
||||||
use project2::{Project, ProjectEntryId, ProjectPath};
|
use project::{Project, ProjectEntryId, ProjectPath};
|
||||||
use schemars::JsonSchema;
|
use schemars::JsonSchema;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use settings2::Settings;
|
use settings::Settings;
|
||||||
use smallvec::SmallVec;
|
use smallvec::SmallVec;
|
||||||
use std::{
|
use std::{
|
||||||
any::{Any, TypeId},
|
any::{Any, TypeId},
|
||||||
@ -33,7 +33,7 @@ use std::{
|
|||||||
},
|
},
|
||||||
time::Duration,
|
time::Duration,
|
||||||
};
|
};
|
||||||
use theme2::Theme;
|
use theme::Theme;
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
#[derive(Deserialize)]
|
||||||
pub struct ItemSettings {
|
pub struct ItemSettings {
|
||||||
@ -110,7 +110,7 @@ pub trait Item: FocusableView + EventEmitter<ItemEvent> {
|
|||||||
fn for_each_project_item(
|
fn for_each_project_item(
|
||||||
&self,
|
&self,
|
||||||
_: &AppContext,
|
_: &AppContext,
|
||||||
_: &mut dyn FnMut(EntityId, &dyn project2::Item),
|
_: &mut dyn FnMut(EntityId, &dyn project::Item),
|
||||||
) {
|
) {
|
||||||
}
|
}
|
||||||
fn is_singleton(&self, _cx: &AppContext) -> bool {
|
fn is_singleton(&self, _cx: &AppContext) -> bool {
|
||||||
@ -222,7 +222,7 @@ pub trait ItemHandle: 'static + Send {
|
|||||||
fn for_each_project_item(
|
fn for_each_project_item(
|
||||||
&self,
|
&self,
|
||||||
_: &AppContext,
|
_: &AppContext,
|
||||||
_: &mut dyn FnMut(EntityId, &dyn project2::Item),
|
_: &mut dyn FnMut(EntityId, &dyn project::Item),
|
||||||
);
|
);
|
||||||
fn is_singleton(&self, cx: &AppContext) -> bool;
|
fn is_singleton(&self, cx: &AppContext) -> bool;
|
||||||
fn boxed_clone(&self) -> Box<dyn ItemHandle>;
|
fn boxed_clone(&self) -> Box<dyn ItemHandle>;
|
||||||
@ -347,7 +347,7 @@ impl<T: Item> ItemHandle for View<T> {
|
|||||||
fn for_each_project_item(
|
fn for_each_project_item(
|
||||||
&self,
|
&self,
|
||||||
cx: &AppContext,
|
cx: &AppContext,
|
||||||
f: &mut dyn FnMut(EntityId, &dyn project2::Item),
|
f: &mut dyn FnMut(EntityId, &dyn project::Item),
|
||||||
) {
|
) {
|
||||||
self.read(cx).for_each_project_item(cx, f)
|
self.read(cx).for_each_project_item(cx, f)
|
||||||
}
|
}
|
||||||
@ -375,6 +375,7 @@ impl<T: Item> ItemHandle for View<T> {
|
|||||||
pane: View<Pane>,
|
pane: View<Pane>,
|
||||||
cx: &mut ViewContext<Workspace>,
|
cx: &mut ViewContext<Workspace>,
|
||||||
) {
|
) {
|
||||||
|
let weak_item = self.downgrade();
|
||||||
let history = pane.read(cx).nav_history_for_item(self);
|
let history = pane.read(cx).nav_history_for_item(self);
|
||||||
self.update(cx, |this, cx| {
|
self.update(cx, |this, cx| {
|
||||||
this.set_nav_history(history, cx);
|
this.set_nav_history(history, cx);
|
||||||
@ -491,16 +492,15 @@ impl<T: Item> ItemHandle for View<T> {
|
|||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
|
|
||||||
// todo!()
|
cx.on_blur(&self.focus_handle(cx), move |workspace, cx| {
|
||||||
// cx.observe_focus(self, move |workspace, item, focused, cx| {
|
if WorkspaceSettings::get_global(cx).autosave == AutosaveSetting::OnFocusChange {
|
||||||
// if !focused
|
if let Some(item) = weak_item.upgrade() {
|
||||||
// && WorkspaceSettings::get_global(cx).autosave == AutosaveSetting::OnFocusChange
|
Pane::autosave_item(&item, workspace.project.clone(), cx)
|
||||||
// {
|
.detach_and_log_err(cx);
|
||||||
// Pane::autosave_item(&item, workspace.project.clone(), cx)
|
}
|
||||||
// .detach_and_log_err(cx);
|
}
|
||||||
// }
|
})
|
||||||
// })
|
.detach();
|
||||||
// .detach();
|
|
||||||
|
|
||||||
let item_id = self.item_id();
|
let item_id = self.item_id();
|
||||||
cx.observe_release(self, move |workspace, _, _| {
|
cx.observe_release(self, move |workspace, _, _| {
|
||||||
@ -640,7 +640,7 @@ impl<T: Item> WeakItemHandle for WeakView<T> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub trait ProjectItem: Item {
|
pub trait ProjectItem: Item {
|
||||||
type Item: project2::Item;
|
type Item: project::Item;
|
||||||
|
|
||||||
fn for_project_item(
|
fn for_project_item(
|
||||||
project: Model<Project>,
|
project: Model<Project>,
|
||||||
@ -662,19 +662,19 @@ pub trait FollowableEvents {
|
|||||||
pub trait FollowableItem: Item {
|
pub trait FollowableItem: Item {
|
||||||
type FollowableEvent: FollowableEvents;
|
type FollowableEvent: FollowableEvents;
|
||||||
fn remote_id(&self) -> Option<ViewId>;
|
fn remote_id(&self) -> Option<ViewId>;
|
||||||
fn to_state_proto(&self, cx: &AppContext) -> Option<proto::view::Variant>;
|
fn to_state_proto(&self, cx: &WindowContext) -> Option<proto::view::Variant>;
|
||||||
fn from_state_proto(
|
fn from_state_proto(
|
||||||
pane: View<Pane>,
|
pane: View<Pane>,
|
||||||
project: View<Workspace>,
|
project: View<Workspace>,
|
||||||
id: ViewId,
|
id: ViewId,
|
||||||
state: &mut Option<proto::view::Variant>,
|
state: &mut Option<proto::view::Variant>,
|
||||||
cx: &mut AppContext,
|
cx: &mut WindowContext,
|
||||||
) -> Option<Task<Result<View<Self>>>>;
|
) -> Option<Task<Result<View<Self>>>>;
|
||||||
fn add_event_to_update_proto(
|
fn add_event_to_update_proto(
|
||||||
&self,
|
&self,
|
||||||
event: &Self::FollowableEvent,
|
event: &Self::FollowableEvent,
|
||||||
update: &mut Option<proto::update_view::Variant>,
|
update: &mut Option<proto::update_view::Variant>,
|
||||||
cx: &AppContext,
|
cx: &WindowContext,
|
||||||
) -> bool;
|
) -> bool;
|
||||||
fn apply_update_proto(
|
fn apply_update_proto(
|
||||||
&mut self,
|
&mut self,
|
||||||
@ -682,20 +682,20 @@ pub trait FollowableItem: Item {
|
|||||||
message: proto::update_view::Variant,
|
message: proto::update_view::Variant,
|
||||||
cx: &mut ViewContext<Self>,
|
cx: &mut ViewContext<Self>,
|
||||||
) -> Task<Result<()>>;
|
) -> Task<Result<()>>;
|
||||||
fn is_project_item(&self, cx: &AppContext) -> bool;
|
fn is_project_item(&self, cx: &WindowContext) -> bool;
|
||||||
|
|
||||||
fn set_leader_peer_id(&mut self, leader_peer_id: Option<PeerId>, cx: &mut ViewContext<Self>);
|
fn set_leader_peer_id(&mut self, leader_peer_id: Option<PeerId>, cx: &mut ViewContext<Self>);
|
||||||
}
|
}
|
||||||
|
|
||||||
pub trait FollowableItemHandle: ItemHandle {
|
pub trait FollowableItemHandle: ItemHandle {
|
||||||
fn remote_id(&self, client: &Arc<Client>, cx: &AppContext) -> Option<ViewId>;
|
fn remote_id(&self, client: &Arc<Client>, cx: &WindowContext) -> Option<ViewId>;
|
||||||
fn set_leader_peer_id(&self, leader_peer_id: Option<PeerId>, cx: &mut WindowContext);
|
fn set_leader_peer_id(&self, leader_peer_id: Option<PeerId>, cx: &mut WindowContext);
|
||||||
fn to_state_proto(&self, cx: &AppContext) -> Option<proto::view::Variant>;
|
fn to_state_proto(&self, cx: &WindowContext) -> Option<proto::view::Variant>;
|
||||||
fn add_event_to_update_proto(
|
fn add_event_to_update_proto(
|
||||||
&self,
|
&self,
|
||||||
event: &dyn Any,
|
event: &dyn Any,
|
||||||
update: &mut Option<proto::update_view::Variant>,
|
update: &mut Option<proto::update_view::Variant>,
|
||||||
cx: &AppContext,
|
cx: &WindowContext,
|
||||||
) -> bool;
|
) -> bool;
|
||||||
fn to_follow_event(&self, event: &dyn Any) -> Option<FollowEvent>;
|
fn to_follow_event(&self, event: &dyn Any) -> Option<FollowEvent>;
|
||||||
fn apply_update_proto(
|
fn apply_update_proto(
|
||||||
@ -704,11 +704,11 @@ pub trait FollowableItemHandle: ItemHandle {
|
|||||||
message: proto::update_view::Variant,
|
message: proto::update_view::Variant,
|
||||||
cx: &mut WindowContext,
|
cx: &mut WindowContext,
|
||||||
) -> Task<Result<()>>;
|
) -> Task<Result<()>>;
|
||||||
fn is_project_item(&self, cx: &AppContext) -> bool;
|
fn is_project_item(&self, cx: &WindowContext) -> bool;
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<T: FollowableItem> FollowableItemHandle for View<T> {
|
impl<T: FollowableItem> FollowableItemHandle for View<T> {
|
||||||
fn remote_id(&self, client: &Arc<Client>, cx: &AppContext) -> Option<ViewId> {
|
fn remote_id(&self, client: &Arc<Client>, cx: &WindowContext) -> Option<ViewId> {
|
||||||
self.read(cx).remote_id().or_else(|| {
|
self.read(cx).remote_id().or_else(|| {
|
||||||
client.peer_id().map(|creator| ViewId {
|
client.peer_id().map(|creator| ViewId {
|
||||||
creator,
|
creator,
|
||||||
@ -721,7 +721,7 @@ impl<T: FollowableItem> FollowableItemHandle for View<T> {
|
|||||||
self.update(cx, |this, cx| this.set_leader_peer_id(leader_peer_id, cx))
|
self.update(cx, |this, cx| this.set_leader_peer_id(leader_peer_id, cx))
|
||||||
}
|
}
|
||||||
|
|
||||||
fn to_state_proto(&self, cx: &AppContext) -> Option<proto::view::Variant> {
|
fn to_state_proto(&self, cx: &WindowContext) -> Option<proto::view::Variant> {
|
||||||
self.read(cx).to_state_proto(cx)
|
self.read(cx).to_state_proto(cx)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -729,7 +729,7 @@ impl<T: FollowableItem> FollowableItemHandle for View<T> {
|
|||||||
&self,
|
&self,
|
||||||
event: &dyn Any,
|
event: &dyn Any,
|
||||||
update: &mut Option<proto::update_view::Variant>,
|
update: &mut Option<proto::update_view::Variant>,
|
||||||
cx: &AppContext,
|
cx: &WindowContext,
|
||||||
) -> bool {
|
) -> bool {
|
||||||
if let Some(event) = event.downcast_ref() {
|
if let Some(event) = event.downcast_ref() {
|
||||||
self.read(cx).add_event_to_update_proto(event, update, cx)
|
self.read(cx).add_event_to_update_proto(event, update, cx)
|
||||||
@ -754,305 +754,315 @@ impl<T: FollowableItem> FollowableItemHandle for View<T> {
|
|||||||
self.update(cx, |this, cx| this.apply_update_proto(project, message, cx))
|
self.update(cx, |this, cx| this.apply_update_proto(project, message, cx))
|
||||||
}
|
}
|
||||||
|
|
||||||
fn is_project_item(&self, cx: &AppContext) -> bool {
|
fn is_project_item(&self, cx: &WindowContext) -> bool {
|
||||||
self.read(cx).is_project_item(cx)
|
self.read(cx).is_project_item(cx)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// #[cfg(any(test, feature = "test-support"))]
|
#[cfg(any(test, feature = "test-support"))]
|
||||||
// pub mod test {
|
pub mod test {
|
||||||
// use super::{Item, ItemEvent};
|
use super::{Item, ItemEvent};
|
||||||
// use crate::{ItemId, ItemNavHistory, Pane, Workspace, WorkspaceId};
|
use crate::{ItemId, ItemNavHistory, Pane, Workspace, WorkspaceId};
|
||||||
// use gpui::{
|
use gpui::{
|
||||||
// elements::Empty, AnyElement, AppContext, Element, Entity, Model, Task, View,
|
AnyElement, AppContext, Context as _, Div, EntityId, EventEmitter, FocusableView,
|
||||||
// ViewContext, View, WeakViewHandle,
|
IntoElement, Model, Render, SharedString, Task, View, ViewContext, VisualContext, WeakView,
|
||||||
// };
|
};
|
||||||
// use project2::{Project, ProjectEntryId, ProjectPath, WorktreeId};
|
use project::{Project, ProjectEntryId, ProjectPath, WorktreeId};
|
||||||
// use smallvec::SmallVec;
|
use std::{any::Any, cell::Cell, path::Path};
|
||||||
// use std::{any::Any, borrow::Cow, cell::Cell, path::Path};
|
|
||||||
|
|
||||||
// pub struct TestProjectItem {
|
pub struct TestProjectItem {
|
||||||
// pub entry_id: Option<ProjectEntryId>,
|
pub entry_id: Option<ProjectEntryId>,
|
||||||
// pub project_path: Option<ProjectPath>,
|
pub project_path: Option<ProjectPath>,
|
||||||
// }
|
}
|
||||||
|
|
||||||
// pub struct TestItem {
|
pub struct TestItem {
|
||||||
// pub workspace_id: WorkspaceId,
|
pub workspace_id: WorkspaceId,
|
||||||
// pub state: String,
|
pub state: String,
|
||||||
// pub label: String,
|
pub label: String,
|
||||||
// pub save_count: usize,
|
pub save_count: usize,
|
||||||
// pub save_as_count: usize,
|
pub save_as_count: usize,
|
||||||
// pub reload_count: usize,
|
pub reload_count: usize,
|
||||||
// pub is_dirty: bool,
|
pub is_dirty: bool,
|
||||||
// pub is_singleton: bool,
|
pub is_singleton: bool,
|
||||||
// pub has_conflict: bool,
|
pub has_conflict: bool,
|
||||||
// pub project_items: Vec<Model<TestProjectItem>>,
|
pub project_items: Vec<Model<TestProjectItem>>,
|
||||||
// pub nav_history: Option<ItemNavHistory>,
|
pub nav_history: Option<ItemNavHistory>,
|
||||||
// pub tab_descriptions: Option<Vec<&'static str>>,
|
pub tab_descriptions: Option<Vec<&'static str>>,
|
||||||
// pub tab_detail: Cell<Option<usize>>,
|
pub tab_detail: Cell<Option<usize>>,
|
||||||
// }
|
focus_handle: gpui::FocusHandle,
|
||||||
|
}
|
||||||
|
|
||||||
// impl Entity for TestProjectItem {
|
impl project::Item for TestProjectItem {
|
||||||
// type Event = ();
|
fn entry_id(&self, _: &AppContext) -> Option<ProjectEntryId> {
|
||||||
// }
|
self.entry_id
|
||||||
|
}
|
||||||
|
|
||||||
// impl project2::Item for TestProjectItem {
|
fn project_path(&self, _: &AppContext) -> Option<ProjectPath> {
|
||||||
// fn entry_id(&self, _: &AppContext) -> Option<ProjectEntryId> {
|
self.project_path.clone()
|
||||||
// self.entry_id
|
}
|
||||||
// }
|
}
|
||||||
|
|
||||||
// fn project_path(&self, _: &AppContext) -> Option<ProjectPath> {
|
pub enum TestItemEvent {
|
||||||
// self.project_path.clone()
|
Edit,
|
||||||
// }
|
}
|
||||||
// }
|
|
||||||
|
|
||||||
// pub enum TestItemEvent {
|
// impl Clone for TestItem {
|
||||||
// Edit,
|
// fn clone(&self) -> Self {
|
||||||
// }
|
// Self {
|
||||||
|
// state: self.state.clone(),
|
||||||
|
// label: self.label.clone(),
|
||||||
|
// save_count: self.save_count,
|
||||||
|
// save_as_count: self.save_as_count,
|
||||||
|
// reload_count: self.reload_count,
|
||||||
|
// is_dirty: self.is_dirty,
|
||||||
|
// is_singleton: self.is_singleton,
|
||||||
|
// has_conflict: self.has_conflict,
|
||||||
|
// project_items: self.project_items.clone(),
|
||||||
|
// nav_history: None,
|
||||||
|
// tab_descriptions: None,
|
||||||
|
// tab_detail: Default::default(),
|
||||||
|
// workspace_id: self.workspace_id,
|
||||||
|
// focus_handle: self.focus_handle.clone(),
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
// impl Clone for TestItem {
|
impl TestProjectItem {
|
||||||
// fn clone(&self) -> Self {
|
pub fn new(id: u64, path: &str, cx: &mut AppContext) -> Model<Self> {
|
||||||
// Self {
|
let entry_id = Some(ProjectEntryId::from_proto(id));
|
||||||
// state: self.state.clone(),
|
let project_path = Some(ProjectPath {
|
||||||
// label: self.label.clone(),
|
worktree_id: WorktreeId::from_usize(0),
|
||||||
// save_count: self.save_count,
|
path: Path::new(path).into(),
|
||||||
// save_as_count: self.save_as_count,
|
});
|
||||||
// reload_count: self.reload_count,
|
cx.build_model(|_| Self {
|
||||||
// is_dirty: self.is_dirty,
|
entry_id,
|
||||||
// is_singleton: self.is_singleton,
|
project_path,
|
||||||
// has_conflict: self.has_conflict,
|
})
|
||||||
// project_items: self.project_items.clone(),
|
}
|
||||||
// nav_history: None,
|
|
||||||
// tab_descriptions: None,
|
|
||||||
// tab_detail: Default::default(),
|
|
||||||
// workspace_id: self.workspace_id,
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
// impl TestProjectItem {
|
pub fn new_untitled(cx: &mut AppContext) -> Model<Self> {
|
||||||
// pub fn new(id: u64, path: &str, cx: &mut AppContext) -> Model<Self> {
|
cx.build_model(|_| Self {
|
||||||
// let entry_id = Some(ProjectEntryId::from_proto(id));
|
project_path: None,
|
||||||
// let project_path = Some(ProjectPath {
|
entry_id: None,
|
||||||
// worktree_id: WorktreeId::from_usize(0),
|
})
|
||||||
// path: Path::new(path).into(),
|
}
|
||||||
// });
|
}
|
||||||
// cx.add_model(|_| Self {
|
|
||||||
// entry_id,
|
|
||||||
// project_path,
|
|
||||||
// })
|
|
||||||
// }
|
|
||||||
|
|
||||||
// pub fn new_untitled(cx: &mut AppContext) -> Model<Self> {
|
impl TestItem {
|
||||||
// cx.add_model(|_| Self {
|
pub fn new(cx: &mut ViewContext<Self>) -> Self {
|
||||||
// project_path: None,
|
Self {
|
||||||
// entry_id: None,
|
state: String::new(),
|
||||||
// })
|
label: String::new(),
|
||||||
// }
|
save_count: 0,
|
||||||
// }
|
save_as_count: 0,
|
||||||
|
reload_count: 0,
|
||||||
|
is_dirty: false,
|
||||||
|
has_conflict: false,
|
||||||
|
project_items: Vec::new(),
|
||||||
|
is_singleton: true,
|
||||||
|
nav_history: None,
|
||||||
|
tab_descriptions: None,
|
||||||
|
tab_detail: Default::default(),
|
||||||
|
workspace_id: 0,
|
||||||
|
focus_handle: cx.focus_handle(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// impl TestItem {
|
pub fn new_deserialized(id: WorkspaceId, cx: &mut ViewContext<Self>) -> Self {
|
||||||
// pub fn new() -> Self {
|
let mut this = Self::new(cx);
|
||||||
// Self {
|
this.workspace_id = id;
|
||||||
// state: String::new(),
|
this
|
||||||
// label: String::new(),
|
}
|
||||||
// save_count: 0,
|
|
||||||
// save_as_count: 0,
|
|
||||||
// reload_count: 0,
|
|
||||||
// is_dirty: false,
|
|
||||||
// has_conflict: false,
|
|
||||||
// project_items: Vec::new(),
|
|
||||||
// is_singleton: true,
|
|
||||||
// nav_history: None,
|
|
||||||
// tab_descriptions: None,
|
|
||||||
// tab_detail: Default::default(),
|
|
||||||
// workspace_id: 0,
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
// pub fn new_deserialized(id: WorkspaceId) -> Self {
|
pub fn with_label(mut self, state: &str) -> Self {
|
||||||
// let mut this = Self::new();
|
self.label = state.to_string();
|
||||||
// this.workspace_id = id;
|
self
|
||||||
// this
|
}
|
||||||
// }
|
|
||||||
|
|
||||||
// pub fn with_label(mut self, state: &str) -> Self {
|
pub fn with_singleton(mut self, singleton: bool) -> Self {
|
||||||
// self.label = state.to_string();
|
self.is_singleton = singleton;
|
||||||
// self
|
self
|
||||||
// }
|
}
|
||||||
|
|
||||||
// pub fn with_singleton(mut self, singleton: bool) -> Self {
|
pub fn with_dirty(mut self, dirty: bool) -> Self {
|
||||||
// self.is_singleton = singleton;
|
self.is_dirty = dirty;
|
||||||
// self
|
self
|
||||||
// }
|
}
|
||||||
|
|
||||||
// pub fn with_dirty(mut self, dirty: bool) -> Self {
|
pub fn with_conflict(mut self, has_conflict: bool) -> Self {
|
||||||
// self.is_dirty = dirty;
|
self.has_conflict = has_conflict;
|
||||||
// self
|
self
|
||||||
// }
|
}
|
||||||
|
|
||||||
// pub fn with_conflict(mut self, has_conflict: bool) -> Self {
|
pub fn with_project_items(mut self, items: &[Model<TestProjectItem>]) -> Self {
|
||||||
// self.has_conflict = has_conflict;
|
self.project_items.clear();
|
||||||
// self
|
self.project_items.extend(items.iter().cloned());
|
||||||
// }
|
self
|
||||||
|
}
|
||||||
|
|
||||||
// pub fn with_project_items(mut self, items: &[Model<TestProjectItem>]) -> Self {
|
pub fn set_state(&mut self, state: String, cx: &mut ViewContext<Self>) {
|
||||||
// self.project_items.clear();
|
self.push_to_nav_history(cx);
|
||||||
// self.project_items.extend(items.iter().cloned());
|
self.state = state;
|
||||||
// self
|
}
|
||||||
// }
|
|
||||||
|
|
||||||
// pub fn set_state(&mut self, state: String, cx: &mut ViewContext<Self>) {
|
fn push_to_nav_history(&mut self, cx: &mut ViewContext<Self>) {
|
||||||
// self.push_to_nav_history(cx);
|
if let Some(history) = &mut self.nav_history {
|
||||||
// self.state = state;
|
history.push(Some(Box::new(self.state.clone())), cx);
|
||||||
// }
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// fn push_to_nav_history(&mut self, cx: &mut ViewContext<Self>) {
|
impl Render for TestItem {
|
||||||
// if let Some(history) = &mut self.nav_history {
|
type Element = Div;
|
||||||
// history.push(Some(Box::new(self.state.clone())), cx);
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
// impl Entity for TestItem {
|
fn render(&mut self, _: &mut ViewContext<Self>) -> Self::Element {
|
||||||
// type Event = TestItemEvent;
|
gpui::div()
|
||||||
// }
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// impl View for TestItem {
|
impl EventEmitter<ItemEvent> for TestItem {}
|
||||||
// fn ui_name() -> &'static str {
|
|
||||||
// "TestItem"
|
|
||||||
// }
|
|
||||||
|
|
||||||
// fn render(&mut self, _: &mut ViewContext<Self>) -> AnyElement<Self> {
|
impl FocusableView for TestItem {
|
||||||
// Empty::new().into_any()
|
fn focus_handle(&self, cx: &AppContext) -> gpui::FocusHandle {
|
||||||
// }
|
self.focus_handle.clone()
|
||||||
// }
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// impl Item for TestItem {
|
impl Item for TestItem {
|
||||||
// fn tab_description(&self, detail: usize, _: &AppContext) -> Option<Cow<str>> {
|
fn tab_description(&self, detail: usize, _: &AppContext) -> Option<SharedString> {
|
||||||
// self.tab_descriptions.as_ref().and_then(|descriptions| {
|
self.tab_descriptions.as_ref().and_then(|descriptions| {
|
||||||
// let description = *descriptions.get(detail).or_else(|| descriptions.last())?;
|
let description = *descriptions.get(detail).or_else(|| descriptions.last())?;
|
||||||
// Some(description.into())
|
Some(description.into())
|
||||||
// })
|
})
|
||||||
// }
|
}
|
||||||
|
|
||||||
// fn tab_content<V: 'static>(
|
fn tab_content(
|
||||||
// &self,
|
&self,
|
||||||
// detail: Option<usize>,
|
detail: Option<usize>,
|
||||||
// _: &theme2::Tab,
|
cx: &ui::prelude::WindowContext,
|
||||||
// _: &AppContext,
|
) -> AnyElement {
|
||||||
// ) -> AnyElement<V> {
|
self.tab_detail.set(detail);
|
||||||
// self.tab_detail.set(detail);
|
gpui::div().into_any_element()
|
||||||
// Empty::new().into_any()
|
}
|
||||||
// }
|
|
||||||
|
|
||||||
// fn for_each_project_item(
|
fn for_each_project_item(
|
||||||
// &self,
|
&self,
|
||||||
// cx: &AppContext,
|
cx: &AppContext,
|
||||||
// f: &mut dyn FnMut(usize, &dyn project2::Item),
|
f: &mut dyn FnMut(EntityId, &dyn project::Item),
|
||||||
// ) {
|
) {
|
||||||
// self.project_items
|
self.project_items
|
||||||
// .iter()
|
.iter()
|
||||||
// .for_each(|item| f(item.id(), item.read(cx)))
|
.for_each(|item| f(item.entity_id(), item.read(cx)))
|
||||||
// }
|
}
|
||||||
|
|
||||||
// fn is_singleton(&self, _: &AppContext) -> bool {
|
fn is_singleton(&self, _: &AppContext) -> bool {
|
||||||
// self.is_singleton
|
self.is_singleton
|
||||||
// }
|
}
|
||||||
|
|
||||||
// fn set_nav_history(&mut self, history: ItemNavHistory, _: &mut ViewContext<Self>) {
|
fn set_nav_history(&mut self, history: ItemNavHistory, _: &mut ViewContext<Self>) {
|
||||||
// self.nav_history = Some(history);
|
self.nav_history = Some(history);
|
||||||
// }
|
}
|
||||||
|
|
||||||
// fn navigate(&mut self, state: Box<dyn Any>, _: &mut ViewContext<Self>) -> bool {
|
fn navigate(&mut self, state: Box<dyn Any>, _: &mut ViewContext<Self>) -> bool {
|
||||||
// let state = *state.downcast::<String>().unwrap_or_default();
|
let state = *state.downcast::<String>().unwrap_or_default();
|
||||||
// if state != self.state {
|
if state != self.state {
|
||||||
// self.state = state;
|
self.state = state;
|
||||||
// true
|
true
|
||||||
// } else {
|
} else {
|
||||||
// false
|
false
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
|
|
||||||
// fn deactivated(&mut self, cx: &mut ViewContext<Self>) {
|
fn deactivated(&mut self, cx: &mut ViewContext<Self>) {
|
||||||
// self.push_to_nav_history(cx);
|
self.push_to_nav_history(cx);
|
||||||
// }
|
}
|
||||||
|
|
||||||
// fn clone_on_split(
|
fn clone_on_split(
|
||||||
// &self,
|
&self,
|
||||||
// _workspace_id: WorkspaceId,
|
_workspace_id: WorkspaceId,
|
||||||
// _: &mut ViewContext<Self>,
|
cx: &mut ViewContext<Self>,
|
||||||
// ) -> Option<Self>
|
) -> Option<View<Self>>
|
||||||
// where
|
where
|
||||||
// Self: Sized,
|
Self: Sized,
|
||||||
// {
|
{
|
||||||
// Some(self.clone())
|
Some(cx.build_view(|cx| Self {
|
||||||
// }
|
state: self.state.clone(),
|
||||||
|
label: self.label.clone(),
|
||||||
|
save_count: self.save_count,
|
||||||
|
save_as_count: self.save_as_count,
|
||||||
|
reload_count: self.reload_count,
|
||||||
|
is_dirty: self.is_dirty,
|
||||||
|
is_singleton: self.is_singleton,
|
||||||
|
has_conflict: self.has_conflict,
|
||||||
|
project_items: self.project_items.clone(),
|
||||||
|
nav_history: None,
|
||||||
|
tab_descriptions: None,
|
||||||
|
tab_detail: Default::default(),
|
||||||
|
workspace_id: self.workspace_id,
|
||||||
|
focus_handle: cx.focus_handle(),
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
|
||||||
// fn is_dirty(&self, _: &AppContext) -> bool {
|
fn is_dirty(&self, _: &AppContext) -> bool {
|
||||||
// self.is_dirty
|
self.is_dirty
|
||||||
// }
|
}
|
||||||
|
|
||||||
// fn has_conflict(&self, _: &AppContext) -> bool {
|
fn has_conflict(&self, _: &AppContext) -> bool {
|
||||||
// self.has_conflict
|
self.has_conflict
|
||||||
// }
|
}
|
||||||
|
|
||||||
// fn can_save(&self, cx: &AppContext) -> bool {
|
fn can_save(&self, cx: &AppContext) -> bool {
|
||||||
// !self.project_items.is_empty()
|
!self.project_items.is_empty()
|
||||||
// && self
|
&& self
|
||||||
// .project_items
|
.project_items
|
||||||
// .iter()
|
.iter()
|
||||||
// .all(|item| item.read(cx).entry_id.is_some())
|
.all(|item| item.read(cx).entry_id.is_some())
|
||||||
// }
|
}
|
||||||
|
|
||||||
// fn save(
|
fn save(
|
||||||
// &mut self,
|
&mut self,
|
||||||
// _: Model<Project>,
|
_: Model<Project>,
|
||||||
// _: &mut ViewContext<Self>,
|
_: &mut ViewContext<Self>,
|
||||||
// ) -> Task<anyhow::Result<()>> {
|
) -> Task<anyhow::Result<()>> {
|
||||||
// self.save_count += 1;
|
self.save_count += 1;
|
||||||
// self.is_dirty = false;
|
self.is_dirty = false;
|
||||||
// Task::ready(Ok(()))
|
Task::ready(Ok(()))
|
||||||
// }
|
}
|
||||||
|
|
||||||
// fn save_as(
|
fn save_as(
|
||||||
// &mut self,
|
&mut self,
|
||||||
// _: Model<Project>,
|
_: Model<Project>,
|
||||||
// _: std::path::PathBuf,
|
_: std::path::PathBuf,
|
||||||
// _: &mut ViewContext<Self>,
|
_: &mut ViewContext<Self>,
|
||||||
// ) -> Task<anyhow::Result<()>> {
|
) -> Task<anyhow::Result<()>> {
|
||||||
// self.save_as_count += 1;
|
self.save_as_count += 1;
|
||||||
// self.is_dirty = false;
|
self.is_dirty = false;
|
||||||
// Task::ready(Ok(()))
|
Task::ready(Ok(()))
|
||||||
// }
|
}
|
||||||
|
|
||||||
// fn reload(
|
fn reload(
|
||||||
// &mut self,
|
&mut self,
|
||||||
// _: Model<Project>,
|
_: Model<Project>,
|
||||||
// _: &mut ViewContext<Self>,
|
_: &mut ViewContext<Self>,
|
||||||
// ) -> Task<anyhow::Result<()>> {
|
) -> Task<anyhow::Result<()>> {
|
||||||
// self.reload_count += 1;
|
self.reload_count += 1;
|
||||||
// self.is_dirty = false;
|
self.is_dirty = false;
|
||||||
// Task::ready(Ok(()))
|
Task::ready(Ok(()))
|
||||||
// }
|
}
|
||||||
|
|
||||||
// fn to_item_events(_: &Self::Event) -> SmallVec<[ItemEvent; 2]> {
|
fn serialized_item_kind() -> Option<&'static str> {
|
||||||
// [ItemEvent::UpdateTab, ItemEvent::Edit].into()
|
Some("TestItem")
|
||||||
// }
|
}
|
||||||
|
|
||||||
// fn serialized_item_kind() -> Option<&'static str> {
|
fn deserialize(
|
||||||
// Some("TestItem")
|
_project: Model<Project>,
|
||||||
// }
|
_workspace: WeakView<Workspace>,
|
||||||
|
workspace_id: WorkspaceId,
|
||||||
// fn deserialize(
|
_item_id: ItemId,
|
||||||
// _project: Model<Project>,
|
cx: &mut ViewContext<Pane>,
|
||||||
// _workspace: WeakViewHandle<Workspace>,
|
) -> Task<anyhow::Result<View<Self>>> {
|
||||||
// workspace_id: WorkspaceId,
|
let view = cx.build_view(|cx| Self::new_deserialized(workspace_id, cx));
|
||||||
// _item_id: ItemId,
|
Task::Ready(Some(anyhow::Ok(view)))
|
||||||
// cx: &mut ViewContext<Pane>,
|
}
|
||||||
// ) -> Task<anyhow::Result<View<Self>>> {
|
}
|
||||||
// let view = cx.add_view(|_cx| Self::new_deserialized(workspace_id));
|
}
|
||||||
// Task::Ready(Some(anyhow::Ok(view)))
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
@ -13,9 +13,9 @@ use gpui::{
|
|||||||
VisualContext, WeakView, WindowContext,
|
VisualContext, WeakView, WindowContext,
|
||||||
};
|
};
|
||||||
use parking_lot::Mutex;
|
use parking_lot::Mutex;
|
||||||
use project2::{Project, ProjectEntryId, ProjectPath};
|
use project::{Project, ProjectEntryId, ProjectPath};
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
use settings2::Settings;
|
use settings::Settings;
|
||||||
use std::{
|
use std::{
|
||||||
any::Any,
|
any::Any,
|
||||||
cmp, fmt, mem,
|
cmp, fmt, mem,
|
||||||
@ -507,6 +507,28 @@ impl Pane {
|
|||||||
!self.nav_history.0.lock().forward_stack.is_empty()
|
!self.nav_history.0.lock().forward_stack.is_empty()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn navigate_backward(&mut self, cx: &mut ViewContext<Self>) {
|
||||||
|
if let Some(workspace) = self.workspace.upgrade() {
|
||||||
|
let pane = cx.view().downgrade();
|
||||||
|
cx.window_context().defer(move |cx| {
|
||||||
|
workspace.update(cx, |workspace, cx| {
|
||||||
|
workspace.go_back(pane, cx).detach_and_log_err(cx)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn navigate_forward(&mut self, cx: &mut ViewContext<Self>) {
|
||||||
|
if let Some(workspace) = self.workspace.upgrade() {
|
||||||
|
let pane = cx.view().downgrade();
|
||||||
|
cx.window_context().defer(move |cx| {
|
||||||
|
workspace.update(cx, |workspace, cx| {
|
||||||
|
workspace.go_forward(pane, cx).detach_and_log_err(cx)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn history_updated(&mut self, cx: &mut ViewContext<Self>) {
|
fn history_updated(&mut self, cx: &mut ViewContext<Self>) {
|
||||||
self.toolbar.update(cx, |_, cx| cx.notify());
|
self.toolbar.update(cx, |_, cx| cx.notify());
|
||||||
}
|
}
|
||||||
@ -1556,12 +1578,20 @@ impl Pane {
|
|||||||
.child(
|
.child(
|
||||||
div().border().border_color(gpui::red()).child(
|
div().border().border_color(gpui::red()).child(
|
||||||
IconButton::new("navigate_backward", Icon::ArrowLeft)
|
IconButton::new("navigate_backward", Icon::ArrowLeft)
|
||||||
|
.on_click({
|
||||||
|
let view = cx.view().clone();
|
||||||
|
move |_, cx| view.update(cx, Self::navigate_backward)
|
||||||
|
})
|
||||||
.disabled(!self.can_navigate_backward()),
|
.disabled(!self.can_navigate_backward()),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
.child(
|
.child(
|
||||||
div().border().border_color(gpui::red()).child(
|
div().border().border_color(gpui::red()).child(
|
||||||
IconButton::new("navigate_forward", Icon::ArrowRight)
|
IconButton::new("navigate_forward", Icon::ArrowRight)
|
||||||
|
.on_click({
|
||||||
|
let view = cx.view().clone();
|
||||||
|
move |_, cx| view.update(cx, Self::navigate_backward)
|
||||||
|
})
|
||||||
.disabled(!self.can_navigate_forward()),
|
.disabled(!self.can_navigate_forward()),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@ -2089,18 +2119,14 @@ impl Render for Pane {
|
|||||||
this.update(cx, |this, cx| this.focus_out(cx)).ok();
|
this.update(cx, |this, cx| this.focus_out(cx)).ok();
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.on_action(cx.listener(|pane: &mut Pane, _: &SplitLeft, cx| {
|
.on_action(cx.listener(|pane, _: &SplitLeft, cx| pane.split(SplitDirection::Left, cx)))
|
||||||
pane.split(SplitDirection::Left, cx)
|
.on_action(cx.listener(|pane, _: &SplitUp, cx| pane.split(SplitDirection::Up, cx)))
|
||||||
}))
|
|
||||||
.on_action(
|
.on_action(
|
||||||
cx.listener(|pane: &mut Pane, _: &SplitUp, cx| pane.split(SplitDirection::Up, cx)),
|
cx.listener(|pane, _: &SplitRight, cx| pane.split(SplitDirection::Right, cx)),
|
||||||
)
|
)
|
||||||
.on_action(cx.listener(|pane: &mut Pane, _: &SplitRight, cx| {
|
.on_action(cx.listener(|pane, _: &SplitDown, cx| pane.split(SplitDirection::Down, cx)))
|
||||||
pane.split(SplitDirection::Right, cx)
|
.on_action(cx.listener(|pane, _: &GoBack, cx| pane.navigate_backward(cx)))
|
||||||
}))
|
.on_action(cx.listener(|pane, _: &GoForward, cx| pane.navigate_forward(cx)))
|
||||||
.on_action(cx.listener(|pane: &mut Pane, _: &SplitDown, cx| {
|
|
||||||
pane.split(SplitDirection::Down, cx)
|
|
||||||
}))
|
|
||||||
.on_action(cx.listener(Pane::toggle_zoom))
|
.on_action(cx.listener(Pane::toggle_zoom))
|
||||||
.on_action(cx.listener(|pane: &mut Pane, action: &ActivateItem, cx| {
|
.on_action(cx.listener(|pane: &mut Pane, action: &ActivateItem, cx| {
|
||||||
pane.activate_item(action.0, true, true, cx);
|
pane.activate_item(action.0, true, true, cx);
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
use crate::{AppState, FollowerState, Pane, Workspace};
|
use crate::{AppState, FollowerState, Pane, Workspace};
|
||||||
use anyhow::{anyhow, bail, Result};
|
use anyhow::{anyhow, bail, Result};
|
||||||
use collections::HashMap;
|
use collections::HashMap;
|
||||||
use db2::sqlez::{
|
use db::sqlez::{
|
||||||
bindable::{Bind, Column, StaticColumnCount},
|
bindable::{Bind, Column, StaticColumnCount},
|
||||||
statement::Statement,
|
statement::Statement,
|
||||||
};
|
};
|
||||||
@ -9,7 +9,7 @@ use gpui::{
|
|||||||
point, size, AnyWeakView, Bounds, Div, IntoElement, Model, Pixels, Point, View, ViewContext,
|
point, size, AnyWeakView, Bounds, Div, IntoElement, Model, Pixels, Point, View, ViewContext,
|
||||||
};
|
};
|
||||||
use parking_lot::Mutex;
|
use parking_lot::Mutex;
|
||||||
use project2::Project;
|
use project::Project;
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
use ui::prelude::*;
|
use ui::prelude::*;
|
||||||
|
@ -5,7 +5,7 @@ pub mod model;
|
|||||||
use std::path::Path;
|
use std::path::Path;
|
||||||
|
|
||||||
use anyhow::{anyhow, bail, Context, Result};
|
use anyhow::{anyhow, bail, Context, Result};
|
||||||
use db2::{define_connection, query, sqlez::connection::Connection, sqlez_macros::sql};
|
use db::{define_connection, query, sqlez::connection::Connection, sqlez_macros::sql};
|
||||||
use gpui::WindowBounds;
|
use gpui::WindowBounds;
|
||||||
|
|
||||||
use util::{unzip_option, ResultExt};
|
use util::{unzip_option, ResultExt};
|
||||||
@ -552,7 +552,7 @@ impl WorkspaceDb {
|
|||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
use db2::open_test_db;
|
use db::open_test_db;
|
||||||
use gpui;
|
use gpui;
|
||||||
|
|
||||||
#[gpui::test]
|
#[gpui::test]
|
||||||
|
@ -3,12 +3,12 @@ use crate::{
|
|||||||
};
|
};
|
||||||
use anyhow::{Context, Result};
|
use anyhow::{Context, Result};
|
||||||
use async_recursion::async_recursion;
|
use async_recursion::async_recursion;
|
||||||
use db2::sqlez::{
|
use db::sqlez::{
|
||||||
bindable::{Bind, Column, StaticColumnCount},
|
bindable::{Bind, Column, StaticColumnCount},
|
||||||
statement::Statement,
|
statement::Statement,
|
||||||
};
|
};
|
||||||
use gpui::{AsyncWindowContext, Model, Task, View, WeakView, WindowBounds};
|
use gpui::{AsyncWindowContext, Model, Task, View, WeakView, WindowBounds};
|
||||||
use project2::Project;
|
use project::Project;
|
||||||
use std::{
|
use std::{
|
||||||
path::{Path, PathBuf},
|
path::{Path, PathBuf},
|
||||||
sync::Arc,
|
sync::Arc,
|
||||||
|
@ -4,7 +4,7 @@ use gpui::{
|
|||||||
AnyView, AppContext, EventEmitter, Subscription, Task, View, ViewContext, WeakView,
|
AnyView, AppContext, EventEmitter, Subscription, Task, View, ViewContext, WeakView,
|
||||||
WindowContext,
|
WindowContext,
|
||||||
};
|
};
|
||||||
use project2::search::SearchQuery;
|
use project::search::SearchQuery;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
item::{Item, WeakItemHandle},
|
item::{Item, WeakItemHandle},
|
||||||
|
@ -52,22 +52,13 @@ impl Render for StatusBar {
|
|||||||
h_stack()
|
h_stack()
|
||||||
.gap_4()
|
.gap_4()
|
||||||
.child(
|
.child(
|
||||||
h_stack()
|
h_stack().gap_1().child(
|
||||||
.gap_1()
|
// TODO: Language picker
|
||||||
.child(
|
div()
|
||||||
// TODO: Line / column numbers
|
.border()
|
||||||
div()
|
.border_color(gpui::red())
|
||||||
.border()
|
.child(Button::new("status_buffer_language", "Rust")),
|
||||||
.border_color(gpui::red())
|
),
|
||||||
.child(Button::new("status_line_column_numbers", "15:22")),
|
|
||||||
)
|
|
||||||
.child(
|
|
||||||
// TODO: Language picker
|
|
||||||
div()
|
|
||||||
.border()
|
|
||||||
.border_color(gpui::red())
|
|
||||||
.child(Button::new("status_buffer_language", "Rust")),
|
|
||||||
),
|
|
||||||
)
|
)
|
||||||
.child(
|
.child(
|
||||||
h_stack()
|
h_stack()
|
||||||
@ -133,7 +124,7 @@ impl StatusBar {
|
|||||||
h_stack()
|
h_stack()
|
||||||
.items_center()
|
.items_center()
|
||||||
.gap_2()
|
.gap_2()
|
||||||
.children(self.right_items.iter().map(|item| item.to_any()))
|
.children(self.right_items.iter().rev().map(|item| item.to_any()))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,6 @@
|
|||||||
use schemars::JsonSchema;
|
use schemars::JsonSchema;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use settings2::Settings;
|
use settings::Settings;
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
#[derive(Deserialize)]
|
||||||
pub struct WorkspaceSettings {
|
pub struct WorkspaceSettings {
|
||||||
|
@ -746,9 +746,9 @@ fn watch_file_types(fs: Arc<dyn fs::Fs>, cx: &mut AppContext) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(not(debug_assertions))]
|
#[cfg(not(debug_assertions))]
|
||||||
async fn watch_languages(_: Arc<dyn Fs>, _: Arc<LanguageRegistry>) -> Option<()> {
|
async fn watch_languages(_: Arc<dyn fs::Fs>, _: Arc<LanguageRegistry>) -> Option<()> {
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(not(debug_assertions))]
|
#[cfg(not(debug_assertions))]
|
||||||
fn watch_file_types(_fs: Arc<dyn Fs>, _cx: &mut AppContext) {}
|
fn watch_file_types(_fs: Arc<dyn fs::Fs>, _cx: &mut AppContext) {}
|
||||||
|
@ -148,7 +148,7 @@ pub fn initialize_workspace(app_state: Arc<AppState>, cx: &mut AppContext) {
|
|||||||
// let feedback_button = cx.add_view(|_| {
|
// let feedback_button = cx.add_view(|_| {
|
||||||
// feedback::deploy_feedback_button::DeployFeedbackButton::new(workspace)
|
// feedback::deploy_feedback_button::DeployFeedbackButton::new(workspace)
|
||||||
// });
|
// });
|
||||||
// let cursor_position = cx.add_view(|_| editor::items::CursorPosition::new());
|
let cursor_position = cx.build_view(|_| editor::items::CursorPosition::new());
|
||||||
workspace.status_bar().update(cx, |status_bar, cx| {
|
workspace.status_bar().update(cx, |status_bar, cx| {
|
||||||
status_bar.add_left_item(diagnostic_summary, cx);
|
status_bar.add_left_item(diagnostic_summary, cx);
|
||||||
status_bar.add_left_item(activity_indicator, cx);
|
status_bar.add_left_item(activity_indicator, cx);
|
||||||
@ -157,7 +157,7 @@ pub fn initialize_workspace(app_state: Arc<AppState>, cx: &mut AppContext) {
|
|||||||
// status_bar.add_right_item(copilot, cx);
|
// status_bar.add_right_item(copilot, cx);
|
||||||
// status_bar.add_right_item(active_buffer_language, cx);
|
// status_bar.add_right_item(active_buffer_language, cx);
|
||||||
// status_bar.add_right_item(vim_mode_indicator, cx);
|
// status_bar.add_right_item(vim_mode_indicator, cx);
|
||||||
// status_bar.add_right_item(cursor_position, cx);
|
status_bar.add_right_item(cursor_position, cx);
|
||||||
});
|
});
|
||||||
|
|
||||||
auto_update::notify_of_any_new_update(cx);
|
auto_update::notify_of_any_new_update(cx);
|
||||||
|
Loading…
Reference in New Issue
Block a user