Add simple test for goto_definition()

Author: lionel-

crates/ark/src/lsp/definitions.rs

@@ -20,7 +20,7 @@ use crate::lsp::traits::node::NodeExt;
 use crate::lsp::traits::rope::RopeExt;
 use crate::treesitter::NodeTypeExt;
 
-pub unsafe fn goto_definition<'a>(
+pub fn goto_definition<'a>(
     document: &'a Document,
     params: GotoDefinitionParams,
 ) -> Result<Option<GotoDefinitionResponse>> {
@@ -75,3 +75,57 @@ pub unsafe fn goto_definition<'a>(
     let response = GotoDefinitionResponse::Link(vec![link]);
     Ok(Some(response))
 }
+
+#[cfg(test)]
+mod tests {
+    use std::path::PathBuf;
+
+    use assert_matches::assert_matches;
+    use tower_lsp::lsp_types;
+
+    use super::*;
+    use crate::lsp::documents::Document;
+    use crate::lsp::indexer;
+
+    #[test]
+    fn test_goto_definition() {
+        // Reset the indexer on exit
+        let _guard = indexer::IndexerGuard;
+
+        let code = r#"
+foo <- 42
+print(foo)
+"#;
+        let doc = Document::new(code, None);
+        let path = PathBuf::from("/foo/test.R");
+
+        indexer::update(&doc, &path).unwrap();
+
+        let params = GotoDefinitionParams {
+            text_document_position_params: lsp_types::TextDocumentPositionParams {
+                text_document: lsp_types::TextDocumentIdentifier {
+                    uri: Url::from_file_path(&path).unwrap(),
+                },
+                position: lsp_types::Position::new(2, 7),
+            },
+            work_done_progress_params: Default::default(),
+            partial_result_params: Default::default(),
+        };
+
+        assert_matches!(
+            goto_definition(&doc, params).unwrap(),
+            Some(GotoDefinitionResponse::Link(ref links)) => {
+                assert!(!links.is_empty());
+                assert_eq!(links[0].target_uri, Url::from_file_path(&path).unwrap());
+
+                assert_eq!(
+                    links[0].target_range,
+                    lsp_types::Range {
+                        start: lsp_types::Position::new(1, 0),
+                        end: lsp_types::Position::new(1, 3),
+                    }
+                );
+            }
+        );
+    }
+}

crates/ark/src/lsp/handlers.rs

@@ -289,7 +289,7 @@ pub(crate) fn handle_goto_definition(
     let document = state.get_document(uri)?;
 
     // build goto definition context
-    let result = unwrap!(unsafe { goto_definition(&document, params) }, Err(err) => {
+    let result = unwrap!(goto_definition(&document, params), Err(err) => {
         lsp::log_error!("{err:?}");
         return Ok(None);
     });

crates/ark/src/lsp/indexer.rs

@@ -164,6 +164,18 @@ pub(crate) fn indexer_clear() {
     index.clear();
 }
 
+/// RAII guard that clears `WORKSPACE_INDEX` when dropped.
+/// Useful for ensuring a clean index state in tests.
+#[cfg(test)]
+pub(crate) struct IndexerGuard;
+
+#[cfg(test)]
+impl Drop for IndexerGuard {
+    fn drop(&mut self) {
+        indexer_clear();
+    }
+}
+
 fn str_from_path(path: &Path) -> anyhow::Result<&str> {
     path.to_str().ok_or(anyhow!(
         "Couldn't convert path {} to string",

crates/ark/src/lsp/symbols.rs

@@ -586,6 +586,7 @@ mod tests {
     use crate::lsp::config::LspConfig;
     use crate::lsp::config::WorkspaceSymbolsConfig;
     use crate::lsp::documents::Document;
+    use crate::lsp::indexer::IndexerGuard;
 
     fn test_symbol(code: &str) -> Vec<DocumentSymbol> {
         let doc = Document::new(code, None);
@@ -900,6 +901,8 @@ a <- function() {
     #[test]
     fn test_workspace_symbols_include_comment_sections() {
         fn run(include_comment_sections: bool) -> Vec<String> {
+            let _guard = IndexerGuard;
+
             let code = "# Section ----\nfoo <- 1";
 
             let mut config = LspConfig::default();
@@ -921,7 +924,6 @@ a <- function() {
             let result = super::symbols(&params, &state).unwrap();
             let out = result.into_iter().map(|s| s.name).collect();
 
-            indexer::indexer_clear();
             out
         }