refactor(lsp): duplicated testing code cleanup

Author: blindFS

Cargo.lock

@@ -34,6 +34,7 @@ nu-std = { path = "../nu-std", version = "0.107.1" }
 nu-test-support = { path = "../nu-test-support", version = "0.107.1" }
 
 assert-json-diff = "2.0"
+rstest = { workspace = true, default-features = false }
 
 [lints]
 workspace = true

crates/nu-lsp/Cargo.toml

@@ -64,96 +64,57 @@ mod tests {
     use crate::tests::{initialize_language_server, open_unchecked, update};
     use assert_json_diff::assert_json_eq;
     use nu_test_support::fs::fixtures;
-
-    #[test]
-    fn publish_diagnostics_variable_does_not_exists() {
+    use rstest::rstest;
+
+    #[rstest]
+    #[case::file_with_no_issues("pwd.nu", None, None, serde_json::json!([]))]
+    #[case::file_fixed_by_update("var.nu", Some("$env"), Some(lsp_types::Range {
+        start: lsp_types::Position { line: 0, character: 6 },
+        end: lsp_types::Position { line: 0, character: 30 },
+    }), serde_json::json!([]))]
+    #[case::variable_does_not_exist("var.nu", None, None, serde_json::json!([{
+        "range": {
+            "start": { "line": 0, "character": 6 },
+            "end": { "line": 0, "character": 30 }
+        },
+        "message": "Variable not found.",
+        "severity": 1
+    }]))]
+    fn publish_diagnostics(
+        #[case] filename: &str,
+        #[case] update_text: Option<&str>,
+        #[case] update_range: Option<lsp_types::Range>,
+        #[case] expected_diagnostics: serde_json::Value,
+    ) {
         let (client_connection, _recv) = initialize_language_server(None, None);
 
         let mut script = fixtures();
         script.push("lsp");
         script.push("diagnostics");
-        script.push("var.nu");
+        script.push(filename);
         let script = path_to_uri(&script);
 
-        let notification = open_unchecked(&client_connection, script.clone());
-
-        assert_json_eq!(
-            notification,
-            serde_json::json!({
-                "method": "textDocument/publishDiagnostics",
-                "params": {
-                    "uri": script,
-                    "diagnostics": [{
-                        "range": {
-                            "start": { "line": 0, "character": 6 },
-                            "end": { "line": 0, "character": 30 }
-                        },
-                        "message": "Variable not found.",
-                        "severity": 1
-                    }]
-                }
-            })
-        );
-    }
-
-    #[test]
-    fn publish_diagnostics_fixed_unknown_variable() {
-        let (client_connection, _recv) = initialize_language_server(None, None);
-
-        let mut script = fixtures();
-        script.push("lsp");
-        script.push("diagnostics");
-        script.push("var.nu");
-        let script = path_to_uri(&script);
-
-        open_unchecked(&client_connection, script.clone());
-        let notification = update(
-            &client_connection,
-            script.clone(),
-            String::from("$env"),
-            Some(lsp_types::Range {
-                start: lsp_types::Position {
-                    line: 0,
-                    character: 6,
-                },
-                end: lsp_types::Position {
-                    line: 0,
-                    character: 30,
-                },
-            }),
-        );
-
-        assert_json_eq!(
-            notification,
-            serde_json::json!({
-                "method": "textDocument/publishDiagnostics",
-                "params": {
-                    "uri": script,
-                    "diagnostics": []
-                }
-            })
-        );
-    }
-
-    #[test]
-    fn publish_diagnostics_none() {
-        let (client_connection, _recv) = initialize_language_server(None, None);
-
-        let mut script = fixtures();
-        script.push("lsp");
-        script.push("diagnostics");
-        script.push("pwd.nu");
-        let script = path_to_uri(&script);
-
-        let notification = open_unchecked(&client_connection, script.clone());
+        // For files that need fixing, open first then update
+        let notification = if let (Some(text), Some(range)) = (update_text, update_range) {
+            open_unchecked(&client_connection, script.clone());
+            update(
+                &client_connection,
+                script.clone(),
+                String::from(text),
+                Some(range),
+            )
+        } else {
+            // For files with no issues, just open
+            open_unchecked(&client_connection, script.clone())
+        };
 
         assert_json_eq!(
             notification,
             serde_json::json!({
                 "method": "textDocument/publishDiagnostics",
                 "params": {
                     "uri": script,
-                    "diagnostics": []
+                    "diagnostics": expected_diagnostics
                 }
             })
         );