Set tabWidth: 2 in Prettier config
#2438
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
b6d8078
to
5e39c87
Compare
If you need to rebase work past this style change, do as follows:
0. Consider this to be commit `commitA`, replacing that with its id in the following.
1. To make sure mistakes aren't fatal, assign a second branch to your current work.
2. Rebase your branch on the commit immediately before this one, commitA~
3. Run the following command at the root of the repo:
git rebase --strategy-option=theirs \
--exec 'npx prettier --write . && git add -u && git commit --amend --no-edit' \
commitA
That will take a short while esp. if you have multiple commits,
as it runs Prettier on everything for every commit.
If you've deleted files, the rebase may drop down to interactive mode
and have you `git rm` as appropriate, then `git rebase --continue`.
You should end up with just your changes in your branch,
prettily formatted. To validate that,
apply the same Prettier config change to your original branch,
reformat the files with `npm run prettier`,
and then compare the results with the rebased branch.
mathjazz
approved these changes
Mar 3, 2022
| @@ -122,13 +122,13 @@ pyupgrade: | |||
| "${DC}" run --rm server pyupgrade --exit-zero-even-if-changed --py38-plus *.py `find pontoon -name \*.py` | |||
|
|
|||
| check-pyupgrade: | |||
| "${DC}" run --rm webapp pyupgrade --py38-plus *.py `find pontoon -name \*.py` | |||
| "${DC}" run --rm server pyupgrade --py38-plus *.py `find pontoon -name \*.py` | |||
eemeli
added a commit
to eemeli/pontoon
that referenced
this pull request
Mar 8, 2022
mathjazz
pushed a commit
that referenced
this pull request
Mar 8, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As discussed on Matrix & last week's call.
This PR will need to be followed by a separate change updating the
.git-blame-ignore-revsfile.If you need to rebase work past this style change, do as follows:
Consider this to be commit
commitA, replacing that with its id in the following.To make sure mistakes aren't fatal, assign a second branch to your current work.
Rebase your branch on the commit immediately before this one, commitA~
Run the following command at the root of the repo:
That will take a short while esp. if you have multiple commits, as it runs Prettier on everything for every commit. If you've deleted files, the rebase may drop down to interactive mode and have you
git rmas appropriate, thengit rebase --continue.You should end up with just your changes in your branch, prettily formatted. To validate that, apply the same Prettier config change to your original branch, reformat the files with
npm run prettier, and then compare the results with the rebased branch.