Fix syntax highlighting on windows (#1288)

Fixes #1282

NEWS.md

@@ -1,5 +1,7 @@
 # pkgdown (development version)
 
+* Syntax highlighting works on Windows once more (#1282)
+
 * Rendering empty `.md` file now returns empty string (#1285).
 
 * `build_articles_index()` is now exported to rapidly rebuild the index (#1281)

R/highlight.r

@@ -4,14 +4,15 @@
 highlight_text <- function(text) {
   stopifnot(is.character(text), length(text) == 1)
 
+  text <- gsub("\r", "", text)
   expr <- tryCatch(
     parse(text = text, keep.source = TRUE),
     error = function(e) NULL
   )
 
   # Failed to parse, or yielded empty expression
   if (length(expr) == 0) {
-    return(text)
+    return(escape_html(text))
   }
 
   packages <- extract_package_attach(expr)

tests/testthat/test-highlight.R

@@ -43,3 +43,18 @@ test_that("can link to implicit base topics", {
     "<span class='fu'><a href='https://rdrr.io/r/stats/median.html'>median</a></span>()"
   )
 })
+
+test_that("can parse code with carriage returns", {
+  scoped_package_context("test")
+
+  expect_equal(
+    highlight_text("1\r\n2"),
+    "<span class='fl'>1</span>\n<span class='fl'>2</span>"
+  )
+})
+
+test_that("unparsed code is still escaped", {
+  scoped_package_context("test")
+
+  expect_equal(highlight_text("<"), "&lt;")
+})