Merge #2669 (swayfmt replacement PR) with master including newline formatting fixes
#2698
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
* newline handler checks for existing newlines before inserting new ones * stability test added * newline-comment handler interaction test added * review suggestion
* feat: add comment context formatting * test: enhance newline-comment handler interaction test * Apply suggestions from code review Co-authored-by: mitchmindtree <mitchell.nordine@fuel.sh> Co-authored-by: mitchmindtree <mitchell.nordine@fuel.sh>
mitchmindtree
changed the title
master including newline formatting fixesmaster including newline formatting fixes
mitchmindtree
requested review from
kayagokalp,
eureka-cpu and
a team
and removed request for
kayagokalp
|
OK! cc @eureka-cpu @kayagokalp I think this should be ready to merge into #2669 and should resolve those conflicts. |
eightfilms
approved these changes
Sep 2, 2022
mitchmindtree
deleted the
mitchmindtree/merge-replace-swayfmt-pr-with-master
branch
3 tasks
eureka-cpu
added a commit
that referenced
this pull request
Sep 2, 2022
* update plugin and swayfmt toml, remove old formatter * update config to formatter for consistency * wip fix lsp formatting * more merge conflicts * update dependencies to 22.1 * remove files that made it back in from merge * comment out function in LSP that uses formatter * format examples and remove debug printlns * Merge #2669 (swayfmt replacement PR) with `master` including newline formatting fixes (#2698) * refactor: forc-deploy requires wallet address and accepts signature (#2629) * Add the `CopyTypes` trait to `DeclarationId` (#2682) Co-authored-by: Toby Hutton <toby@grusly.com> * fix: Unformatted comment spans add extra newline (#2692) * newline handler checks for existing newlines before inserting new ones * stability test added * newline-comment handler interaction test added * review suggestion * feat: add basic comment context formatting (#2697) * feat: add comment context formatting * test: enhance newline-comment handler interaction test * Apply suggestions from code review Co-authored-by: mitchmindtree <mitchell.nordine@fuel.sh> Co-authored-by: mitchmindtree <mitchell.nordine@fuel.sh> * Update `examples/` for recent swayfmt-v2 patches Co-authored-by: Kaya Gökalp <kayagokalp@sabanciuniv.edu> Co-authored-by: Emily Herbert <17410721+emilyaherbert@users.noreply.github.com> Co-authored-by: Toby Hutton <toby@grusly.com> * change name to swayfmt, kashira * add swayfmt file * sort toml dependencies * fix excess newlines in format_context * test on examples Co-authored-by: mitchmindtree <mitchell.nordine@fuel.sh> Co-authored-by: Kaya Gökalp <kayagokalp@sabanciuniv.edu> Co-authored-by: Emily Herbert <17410721+emilyaherbert@users.noreply.github.com> Co-authored-by: Toby Hutton <toby@grusly.com> Co-authored-by: Mohammad Fawaz <mohammadfawaz89@gmail.com>
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.
This is a second attempt at #2695 now that #2697 has landed.