Merge pull request #792 from autozimu/option

trace and trigger_characters should all be Option.
rust-lang · Mar 27, 2018 · 10bbc1c · 10bbc1c
2 parents 4ebefb6 + c07e698
commit 10bbc1c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,7 +15,7 @@ cargo_metadata = "0.5.2"
 env_logger = "0.5"
 failure = "0.1.1"
 jsonrpc-core = "8.0.1"
-languageserver-types = "0.31"
+languageserver-types = "0.35"
 lazy_static = "1"
 log = "0.4"
 racer = "2.0.12"

diff --git a/src/cmd.rs b/src/cmd.rs
@@ -371,7 +371,7 @@ fn initialize(root_path: String) -> Request<server::InitializeRequest> {
             text_document: None,
             experimental: None,
         },
-        trace: TraceOption::Off,
+        trace: Some(TraceOption::Off),
     };
     Request {
         id: next_id(),

diff --git a/src/server/mod.rs b/src/server/mod.rs
@@ -299,7 +299,7 @@ fn server_caps() -> ServerCapabilities {
         hover_provider: Some(true),
         completion_provider: Some(CompletionOptions {
             resolve_provider: Some(true),
-            trigger_characters: vec![".".to_string(), ":".to_string()],
+            trigger_characters: Some(vec![".".to_string(), ":".to_string()]),
         }),
         definition_provider: Some(true),
         references_provider: Some(true),
@@ -359,7 +359,7 @@ mod test {
                 text_document: None,
                 experimental: None,
             },
-            trace: ::ls_types::TraceOption::Off,
+            trace: Some(::ls_types::TraceOption::Off),
         }
     }
 

diff --git a/src/test/mod.rs b/src/test/mod.rs
@@ -59,7 +59,7 @@ pub fn initialize_with_opts<'a>(
             text_document: None,
             experimental: None,
         },
-        trace: TraceOption::Off,
+        trace: Some(TraceOption::Off),
     };
     Request {
         id,