Merge pull request #568 from renkun-ken/lintr-load-all

Provide package symbols before lint in diagnostics

Author: renkun-ken

NAMESPACE

@@ -1,6 +1,8 @@
 # Generated by roxygen2: do not edit by hand
 
 export(run)
+import(callr)
 import(xml2)
 importFrom(R6,R6Class)
+importFrom(parallel,detectCores)
 useDynLib(languageserver)

R/diagnostics.R

@@ -66,7 +66,7 @@ find_config <- function(filename) {
 #'
 #' Lint and diagnose problems in a file.
 #' @noRd
-diagnose_file <- function(uri, is_rmarkdown, content, cache = FALSE) {
+diagnose_file <- function(uri, content, is_rmarkdown = FALSE, globals = NULL, cache = FALSE) {
     if (length(content) == 0) {
         return(list())
     }
@@ -84,6 +84,12 @@ diagnose_file <- function(uri, is_rmarkdown, content, cache = FALSE) {
         content <- c(content, "")
     }
 
+    if (length(globals)) {
+        env_name <- "languageserver:globals"
+        attach(globals, name = env_name, warn.conflicts = FALSE)
+        on.exit(detach(env_name, character.only = TRUE))
+    }
+
     lints <- lintr::lint(path, cache = cache, text = content)
     diagnostics <- lapply(lints, diagnostic_from_lint, content = content)
     names(diagnostics) <- NULL
@@ -113,12 +119,30 @@ diagnostics_callback <- function(self, uri, version, diagnostics) {
 diagnostics_task <- function(self, uri, document, delay = 0) {
     version <- document$version
     content <- document$content
+
+    is_package <- is_package(self$rootPath)
+    globals <- NULL
+
+    if (is_package) {
+        globals <- new.env(parent = emptyenv())
+        for (doc in self$workspace$documents$values()) {
+            if (dirname(path_from_uri(doc$uri)) != file.path(self$rootPath, "R")) next
+            parse_data <- doc$parse_data
+            if (is.null(parse_data)) next
+            for (symbol in parse_data$nonfuncts) {
+                globals[[symbol]] <- NULL
+            }
+            list2env(parse_data$functions, globals)
+        }
+    }
+
     create_task(
         target = package_call(diagnose_file),
         args = list(
             uri = uri,
-            is_rmarkdown = document$is_rmarkdown,
             content = content,
+            is_rmarkdown = document$is_rmarkdown,
+            globals = globals,
             cache = lsp_settings$get("lint_cache")
         ),
         callback = function(result) diagnostics_callback(self, uri, version, result),

R/document.R

@@ -225,6 +225,8 @@ is_top_level <- function(arg_env, ...) {
     any(vapply(top_level_envs, identical, x = arg_env, FUN.VALUE = logical(1L)))
 }
 
+null_function <- local(function() NULL, baseenv())
+
 parser_hooks <- list(
     "{" = function(expr, action) {
         action$parse(as.list(expr)[-1L])
@@ -362,7 +364,9 @@ parse_expr <- function(content, expr, env, srcref = attr(expr, "srcref")) {
 
                     if (type == "function") {
                         env$functs <- c(env$functs, symbol)
-                        env$formals[[symbol]] <- value[[2L]]
+                        fun <- null_function
+                        formals(fun) <- value[[2L]]
+                        env$functions[[symbol]] <- fun
                         env$signatures[[symbol]] <- get_signature(symbol, value)
                     } else {
                         env$nonfuncts <- c(env$nonfuncts, symbol)
@@ -408,7 +412,7 @@ parse_document <- function(uri, content) {
             env$packages <- character()
             env$nonfuncts <- character()
             env$functs <- character()
-            env$formals <- list()
+            env$functions <- list()
             env$signatures <- list()
             env$definitions <- list()
             env$documentation <- list()

R/handlers-general.R

@@ -49,8 +49,7 @@ on_initialize <- function(self, id, params) {
 #' @noRd
 on_initialized <- function(self, params) {
     logger$info("on_initialized")
-    project_root <- self$rootPath
-    if (length(project_root) && is_package(project_root)) {
+    if (is_package(self$rootPath)) {
         # a bit like devtools::load_all()
         self$workspace$load_all(self)
         # TODO: result lint result of the package

R/handlers-workspace.R

@@ -43,7 +43,7 @@ workspace_did_change_watched_files <- function(self, params) {
     # Only non-open documents in a package should be handled here.
 
     project_root <- self$rootPath
-    if (length(project_root) && is_package(project_root)) {
+    if (is_package(project_root)) {
         source_dir <- file.path(project_root, "R")
         for (file_event in params$changes) {
             uri <- file_event$uri

R/languagebase.R

@@ -158,7 +158,6 @@ LanguageBase <- R6::R6Class("LanguageBase",
         },
 
         handle_notification = function(notification) {
-            # logger$info("receive notification: ", notification)
             method <- notification$method
             params <- notification$params
             if (method %in% names(self$notification_handlers)) {

R/languageserver.R

@@ -1,6 +1,7 @@
 #' @useDynLib languageserver
 #' @importFrom R6 R6Class
 #' @import xml2
+#' @importFrom parallel detectCores
 #' @details
 #' An implementation of the Language Server Protocol for R
 "_PACKAGE"

R/namespace.R

@@ -244,7 +244,7 @@ GlobalEnv <- R6::R6Class("GlobalEnv",
             for (doc in self$documents$values()) {
                 if (!is.null(doc$parse_data)) {
                     if (funct %in% doc$parse_data$functs) {
-                        return(doc$parse_data$formals[[funct]])
+                        return(formals(doc$parse_data$functions[[funct]]))
                     }
                 }
             }

R/session.R

@@ -1,5 +1,5 @@
 #' Single R Session for Session Pool
-#'
+#' @import callr
 #' @examples
 #' \dontrun{
 #' # create a session and bind to a session pool

R/utils.R

@@ -325,7 +325,7 @@ find_package <- function(path = getwd()) {
 #' @noRd
 is_package <- function(rootPath) {
     file <- file.path(rootPath, "DESCRIPTION")
-    file.exists(file) && !dir.exists(file)
+    length(file) && file.exists(file) && !dir.exists(file)
 }
 
 get_root_path_for_uri <- function(uri, rootPath) {