drop id, use pos_id only. Also, fix find_start_pos_id.

R/initialize.R

@@ -39,7 +39,8 @@ initialize_spaces <- function(pd_flat) {
 }
 
 remove_unused_attributes <- function(pd_flat) {
-  pd_flat[c("line1", "line2", "col1", "col2", "parent")] <- rep(list(NULL), 4)
+  pd_flat[c("line1", "line2", "col1", "col2", "parent", "id")] <-
+    rep(list(NULL), 4)
   pd_flat
 }
 

R/nested.R

@@ -53,9 +53,8 @@ add_terminal_token_after <- function(pd_flat) {
     filter(terminal) %>%
     arrange(pos_id)
 
-  data_frame(id = terminals$id,
-             token_after = lead(terminals$token, default = "")) %>%
-    left_join(pd_flat, ., by = "id")
+  data_frame(pos_id = terminals$pos_id, token_after = lead(terminals$token, default = "")) %>%
+    left_join(pd_flat, ., by = "pos_id")
 }
 
 #' @rdname add_token_terminal

R/nested_to_tree.R

@@ -22,7 +22,7 @@ create_tree <- function(text) {
 #' initialized <- styler:::pre_visit(nested_pd, c(styler:::initialize_attributes))
 #' styler:::create_node_from_nested_root(initialized)
 create_node_from_nested_root <- function(pd_nested) {
-  n <- data.tree::Node$new("ROOT (token: short_text [lag_newlines/spaces] {id})")
+  n <- data.tree::Node$new("ROOT (token: short_text [lag_newlines/spaces] {pos_id})")
   create_node_from_nested(pd_nested, n)
   n
 }
@@ -35,7 +35,7 @@ create_node_from_nested <- function(pd_nested, parent) {
   if (is.null(pd_nested))
     return()
 
-  node_info <- paste0(pd_nested$token, ": ", pd_nested$short, " [", pd_nested$lag_newlines, "/", pd_nested$spaces, "] {", pd_nested$id, "}")
+  node_info <- paste0(pd_nested$token, ": ", pd_nested$short, " [", pd_nested$lag_newlines, "/", pd_nested$spaces, "] {", pd_nested$pos_id, "}")
 
   child_nodes <-
     node_info %>%

R/token-create.R

@@ -8,13 +8,11 @@
 #' @param spaces Character vector with spaces corresponding to the tokens.
 #' @param pos_ids Character vector with positional id corresponding to the
 #'   tokens.
-#' @param parents Vector with `id` corresponding to the
-#'   parent of the tokens we want to create.
 #' @param token_before Character vector corresponding to the columns
 #'   `token_before`.
 #' @param token_after Character vector corresponding to the columns
 #'   `token_after`.
-#' @param indention_ref_ids Character vector with indention ref ids
+#' @param indention_ref_pos_ids Character vector with indention ref ids
 #'   corresponding to the tokens.
 #' @param indents Vector with indents corresponding to the tokens.
 #' @param terminal Boolean vector indicating whether a token is a terminal or
@@ -28,7 +26,7 @@ create_tokens <- function(tokens,
                           pos_ids,
                           token_before = NA,
                           token_after = NA,
-                          indention_ref_ids = NA,
+                          indention_ref_pos_ids = NA,
                           indents = 0,
                           terminal = TRUE,
                           child = NULL) {
@@ -42,12 +40,11 @@ create_tokens <- function(tokens,
     pos_id = pos_ids,
     token_before = token_before,
     token_after = token_after,
-    id = NA,
     terminal = rep(terminal, len_text),
     internal = rep(FALSE, len_text),
     spaces = spaces,
     multi_line = rep(FALSE, len_text),
-    indention_ref_id = indention_ref_ids,
+    indention_ref_pos_id = indention_ref_pos_ids,
     indent = indents,
     child = rep(list(child), len_text)
   )
@@ -80,19 +77,23 @@ create_pos_ids <- function(pd, pos, by = 0.1, after = FALSE, n = 1) {
 #' 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.
+#' @param candidates The `pos_ids` of the candidates that origin from other
+#'   nests.
 #' @inheritParams create_pos_ids
-find_start_pos_id <- function(pd, pos, by, direction, after) {
+find_start_pos_id <- function(pd, pos, by, direction, after, candidates = NULL) {
+  candidates <- append(candidates, pd$pos_id[pos])
   if (is.null(pd$child[[pos]])) {
-    pd$pos_id[pos] + by * direction
+    ifelse(after, max(candidates), min(candidates)) + by * direction
   } else {
-
     find_start_pos_id(
       pd$child[[pos]], if_else(after, nrow(pd$child[[pos]]), 1L),
-      by, direction, after
+      by, direction, after, candidates
     )
   }
 }
 
+
+
 #' Validate sequence of new position ids
 #'
 #' Ids created with `after = TRUE` can have `pos_id` values between x.0 and
@@ -131,7 +132,7 @@ wrap_expr_in_curly <- function(pd, stretch_out = FALSE) {
   )
   opening <- create_tokens(
     "'{'", "{",
-    pos_ids = create_pos_ids(pd, 1, after = FALSE)
+    pos_ids = create_pos_ids(expr, 1, after = FALSE)
   )
 
   closing <- create_tokens(