Skip to content

Pass buffer to text= for clarity #1325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 3, 2025
Merged

Pass buffer to text= for clarity #1325

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b446eb
Pass buffer to text= for clarity
MichaelChirico Jul 29, 2025
8cf3fc7
don't re-read commandArgs
MichaelChirico Jul 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions lisp/ess-r-flymake.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
;; Flymake is the built-in Emacs package that supports on-the-fly
;; syntax checking. This file adds support for this in ess-r-mode by
;; relying on the lintr package, available on CRAN and currently
;; hosted at https://github.com/jimhester/lintr.
;; hosted at https://github.com/r-lib/lintr.

;;; Code:

Expand Down Expand Up @@ -76,28 +76,26 @@ each element is passed as argument to `lintr::linters_with_defaults'."
(defvar-local ess-r--flymake-proc nil)

(defvar-local ess-r--lintr-file nil
"Location of the .lintr file for this buffer.")
"Location of the .lintr config file for this buffer.")

(defvar ess-r--flymake-def-linter
(replace-regexp-in-string
"[\n\t ]+" " "
"esslint <- function(str, ...) {
if (!suppressWarnings(require(lintr, quietly=T))) {
if (!suppressWarnings(requireNamespace('lintr', quietly=TRUE))) {
cat('@@error: @@`lintr` package not installed')
} else if (packageVersion('lintr') <= '3.0.0') {
cat('@@error: @@Need `lintr` version > v3.0.0')
} else {
if (packageVersion('lintr') <= '3.0.0') {
cat('@@error: @@Need `lintr` version > v3.0.0')
} else {
tryCatch(lintr::lint(commandArgs(TRUE), ...),
error = function(e) {
cat('@@warning: @@', conditionMessage(e))
})
}
tryCatch(lintr::lint(text=str, ..., parse_settings=TRUE),
error = function(e) {
cat('@@warning: @@', conditionMessage(e))
})
}
};"))

(defun ess-r--find-lintr-file ()
"Return the absolute path to the .lintr file.
"Return the absolute path to the .lintr config file.
Check first the current directory, then the project root, then
the package root, then the user's home directory. Return nil if
we couldn't find a .lintr file."
Expand Down