andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-23 01:46:18 +04:00
Code Issues Projects Releases Wiki Activity

editor.open now checks if view already exists

Browse Source
This commit is contained in:
Jan Hrastnik 2021-03-15 21:12:41 +01:00 committed by Blaž Hrastnik
parent 0828d1fdea
commit 4e461bea2f
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -852,7 +852,7 @@ pub fn exit_select_mode(cx: &mut Context) {
cx.doc().mode = Mode::Normal; cx.doc().mode = Mode::Normal;
} }
fn goto(cx: &'static mut Context<'static>, locations: Vec<lsp::Location>) { fn goto(cx: &mut Context, locations: Vec<lsp::Location>) {
let doc = cx.doc(); let doc = cx.doc();
doc.mode = Mode::Normal; doc.mode = Mode::Normal;
@ -878,8 +878,9 @@ fn goto(cx: &'static mut Context<'static>, locations: Vec<lsp::Location>) {
format!("{}:{}", file, line).into() format!("{}:{}", file, line).into()
}, },
move |editor: &mut Editor, item| { move |editor: &mut Editor, item| {
cx.editor.open(PathBuf::from(item.uri.path()), cx.executor); let executor = smol::Executor::new();
let doc = cx.doc(); editor.open(PathBuf::from(item.uri.path()), &executor);
let mut doc = &mut editor.view_mut().doc;
let definition_pos = item.range.start; let definition_pos = item.range.start;
let new_pos = let new_pos =
helix_lsp::util::lsp_pos_to_pos(doc.text().slice(..), definition_pos); helix_lsp::util::lsp_pos_to_pos(doc.text().slice(..), definition_pos);
@ -891,7 +892,7 @@ fn goto(cx: &'static mut Context<'static>, locations: Vec<lsp::Location>) {
} }
} }
pub fn goto_definition(cx: &'static mut Context<'static>) { pub fn goto_definition(cx: &mut Context) {
let doc = cx.doc(); let doc = cx.doc();
let language_server = match doc.language_server.as_ref() { let language_server = match doc.language_server.as_ref() {
Some(language_server) => language_server, Some(language_server) => language_server,
@ -907,7 +908,7 @@ pub fn goto_definition(cx: &'static mut Context<'static>) {
goto(cx, res); goto(cx, res);
} }
pub fn goto_type_definition(cx: &'static mut Context<'static>) { pub fn goto_type_definition(cx: &mut Context) {
let doc = cx.doc(); let doc = cx.doc();
let language_server = match doc.language_server.as_ref() { let language_server = match doc.language_server.as_ref() {
Some(language_server) => language_server, Some(language_server) => language_server,
@ -923,7 +924,7 @@ pub fn goto_type_definition(cx: &'static mut Context<'static>) {
goto(cx, res); goto(cx, res);
} }
pub fn goto_implementation(cx: &'static mut Context<'static>) { pub fn goto_implementation(cx: &mut Context) {
let doc = cx.doc(); let doc = cx.doc();
let language_server = match doc.language_server.as_ref() { let language_server = match doc.language_server.as_ref() {
Some(language_server) => language_server, Some(language_server) => language_server,
@ -939,7 +940,7 @@ pub fn goto_implementation(cx: &'static mut Context<'static>) {
goto(cx, res); goto(cx, res);
} }
pub fn goto_reference(cx: &'static mut Context<'static>) { pub fn goto_reference(cx: &mut Context) {
let doc = cx.doc(); let doc = cx.doc();
let language_server = match doc.language_server.as_ref() { let language_server = match doc.language_server.as_ref() {
Some(language_server) => language_server, Some(language_server) => language_server,

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

@ -62,7 +62,15 @@ pub fn open(&mut self, path: PathBuf, executor: &smol::Executor) -> Result<(), E
} }
let view = View::new(doc)?; let view = View::new(doc)?;
self.tree.insert(view); let existing_view_option = self
.tree
.views()
.find(|v| view.doc.path().unwrap().to_str() == v.0.doc.path().unwrap().to_str());
if let Some(existing_view) = existing_view_option {
self.tree.focus = existing_view.0.id;
} else {
self.tree.insert(view);
}
Ok(()) Ok(())
} }