Update to lsp-types 0.55

This incorproates the rename from languageserver-types to lsp-types.
kakoune-lsp · Feb 10, 2019 · bb484a6 · bb484a6
1 parent 4ac1e89
commit bb484a6
Show file tree

Hide file tree

Showing 23 changed files with 67 additions and 65 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,7 +13,7 @@ fnv = "1"
 glob = "0"
 itertools = "0"
 jsonrpc-core = "8"
-languageserver-types = "0"
+lsp-types = "0"
 regex = "0"
 serde = "1"
 serde_derive = "1"

diff --git a/src/context.rs b/src/context.rs
@@ -1,7 +1,7 @@
 use crossbeam_channel::Sender;
 use fnv::FnvHashMap;
 use jsonrpc_core::{self, Call, Id, Params, Version};
-use languageserver_types::*;
+use lsp_types::*;
 use std::fs;
 use types::*;
 

diff --git a/src/controller.rs b/src/controller.rs
@@ -5,9 +5,9 @@ use general;
 use jsonrpc_core::{Call, ErrorCode, Output, Params};
 use language_features::*;
 use language_server_transport;
-use languageserver_types::notification::Notification;
-use languageserver_types::request::Request;
-use languageserver_types::*;
+use lsp_types::notification::Notification;
+use lsp_types::request::Request;
+use lsp_types::*;
 use serde_json::{self, Value};
 use text_sync::*;
 use types::*;

diff --git a/src/diagnostics.rs b/src/diagnostics.rs
@@ -1,7 +1,7 @@
 use context::*;
 use itertools::Itertools;
 use jsonrpc_core::Params;
-use languageserver_types::*;
+use lsp_types::*;
 use std::path::Path;
 use types::*;
 use util::*;

diff --git a/src/general.rs b/src/general.rs
@@ -1,7 +1,7 @@
 use context::*;
-use languageserver_types::notification::Notification;
-use languageserver_types::request::Request;
-use languageserver_types::*;
+use lsp_types::notification::Notification;
+use lsp_types::request::Request;
+use lsp_types::*;
 use serde_json::Value;
 use std::process;
 use toml;

diff --git a/src/language_features/ccls.rs b/src/language_features/ccls.rs
@@ -1,7 +1,7 @@
 use context::*;
 use itertools::Itertools;
 use jsonrpc_core::{Params, Value};
-use languageserver_types::{NumberOrString, Position, Range, TextDocumentIdentifier};
+use lsp_types::{NumberOrString, Position, Range, TextDocumentIdentifier};
 use serde;
 use serde::Deserialize;
 use serde_json;

diff --git a/src/language_features/completion.rs b/src/language_features/completion.rs
@@ -1,7 +1,7 @@
 use context::*;
 use itertools::Itertools;
-use languageserver_types::request::Request;
-use languageserver_types::*;
+use lsp_types::request::Request;
+use lsp_types::*;
 use regex::Regex;
 use serde::Deserialize;
 use serde_json::{self, Value};

diff --git a/src/language_features/cquery.rs b/src/language_features/cquery.rs
@@ -1,7 +1,7 @@
 use context::*;
 use itertools::Itertools;
 use jsonrpc_core::Params;
-use languageserver_types::{NumberOrString, Range};
+use lsp_types::{NumberOrString, Range};
 use serde;
 use types::*;
 use url::Url;

diff --git a/src/language_features/definition.rs b/src/language_features/definition.rs
@@ -1,6 +1,6 @@
 use context::*;
-use languageserver_types::request::Request;
-use languageserver_types::*;
+use lsp_types::request::Request;
+use lsp_types::*;
 use serde::Deserialize;
 use serde_json::{self, Value};
 use types::*;

diff --git a/src/language_features/document_symbol.rs b/src/language_features/document_symbol.rs
@@ -1,6 +1,6 @@
 use context::*;
-use languageserver_types::request::Request;
-use languageserver_types::*;
+use lsp_types::request::Request;
+use lsp_types::*;
 use serde_json::{self, Value};
 use types::*;
 use url::Url;

diff --git a/src/language_features/formatting.rs b/src/language_features/formatting.rs
@@ -1,6 +1,6 @@
 use context::*;
-use languageserver_types::request::Request;
-use languageserver_types::*;
+use lsp_types::request::Request;
+use lsp_types::*;
 use serde::Deserialize;
 use serde_json::{self, Value};
 use types::*;

diff --git a/src/language_features/hover.rs b/src/language_features/hover.rs
@@ -1,7 +1,7 @@
 use context::*;
 use itertools::Itertools;
-use languageserver_types::request::Request;
-use languageserver_types::*;
+use lsp_types::request::Request;
+use lsp_types::*;
 use serde::Deserialize;
 use serde_json::{self, Value};
 use std::str;

diff --git a/src/language_features/references.rs b/src/language_features/references.rs
@@ -1,7 +1,7 @@
 use context::*;
 use itertools::Itertools;
-use languageserver_types::request::Request;
-use languageserver_types::*;
+use lsp_types::request::Request;
+use lsp_types::*;
 use serde::Deserialize;
 use serde_json::{self, Value};
 use std::fs::File;

diff --git a/src/language_features/rename.rs b/src/language_features/rename.rs
@@ -1,6 +1,6 @@
 use context::*;
-use languageserver_types::request::Request;
-use languageserver_types::*;
+use lsp_types::request::Request;
+use lsp_types::*;
 use serde::Deserialize;
 use serde_json::{self, Value};
 use std::fs;
@@ -56,7 +56,7 @@ pub fn editor_rename(meta: &EditorMeta, _params: EditorParams, result: Value, ct
                         ),
                         DocumentChangeOperation::Op(op) => match op {
                             ResourceOp::Create(op) => {
-                                let path = Url::parse(&op.uri).unwrap().to_file_path().unwrap();
+                                let path = op.uri.to_file_path().unwrap();
                                 let ignore_if_exists = if let Some(options) = op.options {
                                     !options.overwrite.unwrap_or(false)
                                         && options.ignore_if_exists.unwrap_or(false)
@@ -73,7 +73,7 @@ pub fn editor_rename(meta: &EditorMeta, _params: EditorParams, result: Value, ct
                                 }
                             }
                             ResourceOp::Delete(op) => {
-                                let path = Url::parse(&op.uri).unwrap().to_file_path().unwrap();
+                                let path = op.uri.to_file_path().unwrap();
                                 if path.is_dir() {
                                     let recursive = if let Some(options) = op.options {
                                         options.recursive.unwrap_or(false)
@@ -101,8 +101,8 @@ pub fn editor_rename(meta: &EditorMeta, _params: EditorParams, result: Value, ct
                                 }
                             }
                             ResourceOp::Rename(op) => {
-                                let from = Url::parse(&op.old_uri).unwrap().to_file_path().unwrap();
-                                let to = Url::parse(&op.new_uri).unwrap().to_file_path().unwrap();
+                                let from = op.old_uri.to_file_path().unwrap();
+                                let to = op.new_uri.to_file_path().unwrap();
                                 let ignore_if_exists = if let Some(options) = op.options {
                                     !options.overwrite.unwrap_or(false)
                                         && options.ignore_if_exists.unwrap_or(false)

diff --git a/src/language_features/signature_help.rs b/src/language_features/signature_help.rs
@@ -1,6 +1,6 @@
 use context::*;
-use languageserver_types::request::Request;
-use languageserver_types::*;
+use lsp_types::request::Request;
+use lsp_types::*;
 use serde::Deserialize;
 use serde_json::{self, Value};
 use types::*;

diff --git a/src/language_server_transport.rs b/src/language_server_transport.rs
@@ -1,8 +1,8 @@
 use crossbeam_channel::{bounded, Receiver, Sender};
 use fnv::FnvHashMap;
 use jsonrpc_core::{self, Call, Output, Params, Version};
-use languageserver_types::notification::Notification;
-use languageserver_types::*;
+use lsp_types::notification::Notification;
+use lsp_types::*;
 use serde_json;
 use std::io::{self, BufRead, BufReader, BufWriter, Error, ErrorKind, Read, Write};
 use std::process::{Command, Stdio};

diff --git a/src/main.rs b/src/main.rs
@@ -8,7 +8,7 @@ extern crate fnv;
 extern crate glob;
 extern crate itertools;
 extern crate jsonrpc_core;
-extern crate languageserver_types;
+extern crate lsp_types;
 extern crate regex;
 extern crate serde_json;
 #[macro_use]

diff --git a/src/session.rs b/src/session.rs
@@ -2,8 +2,8 @@ use controller;
 use crossbeam_channel::{after, bounded, Receiver, Sender};
 use editor_transport;
 use fnv::FnvHashMap;
-use languageserver_types::notification::Notification;
-use languageserver_types::*;
+use lsp_types::notification::Notification;
+use lsp_types::*;
 use project_root::find_project_root;
 use std::thread::{self, JoinHandle};
 use std::time::Duration;

diff --git a/src/text_sync.rs b/src/text_sync.rs
@@ -1,6 +1,6 @@
 use context::*;
-use languageserver_types::notification::Notification;
-use languageserver_types::*;
+use lsp_types::notification::Notification;
+use lsp_types::*;
 use serde::Deserialize;
 use types::*;
 use url::Url;

diff --git a/src/types.rs b/src/types.rs
@@ -1,6 +1,6 @@
 use fnv::FnvHashMap;
 use jsonrpc_core::{Call, Output, Params};
-use languageserver_types::*;
+use lsp_types::*;
 use serde::Serialize;
 use serde_json::Value;
 use std::io::Error;

diff --git a/src/util.rs b/src/util.rs
@@ -1,7 +1,7 @@
 use context::*;
 use fnv::FnvHashMap;
 use itertools::Itertools;
-use languageserver_types::*;
+use lsp_types::*;
 use std::io::{stderr, stdout, Write};
 use std::os::unix::fs::DirBuilderExt;
 use std::time::Duration;

diff --git a/src/workspace.rs b/src/workspace.rs
@@ -1,13 +1,13 @@
 use context::*;
-use languageserver_types::request::Request;
-use languageserver_types::*;
+use lsp_types::request::Request;
+use lsp_types::*;
 use serde::Deserialize;
 use serde_json::{self, Value};
 use toml;
 use types::*;
 use util::*;
 
-use languageserver_types::notification::{self, Notification};
+use lsp_types::notification::{self, Notification};
 
 fn insert_value<'a, 'b, P>(
     target: &'b mut serde_json::map::Map<String, Value>,