From d3ddc8dea6844f836199196c44b08e63fdf837d0 Mon Sep 17 00:00:00 2001
From: Jan Hrastnik
Date: Sun, 21 Feb 2021 23:22:38 +0100
Subject: wip

---
 helix-term/src/commands.rs | 2 ++
 helix-term/src/keymap.rs   | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'helix-term/src')

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 353d79cc..98e79b44 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -846,6 +846,8 @@ pub fn exit_select_mode(cx: &mut Context) {
     cx.doc().mode = Mode::Normal;
 }
 
+pub fn goto_definition(cx: &mut Context) {}
+
 // NOTE: Transactions in this module get appended to history when we switch back to normal mode.
 pub mod insert {
     use super::*;
diff --git a/helix-term/src/keymap.rs b/helix-term/src/keymap.rs
index 67490003..d9fe348f 100644
--- a/helix-term/src/keymap.rs
+++ b/helix-term/src/keymap.rs
@@ -311,8 +311,12 @@ pub fn default() -> Keymaps {
                 code: KeyCode::Esc,
                 modifiers: Modifiers::NONE
             } => commands::normal_mode as Command,
-            key!('g') => commands::move_file_start as Command,
-            key!('e') => commands::move_file_end as Command,
+            key!('g') => commands::move_file_start,
+            key!('e') => commands::move_file_end,
+            key!('d') => commands::goto_definition,
+            key!('t') => commands::goto_type_definition,
+            key!('r') => commands::goto_reference,
+            key!('i') => commands::goto_implementation,
         ),
     )
 }
-- 
cgit v1.2.3-70-g09d2


From 8a68a043400342a02496c4ff622dd86e6f40a89c Mon Sep 17 00:00:00 2001
From: Jan Hrastnik
Date: Sun, 21 Feb 2021 23:43:28 +0100
Subject: gotodefiniton now runs but doesnt return anything

---
 helix-lsp/src/client.rs    |  5 ++++-
 helix-term/src/commands.rs | 22 +++++++++++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

(limited to 'helix-term/src')

diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index a747dc55..f3d3b7e1 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -603,6 +603,8 @@ impl Client {
 
         let response = self.request::<lsp::request::GotoDefinition>(params).await?;
 
+        println!("{:?}", response);
+
         let items = match response {
             Some(lsp::GotoDefinitionResponse::Scalar(location)) => vec![location],
             Some(lsp::GotoDefinitionResponse::Array(location_vec)) => location_vec,
@@ -613,10 +615,11 @@ impl Client {
                         uri: location_link.target_uri,
                         range: location_link.target_range,
                     };
-                    location_vec.append(&mut link);
+                    location_vec.push(link)
                 });
                 location_vec
             }
+            None => Vec::new(),
         };
 
         Ok(items)
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 98e79b44..8b7e3600 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -846,7 +846,27 @@ pub fn exit_select_mode(cx: &mut Context) {
     cx.doc().mode = Mode::Normal;
 }
 
-pub fn goto_definition(cx: &mut Context) {}
+pub fn goto_definition(cx: &mut Context) {
+    let language_server = cx
+        .editor
+        .language_servers
+        .get("source.rust", &cx.executor)
+        .unwrap();
+    use log::info;
+
+    let doc = cx.doc();
+
+    // TODO: blocking here is not ideal
+    let pos = helix_lsp::util::pos_to_lsp_pos(doc.text().slice(..), doc.selection().cursor());
+
+    // TODO: handle fails
+    let res = smol::block_on(language_server.goto_definition(cx.doc().identifier(), pos))
+        .unwrap_or_default();
+
+    println!("{:?}", res);
+
+    cx.doc().mode = Mode::Normal;
+}
 
 // NOTE: Transactions in this module get appended to history when we switch back to normal mode.
 pub mod insert {
-- 
cgit v1.2.3-70-g09d2


From 18ec8adc7f24d0cde3d185202f8656b5cf7fefb0 Mon Sep 17 00:00:00 2001
From: Blaž Hrastnik
Date: Mon, 22 Feb 2021 12:12:56 +0900
Subject: Simplify code a bit.

---
 helix-term/src/commands.rs | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'helix-term/src')

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 8b7e3600..fee4f362 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -847,25 +847,21 @@ pub fn exit_select_mode(cx: &mut Context) {
 }
 
 pub fn goto_definition(cx: &mut Context) {
-    let language_server = cx
-        .editor
-        .language_servers
-        .get("source.rust", &cx.executor)
-        .unwrap();
-    use log::info;
-
     let doc = cx.doc();
 
+    let language_server = match doc.language_server.as_ref() {
+        Some(language_server) => language_server,
+        None => return,
+    };
+
     // TODO: blocking here is not ideal
     let pos = helix_lsp::util::pos_to_lsp_pos(doc.text().slice(..), doc.selection().cursor());
 
     // TODO: handle fails
-    let res = smol::block_on(language_server.goto_definition(cx.doc().identifier(), pos))
-        .unwrap_or_default();
-
-    println!("{:?}", res);
+    let res =
+        smol::block_on(language_server.goto_definition(doc.identifier(), pos)).unwrap_or_default();
 
-    cx.doc().mode = Mode::Normal;
+    doc.mode = Mode::Normal;
 }
 
 // NOTE: Transactions in this module get appended to history when we switch back to normal mode.
-- 
cgit v1.2.3-70-g09d2


From 0322c28e6bc1f3bf13842b7db47aafbe5752d45c Mon Sep 17 00:00:00 2001
From: Jan Hrastnik
Date: Tue, 23 Feb 2021 23:56:06 +0100
Subject: gd now works for singular definition

---
 helix-lsp/src/client.rs    | 2 --
 helix-term/src/commands.rs | 8 ++++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'helix-term/src')

diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index f3d3b7e1..e0005c09 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -603,8 +603,6 @@ impl Client {
 
         let response = self.request::<lsp::request::GotoDefinition>(params).await?;
 
-        println!("{:?}", response);
-
         let items = match response {
             Some(lsp::GotoDefinitionResponse::Scalar(location)) => vec![location],
             Some(lsp::GotoDefinitionResponse::Array(location_vec)) => location_vec,
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index fee4f362..b2809f96 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -861,6 +861,14 @@ pub fn goto_definition(cx: &mut Context) {
     let res =
         smol::block_on(language_server.goto_definition(doc.identifier(), pos)).unwrap_or_default();
 
+    if res.len() == 1 {
+        let definition_pos = res.get(0).unwrap().range.start;
+        let new_pos = helix_lsp::util::lsp_pos_to_pos(doc.text().slice(..), definition_pos);
+        doc.set_selection(Selection::point(new_pos));
+    } else {
+        // show menu picker i guess
+    }
+
     doc.mode = Mode::Normal;
 }
 
-- 
cgit v1.2.3-70-g09d2


From 294791dffd707d0725db5eb35b5165fd1bb2c24a Mon Sep 17 00:00:00 2001
From: Jan Hrastnik
Date: Sun, 28 Feb 2021 00:39:13 +0100
Subject: added picker for gd, but yet to test it. also need to load
 appropriate file when definition isnt in same file

---
 helix-term/src/commands.rs | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

(limited to 'helix-term/src')

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index b2809f96..f07a3933 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -861,15 +861,42 @@ pub fn goto_definition(cx: &mut Context) {
     let res =
         smol::block_on(language_server.goto_definition(doc.identifier(), pos)).unwrap_or_default();
 
+    /*
     if res.len() == 1 {
         let definition_pos = res.get(0).unwrap().range.start;
         let new_pos = helix_lsp::util::lsp_pos_to_pos(doc.text().slice(..), definition_pos);
         doc.set_selection(Selection::point(new_pos));
     } else {
         // show menu picker i guess
-    }
+    }*/
 
     doc.mode = Mode::Normal;
+
+    match &res.as_slice() {
+        [location] => {
+            let definition_pos = location.range.start;
+            let new_pos = helix_lsp::util::lsp_pos_to_pos(doc.text().slice(..), definition_pos);
+            doc.set_selection(Selection::point(new_pos));
+        }
+        [] => (), // maybe show user message that no definition was found?
+        _ => {
+            let snapshot = doc.state.clone();
+            let mut picker = ui::Picker::new(
+                res,
+                |item| {
+                    let file = item.uri.as_str();
+                    let line = item.range.start.line.to_string();
+                    format!("{}:{}", file, line).into()
+                },
+                move |editor: &mut Editor, item| {
+                    let doc = &mut editor.view_mut().doc;
+
+                    // revert state to what it was before the last update
+                    doc.state = snapshot.clone();
+                },
+            );
+        }
+    }
 }
 
 // NOTE: Transactions in this module get appended to history when we switch back to normal mode.
-- 
cgit v1.2.3-70-g09d2


From b738ae1bc7f42ce6756ee5d79307e416f86ef491 Mon Sep 17 00:00:00 2001
From: Jan Hrastnik
Date: Tue, 2 Mar 2021 23:57:18 +0100
Subject: more goto lsp functions

---
 helix-lsp/src/client.rs    | 116 ++++++++++++++++++++++++++++++++++++++-------
 helix-term/src/commands.rs |  14 ++++--
 helix-view/src/document.rs |   2 +-
 3 files changed, 112 insertions(+), 20 deletions(-)

(limited to 'helix-term/src')

diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index e0005c09..cd07699d 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs
@@ -583,6 +583,30 @@ impl Client {
         Ok(response.unwrap_or_default())
     }
 
+    pub async fn goto_generic(
+        &self,
+        response: Option<lsp::GotoDefinitionResponse>,
+    ) -> anyhow::Result<Vec<lsp::Location>> {
+        let items = match response {
+            Some(lsp::GotoDefinitionResponse::Scalar(location)) => vec![location],
+            Some(lsp::GotoDefinitionResponse::Array(location_vec)) => location_vec,
+            Some(lsp::GotoDefinitionResponse::Link(location_link_vec)) => {
+                let mut location_vec: Vec<lsp::Location> = Vec::new();
+                location_link_vec.into_iter().for_each(|location_link| {
+                    let link = lsp::Location {
+                        uri: location_link.target_uri,
+                        range: location_link.target_range,
+                    };
+                    location_vec.push(link)
+                });
+                location_vec
+            }
+            None => Vec::new(),
+        };
+
+        Ok(items)
+    }
+
     pub async fn goto_definition(
         &self,
         text_document: lsp::TextDocumentIdentifier,
@@ -603,23 +627,83 @@ impl Client {
 
         let response = self.request::<lsp::request::GotoDefinition>(params).await?;
 
-        let items = match response {
-            Some(lsp::GotoDefinitionResponse::Scalar(location)) => vec![location],
-            Some(lsp::GotoDefinitionResponse::Array(location_vec)) => location_vec,
-            Some(lsp::GotoDefinitionResponse::Link(location_link_vec)) => {
-                let mut location_vec: Vec<lsp::Location> = Vec::new();
-                location_link_vec.into_iter().for_each(|location_link| {
-                    let link = lsp::Location {
-                        uri: location_link.target_uri,
-                        range: location_link.target_range,
-                    };
-                    location_vec.push(link)
-                });
-                location_vec
-            }
-            None => Vec::new(),
+        self.goto_generic(response).await
+    }
+
+    pub async fn goto_type_definition(
+        &self,
+        text_document: lsp::TextDocumentIdentifier,
+        position: lsp::Position,
+    ) -> anyhow::Result<Vec<lsp::Location>> {
+        let params = lsp::GotoDefinitionParams {
+            text_document_position_params: lsp::TextDocumentPositionParams {
+                text_document,
+                position,
+            },
+            work_done_progress_params: lsp::WorkDoneProgressParams {
+                work_done_token: None,
+            },
+            partial_result_params: lsp::PartialResultParams {
+                partial_result_token: None,
+            },
         };
 
-        Ok(items)
+        let response = self
+            .request::<lsp::request::GotoTypeDefinition>(params)
+            .await?;
+
+        self.goto_generic(response).await
+    }
+
+    pub async fn goto_implementation(
+        &self,
+        text_document: lsp::TextDocumentIdentifier,
+        position: lsp::Position,
+    ) -> anyhow::Result<Vec<lsp::Location>> {
+        let params = lsp::GotoDefinitionParams {
+            text_document_position_params: lsp::TextDocumentPositionParams {
+                text_document,
+                position,
+            },
+            work_done_progress_params: lsp::WorkDoneProgressParams {
+                work_done_token: None,
+            },
+            partial_result_params: lsp::PartialResultParams {
+                partial_result_token: None,
+            },
+        };
+
+        let response = self
+            .request::<lsp::request::GotoImplementation>(params)
+            .await?;
+
+        self.goto_generic(response).await
+    }
+
+    pub async fn goto_reference(
+        &self,
+        text_document: lsp::TextDocumentIdentifier,
+        position: lsp::Position,
+    ) -> anyhow::Result<Vec<lsp::Location>> {
+        let params = lsp::ReferenceParams {
+            text_document_position: lsp::TextDocumentPositionParams {
+                text_document,
+                position,
+            },
+            context: lsp::ReferenceContext {
+                include_declaration: true,
+            },
+            work_done_progress_params: lsp::WorkDoneProgressParams {
+                work_done_token: None,
+            },
+            partial_result_params: lsp::PartialResultParams {
+                partial_result_token: None,
+            },
+        };
+
+        let response = self.request::<lsp::request::References>(params).await?;
+
+        self.goto_generic(response.map(lsp::GotoDefinitionResponse::Array))
+            .await
     }
 }
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index f07a3933..9b48e803 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -872,11 +872,19 @@ pub fn goto_definition(cx: &mut Context) {
 
     doc.mode = Mode::Normal;
 
+    log::info!("{:?}", res);
+    let filepath = doc.path.clone().unwrap();
+    log::info!("{:?}", filepath);
+
     match &res.as_slice() {
         [location] => {
-            let definition_pos = location.range.start;
-            let new_pos = helix_lsp::util::lsp_pos_to_pos(doc.text().slice(..), definition_pos);
-            doc.set_selection(Selection::point(new_pos));
+            if filepath.to_str().unwrap() == location.uri.path() {
+                let definition_pos = location.range.start;
+                let new_pos = helix_lsp::util::lsp_pos_to_pos(doc.text().slice(..), definition_pos);
+                doc.set_selection(Selection::point(new_pos));
+            } else {
+                // open new file
+            }
         }
         [] => (), // maybe show user message that no definition was found?
         _ => {
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 82258bde..9ec70023 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -19,7 +19,7 @@ pub enum Mode {
 pub struct Document {
     pub state: State, // rope + selection
     /// File path on disk.
-    path: Option<PathBuf>,
+    pub path: Option<PathBuf>, // pub for testing
 
     /// Current editing mode.
     pub mode: Mode,
-- 
cgit v1.2.3-70-g09d2


From 3869d7713e2dfd2621f7e5a656ebac0b13d10542 Mon Sep 17 00:00:00 2001
From: Jan Hrastnik
Date: Sun, 7 Mar 2021 19:41:49 +0100
Subject: added goto functions in helix-term

---
 Cargo.lock                 |  1 +
 helix-term/src/commands.rs | 97 +++++++++++++++++++++++++++++++++++-----------
 helix-view/src/document.rs |  2 +-
 3 files changed, 76 insertions(+), 24 deletions(-)

(limited to 'helix-term/src')

diff --git a/Cargo.lock b/Cargo.lock
index 5fac3391..ac1f172a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -550,6 +550,7 @@ dependencies = [
  "helix-view",
  "ignore",
  "log",
+ "lsp-types",
  "num_cpus",
  "once_cell",
  "pulldown-cmark",
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 9b48e803..87d7ea79 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -13,6 +13,11 @@ use once_cell::sync::Lazy;
 use crate::compositor::Compositor;
 use crate::ui::{self, Popup, Prompt, PromptEvent};
 
+use lsp_types as lsp;
+use std::path::PathBuf;
+
+use smol::Executor;
+
 use helix_view::{
     document::Mode,
     view::{View, PADDING},
@@ -846,34 +851,13 @@ pub fn exit_select_mode(cx: &mut Context) {
     cx.doc().mode = Mode::Normal;
 }
 
-pub fn goto_definition(cx: &mut Context) {
+pub fn goto_generic(cx: &mut Context, res: Vec<lsp::Location>) {
     let doc = cx.doc();
 
-    let language_server = match doc.language_server.as_ref() {
-        Some(language_server) => language_server,
-        None => return,
-    };
-
-    // TODO: blocking here is not ideal
-    let pos = helix_lsp::util::pos_to_lsp_pos(doc.text().slice(..), doc.selection().cursor());
-
-    // TODO: handle fails
-    let res =
-        smol::block_on(language_server.goto_definition(doc.identifier(), pos)).unwrap_or_default();
-
-    /*
-    if res.len() == 1 {
-        let definition_pos = res.get(0).unwrap().range.start;
-        let new_pos = helix_lsp::util::lsp_pos_to_pos(doc.text().slice(..), definition_pos);
-        doc.set_selection(Selection::point(new_pos));
-    } else {
-        // show menu picker i guess
-    }*/
-
     doc.mode = Mode::Normal;
 
     log::info!("{:?}", res);
-    let filepath = doc.path.clone().unwrap();
+    let filepath = doc.path().unwrap();
     log::info!("{:?}", filepath);
 
     match &res.as_slice() {
@@ -884,6 +868,9 @@ pub fn goto_definition(cx: &mut Context) {
                 doc.set_selection(Selection::point(new_pos));
             } else {
                 // open new file
+                cx.editor
+                    .open(PathBuf::from(location.uri.path()), cx.executor);
+                // TODO: go to position
             }
         }
         [] => (), // maybe show user message that no definition was found?
@@ -907,6 +894,70 @@ pub fn goto_definition(cx: &mut Context) {
     }
 }
 
+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,
+        None => return,
+    };
+
+    // TODO: blocking here is not ideal
+    let pos = helix_lsp::util::pos_to_lsp_pos(doc.text().slice(..), doc.selection().cursor());
+
+    // TODO: handle fails
+    let res =
+        smol::block_on(language_server.goto_definition(doc.identifier(), pos)).unwrap_or_default();
+    goto_generic(cx, res);
+}
+
+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,
+        None => return,
+    };
+
+    // TODO: blocking here is not ideal
+    let pos = helix_lsp::util::pos_to_lsp_pos(doc.text().slice(..), doc.selection().cursor());
+
+    // TODO: handle fails
+    let res = smol::block_on(language_server.goto_type_definition(doc.identifier(), pos))
+        .unwrap_or_default();
+    goto_generic(cx, res);
+}
+
+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,
+        None => return,
+    };
+
+    // TODO: blocking here is not ideal
+    let pos = helix_lsp::util::pos_to_lsp_pos(doc.text().slice(..), doc.selection().cursor());
+
+    // TODO: handle fails
+    let res = smol::block_on(language_server.goto_implementation(doc.identifier(), pos))
+        .unwrap_or_default();
+    goto_generic(cx, res);
+}
+
+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,
+        None => return,
+    };
+
+    // TODO: blocking here is not ideal
+    let pos = helix_lsp::util::pos_to_lsp_pos(doc.text().slice(..), doc.selection().cursor());
+
+    // TODO: handle fails
+    let res =
+        smol::block_on(language_server.goto_reference(doc.identifier(), pos)).unwrap_or_default();
+    goto_generic(cx, res);
+}
+
 // NOTE: Transactions in this module get appended to history when we switch back to normal mode.
 pub mod insert {
     use super::*;
diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 9ec70023..82258bde 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -19,7 +19,7 @@ pub enum Mode {
 pub struct Document {
     pub state: State, // rope + selection
     /// File path on disk.
-    pub path: Option<PathBuf>, // pub for testing
+    path: Option<PathBuf>,
 
     /// Current editing mode.
     pub mode: Mode,
-- 
cgit v1.2.3-70-g09d2


From cf71625d4e879ef2e453a33b2eba41bc23174aa2 Mon Sep 17 00:00:00 2001
From: Blaž Hrastnik
Date: Thu, 11 Mar 2021 13:15:25 +0900
Subject: term: Simplify goto code, address lints.

---
 helix-term/src/commands.rs | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

(limited to 'helix-term/src')

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 87d7ea79..5a99d795 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -13,7 +13,6 @@ use once_cell::sync::Lazy;
 use crate::compositor::Compositor;
 use crate::ui::{self, Popup, Prompt, PromptEvent};
 
-use lsp_types as lsp;
 use std::path::PathBuf;
 
 use smol::Executor;
@@ -26,6 +25,8 @@ use helix_view::{
 
 use crossterm::event::{KeyCode, KeyEvent};
 
+use helix_lsp::lsp;
+
 pub struct Context<'a> {
     pub count: usize,
     pub editor: &'a mut Editor,
@@ -851,16 +852,16 @@ pub fn exit_select_mode(cx: &mut Context) {
     cx.doc().mode = Mode::Normal;
 }
 
-pub fn goto_generic(cx: &mut Context, res: Vec<lsp::Location>) {
+fn goto(cx: &mut Context, locations: Vec<lsp::Location>) {
     let doc = cx.doc();
 
     doc.mode = Mode::Normal;
 
-    log::info!("{:?}", res);
+    log::info!("{:?}", locations);
     let filepath = doc.path().unwrap();
     log::info!("{:?}", filepath);
 
-    match &res.as_slice() {
+    match locations.as_slice() {
         [location] => {
             if filepath.to_str().unwrap() == location.uri.path() {
                 let definition_pos = location.range.start;
@@ -874,10 +875,9 @@ pub fn goto_generic(cx: &mut Context, res: Vec<lsp::Location>) {
             }
         }
         [] => (), // maybe show user message that no definition was found?
-        _ => {
-            let snapshot = doc.state.clone();
+        _locations => {
             let mut picker = ui::Picker::new(
-                res,
+                locations,
                 |item| {
                     let file = item.uri.as_str();
                     let line = item.range.start.line.to_string();
@@ -885,9 +885,6 @@ pub fn goto_generic(cx: &mut Context, res: Vec<lsp::Location>) {
                 },
                 move |editor: &mut Editor, item| {
                     let doc = &mut editor.view_mut().doc;
-
-                    // revert state to what it was before the last update
-                    doc.state = snapshot.clone();
                 },
             );
         }
@@ -907,7 +904,7 @@ pub fn goto_definition(cx: &mut Context) {
     // TODO: handle fails
     let res =
         smol::block_on(language_server.goto_definition(doc.identifier(), pos)).unwrap_or_default();
-    goto_generic(cx, res);
+    goto(cx, res);
 }
 
 pub fn goto_type_definition(cx: &mut Context) {
@@ -923,7 +920,7 @@ pub fn goto_type_definition(cx: &mut Context) {
     // TODO: handle fails
     let res = smol::block_on(language_server.goto_type_definition(doc.identifier(), pos))
         .unwrap_or_default();
-    goto_generic(cx, res);
+    goto(cx, res);
 }
 
 pub fn goto_implementation(cx: &mut Context) {
@@ -939,7 +936,7 @@ pub fn goto_implementation(cx: &mut Context) {
     // TODO: handle fails
     let res = smol::block_on(language_server.goto_implementation(doc.identifier(), pos))
         .unwrap_or_default();
-    goto_generic(cx, res);
+    goto(cx, res);
 }
 
 pub fn goto_reference(cx: &mut Context) {
@@ -955,7 +952,7 @@ pub fn goto_reference(cx: &mut Context) {
     // TODO: handle fails
     let res =
         smol::block_on(language_server.goto_reference(doc.identifier(), pos)).unwrap_or_default();
-    goto_generic(cx, res);
+    goto(cx, res);
 }
 
 // NOTE: Transactions in this module get appended to history when we switch back to normal mode.
-- 
cgit v1.2.3-70-g09d2


From 0828d1fdea0b69a2912bc6d550ec50c1b6bf874c Mon Sep 17 00:00:00 2001
From: Jan Hrastnik
Date: Sun, 14 Mar 2021 22:24:46 +0100
Subject: picker wip

---
 helix-term/src/commands.rs | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'helix-term/src')

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 5a99d795..22a8737f 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -852,27 +852,21 @@ pub fn exit_select_mode(cx: &mut Context) {
     cx.doc().mode = Mode::Normal;
 }
 
-fn goto(cx: &mut Context, locations: Vec<lsp::Location>) {
+fn goto(cx: &'static mut Context<'static>, locations: Vec<lsp::Location>) {
     let doc = cx.doc();
 
     doc.mode = Mode::Normal;
 
     log::info!("{:?}", locations);
-    let filepath = doc.path().unwrap();
-    log::info!("{:?}", filepath);
 
     match locations.as_slice() {
         [location] => {
-            if filepath.to_str().unwrap() == location.uri.path() {
-                let definition_pos = location.range.start;
-                let new_pos = helix_lsp::util::lsp_pos_to_pos(doc.text().slice(..), definition_pos);
-                doc.set_selection(Selection::point(new_pos));
-            } else {
-                // open new file
-                cx.editor
-                    .open(PathBuf::from(location.uri.path()), cx.executor);
-                // TODO: go to position
-            }
+            cx.editor
+                .open(PathBuf::from(location.uri.path()), cx.executor);
+            let doc = cx.doc();
+            let definition_pos = location.range.start;
+            let new_pos = helix_lsp::util::lsp_pos_to_pos(doc.text().slice(..), definition_pos);
+            doc.set_selection(Selection::point(new_pos));
         }
         [] => (), // maybe show user message that no definition was found?
         _locations => {
@@ -884,14 +878,20 @@ fn goto(cx: &mut Context, locations: Vec<lsp::Location>) {
                     format!("{}:{}", file, line).into()
                 },
                 move |editor: &mut Editor, item| {
-                    let doc = &mut editor.view_mut().doc;
+                    cx.editor.open(PathBuf::from(item.uri.path()), cx.executor);
+                    let doc = cx.doc();
+                    let definition_pos = item.range.start;
+                    let new_pos =
+                        helix_lsp::util::lsp_pos_to_pos(doc.text().slice(..), definition_pos);
+                    doc.set_selection(Selection::point(new_pos));
                 },
             );
+            cx.push_layer(Box::new(picker));
         }
     }
 }
 
-pub fn goto_definition(cx: &mut Context) {
+pub fn goto_definition(cx: &'static mut Context<'static>) {
     let doc = cx.doc();
     let language_server = match doc.language_server.as_ref() {
         Some(language_server) => language_server,
@@ -907,7 +907,7 @@ pub fn goto_definition(cx: &mut Context) {
     goto(cx, res);
 }
 
-pub fn goto_type_definition(cx: &mut Context) {
+pub fn goto_type_definition(cx: &'static mut Context<'static>) {
     let doc = cx.doc();
     let language_server = match doc.language_server.as_ref() {
         Some(language_server) => language_server,
@@ -923,7 +923,7 @@ pub fn goto_type_definition(cx: &mut Context) {
     goto(cx, res);
 }
 
-pub fn goto_implementation(cx: &mut Context) {
+pub fn goto_implementation(cx: &'static mut Context<'static>) {
     let doc = cx.doc();
     let language_server = match doc.language_server.as_ref() {
         Some(language_server) => language_server,
@@ -939,7 +939,7 @@ pub fn goto_implementation(cx: &mut Context) {
     goto(cx, res);
 }
 
-pub fn goto_reference(cx: &mut Context) {
+pub fn goto_reference(cx: &'static mut Context<'static>) {
     let doc = cx.doc();
     let language_server = match doc.language_server.as_ref() {
         Some(language_server) => language_server,
-- 
cgit v1.2.3-70-g09d2


From 4e461bea2f4cc19d0d25a62a4f278420c074b6e9 Mon Sep 17 00:00:00 2001
From: Jan Hrastnik
Date: Mon, 15 Mar 2021 21:12:41 +0100
Subject: editor.open now checks if view already exists

---
 helix-term/src/commands.rs | 15 ++++++++-------
 helix-view/src/editor.rs   | 10 +++++++++-
 2 files changed, 17 insertions(+), 8 deletions(-)

(limited to 'helix-term/src')

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,
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index b04a07dd..38182126 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -62,7 +62,15 @@ impl Editor {
         }
 
         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(())
     }
 
-- 
cgit v1.2.3-70-g09d2


From eadad13efabb6a838a366b27002e09e1d2580750 Mon Sep 17 00:00:00 2001
From: Jan Hrastnik
Date: Tue, 16 Mar 2021 13:55:12 +0100
Subject: preparing for gd merge

---
 helix-term/src/commands.rs |  4 +---
 helix-view/src/editor.rs   | 18 +++++++++---------
 2 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'helix-term/src')

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 20f51ef4..45e8cd01 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -857,8 +857,6 @@ fn goto(cx: &mut Context, locations: Vec<lsp::Location>) {
 
     doc.mode = Mode::Normal;
 
-    log::info!("{:?}", locations);
-
     match locations.as_slice() {
         [location] => {
             cx.editor
@@ -874,7 +872,7 @@ fn goto(cx: &mut Context, locations: Vec<lsp::Location>) {
                 locations,
                 |item| {
                     let file = item.uri.as_str();
-                    let line = item.range.start.line.to_string();
+                    let line = item.range.start.line;
                     format!("{}:{}", file, line).into()
                 },
                 move |editor: &mut Editor, item| {
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 38182126..99c0398f 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -34,6 +34,14 @@ impl Editor {
 
     pub fn open(&mut self, path: PathBuf, executor: &smol::Executor) -> Result<(), Error> {
         // TODO: try to find an open view/buffer first
+        let existing_view_option = self
+            .tree
+            .views()
+            .find(|v| path.to_str().unwrap() == v.0.doc.path().unwrap().to_str().unwrap());
+        if let Some(existing_view) = existing_view_option {
+            self.tree.focus = existing_view.0.id;
+            return Ok(());
+        }
 
         let mut doc = Document::load(path, self.theme.scopes())?;
 
@@ -62,15 +70,7 @@ impl Editor {
         }
 
         let view = View::new(doc)?;
-        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);
-        }
+        self.tree.insert(view);
         Ok(())
     }
 
-- 
cgit v1.2.3-70-g09d2


From e3ec5e31ec005e33da4c848b4272e81a6d21a5f0 Mon Sep 17 00:00:00 2001
From: Blaž Hrastnik
Date: Tue, 16 Mar 2021 23:05:43 +0900
Subject: Fix goto code before merging.

---
 helix-term/src/commands.rs |  4 +---
 helix-view/src/editor.rs   | 10 +++++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'helix-term/src')

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 45e8cd01..3e90fb63 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -15,8 +15,6 @@ use crate::ui::{self, Popup, Prompt, PromptEvent};
 
 use std::path::PathBuf;
 
-use smol::Executor;
-
 use helix_view::{
     document::Mode,
     view::{View, PADDING},
@@ -853,6 +851,7 @@ pub fn exit_select_mode(cx: &mut Context) {
 }
 
 fn goto(cx: &mut Context, locations: Vec<lsp::Location>) {
+    let executor = cx.executor;
     let doc = cx.doc();
 
     doc.mode = Mode::Normal;
@@ -876,7 +875,6 @@ fn goto(cx: &mut Context, locations: Vec<lsp::Location>) {
                     format!("{}:{}", file, line).into()
                 },
                 move |editor: &mut Editor, item| {
-                    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;
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 99c0398f..5c94df27 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -33,13 +33,13 @@ impl Editor {
     }
 
     pub fn open(&mut self, path: PathBuf, executor: &smol::Executor) -> Result<(), Error> {
-        // TODO: try to find an open view/buffer first
-        let existing_view_option = self
+        let existing_view = self
             .tree
             .views()
-            .find(|v| path.to_str().unwrap() == v.0.doc.path().unwrap().to_str().unwrap());
-        if let Some(existing_view) = existing_view_option {
-            self.tree.focus = existing_view.0.id;
+            .find(|(view, _)| view.doc.path() == Some(&path));
+
+        if let Some((view, _)) = existing_view {
+            self.tree.focus = view.id;
             return Ok(());
         }
 
-- 
cgit v1.2.3-70-g09d2