Standardize switchSourceHeader request (#1109)

Author: martskins

src/extensions/clangd.rs

@@ -1,10 +1,18 @@
 use crate::{language_client::LanguageClient, utils::ToUrl};
 use anyhow::Result;
 use jsonrpc_core::Value;
-use lsp_types::TextDocumentIdentifier;
+use lsp_types::{request::Request, TextDocumentIdentifier};
 
 pub mod request {
-    pub const SWITCH_SOURCE_HEADER: &str = "textDocument/switchSourceHeader";
+    use lsp_types::{request::Request, TextDocumentIdentifier};
+
+    pub enum SwitchSourceHeader {}
+
+    impl Request for SwitchSourceHeader {
+        type Params = TextDocumentIdentifier;
+        type Result = String;
+        const METHOD: &'static str = "textDocument/switchSourceHeader";
+    }
 }
 
 impl LanguageClient {
@@ -17,7 +25,7 @@ impl LanguageClient {
 
         let response: String = self
             .get_client(&Some(language_id))?
-            .call(request::SWITCH_SOURCE_HEADER, params)?;
+            .call(request::SwitchSourceHeader::METHOD, params)?;
 
         let path = std::path::Path::new(&response);
         self.vim()?.edit(&None, path)?;

src/rpchandler.rs

@@ -119,7 +119,7 @@ impl LanguageClient {
             REQUEST_SEMANTIC_SCOPES => self.semantic_scopes(&params),
             REQUEST_SHOW_SEMANTIC_HL_SYMBOLS => self.semantic_highlight_symbols(&params),
 
-            clangd::request::SWITCH_SOURCE_HEADER => {
+            clangd::request::SwitchSourceHeader::METHOD => {
                 self.text_document_switch_source_header(&params)
             }