logiguard fork v3: full patch set on verified 8c74db0 tree
Includes prior-session patches (carry forward so the app compiles): - crates/gpui/build.rs: cross-compile manifest fix - crates/gpui/src/platform.rs: PlatformWindow::activate_with_token trait method - crates/gpui/src/window.rs: Window::activate_with_token public API - crates/gpui_linux/src/linux/wayland/window.rs: WaylandWindow::activate_with_token + activate() keyboard-serial fix Plus the focus-serial fix: - serial.rs: SerialKind::KeyboardEnter - client.rs: store wl_keyboard.enter serial; latest_serial_of() Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
23
crates/language_onboarding/Cargo.toml
Normal file
23
crates/language_onboarding/Cargo.toml
Normal file
@@ -0,0 +1,23 @@
|
||||
[package]
|
||||
name = "language_onboarding"
|
||||
version = "0.1.0"
|
||||
edition.workspace = true
|
||||
publish.workspace = true
|
||||
license = "GPL-3.0-or-later"
|
||||
|
||||
[lints]
|
||||
workspace = true
|
||||
|
||||
[lib]
|
||||
path = "src/python.rs"
|
||||
|
||||
[features]
|
||||
default = []
|
||||
|
||||
[dependencies]
|
||||
db.workspace = true
|
||||
editor.workspace = true
|
||||
gpui.workspace = true
|
||||
project.workspace = true
|
||||
ui.workspace = true
|
||||
workspace.workspace = true
|
||||
1
crates/language_onboarding/LICENSE-GPL
Symbolic link
1
crates/language_onboarding/LICENSE-GPL
Symbolic link
@@ -0,0 +1 @@
|
||||
../../LICENSE-GPL
|
||||
100
crates/language_onboarding/src/python.rs
Normal file
100
crates/language_onboarding/src/python.rs
Normal file
@@ -0,0 +1,100 @@
|
||||
use db::kvp::Dismissable;
|
||||
use editor::Editor;
|
||||
use gpui::{Context, EventEmitter, Subscription};
|
||||
use ui::{Banner, FluentBuilder as _, prelude::*};
|
||||
use workspace::{ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView, Workspace};
|
||||
|
||||
pub struct BasedPyrightBanner {
|
||||
dismissed: bool,
|
||||
have_basedpyright: bool,
|
||||
_subscriptions: [Subscription; 1],
|
||||
}
|
||||
|
||||
impl Dismissable for BasedPyrightBanner {
|
||||
const KEY: &str = "basedpyright-banner";
|
||||
}
|
||||
|
||||
impl BasedPyrightBanner {
|
||||
pub fn new(workspace: &Workspace, cx: &mut Context<Self>) -> Self {
|
||||
let subscription = cx.subscribe(workspace.project(), |this, _, event, _| {
|
||||
if let project::Event::LanguageServerAdded(_, name, _) = event
|
||||
&& name == "basedpyright"
|
||||
{
|
||||
this.have_basedpyright = true;
|
||||
}
|
||||
});
|
||||
let dismissed = Self::dismissed(cx);
|
||||
Self {
|
||||
dismissed,
|
||||
have_basedpyright: false,
|
||||
_subscriptions: [subscription],
|
||||
}
|
||||
}
|
||||
|
||||
fn onboarding_banner_enabled(&self) -> bool {
|
||||
!self.dismissed && self.have_basedpyright
|
||||
}
|
||||
}
|
||||
|
||||
impl EventEmitter<ToolbarItemEvent> for BasedPyrightBanner {}
|
||||
|
||||
impl Render for BasedPyrightBanner {
|
||||
fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
|
||||
div()
|
||||
.id("basedpyright-banner")
|
||||
.when(self.onboarding_banner_enabled(), |el| {
|
||||
el.child(
|
||||
Banner::new()
|
||||
.child(
|
||||
v_flex()
|
||||
.gap_0p5()
|
||||
.child(Label::new("Basedpyright is now the only default language server for Python").mt_0p5())
|
||||
.child(Label::new("We have disabled PyRight and pylsp by default. They can be re-enabled in your settings.").size(LabelSize::Small).color(Color::Muted))
|
||||
)
|
||||
.action_slot(
|
||||
h_flex()
|
||||
.gap_0p5()
|
||||
.child(
|
||||
Button::new("learn-more", "Learn More")
|
||||
.label_size(LabelSize::Small)
|
||||
.end_icon(Icon::new(IconName::ArrowUpRight).size(IconSize::XSmall).color(Color::Muted))
|
||||
.on_click(|_, _, cx| {
|
||||
cx.open_url("https://zed.dev/docs/languages/python")
|
||||
}),
|
||||
)
|
||||
.child(IconButton::new("dismiss", IconName::Close).icon_size(IconSize::Small).on_click(
|
||||
cx.listener(|this, _, _, cx| {
|
||||
this.dismissed = true;
|
||||
Self::set_dismissed(true, cx);
|
||||
cx.notify();
|
||||
}),
|
||||
))
|
||||
)
|
||||
.into_any_element(),
|
||||
)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
impl ToolbarItemView for BasedPyrightBanner {
|
||||
fn set_active_pane_item(
|
||||
&mut self,
|
||||
active_pane_item: Option<&dyn workspace::ItemHandle>,
|
||||
_window: &mut ui::Window,
|
||||
cx: &mut Context<Self>,
|
||||
) -> ToolbarItemLocation {
|
||||
if !self.onboarding_banner_enabled() {
|
||||
return ToolbarItemLocation::Hidden;
|
||||
}
|
||||
if let Some(item) = active_pane_item
|
||||
&& let Some(editor) = item.act_as::<Editor>(cx)
|
||||
&& let Some(path) = editor.update(cx, |editor, cx| editor.target_file_abs_path(cx))
|
||||
&& let Some(file_name) = path.file_name()
|
||||
&& file_name.as_encoded_bytes().ends_with(".py".as_bytes())
|
||||
{
|
||||
return ToolbarItemLocation::Secondary;
|
||||
}
|
||||
|
||||
ToolbarItemLocation::Hidden
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user