aboutsummaryrefslogtreecommitdiff
path: root/helix-term
diff options
context:
space:
mode:
authorJan Hrastnik2021-03-15 20:12:41 +0000
committerBlaž Hrastnik2021-03-16 14:03:29 +0000
commit4e461bea2f4cc19d0d25a62a4f278420c074b6e9 (patch)
tree1d03416b731e41f0a73e456b976ef50e220d7406 /helix-term
parent0828d1fdea0b69a2912bc6d550ec50c1b6bf874c (diff)
editor.open now checks if view already exists
Diffstat (limited to 'helix-term')
-rw-r--r--helix-term/src/commands.rs15
1 files changed, 8 insertions, 7 deletions
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 22a8737f..20f51ef4 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -852,7 +852,7 @@ pub fn exit_select_mode(cx: &mut Context) {
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();
doc.mode = Mode::Normal;
@@ -878,8 +878,9 @@ fn goto(cx: &'static mut Context<'static>, locations: Vec<lsp::Location>) {
format!("{}:{}", file, line).into()
},
move |editor: &mut Editor, item| {
- cx.editor.open(PathBuf::from(item.uri.path()), cx.executor);
- let doc = cx.doc();
+ let executor = smol::Executor::new();
+ editor.open(PathBuf::from(item.uri.path()), &executor);
+ let mut doc = &mut editor.view_mut().doc;
let definition_pos = item.range.start;
let new_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 language_server = match doc.language_server.as_ref() {
Some(language_server) => language_server,
@@ -907,7 +908,7 @@ pub fn goto_definition(cx: &'static mut Context<'static>) {
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 language_server = match doc.language_server.as_ref() {
Some(language_server) => language_server,
@@ -923,7 +924,7 @@ pub fn goto_type_definition(cx: &'static mut Context<'static>) {
goto(cx, res);
}
-pub fn goto_implementation(cx: &'static mut Context<'static>) {
+pub fn goto_implementation(cx: &mut Context) {
let doc = cx.doc();
let language_server = match doc.language_server.as_ref() {
Some(language_server) => language_server,
@@ -939,7 +940,7 @@ pub fn goto_implementation(cx: &'static mut Context<'static>) {
goto(cx, res);
}
-pub fn goto_reference(cx: &'static mut Context<'static>) {
+pub fn goto_reference(cx: &mut Context) {
let doc = cx.doc();
let language_server = match doc.language_server.as_ref() {
Some(language_server) => language_server,