Options from regex tab now used throughout gadget

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: regexplain
 Title: Rstudio Addin to Explain, Test and Build Regular Expressions
-Version: 0.1.4
+Version: 0.1.5
 Date: 2018-03-14
 Authors@R: c(
     person("Garrick", "Aden-Buie", email = "g.adenbuie@gmail.com", role = c("aut", "cre")),

NEWS.md

@@ -1,4 +1,11 @@
-# regexplain 0.1.4
+## regexplain 0.1.x
+
+### 0.1.5
+
+* Options from **Regex** tab are extended to **Output** tab as well. Colored
+  options according to group where they are applied.
+
+### 0.1.4
 
 * Added string substitution function to **Output** tab (`g?sub`, 
   `str_replace(_all)?`) with replacement field

R/regex_gadget.R

@@ -47,16 +47,28 @@ regex_gadget <- function(text = NULL,
                             placeholder = "Enter regex, single \\ okay"),
               checkboxGroupInput(
                 'regex_options',
-                label = "",
+                label = HTML(
+                  '<div style="font-size: 1.25rem;">',
+                  'Option Groups: ',
+                  '<span style="color: #337ab7;">regexplain</span>,',
+                  '<span style="color: #5cb85c;">all</span>, ',
+                  '<span style="color: #f0ad4e;">base only</span>',
+                  '</div>'
+                ),
                 inline = TRUE,
                 width = "90%",
-                choices = c("Break Lines" = "text_break_lines",
-                            "Ignore Case" = "ignore.case",
-                            "Perl Style" = "perl",
-                            "Fixed" = "fixed",
-                            "Use Bytes" = "useBytes"
-                            # , "Invert" = "invert"
-                ),
+                choiceValues = list(
+                  "text_break_lines",
+                  "ignore.case",
+                  "fixed",
+                  "perl",
+                  "useBytes"),
+                choiceNames = list(
+                  HTML('<span style="color: #337ab7;">Break Lines</span>'),
+                  HTML('<span style="color: #5cb85c;">Ignore Case</span>'),
+                  HTML('<span style="color: #5cb85c;">Fixed/Literal</span>'),
+                  HTML('<span style="color: #f0ad4e;">Perl Style</span>'),
+                  HTML('<span style="color: #f0ad4e;">Use Bytes</span>')),
                 selected = c('text_break_lines')
               )
             ),
@@ -75,9 +87,14 @@ regex_gadget <- function(text = NULL,
           fillCol(
             flex = c(1, 3),
             inputPanel(
-              width = "100%;",
-              selectInput('regexFn', label = 'Apply Function',
-                          choices = regexFn_choices),
+              tags$div(
+                width = "100%;",
+                selectInput('regexFn', label = 'Apply Function',
+                            choices = regexFn_choices),
+                tags$span(class = "help-block",
+                          style = "font-size:1.25rem; margin-top:-10px; margin-bottom:0px; margin-left:4px;",
+                          "Adjust options in Regex tab")
+              ),
               uiOutput("output_sub")
             ),
             # verbatimTextOutput('output_result', placeholder = TRUE)
@@ -188,16 +205,39 @@ regex_gadget <- function(text = NULL,
       x <- if (regexPkg == "base") {
         if (req_sub_arg) {
           req(replacement())
-          regexFn(pattern(), replacement(), rtext())
+          regexFn(pattern(), replacement(), rtext(),
+                  ignore.case = 'ignore.case' %in% input$regex_options,
+                  perl = 'perl' %in% input$regex_options,
+                  fixed = 'fixed' %in% input$regex_options,
+                  useBytes = 'useBytes' %in% input$regex_options)
         } else {
-          regexFn(pattern(), rtext())
+          regexFn(pattern(), rtext(),
+                  ignore.case = 'ignore.case' %in% input$regex_options,
+                  perl = 'perl' %in% input$regex_options,
+                  fixed = 'fixed' %in% input$regex_options,
+                  useBytes = 'useBytes' %in% input$regex_options)
         }
       } else if (regexPkg == "stringr") {
         if (req_sub_arg) {
           req(replacement())
-          regexFn(rtext(), pattern(), replacement())
+          regexFn(
+            rtext(),
+            stringr::regex(
+              pattern(),
+              ignore_case = 'ignore.case' %in% input$regex_options,
+              literal = 'fixed' %in% input$regex_options
+            ),
+            replacement()
+          )
         } else {
-          regexFn(rtext(), pattern())
+          regexFn(
+            rtext(),
+            stringr::regex(
+              pattern(),
+              ignore_case = 'ignore.case' %in% input$regex_options,
+              literal = 'fixed' %in% input$regex_options
+            )
+          )
         }
       } else {
         "Um. Not sure how I got here."
@@ -223,7 +263,7 @@ regex_gadget <- function(text = NULL,
     })
   }
 
-  viewer <- shiny::paneViewer(700)
+  viewer <- shiny::paneViewer(minHeight = 1000)
   runGadget(ui, server, viewer = viewer)
 }