Translate format_utf16_range

Author: Xanewok

tests/client.rs

@@ -926,3 +926,47 @@ fn client_handle_utf16_unit_text_edits() {
 
     rls.shutdown();
 }
+
+/// Ensures that wide characters do not prevent RLS from calculating correct
+/// 'whole file' LSP range.
+#[test]
+fn client_format_utf16_range() {
+    let p = project("client_format_utf16_range")
+        .file(
+            "Cargo.toml",
+            r#"[package]
+            name = "client_format_utf16_range"
+            version = "0.1.0"
+            authors = ["example@example.com"]
+            "#,
+        )
+        .file("src/main.rs", "/* 😢😢😢😢😢😢😢 */ fn main() { }")
+        .build();
+    let root_path = p.root();
+    let mut rls = p.spawn_rls_async();
+
+    rls.request::<Initialize>(0, initialize_params(root_path));
+
+    rls.wait_for_indexing();
+
+    let result = rls.request::<Formatting>(66, DocumentFormattingParams {
+        text_document: TextDocumentIdentifier {
+            uri: Url::from_file_path(p.root().join("src/main.rs")).unwrap(),
+        },
+        options: FormattingOptions {
+            tab_size: 4,
+            insert_spaces: true,
+            properties: Default::default(),
+        }
+    });
+
+    let new_text: Vec<_> = result.unwrap()
+        .iter()
+        .map(|edit| edit.new_text.as_str().replace('\r', ""))
+        .collect();
+    // Actual formatting isn't important - what is, is that the buffer isn't
+    // malformed and code stays semantically equivalent.
+    assert_eq!(new_text, vec!["/* 😢😢😢😢😢😢😢 */\nfn main() {}\n"]);
+
+    rls.shutdown();
+}

tests/tests.rs

@@ -12,69 +12,6 @@ use self::support::{fixtures_dir, rls_timeout};
 #[allow(dead_code)]
 mod support;
 
-/// Ensures that wide characters do not prevent RLS from calculating correct
-/// 'whole file' LSP range.
-#[test]
-fn cmd_format_utf16_range() {
-    let project = project("cmd_format_utf16_range")
-        .file(
-            "Cargo.toml",
-            r#"[package]
-            name = "cmd_format_utf16_range"
-            version = "0.1.0"
-            authors = ["example@example.com"]
-            "#,
-        )
-        .file("src/main.rs", "/* 😢😢😢😢😢😢😢 */ fn main() { }")
-        .build();
-    let root_path = project.root();
-    let mut rls = project.spawn_rls();
-
-    rls.request(
-        0,
-        "initialize",
-        Some(json!({
-            "rootPath": root_path,
-            "capabilities": {}
-        })),
-    )
-    .unwrap();
-
-    rls.wait_until_done_indexing(rls_timeout());
-
-    let request_id = 66;
-    rls.request(
-        request_id,
-        "textDocument/formatting",
-        Some(json!(
-        {
-            "textDocument": {
-                "uri": format!("file://{}/src/main.rs", root_path.display()),
-                "version": 1
-            },
-            "options": {
-                "tabSize": 4,
-                "insertSpaces": true
-            }
-        }))
-    ).unwrap();
-
-    let json = rls.wait_until_json_id(request_id, rls_timeout());
-    eprintln!("{:#?}", json);
-
-    let result = json["result"].as_array().unwrap();
-    let new_text: Vec<_> = result
-        .iter()
-        .map(|o| o["newText"].as_str().unwrap())
-        .map(|text| text.replace('\r', ""))
-        .collect();
-    // Actual formatting isn't important - what is, is that the buffer isn't
-    // malformed and code stays semantically equivalent.
-    assert_eq!(new_text, vec!["/* 😢😢😢😢😢😢😢 */\nfn main() {}\n"]);
-
-    rls.shutdown(rls_timeout());
-}
-
 #[test]
 fn cmd_lens_run() {
     let p = ProjectBuilder::try_from_fixture(fixtures_dir().join("lens_run"))