Skip to content

Add location info for closing brace of block statement #5999

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.

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

Merged
merged 2 commits into from
Jul 4, 2025
Merged

Conversation

TrickyPi
Copy link
Member

@TrickyPi TrickyPi commented Jun 29, 2025

This PR contains:

  • bugfix
  • feature
  • refactor
  • documentation
  • other

Are tests included?

  • yes (bugfixes and features will not be merged without tests)
  • no

Breaking Changes?

  • yes (breaking changes will not be merged unless absolutely necessary)
  • no

List any relevant issue numbers:
resolves #5961

Description

Making Rollup generate more precise segments for closing braces that belong to block statements in the sourcemap could help fix some source map merging issues in certain cases.

Copy link

vercel bot commented Jun 29, 2025

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
rollup ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jun 29, 2025 2:16pm

Copy link

github-actions bot commented Jun 29, 2025

Thank you for your contribution! ❤️

You can try out this pull request locally by installing Rollup via

npm install rollup/rollup#fix/5961

Notice: Ensure you have installed the latest stable Rust toolchain. If you haven't installed it yet, please see https://www.rust-lang.org/tools/install to learn how to download Rustup and install Rust.

or load it into the REPL:
https://rollup-6hzjiqf41-rollup-js.vercel.app/repl/?pr=5999

Copy link

Performance report

  • BUILD: 6857ms, 816 MB
    • initialize: 0ms, 24.7 MB
    • generate module graph: 2542ms, 628 MB
      • generate ast: 1366ms (+29ms, +2.2%), 620 MB
    • sort and bind modules: 386ms, 682 MB
    • mark included statements: 3922ms, 816 MB
      • treeshaking pass 1: 2302ms, 814 MB
      • treeshaking pass 2: 457ms, 819 MB
      • treeshaking pass 3: 390ms, 818 MB
      • treeshaking pass 4: 381ms, 812 MB
      • treeshaking pass 5: 378ms, 816 MB
  • GENERATE: 692ms (-75ms, -9.7%), 922 MB (-4%)
    • initialize render: 0ms, 831 MB (-4%)
    • generate chunks: 46ms, 838 MB (-2%)
      • optimize chunks: 0ms, 826 MB (-6%)
    • render chunks: 622ms, 900 MB (-3%)
    • transform chunks: 18ms, 922 MB (-4%)
    • generate bundle: 0ms, 922 MB (-4%)

Copy link

codecov bot commented Jun 29, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.79%. Comparing base (5a7f9e2) to head (2eb308a).
Report is 4 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff            @@
##           master    #5999     +/-   ##
=========================================
  Coverage   98.78%   98.79%             
=========================================
  Files         270      270             
  Lines        8745    10559   +1814     
  Branches     1512     2815   +1303     
=========================================
+ Hits         8639    10432   +1793     
- Misses         73       87     +14     
- Partials       33       40      +7     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Copy link
Member

@lukastaegert lukastaegert left a comment

Choose a reason for hiding this comment

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

Thanks!

@lukastaegert lukastaegert added this pull request to the merge queue Jul 4, 2025
Merged via the queue into master with commit 7155102 Jul 4, 2025
42 checks passed
@lukastaegert lukastaegert deleted the fix/5961 branch July 4, 2025 06:06
Copy link

github-actions bot commented Jul 4, 2025

This PR has been released as part of rollup@4.44.2. You can test it via npm install rollup.

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.

Incorrect combined sourcemaps for if block close token
2 participants