Fix bug that broke the RStudio build pane colors, 1.3.4

gaborcsardi · gaborcsardi · commit b5221ab02460 · 2017-09-15T19:13:36.000+01:00
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: crayon
 Title: Colored Terminal Output
-Version: 1.3.3
+Version: 1.3.4
 Authors@R: c(
     person("Gábor", "Csárdi", , "csardi.gabor@gmail.com",
     role = c("aut", "cre")),
diff --git a/R/has_color.r b/R/has_color.r
@@ -51,7 +51,7 @@ has_color <- function() {
 
   ## RStudio with (potential) ANSI support?
   if (rstudio_with_ansi_support() && sink.number() == 0) {
-    return(rstudioapi::callFun("getConsoleHasColor"))
+    return(TRUE)
   }
 
   ## Are we in a terminal? No?
diff --git a/R/utils.r b/R/utils.r
@@ -118,6 +118,7 @@ rstudio_with_ansi_support <- function() {
 
   ## This only works if the initialization is complete
   requireNamespace("rstudioapi", quietly = TRUE) &&
+    rstudioapi::isAvailable() &&
     rstudioapi::hasFun("getConsoleHasColor")
 }
 
diff --git a/inst/NEWS.md b/inst/NEWS.md
@@ -1,5 +1,5 @@
 
-# 1.3.3
+# 1.3.4
 
 * Style fucntions convert arguments to character now
 

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ has_color <- function() {`
`51`	`51`
`52`	`52`	`## RStudio with (potential) ANSI support?`
`53`	`53`	`if (rstudio_with_ansi_support() && sink.number() == 0) {`
`54`		`- return(rstudioapi::callFun("getConsoleHasColor"))`
	`54`	`+ return(TRUE)`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`## Are we in a terminal? No?`
Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,7 @@ rstudio_with_ansi_support <- function() {`
`118`	`118`
`119`	`119`	`## This only works if the initialization is complete`
`120`	`120`	`requireNamespace("rstudioapi", quietly = TRUE) &&`
	`121`	`+ rstudioapi::isAvailable() &&`
`121`	`122`	`rstudioapi::hasFun("getConsoleHasColor")`
`122`	`123`	`}`
`123`	`124`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`
`2`		`-# 1.3.3`
	`2`	`+# 1.3.4`
`3`	`3`
`4`	`4`	`* Style fucntions convert arguments to character now`
`5`	`5`