Merge pull request #346 from renkun-ken/fix-hover-func-arg

Fix hover func arg

Author: renkun-ken

R/hover.R

@@ -49,7 +49,8 @@ hover_reply <- function(id, uri, workspace, document, point) {
                     all_defs <- xml_find_all(enclosing_scopes, xpath)
                     if (length(all_defs)) {
                         last_def <- all_defs[[length(all_defs)]]
-                        def_func <- xml_find_first(last_def, "expr[FUNCTION]")
+                        def_func <- xml_find_first(last_def,
+                            "self::expr[LEFT_ASSIGN | RIGHT_ASSIGN | EQ_ASSIGN]/expr[FUNCTION]")
                         if (length(def_func)) {
                             func_line1 <- as.integer(xml_attr(def_func, "line1"))
                             func_col1 <- as.integer(xml_attr(def_func, "col1"))

tests/testthat/test-hover.R

@@ -238,6 +238,36 @@ test_that("Hover on function argument works", {
     ))
 })
 
+test_that("Hover on user function with function argument works", {
+    skip_on_cran()
+    client <- language_client()
+
+    withr::local_tempfile(c("temp_file"), fileext = ".R")
+    writeLines(
+        c(
+            "test <- function(var1, var2 = function(x) x + 1) {",
+            "  var1",
+            "  var2",
+            "}"
+        ),
+        temp_file
+    )
+
+    client %>% did_save(temp_file)
+
+    result <- client %>% respond_hover(temp_file, c(1, 3))
+    expect_length(result$contents, 1)
+    expect_equal(result$contents[1], "```r\ntest <- function(var1, var2 = function(x) x + 1) {\n```")
+    expect_equal(result$range$start, list(line = 1, character = 2))
+    expect_equal(result$range$end, list(line = 1, character = 6))
+
+    result <- client %>% respond_hover(temp_file, c(2, 3))
+    expect_length(result$contents, 1)
+    expect_equal(result$contents[1], "```r\ntest <- function(var1, var2 = function(x) x + 1) {\n```")
+    expect_equal(result$range$start, list(line = 2, character = 2))
+    expect_equal(result$range$end, list(line = 2, character = 6))
+})
+
 test_that("Hover works with local function", {
     skip_on_cran()
     client <- language_client()