Skip to content

chore: restyle new examples-shiny apps#4004

Merged
cpsievert merged 3 commits into
mainfrom
chore/examples-code-style
Mar 21, 2024
Merged

chore: restyle new examples-shiny apps#4004
cpsievert merged 3 commits into
mainfrom
chore/examples-code-style

Conversation

@gadenbuie

@gadenbuie gadenbuie commented Mar 21, 2024

Copy link
Copy Markdown
Member

Re-styles the example apps using grkstyle::grk_style_dir("inst/examples-shiny") (powered by styler and using the tidyverse style rules, with an exception for the style described here).

This did have the effect of removing some leading empty lines between the open ( of a function call and the next comment. I don't think this affects readability, but we could add these newlines back if desired.

Note: stacks on top of #4003. We can merge this into #4003 so we can merge the examples changes all at once.

@gadenbuie
gadenbuie requested a review from cpsievert March 21, 2024 13:14
@gadenbuie
gadenbuie changed the base branch from main to chore/rename-examples-dir March 21, 2024 14:11
Base automatically changed from chore/rename-examples-dir to main March 21, 2024 15:58

@cpsievert cpsievert left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like something went wrong with the git history?

@gadenbuie

Copy link
Copy Markdown
Member Author

Looks like something went wrong with the git history?

Yeah I was going to roll this into #4003 before merging

@gadenbuie
gadenbuie force-pushed the chore/examples-code-style branch from b201264 to 4c22b13 Compare March 21, 2024 18:07
@gadenbuie
gadenbuie force-pushed the chore/examples-code-style branch from 4c22b13 to b4cc60c Compare March 21, 2024 18:08
@gadenbuie

Copy link
Copy Markdown
Member Author

@cpsievert okay, merge conflicts are fixed now

@gadenbuie
gadenbuie requested a review from cpsievert March 21, 2024 19:55

# Sidebar panel for inputs ----
sidebar = sidebar(

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm confused as to why this newline got removed, but it didn't in 01_hello?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did attempt to add code changes and restore the newlines manually but it was a bit of work so I bailed. So I probably introduced the difference in this line.

@cpsievert

Copy link
Copy Markdown
Collaborator

but we could add these newlines back if desired.

I think I'd prefer that.

@gadenbuie

Copy link
Copy Markdown
Member Author

@cpsievert okay (most of the useful) newlines are back

@cpsievert
cpsievert merged commit ac06350 into main Mar 21, 2024
@cpsievert
cpsievert deleted the chore/examples-code-style branch March 21, 2024 22:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants