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

Merge branch 'zed2' of github.com:zed-industries/zed into zed2

Browse source
This commit is contained in:
Marshall Bowers 2023-10-30 14:28:27 -04:00
commit 7bacdefa2e
2 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -967,7 +967,6 @@ impl CompletionsMenu {
self.selected_item -= 1; self.selected_item -= 1;
} else { } else {
self.selected_item = self.matches.len() - 1; self.selected_item = self.matches.len() - 1;
self.list.scroll_to(ScrollTarget::Show(self.selected_item));
} }
self.list.scroll_to(ScrollTarget::Show(self.selected_item)); self.list.scroll_to(ScrollTarget::Show(self.selected_item));
self.attempt_resolve_selected_completion_documentation(project, cx); self.attempt_resolve_selected_completion_documentation(project, cx);
@ -1538,7 +1537,6 @@ impl CodeActionsMenu {
self.selected_item -= 1; self.selected_item -= 1;
} else { } else {
self.selected_item = self.actions.len() - 1; self.selected_item = self.actions.len() - 1;
self.list.scroll_to(ScrollTarget::Show(self.selected_item));
} }
self.list.scroll_to(ScrollTarget::Show(self.selected_item)); self.list.scroll_to(ScrollTarget::Show(self.selected_item));
cx.notify(); cx.notify();
@ -1547,11 +1545,10 @@ impl CodeActionsMenu {
fn select_next(&mut self, cx: &mut ViewContext<Editor>) { fn select_next(&mut self, cx: &mut ViewContext<Editor>) {
if self.selected_item + 1 < self.actions.len() { if self.selected_item + 1 < self.actions.len() {
self.selected_item += 1; self.selected_item += 1;
self.list.scroll_to(ScrollTarget::Show(self.selected_item));
} else { } else {
self.selected_item = 0; self.selected_item = 0;
self.list.scroll_to(ScrollTarget::Show(self.selected_item));
} }
self.list.scroll_to(ScrollTarget::Show(self.selected_item));
cx.notify(); cx.notify();
} }

4
crates/zed/src/languages/elixir.rs
View file

@ -321,8 +321,8 @@ impl LspAdapter for NextLspAdapter {
latest_github_release("elixir-tools/next-ls", false, delegate.http_client()).await?; latest_github_release("elixir-tools/next-ls", false, delegate.http_client()).await?;
let version = release.name.clone(); let version = release.name.clone();
let platform = match consts::ARCH { let platform = match consts::ARCH {
"x86_64" => "darwin_arm64", "x86_64" => "darwin_amd64",
"aarch64" => "darwin_amd64", "aarch64" => "darwin_arm64",
other => bail!("Running on unsupported platform: {other}"), other => bail!("Running on unsupported platform: {other}"),
}; };
let asset_name = format!("next_ls_{}", platform); let asset_name = format!("next_ls_{}", platform);