Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into search2

Browse source
This commit is contained in:
Piotr Osiewicz 2023-11-20 19:23:35 +01:00
commit d60855b06d
108 changed files with 2988 additions and 1900 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/search2/src/buffer_search.rs
View file

@ -10,8 +10,8 @@ use collections::HashMap;
use editor::Editor;
use futures::channel::oneshot;
use gpui::{
actions, div, red, Action, AppContext, Component, Div, EventEmitter, InteractiveComponent,
ParentComponent as _, Render, Styled, Subscription, Task, View, ViewContext,
actions, div, red, Action, AppContext, Div, EventEmitter, InteractiveElement as _,
ParentElement as _, Render, RenderOnce, Styled, Subscription, Task, View, ViewContext,
VisualContext as _, WindowContext,
};
use project::search::SearchQuery;
@ -63,7 +63,7 @@ pub struct BufferSearchBar {
impl EventEmitter<Event> for BufferSearchBar {}
impl EventEmitter<workspace::ToolbarItemEvent> for BufferSearchBar {}
impl Render for BufferSearchBar {
impl Render<Self> for BufferSearchBar {
type Element = Div<Self>;
fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
// let query_container_style = if self.query_contains_error {
@ -534,7 +534,7 @@ impl BufferSearchBar {
self.update_matches(cx)
}
fn render_action_button(&self) -> impl Component<Self> {
fn render_action_button(&self) -> impl RenderOnce<Self> {
// let tooltip_style = theme.tooltip.clone();
// let style = theme.search.action_button.clone();