Fix misported emitCommentsBeforeToken #1562
Conversation
There was a problem hiding this comment.
Pull Request Overview
This PR fixes a bug in the emitCommentsBeforeToken function by reordering operations to match the original TypeScript reference implementation. The fix prevents crashes by ensuring proper order of operations when checking node similarity and skipping trivia.
- Moved node similarity check before trivia skipping operation
- Added conditional check to only skip trivia when dealing with similar nodes
| startPos := pos | ||
| if p.currentSourceFile != nil { | ||
| if isSimilarNode && p.currentSourceFile != nil { |
There was a problem hiding this comment.
The condition combines isSimilarNode with the null check for p.currentSourceFile, but this changes the logic from the original code. The original code would skip trivia whenever p.currentSourceFile != nil, regardless of node similarity. This change might cause trivia to not be skipped in cases where it should be, potentially affecting comment positioning.
| if isSimilarNode && p.currentSourceFile != nil { | |
| if p.currentSourceFile != nil { |
Copilot uses AI. Check for mistakes.
|
Ugh, no, this doesn't fix it. I must have had an old binary. |
This PR's order of operations differed from the original Strada code. Fixing it stops the crashes.
I'm not really happy about the fix because it feels like I'm papering over another problem where we are setting positions on a node incorrectly. But this is simply porting the code as it was.
Fixes #1314