Merge branch 'main' into f1032-remove-blank-lines-after-and-before-parens

Author: IndrajeetPatil

.github/workflows/check-full.yaml

@@ -12,31 +12,44 @@ jobs:
   R-CMD-check:
     runs-on: ${{ matrix.config.os }}
 
-    name: ${{ matrix.config.os }} (${{ matrix.config.r }})
+    name: ${{ matrix.config.os }} (${{ matrix.config.r }}) ${{ matrix.config.locale }}
 
     strategy:
       fail-fast: false
       matrix:
         config:
-          - {os: macos-latest,   r: 'release'}
+          - { os: macos-latest, r: "release" }
 
-          - {os: windows-latest, r: 'devel'}
-          - {os: windows-latest, r: 'release'}
+          - { os: windows-latest, r: "devel" }
+          - { os: windows-latest, r: "release" }
           # use 4.1 to check with rtools40's older compiler
-          - {os: windows-latest, r: '4.1'}
+          - { os: windows-latest, r: "4.1" }
 
-          - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}
-          - {os: ubuntu-latest,   r: 'release'}
-          - {os: ubuntu-latest,   r: 'oldrel-1'}
-          - {os: ubuntu-latest,   r: 'oldrel-2'}
-          - {os: ubuntu-latest,   r: 'oldrel-3'}
-          - {os: ubuntu-latest,   r: 'oldrel-4'}
+          - { os: ubuntu-latest, r: "devel", http-user-agent: "release" }
+          - { os: ubuntu-latest, r: "devel", locale: "en_US" }
+          #- { os: ubuntu-latest, r: "release", locale: "zh_CN" }
+          - { os: ubuntu-latest, r: "oldrel-1" }
+          - { os: ubuntu-latest, r: "oldrel-2" }
+          - { os: ubuntu-latest, r: "oldrel-3" }
+          - { os: ubuntu-latest, r: "oldrel-4" }
 
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
       R_KEEP_PKG_SOURCE: yes
 
     steps:
+      - name: Set 'en_US' locale
+        if: matrix.config.locale == 'en_US'
+        run: |
+          sudo locale-gen en_US
+          echo "LC_ALL=en_US" >> $GITHUB_ENV
+
+      - name: Set 'zh_CN' locale
+        if: matrix.config.locale == 'zh_CN'
+        run: |
+          sudo locale-gen zh_CN
+          echo "LC_ALL=zh_CN" >> $GITHUB_ENV
+
       - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-pandoc@v2
@@ -49,6 +62,8 @@ jobs:
 
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
+          pak-version: devel
+          upgrade: "TRUE"
           extra-packages: any::rcmdcheck
           needs: check
 

.gitignore

@@ -3,6 +3,7 @@
 .Rhistory
 .Rproj.user
 .gitsum
+.vscode
 Meta
 R/scratch
 README.html

inst/WORDLIST

@@ -111,6 +111,7 @@ mav
 md
 MERCHANTABILITY
 mlr
+mlr's
 mutli
 Müller
 navbar
@@ -170,6 +171,7 @@ Rmd
 rnw
 Rnw
 roadmap
+Robinlovelace
 roclet
 roclets
 ropensci

tests/testthat/test-parsing.R

@@ -36,10 +36,17 @@ test_that("mixed CRLF / LF EOLs fail", {
   )
 })
 
-test_that("unicode can't be propprely handled on Windows for R < 4.2", {
-  msg <- ifelse(getRversion() < "4.2" && is_windows(),
-    "Can't parse input due to unicode restriction in base R\\.",
-    NA
+test_that("unicode can't be properly handled on Windows for R < 4.2", {
+  skip_if_not(getRversion() < "4.2" && is_windows())
+
+  expect_error(
+    style_text('suit <- "♠"'),
+    "Can't parse input due to unicode restriction in base R\\."
   )
-  expect_error(style_text('suit <- "♠"'), msg)
+})
+
+test_that("unicode is properly handled in all settings other than on Windows for R < 4.2", {
+  skip_if(getRversion() < "4.2" && is_windows())
+
+  expect_error(style_text('suit <- "♠"'), NA)
 })

vignettes/distribute_custom_style_guides.Rmd

@@ -22,15 +22,15 @@ This vignette describes how you can distribute your own style guide. It builds o
 
 There are a few packages that implement a third-party style guide that are maintained by styler contributors:
 
--   [lorenzwalthert/styler.nocomments](https://github.com/lorenzwalthert/styler.nocomments)
--   [lorenzwalthert/semicoloner](https://github.com/lorenzwalthert/semicoloner)
--   [lorenzwalthert/oneliner](https://github.com/lorenzwalthert/oneliner)
--   [mlr-org/styler.mlr](https://github.com/mlr-org/styler.mlr)
+-   [lorenzwalthert/styler.nocomments](https://github.com/lorenzwalthert/styler.nocomments): Drops comments.
+-   [lorenzwalthert/semicoloner](https://github.com/lorenzwalthert/semicoloner): Puts `;` at the end of lines.
+-   [lorenzwalthert/oneliner](https://github.com/lorenzwalthert/oneliner): Puts all code on one line.
+-   [mlr-org/styler.mlr](https://github.com/mlr-org/styler.mlr): Implements mlr's style guide.
 
 Other available style guides include:
-
--   [ropensci-review-tools/spaceout](https://github.com/ropensci-review-tools/spaceout)
--   [gadenbuie/grkstyle](https://github.com/gadenbuie/grkstyle)
+-   [Robinlovelace/styler.equals](https://github.com/Robinlovelace/styler.equals): Tidyverse style but `=` instead of `<-` for assignment.
+-   [ropensci-review-tools/spaceout](https://github.com/ropensci-review-tools/spaceout): More spaces around braces.
+-   [gadenbuie/grkstyle](https://github.com/gadenbuie/grkstyle): Styles indention differently and allows to use tabs for it instead of spaces.
 
 To start out, you can use the [GitHub Template](https://github.com/lorenzwalthert/styler.yours) for third-party style guides that has already the right directory structure and patterns described below in place.