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.

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

fix: resume branch end node shared, insert after previous branch #2483

Merged
merged 1 commit into from
Jan 31, 2025

Conversation

rturnq
Copy link
Contributor

@rturnq rturnq commented Jan 31, 2025

Description

  • Resume markers used as branch end nodes could end up being shared between multiple branches in some circumstances. In these cases, we will inserts a new empty text node and use that as the end node.
  • Runtime now uses the end node as a reference for inserting the branch. The new branch will be inserted after the previous branch's end node instead of before its start node.

Checklist:

  • I have read the CONTRIBUTING document and have signed (or will sign) the CLA.
  • I have updated/added documentation affected by my changes.
  • I have added tests to cover my changes.

Copy link

changeset-bot bot commented Jan 31, 2025

🦋 Changeset detected

Latest commit: 5a36940

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
Name Type
@marko/runtime-tags Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

Copy link

codecov bot commented Jan 31, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 87.02%. Comparing base (99c7428) to head (98d0e91).
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2483      +/-   ##
==========================================
- Coverage   87.09%   87.02%   -0.07%     
==========================================
  Files         351      351              
  Lines       40058    40063       +5     
  Branches     2588     2585       -3     
==========================================
- Hits        34887    34866      -21     
- Misses       5147     5173      +26     
  Partials       24       24              

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

@rturnq rturnq merged commit 0135f5b into main Jan 31, 2025
8 checks passed
@rturnq rturnq deleted the branch-end-node branch January 31, 2025 21:27
@github-actions github-actions bot mentioned this pull request Jan 31, 2025
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.

1 participant