suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix goto code before merging.

pull/8/head
Blaž Hrastnik 2021-03-16 23:05:43 +09:00
parent eadad13efa
commit e3ec5e31ec
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
helix-term/src/commands.rs
View File

@ -15,8 +15,6 @@ use crate::ui::{self, Popup, Prompt, PromptEvent};
use std::path::PathBuf; use std::path::PathBuf;
use smol::Executor;
use helix_view::{ use helix_view::{
document::Mode, document::Mode,
view::{View, PADDING}, view::{View, PADDING},
@ -853,6 +851,7 @@ pub fn exit_select_mode(cx: &mut Context) {
} }
fn goto(cx: &mut Context, locations: Vec<lsp::Location>) { fn goto(cx: &mut Context, locations: Vec<lsp::Location>) {
let executor = cx.executor;
let doc = cx.doc(); let doc = cx.doc();
doc.mode = Mode::Normal; doc.mode = Mode::Normal;
@ -876,7 +875,6 @@ fn goto(cx: &mut Context, locations: Vec<lsp::Location>) {
format!("{}:{}", file, line).into() format!("{}:{}", file, line).into()
}, },
move |editor: &mut Editor, item| { move |editor: &mut Editor, item| {
let executor = smol::Executor::new();
editor.open(PathBuf::from(item.uri.path()), &executor); editor.open(PathBuf::from(item.uri.path()), &executor);
let mut doc = &mut editor.view_mut().doc; let mut doc = &mut editor.view_mut().doc;
let definition_pos = item.range.start; let definition_pos = item.range.start;

10
helix-view/src/editor.rs
View File

@ -33,13 +33,13 @@ impl Editor {
} }
pub fn open(&mut self, path: PathBuf, executor: &smol::Executor) -> Result<(), Error> { pub fn open(&mut self, path: PathBuf, executor: &smol::Executor) -> Result<(), Error> {
// TODO: try to find an open view/buffer first let existing_view = self
let existing_view_option = self
.tree .tree
.views() .views()
.find(|v| path.to_str().unwrap() == v.0.doc.path().unwrap().to_str().unwrap()); .find(|(view, _)| view.doc.path() == Some(&path));
if let Some(existing_view) = existing_view_option {
self.tree.focus = existing_view.0.id; if let Some((view, _)) = existing_view {
self.tree.focus = view.id;
return Ok(()); return Ok(());
} }