Merge pull request #188 from lorenzwalthert/fix_parsing

- Fix parsing inconsistency (#188).

Author: lorenzwalthert

R/nested.R

@@ -26,6 +26,8 @@ compute_parse_data_nested <- function(text) {
 #' @param text A character vector.
 #' @return A flat parse table
 tokenize <- function(text) {
+  # avoid https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=16041
+  parse(text = text, keep.source = TRUE)
   parsed <- parse(text = text, keep.source = TRUE)
   parse_data <- as_tibble(utils::getParseData(parsed, includeText = NA)) %>%
     enhance_mapping_special()

R/utils.R

@@ -25,3 +25,17 @@ add_newlines <- function(n) {
 add_spaces <- function(n) {
   rep_char(" ", n)
 }
+
+#' Invoke a system command
+#'
+#' Wraps a system command into [shell()] or [system()], depending on the
+#' os.
+#' @param sys_call The call to be executed.
+#' @param ... Arguments passed to [shell()] or [system()].
+calls_sys <- function(sys_call, ...) {
+  if (Sys.info()[1] == "Windows") {
+    error <- shell(sys_call, ...)
+  } else {
+    error <- system(sys_call, ...)
+  }
+}

man/calls_sys.Rd

@@ -0,0 +1,21 @@
+#
+#
+#
+r <- function(y, s, g = 10) {
+  b("", "")
+
+  #
+  q <- g(d(i), function(i) {
+    d(op(t[[p]]), n(i = i))
+  })
+  f(calls) <- f(g)
+
+  mb <- j(c(
+    q(a::b), r,
+    y(u = 1)
+  ))
+  k(b)
+}
+
+#
+#

tests/testthat/parsing/repeated_parsing-in.R

@@ -0,0 +1,21 @@
+#
+#
+#
+r <- function(y, s, g = 10) {
+  b("", "")
+
+  #
+  q <- g(d(i), function(i) {
+    d(op(t[[p]]), n(i = i))
+  })
+  f(calls) <- f(g)
+
+  mb <- j(c(
+    q(a::b), r,
+    y(u = 1)
+  ))
+  k(b)
+}
+
+#
+#

tests/testthat/parsing/repeated_parsing-in_tree

@@ -0,0 +1,25 @@
+context("circumvent parsing bugs")
+
+test_that("repreated parsing solves wrong parent assignment", {
+  expect_warning(test_collection(
+    "parsing", "repeated_parsing",
+    transformer = style_text,
+    strict = FALSE),
+    NA)
+
+  # move to temp dir
+  dir <- tempfile("styler")
+  dir.create(dir)
+  path_temp <- file.path(dir, "repeated_parsing-in.R")
+  path_perm <- testthat_file("parsing", "repeated_parsing-in.R")
+  file.copy(path_perm, dir)
+
+  sys_call <- paste0(
+    "R -q -e \"styler::style_file(\\\"", path_temp, "\\\")\""
+  )
+  calls_sys(sys_call, intern = FALSE, ignore.stdout = TRUE, ignore.stderr = TRUE)
+  ref <- utf8::read_lines_enc(construct_out(path_perm))
+  result <- utf8::read_lines_enc(path_temp)
+  expect_equal(ref, result)
+  unlink(dir)
+})