Merge pull request #1237 from h-michael/lsp-types

Bump languageserver-types to v0.54.0 and renam crate name to lsp-types

Author: Xanewok

Cargo.lock

@@ -27,7 +27,7 @@ failure = "0.1.1"
 home = "0.3"
 itertools = "0.8"
 jsonrpc-core = "9"
-languageserver-types = "0.53.1"
+lsp-types = "0.54.0"
 lazy_static = "1"
 log = "0.4"
 num_cpus = "1"

Cargo.toml

@@ -19,7 +19,7 @@ use std::iter;
 use std::path::{Path, PathBuf};
 
 use crate::lsp_data::ls_util;
-use languageserver_types::{
+use lsp_types::{
     DiagnosticRelatedInformation, DiagnosticSeverity, Location, NumberOrString, Range,
 };
 use log::debug;
@@ -28,7 +28,7 @@ use serde_derive::Deserialize;
 use serde_json;
 use url::Url;
 
-pub use languageserver_types::Diagnostic;
+pub use lsp_types::Diagnostic;
 
 #[derive(Debug)]
 pub struct Suggestion {
@@ -348,7 +348,7 @@ impl IsWithin for Range {
 #[cfg(test)]
 mod diagnostic_message_test {
     use super::*;
-    use languageserver_types::Position;
+    use lsp_types::Position;
 
     pub(super) fn fixtures_dir() -> &'static Path {
         Path::new(env!("FIXTURES_DIR"))
@@ -759,7 +759,7 @@ help: consider borrowing here: `&string`"#,
 mod diagnostic_suggestion_test {
     use self::diagnostic_message_test::*;
     use super::*;
-    use languageserver_types::Position;
+    use lsp_types::Position;
 
     #[test]
     fn suggest_use_when_cannot_find_type() {

src/actions/diagnostics.rs

@@ -21,7 +21,7 @@ use crate::build::*;
 use crate::lsp_data::request::{RangeFormatting, RegisterCapability, UnregisterCapability};
 use crate::lsp_data::*;
 use crate::server::Request;
-use languageserver_types::notification::ShowMessage;
+use lsp_types::notification::ShowMessage;
 
 pub use crate::lsp_data::notification::{
     Cancel, DidChangeConfiguration, DidChangeTextDocument, DidChangeWatchedFiles,

src/actions/notifications.rs

@@ -30,7 +30,7 @@ use crate::lsp_data::{Range, PublishDiagnosticsParams};
 
 use failure;
 use itertools::Itertools;
-use languageserver_types::DiagnosticSeverity;
+use lsp_types::DiagnosticSeverity;
 use log::{trace, warn};
 use rls_analysis::AnalysisHost;
 use rls_data::Analysis;

src/actions/post_build.rs

@@ -14,7 +14,7 @@ use crate::lsp_data::{
     MessageType, Progress, ProgressParams, PublishDiagnosticsParams, ShowMessageParams,
 };
 use crate::server::{Notification, Output};
-use languageserver_types::notification::{PublishDiagnostics, ShowMessage};
+use lsp_types::notification::{PublishDiagnostics, ShowMessage};
 use lazy_static::lazy_static;
 
 /// Trait for communication of build progress back to the client.

src/actions/progress.rs

@@ -19,7 +19,7 @@ use rls_analysis::{AnalysisHost, Target};
 use rls_vfs::Vfs;
 use std::sync::atomic::{AtomicU64, Ordering};
 
-use languageserver_types::{
+use lsp_types::{
     ClientCapabilities, CodeActionContext, CodeActionParams, CompletionItem,
     DocumentFormattingParams, DocumentRangeFormattingParams, DocumentSymbolParams,
     FormattingOptions, InitializeParams, Position, Range, RenameParams, TextDocumentIdentifier,

src/cmd.rs

@@ -4,7 +4,6 @@ use std::error::Error;
 use std::fmt;
 use std::path::PathBuf;
 
-use languageserver_types as ls_types;
 use racer;
 use rls_analysis::DefKind;
 use rls_span as span;
@@ -14,9 +13,9 @@ use url::Url;
 use crate::config;
 use crate::actions::hover;
 
-pub use languageserver_types::notification::Notification as LSPNotification;
-pub use languageserver_types::request::Request as LSPRequest;
-pub use languageserver_types::*;
+pub use lsp_types::notification::Notification as LSPNotification;
+pub use lsp_types::request::Request as LSPRequest;
+pub use lsp_types::*;
 
 /// Errors that can occur when parsing a file URI.
 #[derive(Debug)]
@@ -277,7 +276,7 @@ impl Default for InitializationOptions {
     }
 }
 
-// Subset of flags from ls_types::ClientCapabilities that affects this RLS.
+// Subset of flags from lsp_types::ClientCapabilities that affects this RLS.
 // Passed in the `initialize` request under `capabilities`.
 #[derive(Debug, PartialEq, Deserialize, Serialize, Clone, Copy, Default)]
 #[serde(default)]
@@ -287,8 +286,8 @@ pub struct ClientCapabilities {
 }
 
 impl ClientCapabilities {
-    pub fn new(params: &ls_types::InitializeParams) -> ClientCapabilities {
-        // ls_types::ClientCapabilities is a rather awkward object to use internally
+    pub fn new(params: &lsp_types::InitializeParams) -> ClientCapabilities {
+        // lsp_types::ClientCapabilities is a rather awkward object to use internally
         // (for instance it doesn't Clone). Instead we pick out the bits of it that we
         // are going to handle into ClientCapabilities. The upside of
         // using this very simple struct is that it can be kept thread safe

src/lsp_data.rs

@@ -12,7 +12,7 @@
 
 use crate::actions::InitActionContext;
 use jsonrpc_core::{self as jsonrpc, Id};
-use languageserver_types::notification::ShowMessage;
+use lsp_types::notification::ShowMessage;
 use log::debug;
 use serde;
 use serde::ser::{Serialize, SerializeStruct, Serializer};
@@ -417,7 +417,7 @@ impl Serialize for RawMessage {
 mod test {
     use super::*;
     use crate::server::notifications;
-    use languageserver_types::InitializedParams;
+    use lsp_types::InitializedParams;
     use serde_json::json;
 
     #[test]

src/server/message.rs

@@ -27,10 +27,10 @@ pub use crate::server::message::{
 };
 use crate::version;
 use jsonrpc_core::{self as jsonrpc, types::error::ErrorCode, Id};
-pub use languageserver_types::notification::Exit as ExitNotification;
-pub use languageserver_types::request::Initialize as InitializeRequest;
-pub use languageserver_types::request::Shutdown as ShutdownRequest;
-use languageserver_types::{
+pub use lsp_types::notification::Exit as ExitNotification;
+pub use lsp_types::request::Initialize as InitializeRequest;
+pub use lsp_types::request::Shutdown as ShutdownRequest;
+use lsp_types::{
     CodeActionProviderCapability, CodeLensOptions, CompletionOptions, ExecuteCommandOptions,
     ImplementationProviderCapability, InitializeParams, InitializeResult, RenameProviderCapability,
     ServerCapabilities, TextDocumentSyncCapability, TextDocumentSyncKind,
@@ -436,12 +436,12 @@ mod test {
             root_path: None,
             root_uri: None,
             initialization_options: None,
-            capabilities: languageserver_types::ClientCapabilities {
+            capabilities: lsp_types::ClientCapabilities {
                 workspace: None,
                 text_document: None,
                 experimental: None,
             },
-            trace: Some(languageserver_types::TraceOption::Off),
+            trace: Some(lsp_types::TraceOption::Off),
             workspace_folders: None,
         }
     }

src/server/mod.rs

@@ -84,14 +84,14 @@ fn client_test_simple_workspace() {
     let root_path = p.root();
     let mut rls = p.spawn_rls_async();
 
-    rls.request::<languageserver_types::request::Initialize>(
+    rls.request::<lsp_types::request::Initialize>(
         0,
-        languageserver_types::InitializeParams {
+        lsp_types::InitializeParams {
             process_id: None,
             root_uri: None,
             root_path: Some(root_path.display().to_string()),
             initialization_options: None,
-            capabilities: languageserver_types::ClientCapabilities {
+            capabilities: lsp_types::ClientCapabilities {
                 workspace: None,
                 text_document: None,
                 experimental: None,

tests/client.rs

@@ -208,8 +208,8 @@ impl RlsHandle {
     /// Requests the RLS to shut down and waits (with a timeout) until the child
     /// process is terminated.
     pub fn shutdown(mut self) {
-        self.request::<languageserver_types::request::Shutdown>(99999, ());
-        self.notify::<languageserver_types::notification::Exit>(());
+        self.request::<lsp_types::request::Shutdown>(99999, ());
+        self.notify::<lsp_types::notification::Exit>(());
 
         let fut = self.child.wait_with_output().timeout(rls_timeout());
 

tests/support/client.rs

@@ -11,7 +11,7 @@ use std::sync::{Arc, Mutex};
 use rls::config::{Config, Inferrable};
 use rls::server as ls_server;
 use env_logger;
-use languageserver_types as ls_types;
+use lsp_types;
 use rls_analysis::{AnalysisHost, Target};
 use rls_vfs::Vfs;
 use serde_json;
@@ -315,21 +315,21 @@ impl Cache {
         }
     }
 
-    pub(crate) fn mk_ls_position(&mut self, src: Src<'_>) -> ls_types::Position {
+    pub(crate) fn mk_ls_position(&mut self, src: Src<'_>) -> lsp_types::Position {
         let line = self.get_line(src);
         let col = line
             .find(src.name)
             .expect(&format!("Line does not contain name {}", src.name));
-        ls_types::Position::new((src.line - 1) as u64, char_of_byte_index(&line, col) as u64)
+        lsp_types::Position::new((src.line - 1) as u64, char_of_byte_index(&line, col) as u64)
     }
 
     /// Create a range covering the initial position on the line
     ///
     /// The line number uses a 0-based index.
-    pub(crate) fn mk_ls_range_from_line(&mut self, line: u64) -> ls_types::Range {
-        ls_types::Range::new(
-            ls_types::Position::new(line, 0),
-            ls_types::Position::new(line, 0),
+    pub(crate) fn mk_ls_range_from_line(&mut self, line: u64) -> lsp_types::Range {
+        lsp_types::Range::new(
+            lsp_types::Position::new(line, 0),
+            lsp_types::Position::new(line, 0),
         )
     }
 

tests/support/harness.rs

@@ -12,7 +12,7 @@ use self::support::harness::{
     compare_json, expect_message, expect_series, src, Environment, ExpectedMessage, RecordOutput,
 };
 
-use languageserver_types::*;
+use lsp_types::*;
 
 use env_logger;
 use serde_json;