Skip to content

Commit

Permalink
Merge pull request #1181 from r-lib/issue-1180
Browse files Browse the repository at this point in the history
Adjust to parser failures in r devel
  • Loading branch information
lorenzwalthert authored Mar 21, 2024
2 parents 20c5b37 + 8d70633 commit 634dce1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ default_language_version:

repos:
- repo: https://github.com/lorenzwalthert/precommit
rev: v0.3.2.9027
rev: v0.4.0
hooks:
- id: style-files
args:
Expand Down Expand Up @@ -101,7 +101,7 @@ repos:
)$
- id: pkgdown
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: check-added-large-files
args: ["--maxkb=200"]
Expand All @@ -119,7 +119,7 @@ repos:
tests/testthat/_snaps/.*|
)$
- repo: https://github.com/lorenzwalthert/gitignore-tidy
rev: 475bf5d96927a1887ce2863ff3075b1d7240bc51
rev: 517cddbf1d8514ddaf43159686617ae65895dc99
hooks:
- id: tidy-gitignore
- repo: local
Expand Down
3 changes: 2 additions & 1 deletion tests/testthat/test-parsing.R
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@ test_that("CRLF EOLs fail with informative error", {


test_that("mixed CRLF / LF EOLs fail", {
error_msg_stem <- if (getRversion() < "4.4") "unexpected input" else "unexpected invalid token"
expect_error(
style_text("a + 3 -4 -> x\nx + 2\r\n glück + 1"),
"unexpected input"
error_msg_stem
)
})

Expand Down

0 comments on commit 634dce1

Please # to comment.