From 382f3f733ee209d124ac6d9204f3f78989ba72d1 Mon Sep 17 00:00:00 2001 From: Indrajeet Patil Date: Wed, 20 Mar 2024 18:33:44 +0100 Subject: [PATCH 1/7] to kick off CI/CD --- cran-comments.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cran-comments.md b/cran-comments.md index 3f9141dd8..747a930ad 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -8,5 +8,4 @@ This release fixes R CMD check issues in R-devel, as requested by CRAN. ## Reverse dependencies -* I have run R CMD check on the downstream dependencies, no regressions were - found. +* No regressions were found in R CMD check on the downstream dependencies. From e501aed7949ac45e8426fc1d95fe37d2d3c45eba Mon Sep 17 00:00:00 2001 From: Indrajeet Patil Date: Wed, 20 Mar 2024 18:45:57 +0100 Subject: [PATCH 2/7] fix failing test --- tests/testthat/test-get_source_expressions.R | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/testthat/test-get_source_expressions.R b/tests/testthat/test-get_source_expressions.R index 917a414ed..c6fcc2f43 100644 --- a/tests/testthat/test-get_source_expressions.R +++ b/tests/testthat/test-get_source_expressions.R @@ -91,10 +91,11 @@ test_that("Multi-byte characters correct columns", { test_that("Multi-byte character truncated by parser is ignored", { skip_if_not_utf8_locale() + skip_if_not_r_version("4.4.0") # \U2013 is the Unicode character 'en dash', which is # almost identical to a minus sign in monospaced fonts. with_content_to_parse("y <- x \U2013 42", { - expect_identical(error$message, "unexpected input") + expect_identical(error$message, "unexpected invalid token") expect_identical(error$column_number, 8L) }) }) From ea7d6ef7c64f2c016968b3fb741488d1a030d850 Mon Sep 17 00:00:00 2001 From: Michael Chirico Date: Wed, 20 Mar 2024 11:08:47 -0700 Subject: [PATCH 3/7] Test robust across R versions --- tests/testthat/test-get_source_expressions.R | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/testthat/test-get_source_expressions.R b/tests/testthat/test-get_source_expressions.R index c6fcc2f43..68750b380 100644 --- a/tests/testthat/test-get_source_expressions.R +++ b/tests/testthat/test-get_source_expressions.R @@ -91,12 +91,14 @@ test_that("Multi-byte characters correct columns", { test_that("Multi-byte character truncated by parser is ignored", { skip_if_not_utf8_locale() - skip_if_not_r_version("4.4.0") # \U2013 is the Unicode character 'en dash', which is # almost identical to a minus sign in monospaced fonts. - with_content_to_parse("y <- x \U2013 42", { - expect_identical(error$message, "unexpected invalid token") - expect_identical(error$column_number, 8L) + content <- "y <- x \U2013 42" + # message is like ':1:8: unexpected invalid token\n1: ...' + base_msg <- conditionMessage(tryCatch(str2lang(content), error = identity)) + with_content_to_parse(content, { + expect_identical(error$message, gsub(".*: ", "", gsub("\n.*", "", base_msg))) + expect_identical(error$column_number, as.integer(gsub(".*:[0-9]+:([0-9]+).*", "\\1", base_msg))) }) }) From d7bf0c47ca4dc59951b50b8fa99ad46a37078431 Mon Sep 17 00:00:00 2001 From: Michael Chirico Date: Wed, 20 Mar 2024 11:19:30 -0700 Subject: [PATCH 4/7] with_content_to_parse doesn't get parent env variables? --- tests/testthat/test-get_source_expressions.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testthat/test-get_source_expressions.R b/tests/testthat/test-get_source_expressions.R index 68750b380..0bc28db5e 100644 --- a/tests/testthat/test-get_source_expressions.R +++ b/tests/testthat/test-get_source_expressions.R @@ -95,8 +95,8 @@ test_that("Multi-byte character truncated by parser is ignored", { # almost identical to a minus sign in monospaced fonts. content <- "y <- x \U2013 42" # message is like ':1:8: unexpected invalid token\n1: ...' - base_msg <- conditionMessage(tryCatch(str2lang(content), error = identity)) with_content_to_parse(content, { + base_msg <- conditionMessage(tryCatch(str2lang(content), error = identity)) expect_identical(error$message, gsub(".*: ", "", gsub("\n.*", "", base_msg))) expect_identical(error$column_number, as.integer(gsub(".*:[0-9]+:([0-9]+).*", "\\1", base_msg))) }) From 784a21b80176d81270f4839209d4ebdb21976b5e Mon Sep 17 00:00:00 2001 From: Indrajeet Patil Date: Wed, 20 Mar 2024 23:23:25 +0100 Subject: [PATCH 5/7] revert changes to cran comments --- cran-comments.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cran-comments.md b/cran-comments.md index 747a930ad..3f9141dd8 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -8,4 +8,5 @@ This release fixes R CMD check issues in R-devel, as requested by CRAN. ## Reverse dependencies -* No regressions were found in R CMD check on the downstream dependencies. +* I have run R CMD check on the downstream dependencies, no regressions were + found. From 9499a981c15efe7eacf13f6f36ba13991ab7d2a4 Mon Sep 17 00:00:00 2001 From: Michael Chirico Date: Wed, 20 Mar 2024 23:11:53 -0700 Subject: [PATCH 6/7] better test --- tests/testthat/test-get_source_expressions.R | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/testthat/test-get_source_expressions.R b/tests/testthat/test-get_source_expressions.R index 0bc28db5e..10304f26f 100644 --- a/tests/testthat/test-get_source_expressions.R +++ b/tests/testthat/test-get_source_expressions.R @@ -97,8 +97,9 @@ test_that("Multi-byte character truncated by parser is ignored", { # message is like ':1:8: unexpected invalid token\n1: ...' with_content_to_parse(content, { base_msg <- conditionMessage(tryCatch(str2lang(content), error = identity)) - expect_identical(error$message, gsub(".*: ", "", gsub("\n.*", "", base_msg))) - expect_identical(error$column_number, as.integer(gsub(".*:[0-9]+:([0-9]+).*", "\\1", base_msg))) + # Just ensure that the captured message is a substring of the parser error, #2527 + expect_true(grepl(error$message, base_msg, fixed = TRUE)) + expect_identical(error$column_number, 8L) }) }) From 563b66e7b3a09b9c1dbc7ea490ce2561a04b4d30 Mon Sep 17 00:00:00 2001 From: Michael Chirico Date: Wed, 20 Mar 2024 23:20:34 -0700 Subject: [PATCH 7/7] useBytes=TRUE --- tests/testthat/test-get_source_expressions.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testthat/test-get_source_expressions.R b/tests/testthat/test-get_source_expressions.R index 10304f26f..dbacecacc 100644 --- a/tests/testthat/test-get_source_expressions.R +++ b/tests/testthat/test-get_source_expressions.R @@ -98,7 +98,7 @@ test_that("Multi-byte character truncated by parser is ignored", { with_content_to_parse(content, { base_msg <- conditionMessage(tryCatch(str2lang(content), error = identity)) # Just ensure that the captured message is a substring of the parser error, #2527 - expect_true(grepl(error$message, base_msg, fixed = TRUE)) + expect_true(grepl(error$message, base_msg, fixed = TRUE, useBytes = TRUE)) expect_identical(error$column_number, 8L) }) })