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

Replace editor::CycleCopilotSuggestions with copilot::NextSuggestion

Browse source
This commit is contained in:
Antonio Scandurra 2023-03-27 11:00:36 +02:00 • committed by Mikayla Maki
parent 2f95510a2e
commit 093e0a30e9
3 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
assets/keymaps/default.json
View file

@ -176,7 +176,8 @@
{ {
"focus": false "focus": false
} }
] ],
"alt-]": "copilot::NextSuggestion"
} }
}, },
{ {

2
crates/copilot/src/copilot.rs
View file

@ -19,7 +19,7 @@ use util::{
fs::remove_matching, github::latest_github_release, http::HttpClient, paths, ResultExt, fs::remove_matching, github::latest_github_release, http::HttpClient, paths, ResultExt,
}; };
actions!(copilot, [SignIn, SignOut]); actions!(copilot, [SignIn, SignOut, NextSuggestion]);
pub fn init(client: Arc<Client>, cx: &mut MutableAppContext) { pub fn init(client: Arc<Client>, cx: &mut MutableAppContext) {
let copilot = cx.add_model(|cx| Copilot::start(client.http_client(), cx)); let copilot = cx.add_model(|cx| Copilot::start(client.http_client(), cx));

9
crates/editor/src/editor.rs
View file

@ -262,7 +262,6 @@ actions!(
ToggleSoftWrap, ToggleSoftWrap,
RevealInFinder, RevealInFinder,
CopyHighlightJson CopyHighlightJson
CycleCopilotSuggestions
] ]
); );
@ -391,7 +390,7 @@ pub fn init(cx: &mut MutableAppContext) {
cx.add_async_action(Editor::rename); cx.add_async_action(Editor::rename);
cx.add_async_action(Editor::confirm_rename); cx.add_async_action(Editor::confirm_rename);
cx.add_async_action(Editor::find_all_references); cx.add_async_action(Editor::find_all_references);
cx.add_action(Editor::cycle_copilot_suggestions); cx.add_action(Editor::next_copilot_suggestion);
hover_popover::init(cx); hover_popover::init(cx);
link_go_to_definition::init(cx); link_go_to_definition::init(cx);
@ -2801,11 +2800,7 @@ impl Editor {
Some(()) Some(())
} }
fn cycle_copilot_suggestions( fn next_copilot_suggestion(&mut self, _: &copilot::NextSuggestion, cx: &mut ViewContext<Self>) {
&mut self,
_: &CycleCopilotSuggestions,
cx: &mut ViewContext<Self>,
) {
if self.copilot_state.completions.is_empty() { if self.copilot_state.completions.is_empty() {
return; return;
} }