Take updated VFS span type into account

From commit:
rust-dev-tools/rls-vfs@62ee1b9.

Author: Xanewok

Cargo.lock

@@ -14,7 +14,7 @@ use crate::actions::{FileWatch, InitActionContext, VersionOrdering};
 use crate::config::Config;
 use crate::Span;
 use log::{debug, trace, warn};
-use rls_vfs::{Change, SpanAtom};
+use rls_vfs::{Change, Span as VfsSpan, SpanLength as VfsSpanLength, Utf16CodeUnit};
 use serde::de::Error;
 use serde::Deserialize;
 use serde_json;
@@ -106,17 +106,16 @@ impl BlockingNotificationAction for DidChangeTextDocument {
             }
         }
 
-        let changes: Vec<Change> = params
+        // LSP sends UTF-16 code units based offsets and length
+        let changes: Vec<Change<Utf16CodeUnit>> = params
             .content_changes
             .iter()
             .map(|i| {
                 if let Some(range) = i.range {
                     let range = ls_util::range_to_rls(range);
                     Change::ReplaceText {
-                        // LSP uses UTF-16 code units based offsets and length
-                        atom: SpanAtom::Utf16CodeUnit,
-                        span: Span::from_range(range, file_path.clone()),
-                        len: i.range_length,
+                        span: VfsSpan::<Utf16CodeUnit>::from(Span::from_range(range, file_path.clone())),
+                        len: i.range_length.map(VfsSpanLength::from),
                         text: i.text.clone(),
                     }
                 } else {

src/actions/notifications.rs

@@ -1144,13 +1144,13 @@ fn cmd_format_utf16_range() {
     eprintln!("{:#?}", json);
 
     let result = json["result"].as_array().unwrap();
-    let newText: Vec<_> = result
+    let new_text: Vec<_> = result
         .into_iter()
         .map(|o| o["newText"].as_str().unwrap())
         .collect();
     // Actual formatting isn't important - what is, is that the buffer isn't
     // malformed and code stays semantically equivalent.
-    assert_eq!(newText, vec!["/* 😢😢😢😢😢😢😢 */\nfn main() {}\n"]);
+    assert_eq!(new_text, vec!["/* 😢😢😢😢😢😢😢 */\nfn main() {}\n"]);
 
     rls.shutdown(rls_timeout());
 }