patchkit 0.2.4

A library for parsing and manipulating patch files
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
use super::lex::SyntaxKind;
use super::lossless::{Patch, PositionedParseError};
use rowan::{GreenNodeBuilder, TextSize};

pub(crate) struct Parser<'a> {
    tokens: Vec<(SyntaxKind, &'a str)>,
    cursor: usize,
    builder: GreenNodeBuilder<'static>,
    errors: Vec<String>,
    positioned_errors: Vec<PositionedParseError>,
    text_position: TextSize,
}

impl<'a> Parser<'a> {
    pub fn new(tokens: impl Iterator<Item = (SyntaxKind, &'a str)>) -> Self {
        let tokens: Vec<_> = tokens.collect();
        Self {
            tokens,
            cursor: 0,
            builder: GreenNodeBuilder::new(),
            errors: Vec::new(),
            positioned_errors: Vec::new(),
            text_position: TextSize::from(0),
        }
    }

    pub fn parse(mut self) -> super::Parse<Patch> {
        self.builder.start_node(SyntaxKind::ROOT.into());
        self.parse_patch();
        self.builder.finish_node();

        let green = self.builder.finish();
        super::Parse::new_with_positioned_errors(green, self.errors, self.positioned_errors)
    }

    fn parse_patch(&mut self) {
        while !self.at_end() {
            // Try to detect format and parse accordingly
            if self.at(SyntaxKind::STAR) && self.peek_text(0) == Some("***") {
                // Could be context diff file header or context hunk without file header
                if self.looks_like_context_hunk_range() {
                    // It's a context hunk without file headers - create a minimal context diff file
                    self.builder
                        .start_node(SyntaxKind::CONTEXT_DIFF_FILE.into());
                    self.parse_context_hunk_without_separator();
                    self.builder.finish_node();
                } else {
                    // Context diff file with headers
                    self.parse_context_diff_file();
                }
            } else if self.at(SyntaxKind::MINUS)
                && self.peek_text(0) == Some("---")
                && !self
                    .peek_text(3)
                    .map(|t| t.starts_with('>'))
                    .unwrap_or(false)
                && !self.looks_like_context_new_section()
            {
                // Unified diff
                self.parse_patch_file();
            } else if self.at(SyntaxKind::PLUS) && self.peek_text(0) == Some("+++") {
                // Orphan new file header (unified)
                self.parse_patch_file();
            } else if self.looks_like_normal_diff() {
                // Normal diff
                self.parse_normal_hunk();
            } else if self.looks_like_ed_command() {
                // Ed diff
                self.parse_ed_command();
            } else {
                // Skip unknown content - advance to next line
                self.skip_to_next_line();
            }
        }
    }

    fn parse_patch_file(&mut self) {
        self.builder.start_node(SyntaxKind::PATCH_FILE.into());

        // Parse old file header
        if self.at(SyntaxKind::MINUS) && self.peek_text(0) == Some("---") {
            self.parse_old_file();
        }

        // Parse new file header
        if self.at(SyntaxKind::PLUS) && self.peek_text(0) == Some("+++") {
            self.parse_new_file();
        }

        // Parse hunks
        while self.at(SyntaxKind::AT) && self.peek_text(0) == Some("@@") {
            self.parse_hunk();
        }

        self.builder.finish_node();
    }

    fn parse_old_file(&mut self) {
        self.builder.start_node(SyntaxKind::OLD_FILE.into());

        // Consume "---"
        self.advance(); // -
        self.advance(); // -
        self.advance(); // -

        // Skip whitespace
        self.skip_whitespace();

        // Parse path - collect all tokens that make up the path
        let mut path_parts = Vec::new();
        let mut collecting_path = true;
        while !self.at(SyntaxKind::NEWLINE) && !self.at_end() && collecting_path {
            match self.current_kind() {
                Some(SyntaxKind::TEXT)
                | Some(SyntaxKind::SLASH)
                | Some(SyntaxKind::DOT)
                | Some(SyntaxKind::NUMBER)
                | Some(SyntaxKind::COLON)
                | Some(SyntaxKind::BACKSLASH) => {
                    if let Some(text) = self.current_text() {
                        path_parts.push(text.to_string());
                    }
                    self.advance_without_emit();
                }
                Some(SyntaxKind::WHITESPACE) if !path_parts.is_empty() => {
                    // Stop at whitespace after we've collected some path parts (timestamp follows)
                    collecting_path = false;
                }
                _ => {
                    collecting_path = false;
                }
            }
        }

        if !path_parts.is_empty() {
            let path = path_parts.join("");
            self.builder.token(SyntaxKind::PATH.into(), &path);
        }

        // Skip to end of line
        while !self.at(SyntaxKind::NEWLINE) && !self.at_end() {
            self.advance();
        }

        if self.at(SyntaxKind::NEWLINE) {
            self.advance();
        }

        self.builder.finish_node();
    }

    fn parse_new_file(&mut self) {
        self.builder.start_node(SyntaxKind::NEW_FILE.into());

        // Consume "+++"
        self.advance(); // +
        self.advance(); // +
        self.advance(); // +

        // Skip whitespace
        self.skip_whitespace();

        // Parse path - collect all tokens that make up the path
        let mut path_parts = Vec::new();
        let mut collecting_path = true;
        while !self.at(SyntaxKind::NEWLINE) && !self.at_end() && collecting_path {
            match self.current_kind() {
                Some(SyntaxKind::TEXT)
                | Some(SyntaxKind::SLASH)
                | Some(SyntaxKind::DOT)
                | Some(SyntaxKind::NUMBER)
                | Some(SyntaxKind::COLON)
                | Some(SyntaxKind::BACKSLASH) => {
                    if let Some(text) = self.current_text() {
                        path_parts.push(text.to_string());
                    }
                    self.advance_without_emit();
                }
                Some(SyntaxKind::WHITESPACE) if !path_parts.is_empty() => {
                    // Stop at whitespace after we've collected some path parts (timestamp follows)
                    collecting_path = false;
                }
                _ => {
                    collecting_path = false;
                }
            }
        }

        if !path_parts.is_empty() {
            let path = path_parts.join("");
            self.builder.token(SyntaxKind::PATH.into(), &path);
        }

        // Skip to end of line
        while !self.at(SyntaxKind::NEWLINE) && !self.at_end() {
            self.advance();
        }

        if self.at(SyntaxKind::NEWLINE) {
            self.advance();
        }

        self.builder.finish_node();
    }

    fn parse_hunk(&mut self) {
        // Check if this looks like a valid hunk header before committing
        let checkpoint = self.builder.checkpoint();
        let _start_cursor = self.cursor;

        // Peek ahead to see if this is a valid hunk header
        let mut temp_cursor = self.cursor;

        // Skip @@
        temp_cursor += 2;

        // Skip whitespace
        while temp_cursor < self.tokens.len()
            && self
                .tokens
                .get(temp_cursor)
                .map(|(k, _)| *k == SyntaxKind::WHITESPACE)
                .unwrap_or(false)
        {
            temp_cursor += 1;
        }

        // Check if we have at least one valid range (-N or +N)
        let has_valid_range = temp_cursor < self.tokens.len() && {
            let (kind, _) = self.tokens.get(temp_cursor).unwrap();
            (*kind == SyntaxKind::MINUS || *kind == SyntaxKind::PLUS)
                && temp_cursor + 1 < self.tokens.len()
                && self
                    .tokens
                    .get(temp_cursor + 1)
                    .map(|(k, _)| *k == SyntaxKind::NUMBER)
                    .unwrap_or(false)
        };

        if !has_valid_range {
            // Invalid hunk header - skip the @@ line but continue parsing
            self.skip_to_next_line();

            // Continue parsing lines that might belong to this invalid hunk
            // until we find another hunk or file boundary
            while !self.at_end() && !self.is_hunk_end() {
                self.skip_to_next_line();
            }
            return;
        }

        self.builder
            .start_node_at(checkpoint, SyntaxKind::HUNK.into());

        // Parse hunk header
        self.parse_hunk_header();

        // Parse hunk lines
        while !self.at_end() && !self.is_hunk_end() {
            self.parse_hunk_line();
        }

        self.builder.finish_node();
    }

    fn parse_hunk_header(&mut self) {
        self.builder.start_node(SyntaxKind::HUNK_HEADER.into());

        // Consume "@@"
        self.advance(); // @
        self.advance(); // @

        self.skip_whitespace();

        // Parse old range
        if self.at(SyntaxKind::MINUS) {
            self.parse_hunk_range();
        }

        self.skip_whitespace();

        // Parse new range
        if self.at(SyntaxKind::PLUS) {
            self.parse_hunk_range();
        }

        self.skip_whitespace();

        // Consume closing "@@"
        if self.at(SyntaxKind::AT) {
            self.advance(); // @
            self.advance(); // @
        }

        // Skip to end of line
        while !self.at(SyntaxKind::NEWLINE) && !self.at_end() {
            self.advance();
        }

        if self.at(SyntaxKind::NEWLINE) {
            self.advance();
        }

        self.builder.finish_node();
    }

    fn parse_hunk_range(&mut self) {
        self.builder.start_node(SyntaxKind::HUNK_RANGE.into());

        // Consume +/- sign
        self.advance();

        // Parse start line number
        if self.at(SyntaxKind::NUMBER) {
            self.advance();
        }

        // Parse optional count
        if self.at(SyntaxKind::COMMA) {
            self.advance();
            if self.at(SyntaxKind::NUMBER) {
                self.advance();
            }
        }

        self.builder.finish_node();
    }

    fn parse_hunk_line(&mut self) {
        let checkpoint = self.builder.checkpoint();

        match self.current_kind() {
            Some(SyntaxKind::SPACE) => {
                self.builder
                    .start_node_at(checkpoint, SyntaxKind::CONTEXT_LINE.into());
                self.advance(); // space
            }
            Some(SyntaxKind::PLUS) => {
                self.builder
                    .start_node_at(checkpoint, SyntaxKind::ADD_LINE.into());
                self.advance(); // +
            }
            Some(SyntaxKind::MINUS) => {
                self.builder
                    .start_node_at(checkpoint, SyntaxKind::DELETE_LINE.into());
                self.advance(); // -
            }
            _ => {
                // Unknown line type, treat as context
                self.builder
                    .start_node_at(checkpoint, SyntaxKind::CONTEXT_LINE.into());
            }
        }

        // Parse the line content
        while !self.at(SyntaxKind::NEWLINE) && !self.at_end() {
            self.advance();
        }

        if self.at(SyntaxKind::NEWLINE) {
            self.advance();
        }

        self.builder.finish_node();
    }

    fn is_hunk_end(&self) -> bool {
        // Check if we're at the start of a new hunk or file
        (self.at(SyntaxKind::AT) && self.peek_text(0) == Some("@@"))
            || (self.at(SyntaxKind::MINUS) && self.peek_text(0) == Some("---"))
            || (self.at(SyntaxKind::PLUS) && self.peek_text(0) == Some("+++"))
    }

    fn current_kind(&self) -> Option<SyntaxKind> {
        self.tokens.get(self.cursor).map(|(kind, _)| *kind)
    }

    fn current_text(&self) -> Option<&str> {
        self.tokens.get(self.cursor).map(|(_, text)| *text)
    }

    fn peek_text(&self, offset: usize) -> Option<&str> {
        let start = self.cursor + offset;

        // For header detection, we need to look at multiple tokens
        let mut text = String::new();
        for i in 0..3 {
            if let Some((_, t)) = self.tokens.get(start + i) {
                text.push_str(t);

                // Check if we've found a header pattern
                if text.len() >= 2 {
                    if text.starts_with("---") {
                        return Some("---");
                    } else if text.starts_with("+++") {
                        return Some("+++");
                    } else if text.starts_with("@@") {
                        return Some("@@");
                    }
                }

                // Check for three-character patterns
                if text.len() >= 3 {
                    if text.starts_with("***") {
                        return Some("***");
                    }
                }
            } else {
                break;
            }
        }

        // If no pattern found, return the single token at offset
        self.tokens.get(start + offset).map(|(_, text)| *text)
    }

    fn at(&self, kind: SyntaxKind) -> bool {
        self.current_kind() == Some(kind)
    }

    fn at_end(&self) -> bool {
        self.cursor >= self.tokens.len()
    }

    fn advance(&mut self) {
        if let Some((kind, text)) = self.tokens.get(self.cursor) {
            self.builder.token((*kind).into(), text);
            self.text_position += TextSize::from(text.len() as u32);
            self.cursor += 1;
        }
    }

    fn advance_without_emit(&mut self) {
        if let Some((_, text)) = self.tokens.get(self.cursor) {
            self.text_position += TextSize::from(text.len() as u32);
            self.cursor += 1;
        }
    }

    fn skip_whitespace(&mut self) {
        while self.at(SyntaxKind::WHITESPACE) {
            self.advance();
        }
    }

    fn skip_to_next_line(&mut self) {
        while !self.at(SyntaxKind::NEWLINE) && !self.at_end() {
            self.advance();
        }
        if self.at(SyntaxKind::NEWLINE) {
            self.advance();
        }
    }

    // Helper methods for format detection
    fn looks_like_ed_command(&self) -> bool {
        // Ed commands: 5a, 3,7d, 2c
        let mut offset = 0;

        // Must start with a number
        if !matches!(self.peek_kind(offset), Some(SyntaxKind::NUMBER)) {
            return false;
        }

        // Skip numbers and commas
        while matches!(
            self.peek_kind(offset),
            Some(SyntaxKind::NUMBER) | Some(SyntaxKind::COMMA)
        ) {
            offset += 1;
        }

        // Must be followed by a, c, or d
        matches!(
            self.peek_kind(offset),
            Some(SyntaxKind::LETTER_A) | Some(SyntaxKind::LETTER_C) | Some(SyntaxKind::LETTER_D)
        )
    }

    fn looks_like_normal_diff(&self) -> bool {
        // Normal diff: 2c2 or 5,7d10 or 3a4,6
        let mut offset = 0;

        // Must start with a number
        if !matches!(self.peek_kind(offset), Some(SyntaxKind::NUMBER)) {
            return false;
        }

        // Skip first range
        while matches!(
            self.peek_kind(offset),
            Some(SyntaxKind::NUMBER) | Some(SyntaxKind::COMMA)
        ) {
            offset += 1;
        }

        // Must have a, c, or d
        if !matches!(
            self.peek_kind(offset),
            Some(SyntaxKind::LETTER_A) | Some(SyntaxKind::LETTER_C) | Some(SyntaxKind::LETTER_D)
        ) {
            return false;
        }
        offset += 1;

        // Must be followed by another number
        matches!(self.peek_kind(offset), Some(SyntaxKind::NUMBER))
    }

    fn peek_kind(&self, offset: usize) -> Option<SyntaxKind> {
        self.tokens.get(self.cursor + offset).map(|(kind, _)| *kind)
    }

    // Context diff parsing
    fn parse_context_diff_file(&mut self) {
        self.builder
            .start_node(SyntaxKind::CONTEXT_DIFF_FILE.into());

        // Parse old file header (*** file)
        if self.at(SyntaxKind::STAR) && self.peek_text(0) == Some("***") {
            self.parse_context_old_file();
        }

        // Parse new file header (--- file)
        if self.at(SyntaxKind::MINUS) && self.peek_text(0) == Some("---") {
            self.parse_context_new_file();
        }

        // Parse hunks (*************** markers)
        while self.at(SyntaxKind::STAR) && self.looks_like_context_hunk_separator() {
            self.parse_context_hunk();
        }

        self.builder.finish_node();
    }

    fn parse_context_old_file(&mut self) {
        self.builder.start_node(SyntaxKind::CONTEXT_OLD_FILE.into());

        // Consume "***"
        self.advance(); // *
        self.advance(); // *
        self.advance(); // *

        // Parse similar to unified diff headers
        self.skip_whitespace();
        self.parse_file_path();
        self.skip_to_eol();

        self.builder.finish_node();
    }

    fn parse_context_new_file(&mut self) {
        self.builder.start_node(SyntaxKind::CONTEXT_NEW_FILE.into());

        // Consume "---"
        self.advance(); // -
        self.advance(); // -
        self.advance(); // -

        self.skip_whitespace();
        self.parse_file_path();
        self.skip_to_eol();

        self.builder.finish_node();
    }

    fn parse_context_hunk(&mut self) {
        self.builder.start_node(SyntaxKind::CONTEXT_HUNK.into());

        // Parse hunk header (***************...)
        self.builder
            .start_node(SyntaxKind::CONTEXT_HUNK_HEADER.into());
        while self.at(SyntaxKind::STAR) {
            self.advance();
        }
        self.skip_to_eol();
        self.builder.finish_node();

        // Parse old section (*** range ****)
        if self.at(SyntaxKind::STAR) && self.peek_text(0) == Some("***") {
            self.parse_context_old_section();
        }

        // Parse new section (--- range ----)
        if self.at(SyntaxKind::MINUS) && self.peek_text(0) == Some("---") {
            self.parse_context_new_section();
        }

        self.builder.finish_node();
    }

    fn parse_context_hunk_without_separator(&mut self) {
        self.builder.start_node(SyntaxKind::CONTEXT_HUNK.into());

        // No hunk header in this case

        // Parse old section (*** range ****)
        if self.at(SyntaxKind::STAR) && self.peek_text(0) == Some("***") {
            self.parse_context_old_section();
        }

        // Parse new section (--- range ----)
        if self.at(SyntaxKind::MINUS) && self.peek_text(0) == Some("---") {
            self.parse_context_new_section();
        }

        self.builder.finish_node();
    }

    fn parse_context_old_section(&mut self) {
        self.builder
            .start_node(SyntaxKind::CONTEXT_OLD_SECTION.into());

        // Parse section header (*** 1,3 ****)
        self.advance(); // *
        self.advance(); // *
        self.advance(); // *

        self.skip_whitespace();
        self.parse_hunk_range(); // Reuse unified diff range parser

        // Skip to end of header
        while !self.at(SyntaxKind::NEWLINE) && !self.at_end() {
            self.advance();
        }
        if self.at(SyntaxKind::NEWLINE) {
            self.advance();
        }

        // Parse lines
        while !self.at_end() && !self.is_context_section_end() {
            self.parse_context_line();
        }

        self.builder.finish_node();
    }

    fn parse_context_new_section(&mut self) {
        self.builder
            .start_node(SyntaxKind::CONTEXT_NEW_SECTION.into());

        // Parse section header (--- 1,3 ----)
        self.advance(); // -
        self.advance(); // -
        self.advance(); // -

        self.skip_whitespace();
        self.parse_hunk_range();

        // Skip to end of header
        while !self.at(SyntaxKind::NEWLINE) && !self.at_end() {
            self.advance();
        }
        if self.at(SyntaxKind::NEWLINE) {
            self.advance();
        }

        // Parse lines
        while !self.at_end() && !self.is_context_section_end() {
            self.parse_context_line();
        }

        self.builder.finish_node();
    }

    fn parse_context_line(&mut self) {
        let checkpoint = self.builder.checkpoint();

        match self.current_kind() {
            Some(SyntaxKind::SPACE) => {
                self.builder
                    .start_node_at(checkpoint, SyntaxKind::CONTEXT_LINE.into());
                self.advance(); // space
            }
            Some(SyntaxKind::EXCLAMATION) => {
                self.builder
                    .start_node_at(checkpoint, SyntaxKind::CONTEXT_CHANGE_LINE.into());
                self.advance(); // !
            }
            Some(SyntaxKind::PLUS) => {
                self.builder
                    .start_node_at(checkpoint, SyntaxKind::ADD_LINE.into());
                self.advance(); // +
            }
            Some(SyntaxKind::MINUS) => {
                self.builder
                    .start_node_at(checkpoint, SyntaxKind::DELETE_LINE.into());
                self.advance(); // -
            }
            _ => {
                self.builder
                    .start_node_at(checkpoint, SyntaxKind::CONTEXT_LINE.into());
            }
        }

        // Parse line content
        while !self.at(SyntaxKind::NEWLINE) && !self.at_end() {
            self.advance();
        }
        if self.at(SyntaxKind::NEWLINE) {
            self.advance();
        }

        self.builder.finish_node();
    }

    fn is_context_section_end(&self) -> bool {
        // Check for section markers
        (self.at(SyntaxKind::MINUS) && self.peek_text(0) == Some("---"))
            || (self.at(SyntaxKind::STAR)
                && (self.peek_text(0) == Some("***") || self.looks_like_context_hunk_separator()))
    }

    // Ed diff parsing
    fn parse_ed_command(&mut self) {
        self.builder.start_node(SyntaxKind::ED_COMMAND.into());

        let checkpoint = self.builder.checkpoint();

        // Parse line numbers
        while self.at(SyntaxKind::NUMBER) || self.at(SyntaxKind::COMMA) {
            self.advance();
        }

        // Parse command letter
        let cmd = self.current_kind();
        match cmd {
            Some(SyntaxKind::LETTER_A) => {
                self.builder
                    .start_node_at(checkpoint, SyntaxKind::ED_ADD_COMMAND.into());
                self.advance();
                self.skip_to_eol();
                self.parse_ed_content_lines();
                self.builder.finish_node();
            }
            Some(SyntaxKind::LETTER_D) => {
                self.builder
                    .start_node_at(checkpoint, SyntaxKind::ED_DELETE_COMMAND.into());
                self.advance();
                self.skip_to_eol();
                self.builder.finish_node();
            }
            Some(SyntaxKind::LETTER_C) => {
                self.builder
                    .start_node_at(checkpoint, SyntaxKind::ED_CHANGE_COMMAND.into());
                self.advance();
                self.skip_to_eol();
                self.parse_ed_content_lines();
                self.builder.finish_node();
            }
            _ => {
                // Invalid command
                self.skip_to_eol();
            }
        }

        self.builder.finish_node();
    }

    fn parse_ed_content_lines(&mut self) {
        // Ed content lines end with a single "."
        while !self.at_end() {
            if self.at(SyntaxKind::DOT) && self.peek_kind(1) == Some(SyntaxKind::NEWLINE) {
                self.advance(); // .
                self.advance(); // newline
                break;
            }

            self.builder.start_node(SyntaxKind::ED_CONTENT_LINE.into());
            while !self.at(SyntaxKind::NEWLINE) && !self.at_end() {
                self.advance();
            }
            if self.at(SyntaxKind::NEWLINE) {
                self.advance();
            }
            self.builder.finish_node();
        }
    }

    // Normal diff parsing
    fn parse_normal_hunk(&mut self) {
        self.builder.start_node(SyntaxKind::NORMAL_HUNK.into());

        // Parse change command (2c2, 5,7d10, etc.)
        self.builder
            .start_node(SyntaxKind::NORMAL_CHANGE_COMMAND.into());

        // Parse first range
        while self.at(SyntaxKind::NUMBER) || self.at(SyntaxKind::COMMA) {
            self.advance();
        }

        // Parse command (a, c, d)
        if matches!(
            self.current_kind(),
            Some(SyntaxKind::LETTER_A) | Some(SyntaxKind::LETTER_C) | Some(SyntaxKind::LETTER_D)
        ) {
            self.advance();
        }

        // Parse second range
        while self.at(SyntaxKind::NUMBER) || self.at(SyntaxKind::COMMA) {
            self.advance();
        }

        self.skip_to_eol();
        self.builder.finish_node();

        // Parse old lines (< lines)
        if self.at(SyntaxKind::LESS_THAN) {
            self.parse_normal_old_lines();
        }

        // Parse separator (---)
        if self.at(SyntaxKind::MINUS) && self.peek_text(0) == Some("---") {
            self.parse_normal_separator();
        }

        // Parse new lines (> lines)
        if self.at(SyntaxKind::GREATER_THAN) {
            self.parse_normal_new_lines();
        }

        self.builder.finish_node();
    }

    fn parse_normal_old_lines(&mut self) {
        self.builder.start_node(SyntaxKind::NORMAL_OLD_LINES.into());

        while self.at(SyntaxKind::LESS_THAN) {
            self.builder.start_node(SyntaxKind::DELETE_LINE.into());
            self.advance(); // <
            self.skip_whitespace();

            while !self.at(SyntaxKind::NEWLINE) && !self.at_end() {
                self.advance();
            }
            if self.at(SyntaxKind::NEWLINE) {
                self.advance();
            }

            self.builder.finish_node();
        }

        self.builder.finish_node();
    }

    fn parse_normal_separator(&mut self) {
        self.builder.start_node(SyntaxKind::NORMAL_SEPARATOR.into());

        // Consume "---"
        self.advance(); // -
        self.advance(); // -
        self.advance(); // -

        self.skip_to_eol();

        self.builder.finish_node();
    }

    fn parse_normal_new_lines(&mut self) {
        self.builder.start_node(SyntaxKind::NORMAL_NEW_LINES.into());

        while self.at(SyntaxKind::GREATER_THAN) {
            self.builder.start_node(SyntaxKind::ADD_LINE.into());
            self.advance(); // >
            self.skip_whitespace();

            while !self.at(SyntaxKind::NEWLINE) && !self.at_end() {
                self.advance();
            }
            if self.at(SyntaxKind::NEWLINE) {
                self.advance();
            }

            self.builder.finish_node();
        }

        self.builder.finish_node();
    }

    fn parse_file_path(&mut self) {
        let mut path_parts = Vec::new();
        let mut collecting_path = true;

        while !self.at(SyntaxKind::NEWLINE) && !self.at_end() && collecting_path {
            match self.current_kind() {
                Some(SyntaxKind::TEXT)
                | Some(SyntaxKind::SLASH)
                | Some(SyntaxKind::DOT)
                | Some(SyntaxKind::NUMBER)
                | Some(SyntaxKind::MINUS)
                | Some(SyntaxKind::STAR)
                | Some(SyntaxKind::COLON)
                | Some(SyntaxKind::BACKSLASH) => {
                    if let Some(text) = self.current_text() {
                        path_parts.push(text.to_string());
                    }
                    self.advance_without_emit();
                }
                Some(SyntaxKind::WHITESPACE) if !path_parts.is_empty() => {
                    collecting_path = false;
                }
                _ => {
                    collecting_path = false;
                }
            }
        }

        if !path_parts.is_empty() {
            let path = path_parts.join("");
            self.builder.token(SyntaxKind::PATH.into(), &path);
        }
    }

    fn skip_to_eol(&mut self) {
        while !self.at(SyntaxKind::NEWLINE) && !self.at_end() {
            self.advance();
        }
        if self.at(SyntaxKind::NEWLINE) {
            self.advance();
        }
    }

    fn looks_like_context_hunk_separator(&self) -> bool {
        // Context hunk separators are lines of 15 or more asterisks
        let mut offset = 0;
        let mut star_count = 0;

        while matches!(self.peek_kind(offset), Some(SyntaxKind::STAR)) {
            star_count += 1;
            offset += 1;
        }

        // Check if we have at least 7 stars followed by newline or end (15 is standard but be flexible)
        star_count >= 7 && matches!(self.peek_kind(offset), Some(SyntaxKind::NEWLINE) | None)
    }

    fn looks_like_context_hunk_range(&self) -> bool {
        // Context hunk range: *** 1,4 **** or *** 1 ****
        if !self.at(SyntaxKind::STAR) || self.peek_text(0) != Some("***") {
            return false;
        }

        let mut offset = 3; // Skip ***

        // Skip whitespace
        while matches!(self.peek_kind(offset), Some(SyntaxKind::WHITESPACE)) {
            offset += 1;
        }

        // Must have a number
        if !matches!(self.peek_kind(offset), Some(SyntaxKind::NUMBER)) {
            return false;
        }

        // Skip numbers and commas
        while matches!(
            self.peek_kind(offset),
            Some(SyntaxKind::NUMBER) | Some(SyntaxKind::COMMA)
        ) {
            offset += 1;
        }

        // Skip whitespace
        while matches!(self.peek_kind(offset), Some(SyntaxKind::WHITESPACE)) {
            offset += 1;
        }

        // Check for trailing stars
        let mut star_count = 0;
        while matches!(self.peek_kind(offset), Some(SyntaxKind::STAR)) {
            star_count += 1;
            offset += 1;
        }

        // Should have at least 3 trailing stars
        star_count >= 3
    }

    fn looks_like_context_new_section(&self) -> bool {
        // Context new section: --- 1,4 ---- or --- 1 ----
        if !self.at(SyntaxKind::MINUS) || self.peek_text(0) != Some("---") {
            return false;
        }

        let mut offset = 3; // Skip ---

        // Skip whitespace
        while matches!(self.peek_kind(offset), Some(SyntaxKind::WHITESPACE)) {
            offset += 1;
        }

        // Must have a number
        if !matches!(self.peek_kind(offset), Some(SyntaxKind::NUMBER)) {
            return false;
        }

        // Skip numbers and commas
        while matches!(
            self.peek_kind(offset),
            Some(SyntaxKind::NUMBER) | Some(SyntaxKind::COMMA)
        ) {
            offset += 1;
        }

        // Skip whitespace
        while matches!(self.peek_kind(offset), Some(SyntaxKind::WHITESPACE)) {
            offset += 1;
        }

        // Check for trailing minuses
        let mut minus_count = 0;
        while matches!(self.peek_kind(offset), Some(SyntaxKind::MINUS)) {
            minus_count += 1;
            offset += 1;
        }

        // Should have at least 3 trailing minuses
        minus_count >= 3
    }
}

#[cfg(test)]
#[path = "parse_tests.rs"]
mod tests;

#[cfg(test)]
#[path = "error_recovery_tests.rs"]
mod error_recovery_tests;

#[cfg(test)]
#[path = "additional_tests.rs"]
mod additional_tests;

#[cfg(test)]
#[path = "format_tests.rs"]
mod format_tests;

#[cfg(test)]
#[path = "corner_case_tests.rs"]
mod corner_case_tests;