Format selection instead of full document if there's one

Author: AlvaroBrey

R/formatFileAddin.R

@@ -6,18 +6,26 @@ reformatFileAddin <- function() {
     # Get the document data
     context <- rstudioapi::getActiveDocumentContext()
     docId <- context$id
-    docContents <- context$contents
-    docPath <- context$path
 
-    # Check if it's a R file
-    sp <- strsplit(x = docPath, split = ".", fixed = TRUE)
-    t <- sp[[1]]
-    ext <- t[length(t)]
-    if (length(ext) && tolower(ext) == "r") {
-        # Reformat it
-        output <- paste(capture.output(formatR::tidy_source(text = docContents)), collapse = "\n")
-        rstudioapi::setDocumentContents(output, docId)
+    # If there's a selection, format that
+    selection <- rstudioapi::primary_selection(context)
+    selectionText <- selection$text
+    if (nchar(selectionText) > 0) {
+        output <- paste(capture.output(formatR::tidy_source(text = selectionText)), collapse = "\n")
+        rstudioapi::modifyRange(location = selection$range, text = output, id = docId)
     } else {
-        print("formatFile: Only R files are supported. Please focus on an editor with a R file open.")
+        # If not, try to format the whole file. Check if it's a R file
+        docPath <- context$path
+        sp <- strsplit(x = docPath, split = ".", fixed = TRUE)
+        t <-sp[[1]]
+        ext<- t[length(t)]
+        if (length(ext) && tolower(ext) == "r") {
+            docContents <- context$contents
+            # Reformat it
+            output <- paste(capture.output(formatR::tidy_source(text = docContents)), collapse = "\n")
+            rstudioapi::setDocumentContents(output, docId)
+        } else {
+            rstudioapi::showDialog("formatFileAddin error", "Only R files are supported. Please focus on an editor with a R file open.", "")
+        }
     }
 }

packrat/packrat.lock

@@ -3,9 +3,64 @@ PackratVersion: 0.4.8.1
 RVersion: 3.4.2
 Repos: CRAN=https://cran.rstudio.com/
 
+Package: R6
+Source: CRAN
+Version: 2.2.2
+Hash: b2366cd9d2f3851a5704b4e192b985c2
+
+Package: curl
+Source: CRAN
+Version: 3.0
+Hash: fb0029f1c84bf9b510c4f55cda7103f1
+
+Package: devtools
+Source: CRAN
+Version: 1.13.4
+Hash: 80a77b22f641002c7ce0343baeaee300
+Requires: digest, git2r, httr, jsonlite, memoise, rstudioapi, whisker,
+    withr
+
+Package: digest
+Source: CRAN
+Version: 0.6.12
+Hash: e53fb8c58673df868183697e39a6a4d6
+
 Package: formatR
 Source: CRAN
 Version: 1.5
+Hash: 258cf79a8dbeedf1c981cdb53837d2af
+
+Package: git2r
+Source: CRAN
+Version: 0.19.0
+Hash: f4f7966fc357f60dc62dbffcea917eef
+
+Package: httr
+Source: CRAN
+Version: 1.3.1
+Hash: 2d32e01e53d532c812052e27a1021441
+Requires: R6, curl, jsonlite, mime, openssl
+
+Package: jsonlite
+Source: CRAN
+Version: 1.5
+Hash: 9c51936d8dd00b2f1d4fe9d10499694c
+
+Package: memoise
+Source: CRAN
+Version: 1.1.0
+Hash: 410fcd334bc626db100237cc1370f2e9
+Requires: digest
+
+Package: mime
+Source: CRAN
+Version: 0.5
+Hash: 463550cf44fb6f0a2359368f42eebe62
+
+Package: openssl
+Source: CRAN
+Version: 0.9.9
+Hash: 3858537ac10388a5db1687450908f257
 
 Package: packrat
 Source: CRAN
@@ -15,3 +70,14 @@ Hash: 6ad605ba7b4b476d84be6632393f5765
 Package: rstudioapi
 Source: CRAN
 Version: 0.7
+Hash: e2ebaff8160aff3e6b32e6e78a693c2d
+
+Package: whisker
+Source: CRAN
+Version: 0.3-2
+Hash: 803d662762e532705c2c066a82d066e7
+
+Package: withr
+Source: CRAN
+Version: 2.1.0
+Hash: 097f730987c2dc13d421b65bf01ddf08