Fix data.frame.lints issue

Author: fangly

NEWS.md

@@ -25,9 +25,9 @@
   and do not consider "-" an R operator to avoid too many false positives.
 * Fixed object linters to only lint objects declared in the current file 
   (#76, #108, #136, #191, #194, #201, @fangly).
-* Fixed cache not saved in the requested directory (#213, @fangly)
 * Fixed expect_lint() issues (#180, #211, @fangly): markers were displayed when
   check was NULL, some error messages were malformed.
+* Fixed Lint() / as.data.frame() error (#179, @fangly).
 * Do not error with inline \\Sexpr (#127).
 * Do not error with '<% %>' constructs (#185).
 * Allow closing parenthesis or comma after closing curly brace (#167, @Enchufa2)
@@ -37,6 +37,7 @@
   https://github.com/MangoTheCat/xmlparsedata package (#154, @gaborcsardi)
 * lintr does not need the igraph package any more (#152, @gaborcsardi)
 * Fixed lint_package bug where cache was not caching (#146, @schloerke)
+* Fixed cache not saved in a directory other than requested (#213, @fangly)
 * Commas linter handles missing arguments calls properly (#145)
 
 # lintr 1.0.0 #

R/lint.R

@@ -217,17 +217,17 @@ pkg_name <- function(path = find_package()) {
 #' @param ranges ranges on the line that should be emphasized.
 #' @param linter name of linter that created the Lint object.
 #' @export
-Lint <- function(filename, line_number = 1L, column_number = NULL,
+Lint <- function(filename, line_number = 1L, column_number = 1L,
   type = c("style", "warning", "error"),
-  message = "", line = "", ranges = NULL, linter = NULL) {
+  message = "", line = "", ranges = NULL, linter = "") {
 
   type <- match.arg(type)
 
   structure(
     list(
       filename = filename,
       line_number = as.integer(line_number),
-      column_number = as.integer(column_number) %||% 1L,
+      column_number = as.integer(column_number),
       type = type,
       message = message,
       line = line,

man/Lint.Rd

@@ -1,12 +1,12 @@
-% Generated by roxygen2: do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/lint.R
 \name{Lint}
 \alias{Lint}
 \title{Create a \code{Lint} object}
 \usage{
-Lint(filename, line_number = 1L, column_number = NULL, type = c("style",
+Lint(filename, line_number = 1L, column_number = 1L, type = c("style",
   "warning", "error"), message = "", line = "", ranges = NULL,
-  linter = NULL)
+  linter = "")
 }
 \arguments{
 \item{filename}{path to the source file that was linted.}

tests/testthat/test-methods.R

@@ -17,3 +17,50 @@ test_that("it returns the input trimmed to the last full lint if one exists with
 
   expect_equal(trim_output(t1, max = 2000), substr(t1, 1, 1930))
 })
+
+test_that("as.data.frame.lints", {
+  # A minimum lint 
+  expect_is(
+    l1 <- Lint("dummy.R",
+         line_number = 1L,
+         type = "style",
+         message = "",
+         line = ""),
+    "lint"
+  )
+    
+  # A larger lint
+  expect_is(
+    l2 <- Lint("dummy.R",
+              line_number = 2L,
+              column_number = 6L,
+              type = "error",
+              message = "Under no circumstances is the use of foobar allowed.",
+              line = "a <- 1",
+              ranges = list(c(1, 2), c(10, 20)),
+              linter = "custom_linter"),
+    "lint"
+  )
+  
+  # Convert lints to data.frame
+  lints <- structure(list(l1, l2), class = "lints")
+  expect_is(
+    df <- as.data.frame.lints(lints),
+    "data.frame"
+  )
+
+  exp <- data.frame(
+    filename = rep("dummy.R", 2),
+    line_number = c(1, 2),
+    column_number = c(1, 6),
+    type = c("style", "error"),
+    message = c("", "Under no circumstances is the use of foobar allowed."),
+    line = c("", "a <- 1"),
+    linter = c("", "custom_linter"),
+    stringsAsFactors = FALSE)
+  
+  expect_equal(
+    df,
+    exp
+  )  
+})