Skip to content

Use empty_ns() wrappers for xml2 XPath and child lookups #847

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

Open
MichaelChirico wants to merge 1 commit into from
Open

Use empty_ns() wrappers for xml2 XPath and child lookups #847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions R/call_hierarchy.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ call_hierarchy_incoming_calls_reply <- function(id, workspace, item) {
line2 <- end_point$row + 1
col2 <- end_point$col

symbols <- xml_find_all(xdoc,
symbols <- xml_find_all_(xdoc,
glue("//SYMBOL_FUNCTION_CALL[
((@line1 = {line1} and @col1 >= {col1}) or @line1 > {line1}) and
((@line2 = {line2} and @col2 <= {col2}) or @line2 < {line2}) and
Expand Down Expand Up @@ -375,7 +375,7 @@ call_hierarchy_incoming_calls_reply <- function(id, workspace, item) {
}
}

symbols <- xml_find_all(xdoc,
symbols <- xml_find_all_(xdoc,
glue("//SYMBOL_FUNCTION_CALL[text() = '{token_quote}']",
token_quote = token_quote))
if (!length(symbols)) next
Expand Down Expand Up @@ -460,7 +460,7 @@ call_hierarchy_outgoing_calls_reply <- function(id, workspace, item) {
line2 <- end_point$row + 1
col2 <- end_point$col

symbols <- xml_find_all(xdoc,
symbols <- xml_find_all_(xdoc,
glue("//SYMBOL_FUNCTION_CALL[
((@line1 = {line1} and @col1 >= {col1}) or @line1 > {line1}) and
((@line2 = {line2} and @col2 <= {col2}) or @line2 < {line2})]",
Expand Down
6 changes: 3 additions & 3 deletions R/class_index.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

# Parser XML has no namespaces. xml2's default namespace discovery walks the
# whole document for every local query, turning class extraction quadratic.
class_xml_first <- function(node, xpath) xml_find_first(node, xpath, ns = character())
class_xml_all <- function(node, xpath) xml_find_all(node, xpath, ns = character())
class_xml_first <- function(node, xpath) xml_find_first_(node, xpath)
class_xml_all <- function(node, xpath) xml_find_all_(node, xpath)

#' Decode inert class names and member names using R literal syntax
#' @noRd
Expand Down Expand Up @@ -47,8 +47,8 @@
if (native || isTRUE(magrittr)) {
lhs <- class_xml_first(operator, "preceding-sibling::expr[1]")
placeholder <- vapply(arguments, function(argument) {
isTRUE(xml_find_lgl(argument, if (native) "boolean(PLACEHOLDER[parent::expr[count(*) = 1]])" else
isTRUE(xml_find_lgl_(argument, if (native) "boolean(PLACEHOLDER[parent::expr[count(*) = 1]])" else
"boolean(SYMBOL[text() = '.' and parent::expr[count(*) = 1]])"))

Check warning on line 51 in R/class_index.R

View workflow job for this annotation

GitHub Actions / lint 

file=R/class_index.R,line=51,col=20,[indentation_linter] Indentation should be 24 spaces but is 20 spaces.
}, logical(1L))
if (any(placeholder)) arguments[placeholder] <- list(lhs)
else arguments <- c(list(lhs), arguments)
Expand Down
2 changes: 1 addition & 1 deletion R/code_lens.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ function_call_locations <- function(workspace, symbol, context_uri = NULL,
xdoc <- parse_data_xml(parse_data)
if (is.null(xdoc)) next

nodes <- xml_find_all(
nodes <- xml_find_all_(
xdoc,
glue(paste0(
"//SYMBOL_FUNCTION_CALL[text() = '{token_quote}' and ",
Expand Down
2 changes: 1 addition & 1 deletion R/color.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ document_color_reply <- function(id, uri, workspace, document) {
# Shortest color length: 3 (red, tan)
# Longest color length: 20 (lightgoldenrodyellow)
if (is.null(strings)) {
str_tokens <- xml_find_all(xdoc, "//STR_CONST[@line1=@line2 and @col2>@col1+3 and @col2<@col1+22]")
str_tokens <- xml_find_all_(xdoc, "//STR_CONST[@line1=@line2 and @col2>@col1+3 and @col2<@col1+22]")
str_line1 <- as.integer(xml_attr(str_tokens, "line1"))
str_col1 <- as.integer(xml_attr(str_tokens, "col1"))
str_col2 <- as.integer(xml_attr(str_tokens, "col2"))
Expand Down
12 changes: 6 additions & 6 deletions R/completion.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@
if (length(all_defs)) {
last_def <- all_defs[[length(all_defs)]]
func_line1 <- as.integer(xml_attr(last_def, "line1"))
args <- xml_text(xml_find_all(last_def, "SYMBOL_FORMALS"))
args <- xml_text(xml_find_all_(last_def, "SYMBOL_FORMALS"))
token_args <- args[match_with(args, token)]
token_data <- list(
type = "parameter",
Expand Down Expand Up @@ -444,7 +444,7 @@
data = list(
type = "function",
package = nsname
))

Check warning on line 447 in R/completion.R

View workflow job for this annotation

GitHub Actions / lint 

file=R/completion.R,line=447,col=12,[indentation_linter] Indentation should be 16 spaces but is 12 spaces.
})
} else {
completions <- lapply(functs, function(object) {
Expand All @@ -456,7 +456,7 @@
data = list(
type = "function",
package = nsname
))

Check warning on line 459 in R/completion.R

View workflow job for this annotation

GitHub Actions / lint 

file=R/completion.R,line=459,col=12,[indentation_linter] Indentation should be 16 spaces but is 12 spaces.
if (!identical(inserted, object)) item$insertText <- inserted
item
})
Expand Down Expand Up @@ -488,7 +488,7 @@
data = list(
type = "function",
package = nsname
))

Check warning on line 491 in R/completion.R

View workflow job for this annotation

GitHub Actions / lint 

file=R/completion.R,line=491,col=16,[indentation_linter] Indentation should be 20 spaces but is 16 spaces.
} else {
inserted <- quote_completion_name(object)
item <- list(label = object,
Expand All @@ -498,7 +498,7 @@
data = list(
type = "function",
package = nsname
))

Check warning on line 501 in R/completion.R

View workflow job for this annotation

GitHub Actions / lint 

file=R/completion.R,line=501,col=16,[indentation_linter] Indentation should be 20 spaces but is 16 spaces.
if (!identical(inserted, object)) item$insertText <- inserted
}
idx <- idx + 1L
Expand Down Expand Up @@ -573,7 +573,7 @@
value
}
}
candidates[[length(candidates) + 1L]] <<- list(

Check warning on line 576 in R/completion.R

View workflow job for this annotation

GitHub Actions / lint 

file=R/completion.R,line=576,col=47,[assignment_linter] Replace <<- by assigning to a specific environment (with assign() or <-) to avoid hard-to-predict behavior.
label = objects,
kind = recycle(kind),
detail = recycle(detail),
Expand Down Expand Up @@ -875,7 +875,7 @@

in_lexical_scope <- function(nodes) {
vapply(nodes, function(node) {
scope <- xml_find_first(node, "ancestor::expr[FUNCTION or OP-LAMBDA][1]")
scope <- xml_find_first_(node, "ancestor::expr[FUNCTION or OP-LAMBDA][1]")
if (inherits(scope, "xml_missing")) return(TRUE)
contains_point(list(
line1 = as.integer(xml_attr(scope, "line1")),
Expand All @@ -885,13 +885,13 @@
))
}, logical(1L))
}
scope_symbol_nodes <- xml_find_all(enclosing_scopes,
scope_symbol_nodes <- xml_find_all_(enclosing_scopes,
scope_completion_symbols_xpath)
scope_symbol_nodes <- scope_symbol_nodes[in_lexical_scope(scope_symbol_nodes)]
scope_symbol_names <- xml_text(scope_symbol_nodes)
scope_symbol_lines <- as.integer(xml_attr(scope_symbol_nodes, "line1"))

scope_funct_nodes <- xml_find_all(enclosing_scopes,
scope_funct_nodes <- xml_find_all_(enclosing_scopes,
scope_completion_functs_xpath)
scope_funct_nodes <- scope_funct_nodes[in_lexical_scope(scope_funct_nodes)]
scope_funct_names <- xml_text(scope_funct_nodes)
Expand Down Expand Up @@ -1085,7 +1085,7 @@

token_quote <- xml_single_quote(token)

symbols <- xml_text(xml_find_all(
symbols <- xml_text(xml_find_all_(
xdoc,
glue(
"//SYMBOL[preceding-sibling::OP-DOLLAR and starts-with(text(),'{token_quote}')] |
Expand All @@ -1095,7 +1095,7 @@
))

if (nzchar(token)) {
symbols <- c(symbols, xml_text(xml_find_all(
symbols <- c(symbols, xml_text(xml_find_all_(
xdoc,
glue(
"//SYMBOL[starts-with(text(),'{token_quote}')] |
Expand Down Expand Up @@ -1312,7 +1312,7 @@
nmax <- lsp_settings$get("max_completions")
if (isTRUE(lsp_settings$get("member_completion"))) {
members <- tryCatch(member_completion(uri, workspace, document, point,
snippet_support, nmax), error = function(e) {

Check warning on line 1315 in R/completion.R

View workflow job for this annotation

GitHub Actions / lint 

file=R/completion.R,line=1315,col=12,[indentation_linter] Indentation should be 16 spaces but is 12 spaces.
logger$info("static member completion:", e)
NULL
})
Expand Down
2 changes: 1 addition & 1 deletion R/definition.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ definition_reply <- function(id, uri, workspace, document, point,
logger$info("definition: ", token_name, token_text)
if (token_name %in% c("SYMBOL", "SYMBOL_FUNCTION_CALL", "SYMBOL_FORMALS")) {
# symbol
if (xml_find_lgl(token, "not(preceding-sibling::OP-DOLLAR)")) {
if (xml_find_lgl_(token, "not(preceding-sibling::OP-DOLLAR)")) {
xpath <- glue(definition_xpath,
row = row, start = token_start, end = token_end,
token_quote = xml_single_quote(token_text))
Expand Down
6 changes: 3 additions & 3 deletions R/folding.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ FoldingRangeKind <- list(

get_comment_folding_ranges <- function(xdoc, outline = NULL) {
if (is.null(outline)) {
comments <- xml_find_all(xdoc, "//COMMENT")
comments <- xml_find_all_(xdoc, "//COMMENT")
text <- xml_text(comments, trim = FALSE)
lines <- as.integer(xml_attr(comments, "line1"))
cols <- as.integer(xml_attr(comments, "col1"))
Expand Down Expand Up @@ -80,13 +80,13 @@ get_document_blocks <- function(xdoc, outline = NULL) {
if (is.null(xdoc)) {
return(NULL)
}
block_start <- xml_find_all(xdoc, "(//OP-LEFT-PAREN | //OP-LEFT-BRACKET | //OP-LEFT-BRACE)[parent::expr and
block_start <- xml_find_all_(xdoc, "(//OP-LEFT-PAREN | //OP-LEFT-BRACKET | //OP-LEFT-BRACE)[parent::expr and
@line1 < (following-sibling::OP-RIGHT-PAREN | following-sibling::OP-RIGHT-BRACKET | following-sibling::OP-RIGHT-BRACE)/@line1]")
if (!length(block_start)) { # prevent floating point comparision
return(NULL)
}

block_end <- xml_find_first(block_start, "following-sibling::OP-RIGHT-PAREN | following-sibling::OP-RIGHT-BRACKET | following-sibling::OP-RIGHT-BRACE")
block_end <- xml_find_first_(block_start, "following-sibling::OP-RIGHT-PAREN | following-sibling::OP-RIGHT-BRACKET | following-sibling::OP-RIGHT-BRACE")

block_start_line <- as.integer(xml_attr(block_start, "line1"))
block_end_line <- as.integer(xml_attr(block_end, "line1"))
Expand Down
6 changes: 3 additions & 3 deletions R/highlight.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,15 @@ document_highlight_reply <- function(id, uri, workspace, document, point) {

tokens <- NULL
if (token_name %in% c("SYMBOL", "SYMBOL_FUNCTION_CALL", "SYMBOL_FORMALS")) {
if (xml_find_lgl(token, "not(preceding-sibling::OP-DOLLAR)")) {
if (xml_find_lgl_(token, "not(preceding-sibling::OP-DOLLAR)")) {
xpath <- glue(document_highlight_xpath, token_quote = token_quote)
tokens <- xml_find_all(xdoc, xpath)
tokens <- xml_find_all_(xdoc, xpath)
}
} else if (token_name %in% c(
"SYMBOL_PACKAGE", "FUNCTION", "NUM_CONST", "STR_CONST")) {
# Compare text directly: XML entities do not escape quotes
# inside XPath string literals (for example, 'a string').
tokens <- xml_find_all(xdoc, paste0("//", token_name))
tokens <- xml_find_all_(xdoc, paste0("//", token_name))
tokens <- tokens[xml_text(tokens) == token_text]
}

Expand Down
10 changes: 5 additions & 5 deletions R/hover.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,14 @@ hover_reply <- function(id, uri, workspace, document, point) {
logger$info(token_name, token_text)
if (token_name %in% c("SYMBOL", "SYMBOL_FUNCTION_CALL")) {
# symbol
if (xml_find_lgl(token, "not(preceding-sibling::OP-DOLLAR)")) {
if (xml_find_lgl_(token, "not(preceding-sibling::OP-DOLLAR)")) {
xpath <- glue(hover_xpath,
row = row, start = token_start, end = token_end,
token_quote = xml_single_quote(token_text))
all_defs <- xdoc_find_definitions(xdoc, row, col, token_text, xpath)
if (length(all_defs)) {
last_def <- all_defs[[length(all_defs)]]
def_func <- xml_find_first(last_def,
def_func <- xml_find_first_(last_def,
"expr[(FUNCTION or OP-LAMBDA) and parent::*[LEFT_ASSIGN or RIGHT_ASSIGN or EQ_ASSIGN]]")
if (length(def_func)) {
func_line1 <- as.integer(xml_attr(def_func, "line1"))
Expand Down Expand Up @@ -147,9 +147,9 @@ hover_reply <- function(id, uri, workspace, document, point) {
}
} else if (token_name == "SYMBOL_SUB") {
# function parameter
funct <- xml_find_chr(token, "string(preceding-sibling::expr/SYMBOL_FUNCTION_CALL)")
funct <- xml_find_chr_(token, "string(preceding-sibling::expr/SYMBOL_FUNCTION_CALL)")
if (nzchar(funct)) {
package <- xml_find_chr(token, "string(preceding-sibling::expr/SYMBOL_PACKAGE)")
package <- xml_find_chr_(token, "string(preceding-sibling::expr/SYMBOL_PACKAGE)")
if (!nzchar(package)) {
package <- NULL
xpath <- glue(signature_xpath, row = row,
Expand Down Expand Up @@ -187,7 +187,7 @@ hover_reply <- function(id, uri, workspace, document, point) {
}
} else if (token_name == "SYMBOL_FORMALS") {
# function formals
funct <- xml_find_first(token, "parent::expr[FUNCTION or OP-LAMBDA]")
funct <- xml_find_first_(token, "parent::expr[FUNCTION or OP-LAMBDA]")
func_line1 <- as.integer(xml_attr(funct, "line1"))
doc_line1 <- detect_comments(document$content, func_line1 - 1) + 1

Expand Down
10 changes: 5 additions & 5 deletions R/inlay_hint.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ call_argument_groups <- function(call_node) {
#' Whether a pipe supplies an implicit positional argument to this call
#' @noRd
call_has_implicit_argument <- function(call_node) {
operator <- xml_find_first(call_node, "preceding-sibling::*[not(self::COMMENT)][1]")
operator <- xml_find_first_(call_node, "preceding-sibling::*[not(self::COMMENT)][1]")
if (inherits(operator, "xml_missing")) return(FALSE)
if (xml_name(operator) %in% c("PIPE", "OP-PIPE")) {
return(xml_find_lgl(call_node, "not(expr[count(*) = 1]/PLACEHOLDER)"))
return(xml_find_lgl_(call_node, "not(expr[count(*) = 1]/PLACEHOLDER)"))
}
if (xml_name(operator) == "SPECIAL" && xml_text(operator) %in% c("%>%", "%<>%", "%T>%")) {
return(xml_find_lgl(call_node, "not(expr[count(*) = 1]/SYMBOL[text() = '.'])"))
return(xml_find_lgl_(call_node, "not(expr[count(*) = 1]/SYMBOL[text() = '.'])"))
}
FALSE
}
Expand Down Expand Up @@ -217,7 +217,7 @@ inlay_hint_reply <- function(id, uri, workspace, document, request_range) {
if (request_range$end$character == 0L && end_line > start_line) {
end_line <- end_line - 1L
}
fn_nodes <- xml_find_all(
fn_nodes <- xml_find_all_(
xdoc,
paste0(
"//SYMBOL_FUNCTION_CALL[parent::expr[",
Expand All @@ -229,7 +229,7 @@ inlay_hint_reply <- function(id, uri, workspace, document, request_range) {
if (!length(fn_nodes)) return(Response$new(id, result = list()))
calls <- xml_parent(xml_parent(fn_nodes))
function_names <- xml_text(fn_nodes)
packages <- xml_find_chr(fn_nodes, "string(preceding-sibling::SYMBOL_PACKAGE[1])")
packages <- xml_find_chr_(fn_nodes, "string(preceding-sibling::SYMBOL_PACKAGE[1])")

minimum_arguments <- lsp_settings$get("inlay_hints_minimum_arguments")
if (!is.numeric(minimum_arguments) || length(minimum_arguments) != 1L ||
Expand Down
2 changes: 1 addition & 1 deletion R/inline_value.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ inline_value_reply <- function(id, uri, workspace, document, request_range) {
end_line <- end_line - 1L
}
line_cond <- paste0("@line1 >= ", start_line, " and @line1 <= ", end_line)
nodes <- xml_find_all(
nodes <- xml_find_all_(
xdoc,
paste0("//SYMBOL[", line_cond, "] | //SYMBOL_FORMALS[", line_cond, "]")
)
Expand Down
2 changes: 1 addition & 1 deletion R/link.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ document_link_reply <- function(id, uri, workspace, document, rootPath) {
# Limit string length to 255 to avoid potential PATH_MAX error on Windows
# On macOS and Linux, PATH_MAX is much larger but we ignore the long strings at the moment.
if (is.null(indexed)) {
str_tokens <- xml_find_all(xdoc, "//STR_CONST[@line1=@line2 and @col2>@col1+1 and @col2<=@col1+256]")
str_tokens <- xml_find_all_(xdoc, "//STR_CONST[@line1=@line2 and @col2>@col1+1 and @col2<=@col1+256]")
indexed <- list(
line = as.integer(xml_attr(str_tokens, "line1")),
col1 = as.integer(xml_attr(str_tokens, "col1")),
Expand Down
4 changes: 2 additions & 2 deletions R/linked_editing.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,10 @@ linked_editing_range_reply <- function(id, uri, workspace, document, point) {
scopes <- xdoc_find_enclosing_scopes(xdoc, definition_row + 1L,
definition$range$start$character + 1L)
context <- if (length(scopes)) scopes[[1L]] else xdoc
function_nodes <- xml_find_all(context, xpath)
function_nodes <- xml_find_all_(context, xpath)
if (!length(function_nodes)) next
function_node <- function_nodes[[length(function_nodes)]]
formal_nodes <- xml_find_all(function_node, "SYMBOL_FORMALS")
formal_nodes <- xml_find_all_(function_node, "SYMBOL_FORMALS")
if (!length(formal_nodes)) next
}

Expand Down
20 changes: 10 additions & 10 deletions R/refactor.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ refactor_sequence_container <- function(node) {
name <- xml_name(node)
identical(name, "exprlist") ||
identical(name, "expr") &&
xml_find_lgl(node, "boolean(OP-LEFT-BRACE)")
xml_find_lgl_(node, "boolean(OP-LEFT-BRACE)")
}

#' Find the statement and sequential container enclosing an expression
Expand Down Expand Up @@ -197,7 +197,7 @@ refactor_expression_movable <- function(node, statement) {
} else {
"boolean(.//PLACEHOLDER)"
}
if (xml_find_lgl(node, placeholder)) return(FALSE)
if (xml_find_lgl_(node, placeholder)) return(FALSE)
}

assignments <- which(child_names %in% c(
Expand Down Expand Up @@ -234,7 +234,7 @@ refactor_expression_movable <- function(node, statement) {
#' Find an expression exactly matching a selected range
#' @noRd
refactor_exact_expression <- function(xdoc, selected_range) {
nodes <- xml_find_all(xdoc, "//expr[@line1]")
nodes <- xml_find_all_(xdoc, "//expr[@line1]")
matches <- vapply(nodes, function(node) {
refactor_range_equal(refactor_node_range(node), selected_range)
}, logical(1L))
Expand All @@ -248,7 +248,7 @@ refactor_exact_expression <- function(xdoc, selected_range) {
#' Find contiguous statement expressions matching a selected range
#' @noRd
refactor_statement_selection <- function(xdoc, selected_range) {
containers <- xml_find_all(xdoc, "/exprlist | //OP-LEFT-BRACE/parent::expr")
containers <- xml_find_all_(xdoc, "/exprlist | //OP-LEFT-BRACE/parent::expr")
result <- NULL
for (container in containers) {
children <- xml_children(container)
Expand Down Expand Up @@ -331,20 +331,20 @@ refactor_selection_context <- function(uri, workspace, document, item_range) {
#' Return direct token names contained by a parse node
#' @noRd
refactor_token_names <- function(node) {
xml_name(xml_find_all(node, ".//*[not(*)]"))
xml_name(xml_find_all_(node, ".//*[not(*)]"))
}

#' Return function-call names contained by a parse node
#' @noRd
refactor_call_names <- function(node) {
xml_text(xml_find_all(node, ".//SYMBOL_FUNCTION_CALL"))
xml_text(xml_find_all_(node, ".//SYMBOL_FUNCTION_CALL"))
}

#' Detect syntax whose evaluation context cannot safely move
#' @noRd
refactor_unsafe_syntax <- function(node, extracting_function = FALSE) {
token_names <- refactor_token_names(node)
token_text <- xml_text(xml_find_all(
token_text <- xml_text(xml_find_all_(
node,
".//LEFT_ASSIGN | .//RIGHT_ASSIGN"
))
Expand Down Expand Up @@ -516,7 +516,7 @@ refactor_multiline_quoted_ranges <- function(context) {
)
}))
}
quoted <- xml_find_all(context$xdoc, paste(
quoted <- xml_find_all_(context$xdoc, paste(
"//STR_CONST[@line1 < @line2]",
"//SYMBOL[@line1 < @line2]",
"//SYMBOL_FUNCTION_CALL[@line1 < @line2]",
Expand Down Expand Up @@ -614,7 +614,7 @@ refactor_insertion_context <- function(document, statement) {
#' Test whether an expression is only a single atomic token
#' @noRd
refactor_atomic_expression <- function(node) {
terminals <- xml_find_all(node, ".//*[not(*)]")
terminals <- xml_find_all_(node, ".//*[not(*)]")
length(terminals) == 1L && xml_name(terminals[[1L]]) %in% c(
"SYMBOL", "NUM_CONST", "STR_CONST", "NULL_CONST"
)
Expand Down Expand Up @@ -847,7 +847,7 @@ refactor_extract_function_action <- function(uri, workspace, document,
return(NULL)
}
uses_dots <- vapply(selection$nodes, function(node) {
xml_find_lgl(
xml_find_lgl_(
node,
"boolean(.//SYMBOL[text() = '...'] | .//SYMBOL_FORMALS[text() = '...'])"
)
Expand Down
Loading
Loading