Upgrade languageserver-types.

Close #217. Close #238.
autozimu · Jan 1, 2018 · 5e87609 · 5e87609
1 parent da344a5
commit 5e87609
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/languageclient.rs b/src/languageclient.rs
@@ -559,8 +559,16 @@ impl ILanguageClient for Arc<Mutex<State>> {
         debug!("Begin apply WorkspaceEdit: {:?}", edit);
         let (filename, line, character): (String, u64, u64) =
             self.gather_args(&[VimVar::Filename, VimVar::Line, VimVar::Character], &None)?;
-        for (uri, edits) in &edit.changes {
-            self.apply_TextEdits(uri.path(), edits.as_slice())?;
+
+        if let Some(ref changes) = edit.document_changes {
+            for e in changes {
+                self.apply_TextEdits(e.text_document.uri.path(), &e.edits)?;
+            }
+        }
+        if let Some(ref changes) = edit.changes {
+            for (uri, edits) in changes {
+                self.apply_TextEdits(uri.path(), edits)?;
+            }
         }
         debug!("End apply WorkspaceEdit");
         self.goto_location(&filename, line, character)?;