-
Notifications
You must be signed in to change notification settings - Fork 195
Ignore multi-line string contents optionally in line_length_linter #2799
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.
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
base: main
Are you sure you want to change the base?
Changes from 3 commits
98ebda0
1478a4c
75052f4
cdcadd8
08856b1
b44c55a
39627ce
e9018ec
314dd8b
ff20158
744f09e
844c4e7
2ac86a8
4c0a210
eaf77c1
a80c6e9
b7ff1e3
f925a78
72f53bb
e8a50af
32d6266
7f3a029
69e1fd8
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -2,7 +2,10 @@ | |||||
| #' | ||||||
| #' Check that the line length of both comments and code is less than `length`. | ||||||
| #' | ||||||
| #' @param length maximum line length allowed. Default is 80L (Hollerith limit). | ||||||
| #' @param length Maximum line length allowed. Default is `80L` (Hollerith limit). | ||||||
| #' @param ignore_string_bodies Logical, default `FALSE`. If `TRUE`, the contents | ||||||
| #' of string literals are ignored. The quotes themselves are included, so this | ||||||
| #' mainly affects wide multiline strings, e.g. SQL queries. | ||||||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
? Looking at the code, this seems clearer & more precise. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Added a new example related to this -- what I'm trying to convey is mainly that the closing quote counts towards the line length where it's found. The less common case is that the opening lint("string <- '\n too long\n'", line_length_linter(10, ignore_string_bodies=TRUE))
# <text>:1:11: style: [line_length_linter] Lines should not be more than 10 characters. This line is 11 characters.
# string <- '
# ~~~~~~~~~~^
MichaelChirico marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
| #' | ||||||
| #' @examples | ||||||
| #' # will produce lints | ||||||
|
|
@@ -22,14 +25,20 @@ | |||||
| #' - [linters] for a complete list of linters available in lintr. | ||||||
| #' - <https://style.tidyverse.org/syntax.html#long-lines> | ||||||
| #' @export | ||||||
| line_length_linter <- function(length = 80L) { | ||||||
| line_length_linter <- function(length = 80L, ignore_string_bodies = FALSE) { | ||||||
| general_msg <- paste("Lines should not be more than", length, "characters.") | ||||||
|
|
||||||
| Linter(linter_level = "file", function(source_expression) { | ||||||
| # Only go over complete file | ||||||
| line_lengths <- nchar(source_expression$file_lines) | ||||||
| line_lengths <- as.integer(nchar(source_expression$file_lines)) | ||||||
MichaelChirico marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
MichaelChirico marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||||||
| long_lines <- which(line_lengths > length) | ||||||
|
|
||||||
| if (ignore_string_bodies) { | ||||||
| in_string_body_idx <- | ||||||
| is_in_string_body(source_expression$full_parsed_content, length, long_lines) | ||||||
| long_lines <- long_lines[!in_string_body_idx] | ||||||
| } | ||||||
|
|
||||||
| Map( | ||||||
| function(long_line, line_length) { | ||||||
| Lint( | ||||||
|
|
@@ -47,3 +56,39 @@ line_length_linter <- function(length = 80L) { | |||||
| ) | ||||||
| }) | ||||||
| } | ||||||
|
|
||||||
| is_in_string_body <- function(parse_data, max_length, long_idx) { | ||||||
| str_idx <- parse_data$token == "STR_CONST" | ||||||
| if (!any(str_idx)) { | ||||||
| return(rep(FALSE, length(long_idx))) | ||||||
AshesITR marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
| } | ||||||
| str_data <- parse_data[str_idx, ] | ||||||
| if (all(str_data$line1 == str_data$line2)) { | ||||||
| return(rep(FALSE, length(long_idx))) | ||||||
AshesITR marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
| } | ||||||
| # right delimiter just ends at 'col2', but 'col1' takes some sleuthing | ||||||
| str_data$line1_width <- nchar(vapply( | ||||||
| strsplit(str_data$text, "\n", fixed = TRUE), | ||||||
| function(x) x[1L], | ||||||
| FUN.VALUE = character(1L), | ||||||
| USE.NAMES = FALSE | ||||||
| )) | ||||||
| str_data$col1_end <- str_data$col1 + str_data$line1_width | ||||||
| vapply( | ||||||
| long_idx, | ||||||
| function(line) { | ||||||
| # strictly inside a multi-line string body | ||||||
| if (any(str_data$line1 < line & str_data$line2 > line)) { | ||||||
| return(TRUE) | ||||||
| } | ||||||
| on_line1_idx <- str_data$line1 == line | ||||||
| if (any(on_line1_idx)) { | ||||||
| return(max(str_data$col1_end[on_line1_idx]) <= max_length) | ||||||
| } | ||||||
| # use parse data to capture possible trailing expressions on this line | ||||||
| on_line2_idx <- parse_data$line2 == line | ||||||
| any(on_line2_idx) && max(parse_data$col2[on_line2_idx]) <= max_length | ||||||
| }, | ||||||
| logical(1L) | ||||||
| ) | ||||||
| } | ||||||
MichaelChirico marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Uh oh!
There was an error while loading. Please reload this page.