4eca4b3 · helix · git.iko.soy

helix-lsp/src/client.rs+25

compare with master

unifiedsplit

@@ -886,6 +886,31 @@ impl Client {

886 ))

887 }

888

889+ pub fn goto_declaration(

890+ &self,

891+ text_document: lsp::TextDocumentIdentifier,

892+ position: lsp::Position,

893+ work_done_token: Option<lsp::ProgressToken>,

894+ ) -> Option<impl Future<Output = Result<Value>>> {

895+ let capabilities = self.capabilities.get().unwrap();

896+

897+ // Return early if the server does not support goto-declaration.

898+ match capabilities.declaration_provider {

899+ Some(

900+ lsp::DeclarationCapability::Simple(true)

901+ | lsp::DeclarationCapability::RegistrationOptions(_)

902+ | lsp::DeclarationCapability::Options(_),

903+ ) => (),

904+ _ => return None,

905+ }

906+

907+ Some(self.goto_request::<lsp::request::GotoDeclaration>(

908+ text_document,

909+ position,

910+ work_done_token,

911+ ))

912+ }

913+

889 pub fn goto_type_definition(

914 pub fn goto_type_definition(

890 &self,

915 &self,

891 text_document: lsp::TextDocumentIdentifier,

916 text_document: lsp::TextDocumentIdentifier,

helix-term/src/commands.rs+1

@@ -285,6 +285,7 @@ impl MappableCommand {

285 select_mode, "Enter selection extend mode",

286 exit_select_mode, "Exit selection mode",

287 goto_definition, "Goto definition",

288+ goto_declaration, "Goto declaration",

288 add_newline_above, "Add newline above",

289 add_newline_above, "Add newline above",

289 add_newline_below, "Add newline below",

290 add_newline_below, "Add newline below",

290 goto_type_definition, "Goto type definition",

291 goto_type_definition, "Goto type definition",

helix-term/src/commands/lsp.rs+25

@@ -914,6 +914,31 @@ fn to_locations(definitions: Option<lsp::GotoDefinitionResponse>) -> Vec<lsp::Lo

914 }

915}

916

917+pub fn goto_declaration(cx: &mut Context) {

918+ let (view, doc) = current!(cx.editor);

919+ let language_server = language_server!(cx.editor, doc);

920+ let offset_encoding = language_server.offset_encoding();

921+

922+ let pos = doc.position(view.id, offset_encoding);

923+

924+ let future = match language_server.goto_declaration(doc.identifier(), pos, None) {

925+ Some(future) => future,

926+ None => {

927+ cx.editor

928+ .set_error("Language server does not support goto-declaration");

929+ return;

930+ }

931+ };

932+

933+ cx.callback(

934+ future,

935+ move |editor, compositor, response: Option<lsp::GotoDefinitionResponse>| {

936+ let items = to_locations(response);

937+ goto_impl(editor, compositor, items, offset_encoding);

938+ },

939+ );

940+}

941+

917pub fn goto_definition(cx: &mut Context) {

942pub fn goto_definition(cx: &mut Context) {

918 let (view, doc) = current!(cx.editor);

943 let (view, doc) = current!(cx.editor);

919 let language_server = language_server!(cx.editor, doc);

944 let language_server = language_server!(cx.editor, doc);

helix-term/src/keymap/default.rs+1

@@ -44,6 +44,7 @@ pub fn default() -> HashMap<Mode, Keymap> {

44 "l" => goto_line_end,

45 "s" => goto_first_nonwhitespace,

46 "d" => goto_definition,

47+ "D" => goto_declaration,

47 "y" => goto_type_definition,

48 "y" => goto_type_definition,

48 "r" => goto_reference,

49 "r" => goto_reference,

49 "i" => goto_implementation,

50 "i" => goto_implementation,