Skip to content

Commit 33466f5

Browse files
Merge pull request #1270 from r-lib/rc-1.11.0
Release {styler} 1.11.0
2 parents 8bdc4fb + 5b5c9b9 commit 33466f5

File tree

9 files changed

+111
-34
lines changed

9 files changed

+111
-34
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ default_language_version:
66

77
repos:
88
- repo: https://github.com/lorenzwalthert/precommit
9-
rev: v0.4.3.9014
9+
rev: v0.4.3.9015
1010
hooks:
1111
- id: style-files
1212
args:
@@ -119,7 +119,7 @@ repos:
119119
tests/testthat/_snaps/.*|
120120
)$
121121
- repo: https://github.com/lorenzwalthert/gitignore-tidy
122-
rev: 0.1.2
122+
rev: 0.1.3
123123
hooks:
124124
- id: tidy-gitignore
125125
- repo: local

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Type: Package
22
Package: styler
33
Title: Non-Invasive Pretty Printing of R Code
4-
Version: 1.10.3.9000
4+
Version: 1.11.0
55
Authors@R:
66
c(person(given = "Kirill",
77
family = "Müller",

NEWS.md

Lines changed: 93 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,76 @@
11
<!-- NEWS.md is maintained by https://cynkra.github.io/fledge, do not edit -->
22

3-
# styler 1.10.3
3+
# {styler} 1.11.0
4+
5+
This release fixes a bug related that prevented {styler} to format code with
6+
comments in curly-curly expressions `{{` (#1269).
7+
[&#x0040;IndrajeetPatil](https://github.com/IndrajeetPatil) is now a package
8+
author. Thanks for your many contributions.
9+
10+
**New features**
11+
12+
- Add support for {webr} code chunks in Rmd/qmd documents (#1229).
13+
- Add colored output to R API (#1187).
14+
15+
**Major changes**
16+
17+
- Ensure {styler} can format code with comment in curly-curly (#1269).
18+
- Adapt to single indent semantics in style guide (#1235).
19+
- Remove excessive line breaks between top-level expressions (#1239).
20+
- Remove blank lines after opening and before closing braces (#1995).
21+
- Empty curly have no spaces around (#1234).
22+
- Remove spaces around dollar operator (#1246).
23+
- Improve stack trace styler throws on parse error (#1216).
24+
- Use Bootstrap 5 template for pkgdown website (#1209).
25+
- Complete third-party style guide documentation (#1201).
26+
- Document package options (#1193).
27+
- Bump minimum needed R version to 4.0 (#1197).
28+
29+
**Minor changes**
30+
31+
- Ensure formatted token is a call before forcing line breaks (#1254).
32+
- Fix lints (#1260), update `.lintr` file.
33+
- Use `all_linters()` instead of using tags (#1207).
34+
- Fix `paste_linter()` lints (#1204).
35+
- Turn off `strings_as_factors_linter()` (#1217).
36+
- Update precommit config (#1205).
37+
- Remove unused `extend_if_comment()` internal (#1250).
38+
- Remove unused internal utility: `calls_sys()` (#1213).
39+
- Remove unused testing helper: `generate_test_samples()` (#1212).
40+
- Improve a few function names (#1249).
41+
- Use `expect_no_warning()` (#1248).
42+
- Update WORDLIST (#1240, #1210).
43+
- Check for warnings in examples and tests (#1219).
44+
- Use stable version of {purrr} (#1215).
45+
- Don't store code tree structures in tests (#1208).
46+
- Update touchstone config (#1203).
47+
- Add non-US locale and use pak to upgrade packages in GHA (#1200).
48+
- Welcome Indrajeet as author (#1198).
49+
50+
Thanks for everyone who contributed to this release:
51+
[&#x0040;armenic](https://github.com/armenic),
52+
[&#x0040;bernt-matthias](https://github.com/bernt-matthias),
53+
[&#x0040;cicdguy](https://github.com/cicdguy),
54+
[&#x0040;elgabbas](https://github.com/elgabbas),
55+
[&#x0040;fh-mthomson](https://github.com/fh-mthomson),
56+
[&#x0040;IndrajeetPatil](https://github.com/IndrajeetPatil),
57+
[&#x0040;kevinushey](https://github.com/kevinushey),
58+
[&#x0040;kongdd](https://github.com/kongdd),
59+
[&#x0040;krlmlr](https://github.com/krlmlr),
60+
[&#x0040;lorenzwalthert](https://github.com/lorenzwalthert),
61+
[&#x0040;maikol-solis](https://github.com/maikol-solis),
62+
[&#x0040;MichaelChirico](https://github.com/MichaelChirico),
63+
[&#x0040;nickhir](https://github.com/nickhir),
64+
[&#x0040;obsaditelnost](https://github.com/obsaditelnost),
65+
[&#x0040;olivroy](https://github.com/olivroy),
66+
[&#x0040;rinkjames](https://github.com/rinkjames),
67+
[&#x0040;SamGG](https://github.com/SamGG),
68+
[&#x0040;stibu81](https://github.com/stibu81),
69+
[&#x0040;strengejacke](https://github.com/strengejacke),
70+
[&#x0040;wiper8](https://github.com/wiper8), and
71+
[&#x0040;wurli](https://github.com/wurli).
72+
73+
# {styler} 1.10.3
474

575
This release was requested by the CRAN team since parser error messages changed,
676
which were hard-coded in some unit tests (#1180).
@@ -32,7 +102,7 @@ We thank everyone who helped making this release possible.
32102

33103
[&#x0040;AshesITR](https://github.com/AshesITR), [&#x0040;averissimo](https://github.com/averissimo), [&#x0040;IndrajeetPatil](https://github.com/IndrajeetPatil), [&#x0040;lorenzwalthert](https://github.com/lorenzwalthert), [&#x0040;mcanouil](https://github.com/mcanouil), [&#x0040;moodymudskipper](https://github.com/moodymudskipper), [&#x0040;olivroy](https://github.com/olivroy), [&#x0040;sbanville-delfi](https://github.com/sbanville-delfi), [&#x0040;sorhawell](https://github.com/sorhawell), [&#x0040;ssh352](https://github.com/ssh352), [&#x0040;swo](https://github.com/swo), and [&#x0040;vertesy](https://github.com/vertesy).
34104

35-
# styler 1.10.2
105+
# {styler} 1.10.2
36106

37107
This release was requested by the CRAN team to fix CRAN warning on invalid
38108
numeric version inputs (#1143).
@@ -50,7 +120,7 @@ We thank everyone who helped making this release possible.
50120

51121
[&#x0040;krlmlr](https://github.com/krlmlr), [&#x0040;lorenzwalthert](https://github.com/lorenzwalthert), [&#x0040;MichaelChirico](https://github.com/MichaelChirico), [&#x0040;olivroy](https://github.com/olivroy), [&#x0040;rkrug](https://github.com/rkrug), and [&#x0040;rossdrucker](https://github.com/rossdrucker).
52122

53-
# styler 1.10.1
123+
# {styler} 1.10.1
54124

55125
This release was requested by CRAN due to accidentally populating a user cache while building vignettes for R >= 4.3.0.
56126

@@ -59,7 +129,7 @@ This release was requested by CRAN due to accidentally populating a user cache w
59129

60130
Thanks to everyone who contributed to this release: [&#x0040;olivroy](https://github.com/olivroy) and [&#x0040;krlmlr](https://github.com/krlmlr).
61131

62-
# styler 1.10.0
132+
# {styler} 1.10.0
63133

64134
This release contains speed-ups between 20% and 40% depending on your use case
65135
thanks to replacing {base} functionality with {vctrs} (#1114). With the speed
@@ -85,7 +155,7 @@ Thanks for everyone contributing to this release:
85155

86156
[&#x0040;IndrajeetPatil](https://github.com/IndrajeetPatil), [&#x0040;krlmlr](https://github.com/krlmlr), [&#x0040;kyleam](https://github.com/kyleam), [&#x0040;MichaelChirico](https://github.com/MichaelChirico), [&#x0040;mvanaman](https://github.com/mvanaman), [&#x0040;olivroy](https://github.com/olivroy), and [&#x0040;vvarik](https://github.com/vvarik).
87157

88-
# styler 1.9.1
158+
# {styler} 1.9.1
89159

90160
**Bug fixes**
91161

@@ -105,7 +175,7 @@ Thanks for everyone who contributed to this release:
105175
[&#x0040;dpprdan](https://github.com/dpprdan), [&#x0040;flying-sheep](https://github.com/flying-sheep), [&#x0040;giocomai](https://github.com/giocomai) and [&#x0040;MichaelChirico](https://github.com/MichaelChirico).
106176

107177

108-
# styler 1.9.0
178+
# {styler} 1.9.0
109179

110180
**Features**
111181

@@ -170,7 +240,7 @@ A big shout out to anyone who contributed to this release:
170240
[&#x0040;juliangrimm225](https://github.com/) and
171241
[&#x0040;krlmlr](https://github.com/krlmlr).
172242

173-
# styler 1.8.1
243+
# {styler} 1.8.1
174244

175245
**Features**
176246

@@ -201,7 +271,7 @@ Dave Jarvis,
201271
[&#x0040;Robinlovelace](https://github.com/Robinlovelace).
202272

203273

204-
# styler 1.8.0
274+
# {styler} 1.8.0
205275

206276
{styler} 1.8.0 comes with a host of new features, around 40% speed improvement,
207277
bug fixes and the removal of 8 recursive dependencies. We also welcome
@@ -312,7 +382,7 @@ A big hand to everyone who made this release possible:
312382
[&#x0040;lorenzwalthert](https://github.com/lorenzwalthert), [&#x0040;MichaelChirico](https://github.com/MichaelChirico), [&#x0040;moodymudskipper](https://github.com/moodymudskipper), [&#x0040;RaymondBalise](https://github.com/RaymondBalise), [&#x0040;Robinlovelace](https://github.com/Robinlovelace), [&#x0040;sebffischer](https://github.com/sebffischer),
313383
[&#x0040;sgorm123](https://github.com/sgorm123), [&#x0040;stefanoborini](https://github.com/stefanoborini), and [&#x0040;wdkrnls](https://github.com/wdkrnls).
314384

315-
# styler 1.7.0
385+
# {styler} 1.7.0
316386

317387
- if `else` follows directly after `if`, line breaks are removed (#935).
318388

@@ -426,11 +496,11 @@ Thanks to all contributors that made this release possible:
426496
[\@ssh352](https://github.com/ssh352), and
427497
[\@xjtusjtu](https://github.com/xjtusjtu).
428498
429-
# styler 1.6.2
499+
# {styler} 1.6.2
430500
431501
- clean up cache files older than one week (#842).
432502
433-
# styler 1.6.1
503+
# {styler} 1.6.1
434504
435505
- Files with `.Rmarkdown` extension are now recognized as an R markdown files
436506
in `style_file()` and friends (#824).
@@ -465,7 +535,7 @@ We'd like to thank all people who helped making this release possible:
465535
[\@lorenzwalthert](https://github.com/lorenzwalthert), and
466536
[\@MichaelChirico](https://github.com/MichaelChirico).
467537
468-
# styler 1.5.1
538+
# {styler} 1.5.1
469539
470540
## Alignment detection
471541
@@ -568,7 +638,7 @@ release of styler through their contributions in issues and pull requests:
568638
[\@RoyalTS](https://github.com/RoyalTS), and
569639
[\@russHyde](https://github.com/russHyde).
570640

571-
# styler 1.4.1
641+
# {styler} 1.4.1
572642

573643
- fix interaction between cache and `base_indention`. This also fixes the
574644
Addin for styling a selection with base indention repeatedly (#764).
@@ -582,7 +652,7 @@ Thanks to everyone who contributed to this release:
582652
[\@lorenzwalthert](https://github.com/lorenzwalthert), and
583653
[\@renkun-ken](https://github.com/renkun-ken).
584654

585-
# styler 1.4.0
655+
# {styler} 1.4.0
586656

587657
## API Changes
588658

@@ -726,7 +796,7 @@ Thanks to all the people who made this release possible:
726796
[\@swsoyee](https://github.com/swsoyee), and
727797
[\@Winterstorm-j](https://github.com/Winterstorm-j).
728798

729-
# styler 1.3.2
799+
# {styler} 1.3.2
730800

731801
Release upon request by the CRAN team.
732802

@@ -739,7 +809,7 @@ Release upon request by the CRAN team.
739809
- skip timing tests on CRAN as requested by CRAN team because they did not
740810
pass on all machines (#603).
741811

742-
# styler 1.3.1
812+
# {styler} 1.3.1
743813

744814
Emergency release. In case multiple expressions are on one line and only some
745815
of them are cached, styler can remove code. To reach this state, some of the
@@ -766,7 +836,7 @@ We thank the people who have contributed to this release:
766836
[\@ellessenne](https://github.com/ellessenne) and
767837
[\@renkun-ken](https://github.com/renkun-ken).
768838

769-
# styler 1.3.0
839+
# {styler} 1.3.0
770840

771841
## Breaking changes
772842

@@ -820,7 +890,7 @@ Thanks to all contributors involved, in particular
820890
[\@pat-s](https://github.com/pat-s), and
821891
[\@programming-wizard](https://github.com).
822892

823-
# styler 1.2.0
893+
# {styler} 1.2.0
824894

825895
## Breaking changes
826896

@@ -899,7 +969,7 @@ Thanks to all contributors involved, in particular
899969
[\@pat-s](https://github.com/pat-s), \@reddy-ia, and
900970
[\@russHyde](https://github.com/russHyde)
901971

902-
# styler 1.1.1
972+
# {styler} 1.1.1
903973

904974
This is primarily a maintenance release upon the request of the CRAN team
905975
(#490).
@@ -988,7 +1058,7 @@ Thanks to all contributors involved, in particular
9881058
[\@wdearden](https://github.com/wdearden),
9891059
[\@wmayner](https://github.com/wmayner), and \@yech1990.
9901060
991-
# styler 1.1.0
1061+
# {styler} 1.1.0
9921062
9931063
This release introduces new features and is fully backward-compatible. It also
9941064
adapts to changes in the R parser committed into R devel (#419).
@@ -1028,7 +1098,7 @@ Thanks to all contributors for patches, issues and the like: @jonmcalder,
10281098
@krlmlr, @IndrajeetPatil, @kalibera, @Hasnep, @kiranmaiganji, @dirkschumacher,
10291099
@ClaytonJY, @wlandau, @maurolepore
10301100
1031-
# styler 1.0.2
1101+
# {styler} 1.0.2
10321102
10331103
This is a maintenance release without any breaking API changes.
10341104
@@ -1059,7 +1129,7 @@ Thanks to all contributors for patches, issues and the like: @katrinleinweber,
10591129
@krlmlr, @dchiu911, @ramnathv, @aedobbyn, @Bio7, @tonytonov, @samhinshaw, @fny,
10601130
@vnijs, @martin-mfg, @NGaffney, @dchiu911.
10611131

1062-
# styler 1.0.1
1132+
# {styler} 1.0.1
10631133

10641134
This is a maintenance release without any breaking API changes.
10651135

@@ -1099,7 +1169,7 @@ Thanks to all contributors for patches, issues and the like: @devSJR, @klrmlr,
10991169
@yutannihilation, @samhinshaw, @martin-mfg, @jjramsey, @RMHogervorst, @wlandau,
11001170
@llrs, @aaronrudkin, @crew102, @jkgrain, @jennybc, @joranE.
11011171

1102-
# styler 1.0.0
1172+
# {styler} 1.0.0
11031173

11041174
Initial release.
11051175

README.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,4 @@ The following online docs are available:
6969

7070
Hex sticker font is [Gayathri](https://fonts.google.com/specimen/Gayathri), and
7171
the image is taken from icon made by [Freepik](https://www.freepik.com) and
72-
available at [flaticon.com](https://www.flaticon.com/free-icon/suit).
72+
available at [flaticon.com](https://www.flaticon.com/free-icon/suit-and-tie-outfit_25978?term=suit&page=1&position=2&origin=search&related_id=25978).

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,5 @@ The following online docs are available:
5858
Hex sticker font is
5959
[Gayathri](https://fonts.google.com/specimen/Gayathri), and the image is
6060
taken from icon made by [Freepik](https://www.freepik.com) and available
61-
at [flaticon.com](https://www.flaticon.com/free-icon/suit).
61+
at
62+
[flaticon.com](https://www.flaticon.com/free-icon/suit-and-tie-outfit_25978?term=suit&page=1&position=2&origin=search&related_id=25978).

cran-comments.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@ editor_options:
44
wrap: 79
55
---
66

7-
This is a release requested by the CRAN team to comply with new error messages
8-
in the R parser that caused unit tests to fail.
7+
This release fixes a bug related that prevented {styler} to format code with
8+
comments in curly-curly expressions `{{` (#1269).
9+
[&#x0040;IndrajeetPatil](https://github.com/IndrajeetPatil) is now a package
10+
author. Thanks for your many contributions.
911

1012

1113
## Test environments
1214

13-
- ubuntu-latest (on GitHub Actions): R devel, R 4.4.0, R 4.3.0, R 4.2.1, 4.1.2, R 4.0.5
14-
- Windows Server 10 (on GitHub Actions): R devel, R 4.4.0, R 4.3.0, R 4.2.1, R 4.1.2, R 4.0.5
15+
- ubuntu-latest (on GitHub Actions): R devel, R 4.5.1, R 4.4.0, R 4.3.0, R 4.2.1, 4.1.2
16+
- Windows Server 10 (on GitHub Actions): R devel, R 4.5.1, R 4.4.0, R 4.3.0, R 4.2.1, R 4.1.2
1517
- win-builder: R devel
1618

1719
## R CMD check results

inst/WORDLIST

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ gadenbuie
6161
Gayathri
6262
getOption
6363
ggplot
64+
GHA
6465
Github
6566
github
6667
gitsum
@@ -119,6 +120,7 @@ oneliner
119120
ORCID
120121
ourself
121122
packrat
123+
pak
122124
pandoc
123125
params
124126
parsable
@@ -220,9 +222,11 @@ VignetteBuilder
220222
Visit'em
221223
walthert
222224
Walthert
225+
webr
223226
winbuilder
224227
withr
225228
WN
229+
WORDLIST
226230
www
227231
xaringan
228232
xfun

man/styler_options.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vignettes/third-party-integrations.Rmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ styler functionality is available in other tools, most notably
3434

3535
- in the *format-all* command for Emacs in [emacs-format-all-the-code](https://github.com/lassik/emacs-format-all-the-code).
3636

37-
- As a [Jupyterlab code formatter](https://ryantam626.github.io/jupyterlab_code_formatter/index.html).
37+
- As a [Jupyterlab code formatter](https://jupyterlab-code-formatter.readthedocs.io).
3838

3939
- for pretty-printing [drake](https://github.com/ropensci/drake) workflow data frames with `drake::drake_plan_source()`.
4040

0 commit comments

Comments
 (0)