Skip to content

Fix star comment non-idempoteny#220

Merged
infinisil merged 1 commit intomasterfrom
fix-star-comment-non-idempotency
Jul 12, 2024
Merged

Fix star comment non-idempoteny#220
infinisil merged 1 commit intomasterfrom
fix-star-comment-non-idempotency

Conversation

@infinisil
Copy link
Member

@infinisil infinisil commented Jul 11, 2024

Previously, empty trailing lines in star comments would only get stripped after the second formatting, e.g.:

Original:

{
  /* foo
   * bar
   *
   */
}

After one formatting:

{
  /*
    foo
    bar

  */
}

After two formattings (and newly already after the first)

{
  /*
    foo
    bar
  */
}

This work is sponsored by Antithesis

Previously, empty trailing lines in star comments would only get
stripped after the second formatting
@github-actions
Copy link

github-actions bot commented Jul 11, 2024

Nixpkgs diff

@infinisil infinisil requested a review from piegamesde July 11, 2024 22:19
@infinisil infinisil mentioned this pull request Jul 11, 2024
2 tasks
@infinisil infinisil merged commit 83de1ec into master Jul 12, 2024
@infinisil infinisil deleted the fix-star-comment-non-idempotency branch July 12, 2024 18:14
infinisil added a commit to tweag/nixpkgs that referenced this pull request Jul 12, 2024
infinisil added a commit to tweag/nixpkgs that referenced this pull request Jul 16, 2024
dasJ pushed a commit to NixOS/nixpkgs that referenced this pull request Jul 17, 2024
* Fix the update script so it points at the new nixos/nixfmt repo and bump to the lasest version on master.

(cherry picked from commit 2c2f1d0)

* nixfmt: unstable-2024-05-28 -> unstable-2024-07-03

(cherry picked from commit 72ae7e0)

* nixfmt-rfc-style: unstable-2024-07-03 -> unstable-2024-07-12

Notably includes NixOS/nixfmt#219
and NixOS/nixfmt#220

(cherry picked from commit 8058a2a)

---------

Co-authored-by: Daniel Baker <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

2 participants