Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Unexpected duplication of comments #16110

Merged
merged 3 commits into from Nov 22, 2023
Merged

fix: Unexpected duplication of comments #16110

merged 3 commits into from Nov 22, 2023

Conversation

liuxingbaoyu
Copy link
Member

Q                       A
Fixed Issues? Fixes #16106
Patch: Bug Fix? √
Major: Breaking Change?
Minor: New Feature?
Tests Added + Pass? √
Documentation PR Link
Any Dependency Changes?
License MIT

@liuxingbaoyu liuxingbaoyu added PR: Bug Fix 🐛 A type of pull request used for our changelog categories pkg: generator pkg: traverse area: comments labels Nov 19, 2023
@babel-bot
Copy link
Collaborator

babel-bot commented Nov 19, 2023 •
edited

Build successful! You can test your changes in the REPL here: https://babeljs.io/repl/build/55844/

liuxingbaoyu
liuxingbaoyu commented Nov 19, 2023
View reviewed changes
packages/babel-generator/src/printer.ts
@@ -824,6 +824,10 @@ class Printer {
if (i < len - 1) separator?.();

if (opts.statement) {
if (!node.trailingComments?.length) {
Copy link
Member Author

Choose a reason for hiding this comment

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

This fixes the extra new line.

{
  var t = 20; /*
               * This is trailing comment
               */
}

{
  var tt = 20; /*
                * This is trailing comment
                */
}

liuxingbaoyu
liuxingbaoyu commented Nov 19, 2023
View reviewed changes
packages/babel-traverse/src/path/comments.ts Outdated
Comment on lines 49 to 55
function removeIfExisting<T>(list: T[], toRemove?: T[]): T[] {
if (!toRemove) return list;
let lastFoundIndex = -1;
const set = new Set(toRemove);
return list.filter(el => {
const i = toRemove.indexOf(el, lastFoundIndex);
if (i === -1) return true;
lastFoundIndex = i;
return !set.has(el);
});
}
Copy link
Member Author

Choose a reason for hiding this comment

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

The problem is that the order may be reversed.
removeIfExisting([1,2], [2,1])

liuxingbaoyu
liuxingbaoyu commented Nov 20, 2023
View reviewed changes
packages/babel-generator/test/index.js
@@ -1492,6 +1492,26 @@ describe("programmatic generation", function () {
val
);`);
});

it("multi-line leading comment after return 2", () => {
Copy link
Member Author

Choose a reason for hiding this comment

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

This test has nothing to do with this PR, it just ensures that #16104 does not cause regressions.

nicolo-ribaudo
nicolo-ribaudo approved these changes Nov 22, 2023
View reviewed changes
babel.config.js
@@ -304,6 +305,16 @@ module.exports = function (api) {
].filter(Boolean),
};

if (jestSnapshot) {
Copy link
Member

Choose a reason for hiding this comment

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

Can we configure Jest to just not load the Babel config for snapshots?

Copy link
Member Author

Choose a reason for hiding this comment

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

https://github.com/jestjs/jest/blob/2c3d2409879952157433de215ae0eee5188a4384/packages/jest-snapshot/src/utils.ts#L363-L368

This doesn't seem to be possible at the moment.

Copy link
Member Author

Choose a reason for hiding this comment

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

To be honest, I even want to open a pr in jest to avoid using @babel/core.

@nicolo-ribaudo nicolo-ribaudo merged commit fadc081 into babel:main Nov 22, 2023
48 checks passed
Vylpes pushed a commit to Vylpes/random-bunny that referenced this pull request Dec 4, 2023
@Vylpes
Update dependency @babel/traverse to v7.23.5 (#113)
5a6c9ed 
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [@babel/traverse](https://babel.dev/docs/en/next/babel-traverse) ([source](https://github.com/babel/babel)) | resolutions | patch | [`7.23.3` -> `7.23.5`](https://renovatebot.com/diffs/npm/@babel%2ftraverse/7.23.3/7.23.5) |

---

### Release Notes

<details>
<summary>babel/babel (@&#8203;babel/traverse)</summary>

### [`v7.23.5`](https://github.com/babel/babel/blob/HEAD/CHANGELOG.md#v7235-2023-11-29)

[Compare Source](babel/babel@v7.23.4...v7.23.5)

##### 👓 Spec Compliance

-   `babel-plugin-proposal-decorators`
    -   [#&#8203;16138](babel/babel#16138) Class binding is in TDZ during decorators initialization ([@&#8203;nicolo-ribaudo](https://github.com/nicolo-ribaudo))
-   `babel-helpers`, `babel-plugin-proposal-decorators`
    -   [#&#8203;16132](babel/babel#16132) Allow addInitializer in field decorator context ([@&#8203;JLHwung](https://github.com/JLHwung))

##### 🐛 Bug Fix

-   `babel-traverse`, `babel-types`
    -   [#&#8203;16131](babel/babel#16131) Do not remove bindings when removing assignment expression path ([@&#8203;nicolo-ribaudo](https://github.com/nicolo-ribaudo))
-   `babel-plugin-transform-classes`
    -   [#&#8203;16135](babel/babel#16135) Require class properties transform when compiling class with private fields ([@&#8203;nicolo-ribaudo](https://github.com/nicolo-ribaudo))
-   `babel-generator`
    -   [#&#8203;16122](babel/babel#16122) fix: Missing parentheses after line break ([@&#8203;liuxingbaoyu](https://github.com/liuxingbaoyu))
-   `babel-helpers`
    -   [#&#8203;16130](babel/babel#16130) Fix helpers internal fns names conflict resolution  ([@&#8203;nicolo-ribaudo](https://github.com/nicolo-ribaudo))
-   `babel-helper-create-class-features-plugin`, `babel-plugin-transform-class-properties`, `babel-plugin-transform-typescript`
    -   [#&#8203;16123](babel/babel#16123) Simplify class fields injetion after `super()` ([@&#8203;nicolo-ribaudo](https://github.com/nicolo-ribaudo))
-   `babel-generator`, `babel-plugin-transform-modules-commonjs`, `babel-plugin-transform-parameters`, `babel-plugin-transform-typescript`, `babel-traverse`
    -   [#&#8203;16110](babel/babel#16110) fix: Unexpected duplication of comments ([@&#8203;liuxingbaoyu](https://github.com/liuxingbaoyu))
-   `babel-eslint-plugin`
    -   [#&#8203;16023](babel/babel#16023) Add `@babel/eslint-plugin/no-undef` to fix `no-undef` with accessor props ([@&#8203;nicolo-ribaudo](https://github.com/nicolo-ribaudo))

##### 🔬 Output optimization

-   `babel-helpers`
    -   [#&#8203;16129](babel/babel#16129) Optimize `decorator` helper size ([@&#8203;liuxingbaoyu](https://github.com/liuxingbaoyu))

### [`v7.23.4`](https://github.com/babel/babel/blob/HEAD/CHANGELOG.md#v7234-2023-11-20)

[Compare Source](babel/babel@v7.23.3...v7.23.4)

##### 🐛 Bug Fix

-   `babel-generator`
    -   [#&#8203;16104](babel/babel#16104) fix: Pure comments missing parentheses ([@&#8203;liuxingbaoyu](https://github.com/liuxingbaoyu))

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4wLjAiLCJ1cGRhdGVkSW5WZXIiOiIzNy4wLjAiLCJ0YXJnZXRCcmFuY2giOiJkZXZlbG9wIn0=-->

Reviewed-on: https://gitea.vylpes.xyz/RabbitLabs/random-bunny/pulls/113
Reviewed-by: Vylpes <ethan@vylpes.com>
Co-authored-by: Renovate Bot <renovate@vylpes.com>
Co-committed-by: Renovate Bot <renovate@vylpes.com>
@github-actions github-actions bot added the outdated A closed issue/PR that is archived due to age. Recommended to make a new issue label Feb 22, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 22, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@JLHwung JLHwung JLHwung approved these changes

@nicolo-ribaudo nicolo-ribaudo nicolo-ribaudo approved these changes

Assignees
No one assigned
Labels
area: comments outdated A closed issue/PR that is archived due to age. Recommended to make a new issue pkg: generator pkg: traverse PR: Bug Fix 🐛 A type of pull request used for our changelog categories
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Bug]: duplicated comment after path.remove()
4 participants
@liuxingbaoyu @babel-bot @JLHwung @nicolo-ribaudo