debugger: Show run to cursor in editor's context menu (#35745)
This also fixed a bug where evaluate selected text was an available option when the selected debug session was terminated. Release Notes: - debugger: add Run to Cursor back to Editor's context menu Co-authored-by: Remco Smits <djsmits12@gmail.com>
This commit is contained in:
parent
f9038f6189
commit
010441e23b
3 changed files with 91 additions and 49 deletions
|
@ -299,8 +299,24 @@ pub fn init(cx: &mut App) {
|
||||||
else {
|
else {
|
||||||
return;
|
return;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
let session = active_session
|
||||||
|
.read(cx)
|
||||||
|
.running_state
|
||||||
|
.read(cx)
|
||||||
|
.session()
|
||||||
|
.read(cx);
|
||||||
|
|
||||||
|
if session.is_terminated() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
let editor = cx.entity().downgrade();
|
let editor = cx.entity().downgrade();
|
||||||
window.on_action(TypeId::of::<editor::actions::RunToCursor>(), {
|
|
||||||
|
window.on_action_when(
|
||||||
|
session.any_stopped_thread(),
|
||||||
|
TypeId::of::<editor::actions::RunToCursor>(),
|
||||||
|
{
|
||||||
let editor = editor.clone();
|
let editor = editor.clone();
|
||||||
let active_session = active_session.clone();
|
let active_session = active_session.clone();
|
||||||
move |_, phase, _, cx| {
|
move |_, phase, _, cx| {
|
||||||
|
@ -351,7 +367,8 @@ pub fn init(cx: &mut App) {
|
||||||
Some(())
|
Some(())
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
},
|
||||||
|
);
|
||||||
|
|
||||||
window.on_action(
|
window.on_action(
|
||||||
TypeId::of::<editor::actions::EvaluateSelectedText>(),
|
TypeId::of::<editor::actions::EvaluateSelectedText>(),
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
use crate::{
|
use crate::{
|
||||||
Copy, CopyAndTrim, CopyPermalinkToLine, Cut, DisplayPoint, DisplaySnapshot, Editor,
|
Copy, CopyAndTrim, CopyPermalinkToLine, Cut, DisplayPoint, DisplaySnapshot, Editor,
|
||||||
EvaluateSelectedText, FindAllReferences, GoToDeclaration, GoToDefinition, GoToImplementation,
|
EvaluateSelectedText, FindAllReferences, GoToDeclaration, GoToDefinition, GoToImplementation,
|
||||||
GoToTypeDefinition, Paste, Rename, RevealInFileManager, SelectMode, SelectionEffects,
|
GoToTypeDefinition, Paste, Rename, RevealInFileManager, RunToCursor, SelectMode,
|
||||||
SelectionExt, ToDisplayPoint, ToggleCodeActions,
|
SelectionEffects, SelectionExt, ToDisplayPoint, ToggleCodeActions,
|
||||||
actions::{Format, FormatSelections},
|
actions::{Format, FormatSelections},
|
||||||
selections_collection::SelectionsCollection,
|
selections_collection::SelectionsCollection,
|
||||||
};
|
};
|
||||||
|
@ -200,15 +200,21 @@ pub fn deploy_context_menu(
|
||||||
});
|
});
|
||||||
|
|
||||||
let evaluate_selection = window.is_action_available(&EvaluateSelectedText, cx);
|
let evaluate_selection = window.is_action_available(&EvaluateSelectedText, cx);
|
||||||
|
let run_to_cursor = window.is_action_available(&RunToCursor, cx);
|
||||||
|
|
||||||
ui::ContextMenu::build(window, cx, |menu, _window, _cx| {
|
ui::ContextMenu::build(window, cx, |menu, _window, _cx| {
|
||||||
let builder = menu
|
let builder = menu
|
||||||
.on_blur_subscription(Subscription::new(|| {}))
|
.on_blur_subscription(Subscription::new(|| {}))
|
||||||
.when(evaluate_selection && has_selections, |builder| {
|
.when(run_to_cursor, |builder| {
|
||||||
builder
|
builder.action("Run to Cursor", Box::new(RunToCursor))
|
||||||
.action("Evaluate Selection", Box::new(EvaluateSelectedText))
|
|
||||||
.separator()
|
|
||||||
})
|
})
|
||||||
|
.when(evaluate_selection && has_selections, |builder| {
|
||||||
|
builder.action("Evaluate Selection", Box::new(EvaluateSelectedText))
|
||||||
|
})
|
||||||
|
.when(
|
||||||
|
run_to_cursor || (evaluate_selection && has_selections),
|
||||||
|
|builder| builder.separator(),
|
||||||
|
)
|
||||||
.action("Go to Definition", Box::new(GoToDefinition))
|
.action("Go to Definition", Box::new(GoToDefinition))
|
||||||
.action("Go to Declaration", Box::new(GoToDeclaration))
|
.action("Go to Declaration", Box::new(GoToDeclaration))
|
||||||
.action("Go to Type Definition", Box::new(GoToTypeDefinition))
|
.action("Go to Type Definition", Box::new(GoToTypeDefinition))
|
||||||
|
|
|
@ -4248,6 +4248,25 @@ impl Window {
|
||||||
.on_action(action_type, Rc::new(listener));
|
.on_action(action_type, Rc::new(listener));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Register an action listener on the window for the next frame if the condition is true.
|
||||||
|
/// The type of action is determined by the first parameter of the given listener.
|
||||||
|
/// When the next frame is rendered the listener will be cleared.
|
||||||
|
///
|
||||||
|
/// This is a fairly low-level method, so prefer using action handlers on elements unless you have
|
||||||
|
/// a specific need to register a global listener.
|
||||||
|
pub fn on_action_when(
|
||||||
|
&mut self,
|
||||||
|
condition: bool,
|
||||||
|
action_type: TypeId,
|
||||||
|
listener: impl Fn(&dyn Any, DispatchPhase, &mut Window, &mut App) + 'static,
|
||||||
|
) {
|
||||||
|
if condition {
|
||||||
|
self.next_frame
|
||||||
|
.dispatch_tree
|
||||||
|
.on_action(action_type, Rc::new(listener));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// Read information about the GPU backing this window.
|
/// Read information about the GPU backing this window.
|
||||||
/// Currently returns None on Mac and Windows.
|
/// Currently returns None on Mac and Windows.
|
||||||
pub fn gpu_specs(&self) -> Option<GpuSpecs> {
|
pub fn gpu_specs(&self) -> Option<GpuSpecs> {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue