Merge pull request #242 from lorenzwalthert/master

Fixing token insertion (#242).

Author: lorenzwalthert

R/modify_pd.R

@@ -129,7 +129,7 @@ compute_indent_indices <- function(pd,
   if (is.null(token_closing)) {
     stop <- npd
   } else {
-    stop <- which(pd$token %in% token_closing) - 1
+    stop <- last(which(pd$token %in% token_closing)[needs_indention]) - 1
   }
 
   seq2(start, stop)

R/token-create.R

@@ -65,12 +65,31 @@ create_tokens <- function(tokens,
 #' @family token creators
 create_pos_ids <- function(pd, pos, by = 0.1, after = FALSE, n = 1) {
   direction <- ifelse(after, 1L, -1L)
-  first <- pd$pos_id[pos] + by * direction
+  first <- find_start_pos_id(pd, pos, by, direction, after)
   new_ids <- seq(first, to = first + direction * (n - 1) * by, by = by * direction)
   validate_new_pos_ids(new_ids, after)
   new_ids
 }
 
+#' Find legit starting value for a new positional id
+#'
+#' Looks at the current nest as well as into its children (if necessary) to make
+#' sure the right id is returned. Otherise, ordering of tokens might not be
+#' preserved.
+#' @param direction Derived from `after`. `1` if `after = TRUE`, `-1` otherwise.
+#' @inheritParams create_pos_ids
+find_start_pos_id <- function(pd, pos, by, direction, after) {
+  if (is.null(pd$child[[pos]])) {
+    pd$pos_id[pos] + by * direction
+  } else {
+
+    find_start_pos_id(
+      pd$child[[pos]], if_else(after, nrow(pd$child[[pos]]), 1L),
+      by, direction, after
+    )
+  }
+}
+
 #' Validate sequence of new position ids
 #'
 #' Ids created with `after = TRUE` can have `pos_id` values between x.0 and

R/transform.R

@@ -83,6 +83,7 @@ make_transformer <- function(transformers) {
 #' @inheritParams compute_parse_data_nested
 #' @inheritParams apply_transformers
 parse_transform_serialize <- function(text, transformers) {
+  text <- assert_text(text)
   pd_nested <- compute_parse_data_nested(text)
   start_line <- find_start_line(pd_nested)
   if (nrow(pd_nested) == 0) {

R/utils.R

@@ -39,3 +39,13 @@ calls_sys <- function(sys_call, ...) {
     error <- system(sys_call, ...)
   }
 }
+
+#' Assert text to be of positive length and replace it with the empty
+#' string otherwise.
+#' @param text The input to style.
+assert_text <- function(text) {
+  if (length(text) < 1) {
+    text <- ""
+  }
+  text
+}

man/assert_text.Rd

@@ -9,9 +9,16 @@ test_that("other manipulations are correct (add braces, semi-colon etc.)", {
 test_that("braces in if-else clause are added correctly", {
   expect_warning(test_collection("token_adding_removing", "if_else_strict",
                                  transformer = style_text), NA)
-})
-
-test_that("braces in if-else clause are added correctly", {
   expect_warning(test_collection("token_adding_removing", "if_else_non_strict",
                                  transformer = style_text, strict = FALSE), NA)
 })
+
+test_that("double braces are treated correctly", {
+  expect_warning(test_collection("token_adding_removing", "double_braces",
+                                 transformer = style_text), NA)
+})
+
+test_that("double braces are treated correctly", {
+  expect_warning(test_collection("token_adding_removing", "token_creation_find_pos",
+                                 transformer = style_text), NA)
+})

man/find_start_pos_id.Rd

@@ -0,0 +1,4 @@
+if (X)
+  return(TRUE)
+
+if (X) return(FALSE)

tests/testthat/test-token_adding_removing.R

@@ -0,0 +1,5 @@
+if (X) {
+  return(TRUE)
+}
+
+if (X) return(FALSE)