c/11-04-feat_parser_improve_diagnostic_messages_for_merge_conflicts - Branch - oxc-project/oxc

feat(parser): improve diagnostic messages for merge conflicts

#15443Merged

Comparing

c/11-04-feat_parser_improve_diagnostic_messages_for_merge_conflicts

(

da6cf0f

) with

main

(

0fa484d

)

Untouched: 37

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

Benchmarks

Passed

mangler[RadixUIAdoptionSection.jsx]

tasks/benchmark/benches/minifier.rs::minifier::bench_mangler

+2%

13.4 µs13.1 µs

semantic[RadixUIAdoptionSection.jsx]

tasks/benchmark/benches/semantic.rs::semantic::bench_semantic

+1%

72.1 µs71.3 µs

formatter[RadixUIAdoptionSection.jsx]

tasks/benchmark/benches/formatter.rs::formatter::bench_formatter

480.6 µs479.4 µs

semantic[binder.ts]

tasks/benchmark/benches/semantic.rs::semantic::bench_semantic

4.1 ms4.1 ms

semantic[react.development.js]

tasks/benchmark/benches/semantic.rs::semantic::bench_semantic

1.6 ms1.6 ms

semantic[cal.com.tsx]

tasks/benchmark/benches/semantic.rs::semantic::bench_semantic

26.5 ms26.5 ms

transformer[cal.com.tsx]

tasks/benchmark/benches/transformer.rs::transformer::bench_transformer

26.3 ms26.3 ms

transformer[RadixUIAdoptionSection.jsx]

tasks/benchmark/benches/transformer.rs::transformer::bench_transformer

135.4 µs135.2 µs

transformer[react.development.js]

tasks/benchmark/benches/transformer.rs::transformer::bench_transformer

709.7 µs709 µs

linter[react.development.js]

tasks/benchmark/benches/linter.rs::linter::bench_linter

19.3 ms19.3 ms

lexer[react.development.js]

tasks/benchmark/benches/lexer.rs::lexer::bench_lexer

355 µs354.7 µs

mangler[cal.com.tsx]

tasks/benchmark/benches/minifier.rs::minifier::bench_mangler

2.9 ms2.9 ms

estree[checker.ts]

tasks/benchmark/benches/parser.rs::parser::bench_estree

104.6 ms104.6 ms

mangler[binder.ts]

tasks/benchmark/benches/minifier.rs::minifier::bench_mangler

774.3 µs774.2 µs

linter[RadixUIAdoptionSection.jsx]

tasks/benchmark/benches/linter.rs::linter::bench_linter

704 µs703.9 µs

lexer[binder.ts]

tasks/benchmark/benches/lexer.rs::lexer::bench_lexer

864.5 µs864.5 µs

linter[cal.com.tsx]

tasks/benchmark/benches/linter.rs::linter::bench_linter

476.8 ms476.7 ms

lexer[RadixUIAdoptionSection.jsx]

tasks/benchmark/benches/lexer.rs::lexer::bench_lexer

20.2 µs20.2 µs

lexer[cal.com.tsx]

tasks/benchmark/benches/lexer.rs::lexer::bench_lexer

5.3 ms5.3 ms

minifier[cal.com.tsx]

tasks/benchmark/benches/minifier.rs::minifier::bench_minifier

36.2 ms36.2 ms

linter[binder.ts]

tasks/benchmark/benches/linter.rs::linter::bench_linter

49.2 ms49.2 ms

minifier[binder.ts]

tasks/benchmark/benches/minifier.rs::minifier::bench_minifier

4 ms4 ms

formatter[binder.ts]

tasks/benchmark/benches/formatter.rs::formatter::bench_formatter

19.3 ms19.3 ms

formatter[cal.com.tsx]

tasks/benchmark/benches/formatter.rs::formatter::bench_formatter

161.8 ms161.8 ms

mangler[react.development.js]

tasks/benchmark/benches/minifier.rs::minifier::bench_mangler

269.6 µs269.7 µs

isolated-declarations[vue-id.ts]

tasks/benchmark/benches/transformer.rs::transformer::bench_isolated_declarations

56.9 ms56.9 ms

codegen[react.development.js]

tasks/benchmark/benches/codegen.rs::codegen::bench_codegen

1.9 ms1.9 ms

transformer[binder.ts]

tasks/benchmark/benches/transformer.rs::transformer::bench_transformer

1.6 ms1.7 ms

codegen[cal.com.tsx]

tasks/benchmark/benches/codegen.rs::codegen::bench_codegen

33.8 ms33.9 ms

formatter[react.development.js]

tasks/benchmark/benches/formatter.rs::formatter::bench_formatter

9.3 ms9.3 ms

minifier[react.development.js]

tasks/benchmark/benches/minifier.rs::minifier::bench_minifier

2.5 ms2.5 ms

parser[cal.com.tsx]

tasks/benchmark/benches/parser.rs::parser::bench_parser

26.8 ms26.9 ms

parser[binder.ts]

tasks/benchmark/benches/parser.rs::parser::bench_parser

3.3 ms3.3 ms

parser[react.development.js]

tasks/benchmark/benches/parser.rs::parser::bench_parser

1.3 ms1.3 ms

parser[RadixUIAdoptionSection.jsx]

tasks/benchmark/benches/parser.rs::parser::bench_parser

87.3 µs87.7 µs

codegen[RadixUIAdoptionSection.jsx]

tasks/benchmark/benches/codegen.rs::codegen::bench_codegen

-2%

120.7 µs122.6 µs

codegen[binder.ts]

tasks/benchmark/benches/codegen.rs::codegen::bench_codegen

-2%

4.2 ms4.3 ms

Commits

Click on a commit to change the comparison range

Base

main

0fa484d

+0.04%

feat(parser): improve diagnostic messages for merge conflicts

02218ae

2 months ago

by camc314

-0.08%

chore: update message style Signed-off-by: 翠 <green@sapphi.red>

8b1f333

2 months ago

by sapphi-red

+0.02%

test: update conformance snapshots for merge conflict diagnostics (#15462) Updates test snapshots to reflect the improved merge conflict diagnostic messages implemented in previous commits. ## Changes - Updated `parser_misc.snap` and `parser_typescript.snap` with capitalized error titles and properly formatted help text - Snapshots now match the current diagnostic output: "Encountered diff marker" with sentence-case help messages The snapshots were updated by running `just conformance` after the diagnostic message improvements were merged.  --- 💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more [Copilot coding agent tips](https://gh.io/copilot-coding-agent-tips) in the docs. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: sapphi-red <49056869+sapphi-red@users.noreply.github.com>

da6cf0f

2 months ago

by Copilot

Home Terms Privacy Docs