Merge pull request #936 from dgriffen/goto-implementation

Switch to standard implementation method.
rust-lang · Jul 14, 2018 · 2b57851 · 2b57851
2 parents 4e4cf43 + 42c1c75
commit 2b57851
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 25 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,7 +17,7 @@ env_logger = "0.5"
 failure = "0.1.1"
 itertools = "0.7.3"
 jsonrpc-core = "8.0.1"
-languageserver-types = "0.44"
+languageserver-types = "0.45"
 lazy_static = "1"
 log = "0.4"
 num_cpus = "1"

diff --git a/src/actions/requests.rs b/src/actions/requests.rs
@@ -35,6 +35,7 @@ pub use lsp_data::request::{
     DocumentSymbol as Symbols,
     HoverRequest as Hover,
     GotoDefinition as Definition,
+    GotoImplementation as Implementation,
     References,
     Completion,
     DocumentHighlightRequest as DocumentHighlight,
@@ -46,7 +47,6 @@ pub use lsp_data::request::{
     ResolveCompletionItem as ResolveCompletion,
     CodeLensRequest,
 };
-pub use lsp_data::FindImpls;
 
 use std::collections::HashMap;
 use std::path::Path;
@@ -174,7 +174,7 @@ impl RequestAction for Hover {
     }
 }
 
-impl RequestAction for FindImpls {
+impl RequestAction for Implementation {
     type Response = Vec<Location>;
 
     fn fallback_response() -> Result<Self::Response, ResponseError> {

diff --git a/src/lsp_data.rs b/src/lsp_data.rs
@@ -350,18 +350,6 @@ impl LSPNotification for BeginBuild {
     const METHOD: &'static str = "rustDocument/beginBuild";
 }
 
-/* ------------------ Custom JSON-RPC requests ---------------- */
-
-/// Find all the implementations of a given trait.
-#[derive(Debug)]
-pub enum FindImpls { }
-
-impl LSPRequest for FindImpls {
-    type Params = TextDocumentPositionParams;
-    type Result = Vec<Location>;
-    const METHOD: &'static str = "rustDocument/implementations";
-}
-
 /* ----------  Temporary LSP type until window/progress proposal is done --------- */
 
 // Notification from server to client for build progress.

diff --git a/src/server/dispatch.rs b/src/server/dispatch.rs
@@ -95,7 +95,7 @@ define_dispatch_request_enum!(
     WorkspaceSymbol,
     Symbols,
     Hover,
-    FindImpls,
+    Implementation,
     DocumentHighlight,
     Rename,
     CodeAction,

diff --git a/src/server/mod.rs b/src/server/mod.rs
@@ -20,8 +20,8 @@ pub use ls_types::notification::Exit as ExitNotification;
 pub use ls_types::request::Initialize as InitializeRequest;
 pub use ls_types::request::Shutdown as ShutdownRequest;
 use ls_types::{
-    CompletionOptions, ExecuteCommandOptions, InitializeParams, InitializeResult,
-    ServerCapabilities, TextDocumentSyncCapability, TextDocumentSyncKind, CodeLensOptions
+    CompletionOptions, ExecuteCommandOptions, ImplementationProviderCapability, InitializeParams, InitializeResult,
+    ServerCapabilities, TextDocumentSyncCapability, TextDocumentSyncKind, CodeLensOptions,
 };
 use lsp_data;
 use lsp_data::{InitializationOptions, LSPNotification, LSPRequest};
@@ -270,7 +270,7 @@ impl<O: Output> LsService<O> {
                 requests::Rename,
                 requests::CodeAction,
                 requests::DocumentHighlight,
-                requests::FindImpls,
+                requests::Implementation,
                 requests::Symbols,
                 requests::Hover,
                 requests::WorkspaceSymbol,
@@ -360,6 +360,8 @@ fn server_caps(ctx: &ActionContext) -> ServerCapabilities {
             trigger_characters: Some(vec![".".to_string(), ":".to_string()]),
         }),
         definition_provider: Some(true),
+        type_definition_provider: None,
+        implementation_provider: Some(ImplementationProviderCapability::Simple(true)),
         references_provider: Some(true),
         document_highlight_provider: Some(true),
         document_symbol_provider: Some(true),
@@ -376,6 +378,8 @@ fn server_caps(ctx: &ActionContext) -> ServerCapabilities {
             ],
         }),
         rename_provider: Some(true),
+        color_provider: None,
+
         // These are supported if the `unstable_features` option is set.
         // We'll update these capabilities dynamically when we get config
         // info from the client.

diff --git a/src/test/mod.rs b/src/test/mod.rs
@@ -1148,14 +1148,14 @@ fn test_find_impls() {
 
     let messages = vec![
         initialize(0, root_path.as_os_str().to_str().map(|x| x.to_owned())).to_string(),
-        request::<requests::FindImpls>(
+        request::<requests::Implementation>(
             1,
             TextDocumentPositionParams {
                 text_document: TextDocumentIdentifier::new(url.clone()),
                 position: env.cache.mk_ls_position(src(&source_file_path, 13, "Bar")),
             },
         ).to_string(),
-        request::<requests::FindImpls>(
+        request::<requests::Implementation>(
             2,
             TextDocumentPositionParams {
                 text_document: TextDocumentIdentifier::new(url.clone()),
@@ -1164,7 +1164,7 @@ fn test_find_impls() {
             },
         ).to_string(),
         // FIXME Does not work on Travis
-        // request::<requests::FindImpls>(
+        // request::<requests::Implementation>(
         //     3,
         //     TextDocumentPositionParams {
         //         text_document: TextDocumentIdentifier::new(url),