From 4fe20549f7f3eb23a2ba24c13ff74719372a15c9 Mon Sep 17 00:00:00 2001
From: simonpcouch <simonpatrickcouch@gmail.com>
Date: Wed, 30 Oct 2024 16:15:43 -0500
Subject: [PATCH 1/4] refactor pal retrieval code into helper

---
 R/rstudioapi.R | 55 +++++++++++++++++---------------------------------
 1 file changed, 19 insertions(+), 36 deletions(-)

diff --git a/R/rstudioapi.R b/R/rstudioapi.R
index 05a8c23..b250b06 100644
--- a/R/rstudioapi.R
+++ b/R/rstudioapi.R
@@ -1,17 +1,6 @@
 # replace selection with refactored code
 rs_replace_selection <- function(context, role) {
-  # check if pal exists
-  if (exists(paste0(".pal_last_", role))) {
-    pal <- get(paste0(".pal_last_", role))
-  } else {
-    tryCatch(
-      pal <- .init_pal(role),
-      error = function(e) {
-        rstudioapi::showDialog("Error", "Unable to create a pal. See `?.init_pal()`.")
-        return(NULL)
-      }
-    )
-  }
+  pal <- retrieve_pal(role)
 
   selection <- rstudioapi::primary_selection(context)
 
@@ -38,6 +27,22 @@ rs_replace_selection <- function(context, role) {
   )
 }
 
+retrieve_pal <- function(role) {
+  if (exists(paste0(".pal_last_", role))) {
+    pal <- get(paste0(".pal_last_", role))
+  } else {
+    tryCatch(
+      pal <- .init_pal(role),
+      error = function(e) {
+        rstudioapi::showDialog("Error", "Unable to create a pal. See `?.init_pal()`.")
+        return(NULL)
+      }
+    )
+  }
+
+  pal
+}
+
 standardize_selection <- function(selection, context) {
   # if the first entry on a newline, make it the last entry on the line previous
   if (selection$range$end[["column"]] == 1L) {
@@ -123,18 +128,7 @@ stream_selection <- function(selection, context, pal, n_lines_orig, remainder =
 
 # prefix selection with new code -----------------------------------------------
 rs_prefix_selection <- function(context, role) {
-  # check if pal exists
-  if (exists(paste0(".pal_last_", role))) {
-    pal <- get(paste0(".pal_last_", role))
-  } else {
-    tryCatch(
-      pal <- .init_pal(role),
-      error = function(e) {
-        rstudioapi::showDialog("Error", "Unable to create a pal. See `?.init_pal()`.")
-        return(NULL)
-      }
-    )
-  }
+  pal <- retrieve_pal(role)
 
   selection <- rstudioapi::primary_selection(context)
 
@@ -165,18 +159,7 @@ rs_prefix_selection <- function(context, role) {
 
 # suffix selection with new code -----------------------------------------------
 rs_suffix_selection <- function(context, role) {
-  # check if pal exists
-  if (exists(paste0(".pal_last_", role))) {
-    pal <- get(paste0(".pal_last_", role))
-  } else {
-    tryCatch(
-      pal <- .init_pal(role),
-      error = function(e) {
-        rstudioapi::showDialog("Error", "Unable to create a pal. See `?.init_pal()`.")
-        return(NULL)
-      }
-    )
-  }
+  pal <- retrieve_pal(role)
 
   selection <- rstudioapi::primary_selection(context)
 

From 2d3bd840bc03c4a41cd79533a0a44bd19c537af6 Mon Sep 17 00:00:00 2001
From: simonpcouch <simonpatrickcouch@gmail.com>
Date: Wed, 30 Oct 2024 16:18:20 -0500
Subject: [PATCH 2/4] refactor selection retrieval code into helper

---
 R/rstudioapi.R | 35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/R/rstudioapi.R b/R/rstudioapi.R
index b250b06..89986ec 100644
--- a/R/rstudioapi.R
+++ b/R/rstudioapi.R
@@ -1,13 +1,7 @@
 # replace selection with refactored code
 rs_replace_selection <- function(context, role) {
   pal <- retrieve_pal(role)
-
-  selection <- rstudioapi::primary_selection(context)
-
-  if (selection[["text"]] == "") {
-    rstudioapi::showDialog("Error", "No code selected. Please highlight some code first.")
-    return(NULL)
-  }
+  selection <- get_primary_selection(context)
 
   # make the format of the "final position" consistent
   selection_portions <- standardize_selection(selection, context)
@@ -43,6 +37,17 @@ retrieve_pal <- function(role) {
   pal
 }
 
+get_primary_selection <- function(context) {
+  selection <- rstudioapi::primary_selection(context)
+
+  if (selection[["text"]] == "") {
+    rstudioapi::showDialog("Error", "No code selected. Please highlight some code first.")
+    return(NULL)
+  }
+
+  selection
+}
+
 standardize_selection <- function(selection, context) {
   # if the first entry on a newline, make it the last entry on the line previous
   if (selection$range$end[["column"]] == 1L) {
@@ -129,13 +134,7 @@ stream_selection <- function(selection, context, pal, n_lines_orig, remainder =
 # prefix selection with new code -----------------------------------------------
 rs_prefix_selection <- function(context, role) {
   pal <- retrieve_pal(role)
-
-  selection <- rstudioapi::primary_selection(context)
-
-  if (selection[["text"]] == "") {
-    rstudioapi::showDialog("Error", "No code selected. Please highlight some code first.")
-    return(NULL)
-  }
+  selection <- get_primary_selection(context)
 
   # add one blank line before the selection
   rstudioapi::modifyRange(selection$range, paste0("\n", selection[["text"]]), context$id)
@@ -160,13 +159,7 @@ rs_prefix_selection <- function(context, role) {
 # suffix selection with new code -----------------------------------------------
 rs_suffix_selection <- function(context, role) {
   pal <- retrieve_pal(role)
-
-  selection <- rstudioapi::primary_selection(context)
-
-  if (selection[["text"]] == "") {
-    rstudioapi::showDialog("Error", "No code selected. Please highlight some code first.")
-    return(NULL)
-  }
+  selection <- get_primary_selection(context)
 
   # add one blank line after the selection
   rstudioapi::modifyRange(selection$range, paste0(selection[["text"]], "\n"), context$id)

From 376b209d55fdf90b678fac502ab38da0b5cd8cd7 Mon Sep 17 00:00:00 2001
From: simonpcouch <simonpatrickcouch@gmail.com>
Date: Wed, 30 Oct 2024 16:22:31 -0500
Subject: [PATCH 3/4] move streaming error handling into helper

---
 R/rstudioapi.R | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/R/rstudioapi.R b/R/rstudioapi.R
index 89986ec..69d08bd 100644
--- a/R/rstudioapi.R
+++ b/R/rstudioapi.R
@@ -13,12 +13,7 @@ rs_replace_selection <- function(context, role) {
   selection <- wipe_selection(selection, context)
 
   # start streaming
-  tryCatch(
-    stream_selection(selection, context, pal, n_lines_orig, remainder = selection_remainder),
-    error = function(e) {
-      rstudioapi::showDialog("Error", paste("The pal ran into an issue: ", e$message))
-    }
-  )
+  stream_selection(selection, context, pal, n_lines_orig, selection_remainder)
 }
 
 retrieve_pal <- function(role) {
@@ -80,7 +75,23 @@ wipe_selection <- function(selection, context) {
   selection
 }
 
+
 stream_selection <- function(selection, context, pal, n_lines_orig, remainder = "") {
+  tryCatch(
+    stream_selection_impl(
+      selection = selection,
+      context = context,
+      pal = pal,
+      n_lines_orig = n_lines_orig,
+      remainder = remainder
+    ),
+    error = function(e) {
+      rstudioapi::showDialog("Error", paste("The pal ran into an issue: ", e$message))
+    }
+  )
+}
+
+stream_selection_impl <- function(selection, context, pal, n_lines_orig, remainder = "") {
   selection_text <- selection[["text"]]
   output_lines <- character(0)
   stream <- pal[[".__enclos_env__"]][["private"]]$.stream(selection_text)
@@ -148,12 +159,7 @@ rs_prefix_selection <- function(context, role) {
   rstudioapi::setCursorPosition(selection$range$start)
 
   # start streaming into it--will be interactively appended to if need be
-  tryCatch(
-    stream_selection(selection, context, pal, n_lines_orig = 1),
-    error = function(e) {
-      rstudioapi::showDialog("Error", paste("The pal ran into an issue: ", e$message))
-    }
-  )
+  stream_selection(selection, context, pal, n_lines_orig = 1)
 }
 
 # suffix selection with new code -----------------------------------------------
@@ -174,10 +180,5 @@ rs_suffix_selection <- function(context, role) {
   rstudioapi::setCursorPosition(selection$range$start)
 
   # start streaming into it--will be interactively appended to if need be
-  tryCatch(
-    stream_selection(selection, context, pal, n_lines_orig = 1),
-    error = function(e) {
-      rstudioapi::showDialog("Error", paste("The pal ran into an issue: ", e$message))
-    }
-  )
+  stream_selection(selection, context, pal, n_lines_orig = 1)
 }

From 2f94b3ace6fb5b5469d68a5ea3c5ceb860acfb8a Mon Sep 17 00:00:00 2001
From: simonpcouch <simonpatrickcouch@gmail.com>
Date: Wed, 30 Oct 2024 16:23:54 -0500
Subject: [PATCH 4/4] reorganize

main methods at the top, helpers below, in the order in which they appear in main methods
---
 R/rstudioapi.R | 85 +++++++++++++++++++++++++-------------------------
 1 file changed, 43 insertions(+), 42 deletions(-)

diff --git a/R/rstudioapi.R b/R/rstudioapi.R
index 69d08bd..a4cf900 100644
--- a/R/rstudioapi.R
+++ b/R/rstudioapi.R
@@ -1,4 +1,4 @@
-# replace selection with refactored code
+# replace selection with refactored code ---------------------------------------
 rs_replace_selection <- function(context, role) {
   pal <- retrieve_pal(role)
   selection <- get_primary_selection(context)
@@ -16,6 +16,48 @@ rs_replace_selection <- function(context, role) {
   stream_selection(selection, context, pal, n_lines_orig, selection_remainder)
 }
 
+# prefix selection with new code -----------------------------------------------
+rs_prefix_selection <- function(context, role) {
+  pal <- retrieve_pal(role)
+  selection <- get_primary_selection(context)
+
+  # add one blank line before the selection
+  rstudioapi::modifyRange(selection$range, paste0("\n", selection[["text"]]), context$id)
+
+  # make the "current selection" that blank line
+  first_line <- selection$range
+  first_line$start[["column"]] <- 1
+  first_line$end[["row"]] <- selection$range$start[["row"]]
+  first_line$end[["column"]] <- 100000
+  selection$range <- first_line
+  rstudioapi::setCursorPosition(selection$range$start)
+
+  # start streaming into it--will be interactively appended to if need be
+  stream_selection(selection, context, pal, n_lines_orig = 1)
+}
+
+# suffix selection with new code -----------------------------------------------
+rs_suffix_selection <- function(context, role) {
+  pal <- retrieve_pal(role)
+  selection <- get_primary_selection(context)
+
+  # add one blank line after the selection
+  rstudioapi::modifyRange(selection$range, paste0(selection[["text"]], "\n"), context$id)
+
+  # make the "current selection" that blank line
+  last_line <- selection$range
+  last_line$start[["row"]] <- selection$range$end[["row"]] + 1
+  last_line$end[["row"]] <- selection$range$end[["row"]] + 1
+  last_line$start[["column"]] <- 1
+  last_line$end[["column"]] <- 100000
+  selection$range <- last_line
+  rstudioapi::setCursorPosition(selection$range$start)
+
+  # start streaming into it--will be interactively appended to if need be
+  stream_selection(selection, context, pal, n_lines_orig = 1)
+}
+
+# helpers ----------------------------------------------------------------------
 retrieve_pal <- function(role) {
   if (exists(paste0(".pal_last_", role))) {
     pal <- get(paste0(".pal_last_", role))
@@ -141,44 +183,3 @@ stream_selection_impl <- function(selection, context, pal, n_lines_orig, remaind
 
   rstudioapi::setCursorPosition(selection$range$start)
 }
-
-# prefix selection with new code -----------------------------------------------
-rs_prefix_selection <- function(context, role) {
-  pal <- retrieve_pal(role)
-  selection <- get_primary_selection(context)
-
-  # add one blank line before the selection
-  rstudioapi::modifyRange(selection$range, paste0("\n", selection[["text"]]), context$id)
-
-  # make the "current selection" that blank line
-  first_line <- selection$range
-  first_line$start[["column"]] <- 1
-  first_line$end[["row"]] <- selection$range$start[["row"]]
-  first_line$end[["column"]] <- 100000
-  selection$range <- first_line
-  rstudioapi::setCursorPosition(selection$range$start)
-
-  # start streaming into it--will be interactively appended to if need be
-  stream_selection(selection, context, pal, n_lines_orig = 1)
-}
-
-# suffix selection with new code -----------------------------------------------
-rs_suffix_selection <- function(context, role) {
-  pal <- retrieve_pal(role)
-  selection <- get_primary_selection(context)
-
-  # add one blank line after the selection
-  rstudioapi::modifyRange(selection$range, paste0(selection[["text"]], "\n"), context$id)
-
-  # make the "current selection" that blank line
-  last_line <- selection$range
-  last_line$start[["row"]] <- selection$range$end[["row"]] + 1
-  last_line$end[["row"]] <- selection$range$end[["row"]] + 1
-  last_line$start[["column"]] <- 1
-  last_line$end[["column"]] <- 100000
-  selection$range <- last_line
-  rstudioapi::setCursorPosition(selection$range$start)
-
-  # start streaming into it--will be interactively appended to if need be
-  stream_selection(selection, context, pal, n_lines_orig = 1)
-}