Skip to content

Use more efficient match() alternative #1001

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
IndrajeetPatil merged 5 commits into from
Sep 14, 2022
Merged

Use more efficient match() alternative #1001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c9e1319
start with a couple
IndrajeetPatil Sep 13, 2022
0d175d4
Update indent.R
IndrajeetPatil Sep 13, 2022
64e73a7
Merge branch 'main' into replace_match_with_all
IndrajeetPatil Sep 14, 2022
cabda14
Update rules-line-breaks.R
IndrajeetPatil Sep 14, 2022
c7969fd
Update rules-line-breaks.R
IndrajeetPatil Sep 14, 2022
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
8 changes: 3 additions & 5 deletions R/detect-alignment-utils.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,14 +111,12 @@ alignment_ensure_trailing_comma <- function(pd_by_line) {
#' @keywords internal
alignment_col1_all_named <- function(relevant_pd_by_line) {
map_lgl(relevant_pd_by_line, function(x) {
if (nrow(x) < 3) {
if (nrow(x) < 3L) {
return(FALSE)
}
x$token[3] == "expr" &&
x$token[1] %in% c("SYMBOL_SUB", "STR_CONST", "SYMBOL_FORMALS") &&
x$token[2] %in% c(
"EQ_SUB", "EQ_FORMALS", "SPECIAL-IN", "LT", "GT", "EQ", "NE"
)
any(c("SYMBOL_SUB", "STR_CONST", "SYMBOL_FORMALS") == x$token[1]) &&
any(c("EQ_SUB", "EQ_FORMALS", "SPECIAL-IN", "LT", "GT", "EQ", "NE") == x$token[2])
}) %>%
all()
}
Expand Down
2 changes: 1 addition & 1 deletion R/indent.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ indent_without_paren_for_while_fun <- function(pd, indent_by) {
#' @keywords internal
indent_without_paren_if_else <- function(pd, indent_by) {
expr_after_if <- next_non_comment(pd, which(pd$token == "')'")[1])
is_if <- pd$token[1] %in% "IF"
is_if <- pd$token[1] == "IF"
if (!is_if) {
return(pd)
}
Expand Down
12 changes: 6 additions & 6 deletions R/rules-line-breaks.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@ set_line_break_before_curly_opening <- function(pd) {
~ next_terminal(pd[.x, ], vars = "token_after")$token_after
) != "'{'"
last_expr_idx <- max(which(pd$token == "expr"))
is_last_expr <- ifelse(pd$token[1] %in% c("IF", "WHILE"),
is_last_expr <- ifelse(any(c("IF", "WHILE") == pd$token[1]),
# rule not applicable for if and while
TRUE, (line_break_to_set_idx + 1L) == last_expr_idx
)

no_line_break_before_curly_idx <- pd$token[line_break_to_set_idx] %in% "EQ_SUB"
no_line_break_before_curly_idx <- any(pd$token[line_break_to_set_idx] == "EQ_SUB")
linebreak_before_curly <- ifelse(is_function_call(pd),
# if in function call and has pipe, it is not recognized as function call
# and goes to else case
Expand All @@ -85,7 +85,7 @@ set_line_break_before_curly_opening <- function(pd) {
no_line_break_before_curly_idx
)
is_not_curly_curly_idx <- line_break_to_set_idx[should_be_on_same_line]
pd$lag_newlines[1 + is_not_curly_curly_idx] <- 0L
pd$lag_newlines[1L + is_not_curly_curly_idx] <- 0L


# other cases: line breaks
Expand All @@ -99,10 +99,10 @@ set_line_break_before_curly_opening <- function(pd) {
]
if (is_function_dec(pd)) {
should_not_be_on_same_line_idx <- setdiff(
1 + should_not_be_on_same_line_idx, nrow(pd)
1L + should_not_be_on_same_line_idx, nrow(pd)
)
} else {
should_not_be_on_same_line_idx <- 1 + should_not_be_on_same_line_idx
should_not_be_on_same_line_idx <- 1L + should_not_be_on_same_line_idx
}
pd$lag_newlines[should_not_be_on_same_line_idx] <- 1L

Expand Down Expand Up @@ -150,7 +150,7 @@ set_line_break_around_comma_and_or <- function(pd, strict) {
}

style_line_break_around_curly <- function(strict, pd) {
if (is_curly_expr(pd) && nrow(pd) > 2) {
if (is_curly_expr(pd) && nrow(pd) > 2L) {
closing_before <- pd$token == "'}'"
opening_before <- (pd$token == "'{'")
to_break <- lag(opening_before, default = FALSE) | closing_before
Expand Down
2 changes: 1 addition & 1 deletion R/ui-caching.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ cache_info <- function(cache_name = NULL, format = "both") {
location = path_cache,
activated = cache_is_activated(cache_name)
)
if (format %in% c("lucid", "both")) {
if (any(c("lucid", "both") == format)) {
cat(
"Size:\t\t", tbl$size, " bytes (", tbl$n, " cached expressions)",
"\nLast modified:\t", as.character(tbl$last_modified),
Expand Down