Reduce duplications of various goto.

Author: Junfeng Li

src/languageclient.rs

@@ -703,9 +703,10 @@ pub trait ILanguageClient: IVim {
         Ok(result)
     }
 
-    fn textDocument_definition(&self, params: &Option<Params>) -> Result<Value> {
+    /// Generic find locations, e.g, definitions, references.
+    fn find_locations(&self, method_name: &str, params: &Option<Params>) -> Result<Value> {
         self.textDocument_didChange(params)?;
-        info!("Begin {}", lsp::request::GotoDefinition::METHOD);
+        info!("Begin {}", method_name);
         let (buftype, languageId, filename, line, character, goto_cmd, handle): (
             String,
             String,
@@ -732,7 +733,7 @@ pub trait ILanguageClient: IVim {
 
         let result = self.call(
             Some(&languageId),
-            lsp::request::GotoDefinition::METHOD,
+            method_name,
             TextDocumentPositionParams {
                 text_document: TextDocumentIdentifier {
                     uri: filename.to_url()?,
@@ -775,7 +776,7 @@ pub trait ILanguageClient: IVim {
             },
         };
 
-        info!("End {}", lsp::request::GotoDefinition::METHOD);
+        info!("End {}", method_name);
         Ok(result)
     }
 
@@ -2160,194 +2161,6 @@ pub trait ILanguageClient: IVim {
         info!("End {}", NOTIFICATION__CqueryProgress);
         Ok(())
     }
-
-    fn cquery_base(&self, params: &Option<Params>) -> Result<Value> {
-        info!("Begin {}", REQUEST__CqueryBase);
-
-        let (buftype, languageId, filename, line, character, handle): (
-            String,
-            String,
-            String,
-            u64,
-            u64,
-            bool,
-        ) = self.gather_args(
-            &[
-                VimVar::Buftype,
-                VimVar::LanguageId,
-                VimVar::Filename,
-                VimVar::Line,
-                VimVar::Character,
-                VimVar::Handle,
-            ],
-            params,
-        )?;
-        if !buftype.is_empty() || languageId.is_empty() {
-            return Ok(Value::Null);
-        }
-
-        let result = self.call(
-            Some(&languageId),
-            REQUEST__CqueryBase,
-            TextDocumentPositionParams {
-                text_document: TextDocumentIdentifier {
-                    uri: filename.to_url()?,
-                },
-                position: Position { line, character },
-            },
-        )?;
-
-        if !handle {
-            return Ok(result);
-        }
-
-        let locations: Vec<Location> = serde_json::from_value(result.clone())?;
-        self.display_locations(&locations, &languageId)?;
-
-        info!("End {}", REQUEST__CqueryBase);
-        Ok(result)
-    }
-
-    fn cquery_derived(&self, params: &Option<Params>) -> Result<Value> {
-        info!("Begin {}", REQUEST__CqueryDerived);
-
-        let (buftype, languageId, filename, line, character, handle): (
-            String,
-            String,
-            String,
-            u64,
-            u64,
-            bool,
-        ) = self.gather_args(
-            &[
-                VimVar::Buftype,
-                VimVar::LanguageId,
-                VimVar::Filename,
-                VimVar::Line,
-                VimVar::Character,
-                VimVar::Handle,
-            ],
-            params,
-        )?;
-        if !buftype.is_empty() || languageId.is_empty() {
-            return Ok(Value::Null);
-        }
-
-        let result = self.call(
-            Some(&languageId),
-            REQUEST__CqueryDerived,
-            TextDocumentPositionParams {
-                text_document: TextDocumentIdentifier {
-                    uri: filename.to_url()?,
-                },
-                position: Position { line, character },
-            },
-        )?;
-
-        if !handle {
-            return Ok(result);
-        }
-
-        let locations: Vec<Location> = serde_json::from_value(result.clone())?;
-        self.display_locations(&locations, &languageId)?;
-
-        info!("End {}", REQUEST__CqueryDerived);
-        Ok(result)
-    }
-
-    fn cquery_callers(&self, params: &Option<Params>) -> Result<Value> {
-        info!("Begin {}", REQUEST__CqueryCallers);
-
-        let (buftype, languageId, filename, line, character, handle): (
-            String,
-            String,
-            String,
-            u64,
-            u64,
-            bool,
-        ) = self.gather_args(
-            &[
-                VimVar::Buftype,
-                VimVar::LanguageId,
-                VimVar::Filename,
-                VimVar::Line,
-                VimVar::Character,
-                VimVar::Handle,
-            ],
-            params,
-        )?;
-        if !buftype.is_empty() || languageId.is_empty() {
-            return Ok(Value::Null);
-        }
-
-        let result = self.call(
-            Some(&languageId),
-            REQUEST__CqueryCallers,
-            TextDocumentPositionParams {
-                text_document: TextDocumentIdentifier {
-                    uri: filename.to_url()?,
-                },
-                position: Position { line, character },
-            },
-        )?;
-
-        if !handle {
-            return Ok(result);
-        }
-
-        let locations: Vec<Location> = serde_json::from_value(result.clone())?;
-        self.display_locations(&locations, &languageId)?;
-
-        info!("End {}", REQUEST__CqueryCallers);
-        Ok(result)
-    }
-
-    fn cquery_vars(&self, params: &Option<Params>) -> Result<Value> {
-        info!("Begin {}", REQUEST__CqueryVars);
-
-        let (buftype, languageId, filename, line, character, handle): (
-            String,
-            String,
-            String,
-            u64,
-            u64,
-            bool,
-        ) = self.gather_args(
-            &[
-                VimVar::Buftype,
-                VimVar::LanguageId,
-                VimVar::Filename,
-                VimVar::Line,
-                VimVar::Character,
-                VimVar::Handle,
-            ],
-            params,
-        )?;
-        if !buftype.is_empty() || languageId.is_empty() {
-            return Ok(Value::Null);
-        }
-
-        let result = self.call(
-            Some(&languageId),
-            REQUEST__CqueryVars,
-            TextDocumentPositionParams {
-                text_document: TextDocumentIdentifier {
-                    uri: filename.to_url()?,
-                },
-                position: Position { line, character },
-            },
-        )?;
-
-        if !handle {
-            return Ok(result);
-        }
-
-        let locations: Vec<Location> = serde_json::from_value(result.clone())?;
-        self.display_locations(&locations, &languageId)?;
-
-        info!("End {}", REQUEST__CqueryVars);
-        Ok(result)
-    }
 }
 
 impl ILanguageClient for Arc<RwLock<State>> {

src/rpchandler.rs

@@ -34,9 +34,11 @@ impl IRpcHandler for Arc<RwLock<State>> {
 
         match method_call.method.as_str() {
             lsp::request::HoverRequest::METHOD => self.textDocument_hover(&method_call.params),
-            lsp::request::GotoDefinition::METHOD => {
-                self.textDocument_definition(&method_call.params)
-            }
+            m @ lsp::request::GotoDefinition::METHOD
+            | m @ REQUEST__CqueryBase
+            | m @ REQUEST__CqueryCallers
+            | m @ REQUEST__CqueryDerived
+            | m @ REQUEST__CqueryVars => self.find_locations(m, &method_call.params),
             lsp::request::Rename::METHOD => self.textDocument_rename(&method_call.params),
             lsp::request::DocumentSymbol::METHOD => {
                 self.textDocument_documentSymbol(&method_call.params)
@@ -75,10 +77,6 @@ impl IRpcHandler for Arc<RwLock<State>> {
             REQUEST__RegisterHandlers => self.languageClient_registerHandlers(&method_call.params),
             REQUEST__NCMRefresh => self.NCM_refresh(&method_call.params),
             REQUEST__OmniComplete => self.languageClient_omniComplete(&method_call.params),
-            REQUEST__CqueryBase => self.cquery_base(&method_call.params),
-            REQUEST__CqueryCallers => self.cquery_callers(&method_call.params),
-            REQUEST__CqueryDerived => self.cquery_derived(&method_call.params),
-            REQUEST__CqueryVars => self.cquery_vars(&method_call.params),
 
             _ => {
                 if languageId.is_none() {