Merge pull request #703 from dmurdoch/patch-1

AshesITR · web-flow · commit 3dbf24d5c741 · 2020-12-31T13:10:48.000+01:00
Include "demo" directory in `lint_package`
diff --git a/NEWS.md b/NEWS.md
@@ -36,6 +36,7 @@
 * `unneeded_concatenation_linter` now correctly considers arguments piped in via magrittr `%>%` (#573, #585, @michaelquinn32)
 * Set the default `complexity_limit` in `cyclocomp_linter` to 15. This is the same complexity limit that is enforced via
   `default_linters` (#693, #695, @AshesITR).
+* `lint_package()` now lints files in the `demo` directory by default (#703, @dmurdoch).
 
 # lintr 2.0.1
 
diff --git a/R/lint.R b/R/lint.R
@@ -267,7 +267,7 @@ lint_package <- function(path = ".", relative_path = TRUE, ...,
     pattern = pattern
   )
 
-  lints <- lint_dir(file.path(path, c("R", "tests", "inst", "vignettes", "data-raw")),
+  lints <- lint_dir(file.path(path, c("R", "tests", "inst", "vignettes", "data-raw", "demo")),
                     relative_path = FALSE, exclusions = exclusions, parse_settings = FALSE, ...)
 
   if (isTRUE(relative_path)) {

Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ lint_package <- function(path = ".", relative_path = TRUE, ...,`
`267`	`267`	`pattern = pattern`
`268`	`268`	`)`
`269`	`269`
`270`		`- lints <- lint_dir(file.path(path, c("R", "tests", "inst", "vignettes", "data-raw")),`
	`270`	`+ lints <- lint_dir(file.path(path, c("R", "tests", "inst", "vignettes", "data-raw", "demo")),`
`271`	`271`	`relative_path = FALSE, exclusions = exclusions, parse_settings = FALSE, ...)`
`272`	`272`
`273`	`273`	`if (isTRUE(relative_path)) {`