Allow users to set lintr.linter_file

jabranham · jabranham · commit c11fdc16fceb · 2018-07-24T16:00:29.000-05:00
This lets users specify the location of the linter file with options(lintr.linter_file) before calling lintr::lint(). This should be useful to allow the various plugins to specify the path to the .lintr file Related to r-lib#123 and r-lib#335
diff --git a/R/settings.R b/R/settings.R
@@ -56,6 +56,9 @@ find_config <- function(filename) {
   }
   linter_file <- getOption("lintr.linter_file")
 
+  ## if users changed lintr.linter_file, return immediately.
+  if (".lintr" != linter_file) return(linter_file)
+
   path <- if (is_directory(filename)) {
     filename
   } else {

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,9 @@ find_config <- function(filename) {`
`56`	`56`	`}`
`57`	`57`	`linter_file <- getOption("lintr.linter_file")`
`58`	`58`
	`59`	`+ ## if users changed lintr.linter_file, return immediately.`
	`60`	`+ if (".lintr" != linter_file) return(linter_file)`
	`61`	`+`
`59`	`62`	`path <- if (is_directory(filename)) {`
`60`	`63`	`filename`
`61`	`64`	`} else {`