test(lsp): add more test cases for recent fixes

Author: blindFS

crates/nu-lsp/src/completion.rs

@@ -258,6 +258,17 @@ mod tests {
             "kind": 6
         }
     ]))]
+    #[case::local_variable("var.nu", (5, 10), None, serde_json::json!([
+        {
+            "label": "$bar",
+            "labelDetails": { "description": "variable" },
+            "textEdit": {
+                "newText": "$bar",
+                "range": { "start": { "character": 7, "line": 5 }, "end": { "character": 10, "line": 5 } }
+            },
+            "kind": 6
+        }
+    ]))]
     #[case::keyword("keyword.nu", (0, 2), None, serde_json::json!([
         {
             "label": "overlay",

crates/nu-lsp/src/goto.rs

@@ -97,7 +97,7 @@ impl LanguageServer {
 #[cfg(test)]
 mod tests {
     use crate::path_to_uri;
-    use crate::tests::{initialize_language_server, open_unchecked, result_from_message};
+    use crate::tests::{initialize_language_server, open, open_unchecked, result_from_message};
     use assert_json_diff::assert_json_eq;
     use lsp_server::{Connection, Message};
     use lsp_types::{
@@ -205,4 +205,39 @@ mod tests {
             );
         }
     }
+
+    #[rstest]
+    // https://github.com/nushell/nushell/issues/16539
+    fn goto_definition_in_new_file() {
+        let (client_connection, _recv) = initialize_language_server(None, None);
+
+        let mut script = fixtures();
+        script.push("lsp/no_such_file.nu");
+        let script = path_to_uri(&script);
+
+        let file_content = r#"def foo [] {}; foo"#;
+        let _ = open(
+            &client_connection,
+            script.clone(),
+            Some(file_content.into()),
+        );
+        let resp = send_goto_definition_request(
+            &client_connection,
+            script.clone(),
+            0,
+            file_content.len() as u32 - 1,
+        );
+        let result = result_from_message(resp);
+
+        assert_json_eq!(
+            result,
+            serde_json::json!({
+                "uri": script,
+                "range": {
+                    "start": { "line": 0, "character": 11 },
+                    "end": { "line": 0, "character": 13 }
+                }
+            })
+        );
+    }
 }

crates/nu-lsp/src/lib.rs

@@ -576,14 +576,17 @@ mod tests {
         client_connection: &Connection,
         uri: Uri,
     ) -> lsp_server::Notification {
-        open(client_connection, uri).unwrap()
+        open(client_connection, uri, None).unwrap()
     }
 
     pub(crate) fn open(
         client_connection: &Connection,
         uri: Uri,
+        new_text: Option<String>,
     ) -> Result<lsp_server::Notification, String> {
-        let text = std::fs::read_to_string(uri_to_path(&uri)).map_err(|e| e.to_string())?;
+        let text = new_text
+            .or_else(|| std::fs::read_to_string(uri_to_path(&uri)).ok())
+            .ok_or("Failed to read file.")?;
 
         client_connection
             .sender

crates/nu-lsp/src/notification.rs

@@ -136,8 +136,7 @@ impl LanguageServer {
 mod tests {
     use crate::path_to_uri;
     use crate::tests::{
-        initialize_language_server, open, open_unchecked, result_from_message, send_hover_request,
-        update,
+        initialize_language_server, open_unchecked, result_from_message, send_hover_request, update,
     };
     use assert_json_diff::assert_json_eq;
     use lsp_types::Range;
@@ -195,8 +194,6 @@ hello"#,
         script.push("lsp/notifications/issue_11522.nu");
         let script = path_to_uri(&script);
 
-        let result = open(&client_connection, script);
-
-        assert_eq!(result.map(|_| ()), Ok(()))
+        open_unchecked(&client_connection, script);
     }
 }

crates/nu-lsp/src/workspace.rs

@@ -543,7 +543,7 @@ impl LanguageServer {
 #[cfg(test)]
 mod tests {
     use crate::path_to_uri;
-    use crate::tests::{initialize_language_server, open_unchecked, send_hover_request};
+    use crate::tests::{initialize_language_server, open, open_unchecked, send_hover_request};
     use assert_json_diff::assert_json_eq;
     use lsp_server::{Connection, Message};
     use lsp_types::{
@@ -761,28 +761,41 @@ mod tests {
 
     #[rstest]
     #[case::command_reference(
-        "foo.nu", (0, 12),
+        "foo.nu", (0, 12), true,
         vec![make_location_ref("bar", 4, 2, 4, 7), make_location_ref("foo", 0, 11, 0, 16)],
     )]
+    #[case::single_file_without_workspace_folder_param(
+        "foo.nu", (0, 12), false,
+        vec![make_location_ref("foo", 0, 11, 0, 16)],
+    )]
+    #[case::new_file(
+        "no_such_file.nu", (0, 5), true,
+        vec![make_location_ref("no_such_file", 0, 4, 0, 7)],
+    )]
+    #[case::new_file_without_workspace_folder_param(
+        "no_such_file.nu", (0, 5), false,
+        vec![make_location_ref("no_such_file", 0, 4, 0, 7)],
+    )]
     #[case::quoted_command_reference(
-        "bar.nu", (0, 23),
+        "bar.nu", (0, 23), true,
         vec![make_location_ref("bar", 5, 4, 5, 11), make_location_ref("foo", 6, 13, 6, 20)],
     )]
     #[case::module_path_reference(
-        "baz.nu", (0, 12),
+        "baz.nu", (0, 12), true,
         vec![make_location_ref("bar", 0, 4, 0, 12), make_location_ref("baz", 6, 4, 6, 12)],
     )]
     fn reference_in_workspace(
         #[case] main_file: &str,
         #[case] cursor_position: (u32, u32),
+        #[case] with_workspace_folder: bool,
         #[case] expected_refs: Vec<serde_json::Value>,
     ) {
         let mut script = fixtures();
         script.push("lsp/workspace");
         let (client_connection, _recv) = initialize_language_server(
             None,
             serde_json::to_value(InitializeParams {
-                workspace_folders: Some(vec![WorkspaceFolder {
+                workspace_folders: with_workspace_folder.then_some(vec![WorkspaceFolder {
                     uri: path_to_uri(&script),
                     name: "random name".to_string(),
                 }]),
@@ -791,11 +804,24 @@ mod tests {
             .ok(),
         );
         script.push(main_file);
+        let file_exists = script.is_file();
         let script = path_to_uri(&script);
 
-        open_unchecked(&client_connection, script.clone());
+        if file_exists {
+            open_unchecked(&client_connection, script.clone());
+        } else {
+            let _ = open(
+                &client_connection,
+                script.clone(),
+                Some("def foo [] {}".into()),
+            );
+        }
 
-        let message_num = 6;
+        let message_num = if with_workspace_folder {
+            if file_exists { 6 } else { 7 }
+        } else {
+            1
+        };
         let (line, character) = cursor_position;
         let messages = send_reference_request(
             &client_connection,

tests/fixtures/lsp/completion/var.nu

@@ -1,3 +1,7 @@
 let greeting = "Hello"
 
 echo $gre
+
+def foo [bar: int] {
+  echo $ba
+}