Skip to content

Comments

fix(formatter): Handle <CRLF> for SourceText#15016

Merged
graphite-app[bot] merged 1 commit intomainfrom
10-28-fix_formatter_handle_crlf_for_sourcetext
Oct 28, 2025
Merged

fix(formatter): Handle <CRLF> for SourceText#15016
graphite-app[bot] merged 1 commit intomainfrom
10-28-fix_formatter_handle_crlf_for_sourcetext

Conversation

@leaysgur
Copy link
Member

@leaysgur leaysgur commented Oct 28, 2025

Fixes #14989

Copilot AI review requested due to automatic review settings October 28, 2025 01:57
@leaysgur leaysgur requested a review from Dunqing as a code owner October 28, 2025 01:57
@github-actions github-actions bot added the A-formatter Area - Formatter label Oct 28, 2025
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

This PR fixes the handling of CRLF (Windows-style \r\n) line endings in the formatter's SourceText implementation. Previously, CRLF sequences were counted as two separate line breaks instead of one, leading to incorrect line counting.

Key Changes:

  • Modified lines_after() and get_lines_before() methods to properly handle CRLF sequences by consuming both \r and \n as a single line break
  • Added comprehensive tests for LF-only, CRLF-only, and mixed line ending scenarios

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@github-actions github-actions bot added the C-bug Category - Bug label Oct 28, 2025
Copy link
Member Author


How to use the Graphite Merge Queue

Add either label to this PR to merge it via the merge queue:

  • 0-merge - adds this PR to the back of the merge queue
  • hotfix - for urgent hot fixes, skip the queue and merge this PR next

You must have a Graphite account in order to use the merge queue. Sign up using this link.

An organization admin has enabled the Graphite Merge Queue in this repository.

Please do not merge from GitHub as this will restart CI on PRs being processed by the merge queue.

This stack of pull requests is managed by Graphite. Learn more about stacking.

@leaysgur leaysgur changed the title fix(formatter): Handle CRLF for SourceText fix(formatter): Handle <CRLF> for SourceText Oct 28, 2025
@leaysgur leaysgur force-pushed the 10-28-fix_formatter_handle_crlf_for_sourcetext branch from 2100d45 to c7b1fdb Compare October 28, 2025 02:00
@codspeed-hq
Copy link

codspeed-hq bot commented Oct 28, 2025

CodSpeed Performance Report

Merging #15016 will not alter performance

Comparing 10-28-fix_formatter_handle_crlf_for_sourcetext (c7b1fdb) with main (4904710)1

Summary

✅ 33 untouched
⏩ 4 skipped2

Footnotes

  1. No successful run was found on main (a8e5181) during the generation of this report, so 4904710 was used instead as the comparison base. There might be some changes unrelated to this pull request in this report.

  2. 4 benchmarks were skipped, so the baseline results were used instead. If they were deleted from the codebase, click here and archive them to remove them from the performance reports.

@Dunqing Dunqing added the 0-merge Merge with Graphite Merge Queue label Oct 28, 2025
Copy link
Member

Dunqing commented Oct 28, 2025

Merge activity

@graphite-app graphite-app bot force-pushed the 10-28-fix_formatter_handle_crlf_for_sourcetext branch from c7b1fdb to 43d74e4 Compare October 28, 2025 05:17
@graphite-app graphite-app bot merged commit 43d74e4 into main Oct 28, 2025
20 checks passed
@graphite-app graphite-app bot deleted the 10-28-fix_formatter_handle_crlf_for_sourcetext branch October 28, 2025 05:22
@graphite-app graphite-app bot removed the 0-merge Merge with Graphite Merge Queue label Oct 28, 2025
@Boshen Boshen mentioned this pull request Oct 30, 2025
leaysgur added a commit that referenced this pull request Oct 30, 2025
## [0.9.0] - 2025-10-30

### 🚀 Features

- 8fe7e85 formatter: Support printing Formatter IR (#14855) (Dunqing)

### 🐛 Bug Fixes

- a6b6ef8 formatter: Correct calculating layout for
`TSNonNullExpression` in `StaticMemberExpression` (#15065) (Dunqing)
- 99bd995 formatter: Print parenthesis for sequence expression in
`ReturnStatement` and `ExpressionStatement` (#15062) (Dunqing)
- f3fb998 formatter: Correct printing comments for `TSAsExpression`
(#15061) (Dunqing)
- 1e4a018 formatter: Correct checking of the short argument for
`CallArguments` (#15055) (Dunqing)
- c0dfd9b formatter: Print comments before fat arrow as-is for
`ArrowFunctionExpression` (#15050) (Dunqing)
- 206b519 formatter: Should hug parameter with `TSMappedType` type
annotation (#15049) (Dunqing)
- e48c604 formatter: Incorrect formatting of a function with `this`
parameter (#15031) (Dunqing)
- a9f0c45 formatter: Decorators and class method on the same line
shouldn't be broken by a leading comment of the method (#15029)
(Dunqing)
- 43d74e4 formatter: Handle `<CRLF>` for `SourceText` (#15016)
(leaysgur)
- 34fab40 formatter: Correct calculating layout for `ChainExpression` in
`StaticMemberExpression` (#14986) (Dunqing)
- 68dc101 formatter: Should not break when the parent of root of
`StaticMemberExpression` is used as the `Argument` of `NewExpression`
(#14985) (Dunqing)
- 071b739 formatter: Align the short argument handling for
UnaryExpression with Prettier (#14984) (Dunqing)
- 3940f3a formatter: `BestFitting` doesn't exactly matches the
`conditinalGroup` behavior in Prettier (#14983) (Dunqing)
- 4a84e44 formatter: Align the logic of printing type parameters,
parameters, and return type for functions with Prettier (#14942)
(Dunqing)
- 68c1f2a formatter: Non-nested static member expressions will never
break (#14929) (Dunqing)
- 42adc47 formatter: Check whether a type alias is complex when its
right hand side never break (#14928) (Dunqing)
- e501f13 formatter: Should not add a trailing comma for long curried
calls when `trailingComma` is es5 (#14913) (Dunqing)

### 🚜 Refactor

- 7d64291 formatter: Simplify printing ClassElement with a semicolon
(#15030) (Dunqing)
- 5de99c2 formatter: Export unified way to get_parse_options (#15027)
(leaysgur)
- f6f22e2 formatter: Clean up unneeded implementations for printing
comments (#14935) (Dunqing)
- 7a2b9d1 formatter: Improve printing trailing comments (#14934)
(Dunqing)
- ba10caa formatter: Align printing trailing comments with Prettier
(#14927) (Dunqing)
- 597c9e8 formatter: Remove redundunt public API (#14915) (leaysgur)

### ⚡ Performance

- 467b3a1 formatter: Optimize grouping logic for call arguments (#15033)
(Dunqing)

Co-authored-by: leaysgur <6259812+leaysgur@users.noreply.github.com>
@Boshen Boshen mentioned this pull request Oct 30, 2025
graphite-app bot pushed a commit that referenced this pull request Oct 30, 2025
## [0.9.0] - 2025-10-30

### 🚀 Features

- 8fe7e85 formatter: Support printing Formatter IR (#14855) (Dunqing)

### 🐛 Bug Fixes

- a6b6ef8 formatter: Correct calculating layout for `TSNonNullExpression` in `StaticMemberExpression` (#15065) (Dunqing)
- 99bd995 formatter: Print parenthesis for sequence expression in `ReturnStatement` and `ExpressionStatement` (#15062) (Dunqing)
- f3fb998 formatter: Correct printing comments for `TSAsExpression` (#15061) (Dunqing)
- 1e4a018 formatter: Correct checking of the short argument for `CallArguments` (#15055) (Dunqing)
- c0dfd9b formatter: Print comments before fat arrow as-is for `ArrowFunctionExpression` (#15050) (Dunqing)
- 206b519 formatter: Should hug parameter with `TSMappedType` type annotation (#15049) (Dunqing)
- e48c604 formatter: Incorrect formatting of a function with `this` parameter (#15031) (Dunqing)
- a9f0c45 formatter: Decorators and class method on the same line shouldn't be broken by a leading comment of the method (#15029) (Dunqing)
- 43d74e4 formatter: Handle `<CRLF>` for `SourceText` (#15016) (leaysgur)
- 34fab40 formatter: Correct calculating layout for `ChainExpression` in `StaticMemberExpression` (#14986) (Dunqing)
- 68dc101 formatter: Should not break when the parent of root of `StaticMemberExpression` is used as the `Argument` of `NewExpression` (#14985) (Dunqing)
- 071b739 formatter: Align the short argument handling for UnaryExpression with Prettier (#14984) (Dunqing)
- 3940f3a formatter: `BestFitting` doesn't exactly matches the `conditinalGroup` behavior in Prettier (#14983) (Dunqing)
- 4a84e44 formatter: Align the logic of printing type parameters, parameters, and return type for functions with Prettier (#14942) (Dunqing)
- 68c1f2a formatter: Non-nested static member expressions will never break (#14929) (Dunqing)
- 42adc47 formatter: Check whether a type alias is complex when its right hand side never break (#14928) (Dunqing)
- e501f13 formatter: Should not add a trailing comma for long curried calls when `trailingComma` is es5 (#14913) (Dunqing)

### 🚜 Refactor

- 7d64291 formatter: Simplify printing ClassElement with a semicolon (#15030) (Dunqing)
- 5de99c2 formatter: Export unified way to get_parse_options (#15027) (leaysgur)
- f6f22e2 formatter: Clean up unneeded implementations for printing comments (#14935) (Dunqing)
- 7a2b9d1 formatter: Improve printing trailing comments (#14934) (Dunqing)
- ba10caa formatter: Align printing trailing comments with Prettier (#14927) (Dunqing)
- 597c9e8 formatter: Remove redundunt public API (#14915) (leaysgur)

### ⚡ Performance

- 467b3a1 formatter: Optimize grouping logic for call arguments (#15033) (Dunqing)

### 💼 Other

- aceff66 oxfmt: V0.9.0 (#15088) (Boshen)
@Boshen Boshen mentioned this pull request Oct 30, 2025
graphite-app bot pushed a commit that referenced this pull request Oct 30, 2025
## [0.9.0] - 2025-10-30

### 🚀 Features

- 8fe7e85 formatter: Support printing Formatter IR (#14855) (Dunqing)

### 🐛 Bug Fixes

- a6b6ef8 formatter: Correct calculating layout for `TSNonNullExpression` in `StaticMemberExpression` (#15065) (Dunqing)
- 99bd995 formatter: Print parenthesis for sequence expression in `ReturnStatement` and `ExpressionStatement` (#15062) (Dunqing)
- f3fb998 formatter: Correct printing comments for `TSAsExpression` (#15061) (Dunqing)
- 1e4a018 formatter: Correct checking of the short argument for `CallArguments` (#15055) (Dunqing)
- c0dfd9b formatter: Print comments before fat arrow as-is for `ArrowFunctionExpression` (#15050) (Dunqing)
- 206b519 formatter: Should hug parameter with `TSMappedType` type annotation (#15049) (Dunqing)
- e48c604 formatter: Incorrect formatting of a function with `this` parameter (#15031) (Dunqing)
- a9f0c45 formatter: Decorators and class method on the same line shouldn't be broken by a leading comment of the method (#15029) (Dunqing)
- 43d74e4 formatter: Handle `<CRLF>` for `SourceText` (#15016) (leaysgur)
- 34fab40 formatter: Correct calculating layout for `ChainExpression` in `StaticMemberExpression` (#14986) (Dunqing)
- 68dc101 formatter: Should not break when the parent of root of `StaticMemberExpression` is used as the `Argument` of `NewExpression` (#14985) (Dunqing)
- 071b739 formatter: Align the short argument handling for UnaryExpression with Prettier (#14984) (Dunqing)
- 3940f3a formatter: `BestFitting` doesn't exactly matches the `conditinalGroup` behavior in Prettier (#14983) (Dunqing)
- 4a84e44 formatter: Align the logic of printing type parameters, parameters, and return type for functions with Prettier (#14942) (Dunqing)
- 68c1f2a formatter: Non-nested static member expressions will never break (#14929) (Dunqing)
- 42adc47 formatter: Check whether a type alias is complex when its right hand side never break (#14928) (Dunqing)
- e501f13 formatter: Should not add a trailing comma for long curried calls when `trailingComma` is es5 (#14913) (Dunqing)

### 🚜 Refactor

- 7d64291 formatter: Simplify printing ClassElement with a semicolon (#15030) (Dunqing)
- 5de99c2 formatter: Export unified way to get_parse_options (#15027) (leaysgur)
- f6f22e2 formatter: Clean up unneeded implementations for printing comments (#14935) (Dunqing)
- 7a2b9d1 formatter: Improve printing trailing comments (#14934) (Dunqing)
- ba10caa formatter: Align printing trailing comments with Prettier (#14927) (Dunqing)
- 597c9e8 formatter: Remove redundunt public API (#14915) (leaysgur)

### ⚡ Performance

- 467b3a1 formatter: Optimize grouping logic for call arguments (#15033) (Dunqing)

### 💼 Other

- 6368793 oxfmt: V0.9.0 (#15091) (Boshen)
- aceff66 oxfmt: V0.9.0 (#15088) (Boshen)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-formatter Area - Formatter C-bug Category - Bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

formatter: unexpected new lines behavior with CRLF

2 participants