factor out test_go_to_def

Summary:
simplification: will be used in a future diff.

- requests is still fairly confusing - open to feedback. making it a map might make it harder to use so I'm keeping it like this for now

Reviewed By: SamChou19815

Differential Revision: D75471774

fbshipit-source-id: b9b8b370213f6975b9509a35876b38238288a935

Author: kinto0

pyrefly/lib/test/lsp/lsp_interaction.rs

@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+use std::iter::once;
+
 use lsp_server::Message;
 use lsp_server::Notification;
 use lsp_server::Request;
@@ -66,112 +68,88 @@ fn test_initialize_with_python_path() {
     });
 }
 
-fn test_go_to_def(root: &TempDir, workspace_folders: Option<Vec<(String, Url)>>) {
+fn test_go_to_def(
+    root: &TempDir,
+    workspace_folders: Option<Vec<(String, Url)>>,
+    // request file name, relative to root
+    request_file_name: &str,
+    // (line, character, response_file_name (relative to root), response_line_start, response_character_start, response_line_end, response_character_end)
+    requests: Vec<(u32, u32, String, u32, u32, u32, u32)>,
+) {
     run_test_lsp(TestCase {
-        messages_from_language_client: vec![
-            Message::from(build_did_open_notification(root.path().join("foo.py"))),
-            Message::from(Request {
-                id: RequestId::from(2),
-                method: "textDocument/definition".to_owned(),
-                params: serde_json::json!({
-                    "textDocument": {
-                        "uri": Url::from_file_path(root.path().join("foo.py")).unwrap().to_string()
-                    },
-                    "position": {
-                        "line": 6,
-                        "character": 16
-                    }
-                }),
-            }),
-            Message::from(Request {
-                id: RequestId::from(3),
-                method: "textDocument/definition".to_owned(),
-                params: serde_json::json!({
-                    "textDocument": {
-                        "uri": Url::from_file_path(root.path().join("foo.py")).unwrap().to_string()
-                    },
-                    "position": {
-                        "line": 8,
-                        "character": 9
-                    }
-                }),
-            }),
-            Message::from(Request {
-                id: RequestId::from(4),
-                method: "textDocument/definition".to_owned(),
-                params: serde_json::json!({
-                    "textDocument": {
-                        "uri": Url::from_file_path(root.path().join("foo.py")).unwrap().to_string()
-                    },
-                    "position": {
-                        "line": 9,
-                        "character": 7
-                    }
-                }),
-            }),
-        ],
-        expected_messages_from_language_server: vec![
-            Message::Response(Response {
-                id: RequestId::from(2),
-                result: Some(serde_json::json!({
-                    "uri": Url::from_file_path(root.path().join("bar.py")).unwrap().to_string(),
-                    "range": {
-                        "start": {
-                            "line": 6,
-                            "character": 6
+        messages_from_language_client: once(Message::from(build_did_open_notification(
+                root.path().join(request_file_name),
+        ))).chain(
+            requests.iter().enumerate().map(
+                |(i, (request_line, request_character, _response_file_name, _response_line_start, _response_character_start, _response_line_end, _response_character_end))| {
+                Message::from(Request {
+                    id: RequestId::from((2 + i) as i32),
+                    method: "textDocument/definition".to_owned(),
+                    params: serde_json::json!({
+                        "textDocument": {
+                            "uri": Url::from_file_path(root.path().join(request_file_name)).unwrap().to_string()
                         },
-                        "end": {
-                            "line": 6,
-                            "character": 9
+                        "position": {
+                            "line": request_line,
+                            "character": request_character
                         }
-                    }
-                })),
-                error: None,
-            }),
-            Message::Response(Response {
-                id: RequestId::from(3),
-                result: Some(serde_json::json!({
-                    "uri": Url::from_file_path(root.path().join("bar.py")).unwrap().to_string(),
-                    "range": {
-                        "start": {
-                            "line": 7,
-                            "character": 4
-                        },
-                        "end": {
-                            "line": 7,
-                            "character": 7
-                        }
-                    }
-                })),
-                error: None,
-            }),
-            Message::Response(Response {
-                id: RequestId::from(4),
-                result: Some(serde_json::json!({
-                    "uri": Url::from_file_path(root.path().join("bar.py")).unwrap().to_string(),
-                    "range": {
-                        "start": {
-                            "line": 6,
-                            "character": 6
-                        },
-                        "end": {
-                            "line": 6,
-                            "character": 9
+                    }),
+                })
+            })).collect(),
+        expected_messages_from_language_server: requests.iter().enumerate().map(
+            |(
+                i,
+                (
+                    _request_line,
+                    _request_character,
+                    response_file_name,
+                    response_line_start,
+                    response_character_start,
+                    response_line_end,
+                    response_character_end,
+                ),
+            )| {
+                Message::Response(Response {
+                    id: RequestId::from((2 + i) as i32),
+                    result: Some(serde_json::json!({
+                        "uri": Url::from_file_path(root.path().join(response_file_name)).unwrap().to_string(),
+                        "range": {
+                            "start": {
+                                "line": response_line_start,
+                                "character": response_character_start
+                            },
+                            "end": {
+                                "line": response_line_end,
+                                "character": response_character_end
+                            }
                         }
-                    }
-                })),
-                error: None,
-            }),
-        ],
+                    })),
+                    error: None,
+                })
+            },
+        ).collect(),
         workspace_folders,
         ..Default::default()
     });
 }
 
+fn test_go_to_def_basic(root: &TempDir, workspace_folders: Option<Vec<(String, Url)>>) {
+    test_go_to_def(
+        root,
+        workspace_folders,
+        "foo.py",
+        vec![
+            (6, 16, "bar.py".to_owned(), 6, 6, 6, 9),
+            (8, 9, "bar.py".to_owned(), 7, 4, 7, 7),
+            (9, 7, "bar.py".to_owned(), 6, 6, 6, 9),
+        ],
+    );
+}
+
 #[test]
 fn test_go_to_def_single_root() {
     let root = get_test_files_root();
-    test_go_to_def(
+    test_go_to_def_basic(
         &root,
         Some(vec![(
             "test".to_owned(),
@@ -183,19 +161,19 @@ fn test_go_to_def_single_root() {
 #[test]
 fn test_go_to_def_no_root() {
     let root = get_test_files_root();
-    test_go_to_def(&root, Some(vec![]));
+    test_go_to_def_basic(&root, Some(vec![]));
 }
 
 #[test]
 fn test_go_to_def_no_root_uses_upwards_search() {
     let root = get_test_files_root();
-    test_go_to_def(&root, Some(vec![]));
+    test_go_to_def_basic(&root, Some(vec![]));
 }
 
 #[test]
 fn test_go_to_def_no_folder_capability() {
     let root = get_test_files_root();
-    test_go_to_def(&root, None);
+    test_go_to_def_basic(&root, None);
 }
 
 #[test]