Merge branch 'main' into routine

Author: IndrajeetPatil

DESCRIPTION

@@ -29,7 +29,6 @@ Imports:
     cyclocomp,
     digest,
     glue,
-    jsonlite,
     knitr,
     rex,
     stats,
@@ -39,6 +38,7 @@ Imports:
 Suggests:
     bookdown,
     httr (>= 1.2.1),
+    jsonlite,
     mockery,
     patrick,
     pkgdown,

R/comments.R

@@ -86,6 +86,9 @@ github_comment <- function(text, info = NULL, token = settings$comment_token) {
   if (!requireNamespace("httr", quietly = TRUE)) {
     stop("Package 'httr' is required to post comments with github_comment().")
   }
+  if (!requireNamespace("jsonlite", quietly = TRUE)) {
+    stop("Package 'jsonlite' is required to post comments with github_comment().")
+  }
 
   if (is.null(info)) {
     info <- ci_build_info()

R/lint.R

@@ -569,6 +569,9 @@ checkstyle_output <- function(lints, filename = "lintr_results.xml") {
 #' @param filename the name of the output report
 #' @export
 sarif_output <- function(lints, filename = "lintr_results.sarif") {
+  if (!requireNamespace("jsonlite", quietly = TRUE)) {
+    stop("'jsonlite' is required to produce SARIF reports, please install to continue.")
+  }
 
   # package path will be `NULL` unless it is a relative path
   package_path <- attr(lints, "path")
@@ -716,8 +719,7 @@ sarif_output <- function(lints, filename = "lintr_results.sarif") {
       append(sarif$runs[[1L]]$results, list(one_result))
   }
 
-  write(jsonlite::toJSON(sarif, pretty = TRUE, auto_unbox = TRUE),
-        filename)
+  write(jsonlite::toJSON(sarif, pretty = TRUE, auto_unbox = TRUE), filename)
 }
 
 highlight_string <- function(message, column_number = NULL, ranges = NULL) {

tests/testthat/test-sarif_output.R

@@ -1,3 +1,5 @@
+skip_if_not_installed("jsonlite")
+
 test_that("`sarif_output` produces expected error", {
   l <- lint(text = "x = 1", linters = assignment_linter())
   expect_error(sarif_output(l), "Package path needs to be a relative path", fixed = TRUE)