adze 0.8.0

Define tree-sitter grammars alongside Rust logic with AST-first parsing
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
//! Optimized GLR Incremental Parsing Strategies
//!
//! This module provides specialized optimizations for common edit patterns
//! to minimize reparsing overhead in GLR incremental parsing.

use crate::glr_incremental::{ForestNode, GLREdit, GLRToken};
use crate::subtree::Subtree;
use adze_ir::SymbolId;
use std::collections::{HashMap, VecDeque};
use std::sync::Arc;

/// Edit classification for optimization strategies
#[derive(Debug, Clone, PartialEq)]
pub enum EditClass {
    /// Single character insertion (common during typing)
    SingleCharInsertion,
    /// Single character deletion (backspace/delete)
    SingleCharDeletion,
    /// Token replacement (e.g., variable rename)
    TokenReplacement,
    /// Whitespace only change
    WhitespaceOnly,
    /// Comment modification
    CommentOnly,
    /// Block-level structural change
    StructuralChange,
    /// Multiple scattered edits
    Multiple,
}

impl EditClass {
    /// Classify an edit for optimization
    pub fn classify(edit: &GLREdit) -> Self {
        let old_len = edit.old_range.len();
        let new_len = edit.new_text.len();

        // Single character insertion
        if old_len == 0 && new_len == 1 {
            return EditClass::SingleCharInsertion;
        }

        // Single character deletion
        if old_len == 1 && new_len == 0 {
            return EditClass::SingleCharDeletion;
        }

        // Check if it's whitespace only
        if Self::is_whitespace_change(&edit.new_text) {
            return EditClass::WhitespaceOnly;
        }

        // Check if it's a comment
        if Self::is_comment_change(&edit.new_text) {
            return EditClass::CommentOnly;
        }

        // Token replacement (similar size, single token affected)
        if edit.old_token_range.len() == 1 && edit.new_tokens.len() == 1 {
            return EditClass::TokenReplacement;
        }

        // Default to structural change for larger edits
        if old_len > 50 || new_len > 50 {
            return EditClass::StructuralChange;
        }

        EditClass::Multiple
    }

    fn is_whitespace_change(text: &[u8]) -> bool {
        text.iter().all(|&b| b.is_ascii_whitespace())
    }

    fn is_comment_change(text: &[u8]) -> bool {
        // Simple heuristic for common comment patterns
        let text_str = String::from_utf8_lossy(text);
        text_str.starts_with("//") || text_str.starts_with("/*") || text_str.starts_with("#")
    }
}

/// Optimized reparse strategy based on edit classification
pub struct OptimizedReparser {
    /// Cache of recent parse results for fast lookup
    parse_cache: ParseCache,
    /// Statistics for optimization effectiveness
    stats: ReparseStats,
}

/// Cache for recent parse results
struct ParseCache {
    /// Maps token sequences to parsed subtrees
    token_cache: HashMap<Vec<SymbolId>, Arc<Subtree>>,
    /// LRU queue for cache eviction
    lru_queue: VecDeque<Vec<SymbolId>>,
    /// Maximum cache size
    max_size: usize,
}

impl ParseCache {
    fn new(max_size: usize) -> Self {
        Self {
            token_cache: HashMap::new(),
            lru_queue: VecDeque::new(),
            max_size,
        }
    }

    fn get(&mut self, tokens: &[SymbolId]) -> Option<Arc<Subtree>> {
        if let Some(subtree) = self.token_cache.get(tokens) {
            // Move to front of LRU queue
            self.lru_queue.retain(|t| t != tokens);
            self.lru_queue.push_front(tokens.to_vec());
            Some(subtree.clone())
        } else {
            None
        }
    }

    fn insert(&mut self, tokens: Vec<SymbolId>, subtree: Arc<Subtree>) {
        // Evict if at capacity
        if self.token_cache.len() >= self.max_size {
            if let Some(old_tokens) = self.lru_queue.pop_back() {
                self.token_cache.remove(&old_tokens);
            }
        }

        self.token_cache.insert(tokens.clone(), subtree);
        self.lru_queue.push_front(tokens);
    }
}

/// Statistics for reparse optimization
#[derive(Debug, Default)]
pub struct ReparseStats {
    pub total_reparses: usize,
    pub cache_hits: usize,
    pub cache_misses: usize,
    pub subtrees_reused: usize,
    pub full_reparses: usize,
    pub optimized_reparses: usize,
}

impl OptimizedReparser {
    pub fn new() -> Self {
        Self {
            parse_cache: ParseCache::new(1000),
            stats: ReparseStats::default(),
        }
    }

    /// Optimize reparse based on edit classification
    pub fn optimize_reparse(
        &mut self,
        edit: &GLREdit,
        tokens: &[GLRToken],
        reuse_map: &ReuseMap,
    ) -> Option<Arc<ForestNode>> {
        self.stats.total_reparses += 1;

        let edit_class = EditClass::classify(edit);

        match edit_class {
            EditClass::SingleCharInsertion => self.handle_char_insertion(edit, tokens, reuse_map),
            EditClass::SingleCharDeletion => self.handle_char_deletion(edit, tokens, reuse_map),
            EditClass::TokenReplacement => self.handle_token_replacement(edit, tokens, reuse_map),
            EditClass::WhitespaceOnly => self.handle_whitespace_change(edit, tokens, reuse_map),
            EditClass::CommentOnly => self.handle_comment_change(edit, tokens, reuse_map),
            _ => {
                // Fall back to standard incremental parsing
                self.stats.full_reparses += 1;
                None
            }
        }
    }

    /// Handle single character insertion optimization
    fn handle_char_insertion(
        &mut self,
        edit: &GLREdit,
        tokens: &[GLRToken],
        reuse_map: &ReuseMap,
    ) -> Option<Arc<ForestNode>> {
        // Check if we're in the middle of a token
        let affected_token_idx = tokens.iter().position(|t| {
            t.start_byte <= edit.old_range.start && t.end_byte > edit.old_range.start
        })?;

        let _affected_token = &tokens[affected_token_idx];

        // Try to use cached result for similar token
        let token_symbols: Vec<SymbolId> = tokens.iter().map(|t| t.symbol).collect();

        if let Some(cached) = self.parse_cache.get(&token_symbols) {
            self.stats.cache_hits += 1;
            self.stats.optimized_reparses += 1;

            // Adjust byte offsets in cached result
            return Some(self.adjust_forest_offsets(cached, edit));
        }

        self.stats.cache_misses += 1;

        // Try to reuse surrounding subtrees
        if self.can_reuse_surrounding_subtrees(edit, reuse_map) {
            self.stats.subtrees_reused += 1;
            self.stats.optimized_reparses += 1;
            // Reparse only the affected token and merge with reused subtrees
            return self.reparse_minimal_region(edit, tokens, reuse_map);
        }

        None
    }

    /// Handle single character deletion optimization
    fn handle_char_deletion(
        &mut self,
        edit: &GLREdit,
        tokens: &[GLRToken],
        reuse_map: &ReuseMap,
    ) -> Option<Arc<ForestNode>> {
        // Similar to insertion but in reverse
        self.handle_char_insertion(edit, tokens, reuse_map)
    }

    /// Handle token replacement optimization
    fn handle_token_replacement(
        &mut self,
        edit: &GLREdit,
        tokens: &[GLRToken],
        reuse_map: &ReuseMap,
    ) -> Option<Arc<ForestNode>> {
        // If only one token is affected, we can often reuse the entire parse tree structure
        // and just replace the single token node

        if edit.old_token_range.len() != 1 || edit.new_tokens.len() != 1 {
            return None;
        }

        let token_idx = edit.old_token_range.start;

        // Check if the token has the same symbol type (e.g., both identifiers)
        if token_idx < tokens.len() && tokens[token_idx].symbol == edit.new_tokens[0].symbol {
            self.stats.optimized_reparses += 1;
            // Can directly replace the token in the tree
            return self.replace_single_token(token_idx, &edit.new_tokens[0], tokens, reuse_map);
        }

        None
    }

    /// Handle whitespace-only changes
    fn handle_whitespace_change(
        &mut self,
        _edit: &GLREdit,
        tokens: &[GLRToken],
        reuse_map: &ReuseMap,
    ) -> Option<Arc<ForestNode>> {
        // Whitespace changes usually don't affect the parse tree structure
        // We can often reuse the entire tree with adjusted positions
        self.stats.optimized_reparses += 1;
        self.stats.subtrees_reused += tokens.len();

        // Return existing forest with adjusted positions
        self.get_existing_forest(reuse_map)
    }

    /// Handle comment-only changes
    fn handle_comment_change(
        &mut self,
        edit: &GLREdit,
        tokens: &[GLRToken],
        reuse_map: &ReuseMap,
    ) -> Option<Arc<ForestNode>> {
        // Comments typically don't affect parse tree structure
        // Similar to whitespace handling
        self.handle_whitespace_change(edit, tokens, reuse_map)
    }

    /// Check if we can reuse surrounding subtrees
    fn can_reuse_surrounding_subtrees(&self, edit: &GLREdit, reuse_map: &ReuseMap) -> bool {
        // Check if there are reusable subtrees before and after the edit
        let before_range = 0..edit.old_range.start;
        let after_range = edit.old_range.end..usize::MAX;

        !reuse_map.is_affected(&before_range) && !reuse_map.is_affected(&after_range)
    }

    /// Reparse only the minimal affected region
    fn reparse_minimal_region(
        &self,
        _edit: &GLREdit,
        _tokens: &[GLRToken],
        _reuse_map: &ReuseMap,
    ) -> Option<Arc<ForestNode>> {
        // This would implement minimal region reparsing
        // For now, return None to fall back to standard incremental
        None
    }

    /// Replace a single token in the forest
    fn replace_single_token(
        &self,
        _token_idx: usize,
        _new_token: &GLRToken,
        _tokens: &[GLRToken],
        _reuse_map: &ReuseMap,
    ) -> Option<Arc<ForestNode>> {
        // This would implement single token replacement
        // For now, return None to fall back to standard incremental
        None
    }

    /// Adjust forest node offsets after an edit
    fn adjust_forest_offsets(&self, _subtree: Arc<Subtree>, _edit: &GLREdit) -> Arc<ForestNode> {
        // This would adjust byte offsets in the forest
        // For now, create a dummy forest node
        Arc::new(ForestNode {
            symbol: SymbolId(0),
            alternatives: vec![],
            byte_range: 0..0,
            token_range: 0..0,
            cached_subtree: None,
        })
    }

    /// Get existing forest from reuse map
    fn get_existing_forest(&self, _reuse_map: &ReuseMap) -> Option<Arc<ForestNode>> {
        // This would retrieve the existing forest
        // For now, return None
        None
    }

    /// Get optimization statistics
    pub fn stats(&self) -> &ReparseStats {
        &self.stats
    }

    /// Reset statistics
    pub fn reset_stats(&mut self) {
        self.stats = ReparseStats::default();
    }
}

/// Incremental boundary detection for optimal reparse regions
pub struct BoundaryDetector {
    /// Grammar information for boundary detection
    grammar_info: GrammarInfo,
}

#[derive(Debug)]
struct GrammarInfo {
    /// Symbols that can start a statement/expression
    statement_starters: Vec<SymbolId>,
    /// Symbols that can end a statement/expression
    statement_enders: Vec<SymbolId>,
    /// Balanced delimiter pairs
    delimiter_pairs: Vec<(SymbolId, SymbolId)>,
}

impl BoundaryDetector {
    pub fn new() -> Self {
        Self {
            grammar_info: GrammarInfo {
                statement_starters: vec![],
                statement_enders: vec![],
                delimiter_pairs: vec![],
            },
        }
    }

    /// Find optimal reparse boundaries around an edit
    pub fn find_boundaries(&self, edit: &GLREdit, tokens: &[GLRToken]) -> (usize, usize) {
        let mut start_boundary = edit.old_token_range.start;
        let mut end_boundary = edit.old_token_range.end;

        // Expand to nearest statement boundaries
        start_boundary = self.find_statement_start(start_boundary, tokens);
        end_boundary = self.find_statement_end(end_boundary, tokens);

        // Ensure balanced delimiters
        self.balance_delimiters(start_boundary, end_boundary, tokens)
    }

    fn find_statement_start(&self, from: usize, tokens: &[GLRToken]) -> usize {
        // Search backwards for a statement starter
        for i in (0..from.min(tokens.len())).rev() {
            if self
                .grammar_info
                .statement_starters
                .contains(&tokens[i].symbol)
            {
                return i;
            }
        }
        0
    }

    fn find_statement_end(&self, from: usize, tokens: &[GLRToken]) -> usize {
        // Search forwards for a statement ender
        for i in from..tokens.len() {
            if self
                .grammar_info
                .statement_enders
                .contains(&tokens[i].symbol)
            {
                return i + 1;
            }
        }
        tokens.len()
    }

    fn balance_delimiters(
        &self,
        mut start: usize,
        mut end: usize,
        tokens: &[GLRToken],
    ) -> (usize, usize) {
        // Ensure we have balanced delimiters in the reparse region
        let mut delimiter_stack = Vec::new();

        for i in start..end.min(tokens.len()) {
            let symbol = tokens[i].symbol;

            // Check for opening delimiter
            for (open, close) in &self.grammar_info.delimiter_pairs {
                if symbol == *open {
                    delimiter_stack.push(*close);
                } else if symbol == *close {
                    if delimiter_stack.last() == Some(close) {
                        delimiter_stack.pop();
                    } else {
                        // Unmatched closing delimiter - expand region
                        start = self.find_matching_opener(i, tokens, *open).unwrap_or(0);
                    }
                }
            }
        }

        // If we have unclosed delimiters, expand to include their closers
        if !delimiter_stack.is_empty() {
            end = self
                .find_closers(end, &delimiter_stack, tokens)
                .unwrap_or(tokens.len());
        }

        (start, end)
    }

    fn find_matching_opener(
        &self,
        from: usize,
        tokens: &[GLRToken],
        opener: SymbolId,
    ) -> Option<usize> {
        for i in (0..from).rev() {
            if tokens[i].symbol == opener {
                return Some(i);
            }
        }
        None
    }

    fn find_closers(
        &self,
        from: usize,
        closers: &[SymbolId],
        tokens: &[GLRToken],
    ) -> Option<usize> {
        let mut remaining = closers.to_vec();

        for i in from..tokens.len() {
            if let Some(pos) = remaining.iter().position(|&c| c == tokens[i].symbol) {
                remaining.remove(pos);
                if remaining.is_empty() {
                    return Some(i + 1);
                }
            }
        }

        None
    }
}

#[cfg(test)]
mod tests {
    use super::*;

    #[test]
    fn test_edit_classification() {
        // Single char insertion
        let edit = GLREdit {
            old_range: 5..5,
            new_text: b"x".to_vec(),
            old_token_range: 0..0,
            new_tokens: vec![],
            old_tokens: vec![],
            old_forest: None,
        };
        assert_eq!(EditClass::classify(&edit), EditClass::SingleCharInsertion);

        // Single char deletion
        let edit = GLREdit {
            old_range: 5..6,
            new_text: vec![],
            old_token_range: 0..0,
            new_tokens: vec![],
            old_tokens: vec![],
            old_forest: None,
        };
        assert_eq!(EditClass::classify(&edit), EditClass::SingleCharDeletion);

        // Whitespace change
        let edit = GLREdit {
            old_range: 5..10,
            new_text: b"  \n\t ".to_vec(),
            old_token_range: 0..0,
            new_tokens: vec![],
            old_tokens: vec![],
            old_forest: None,
        };
        assert_eq!(EditClass::classify(&edit), EditClass::WhitespaceOnly);

        // Comment change
        let edit = GLREdit {
            old_range: 5..10,
            new_text: b"// comment".to_vec(),
            old_token_range: 0..0,
            new_tokens: vec![],
            old_tokens: vec![],
            old_forest: None,
        };
        assert_eq!(EditClass::classify(&edit), EditClass::CommentOnly);
    }

    #[test]
    fn test_parse_cache() {
        let mut cache = ParseCache::new(2);

        let tokens1 = vec![SymbolId(1), SymbolId(2)];
        let tokens2 = vec![SymbolId(3), SymbolId(4)];
        let tokens3 = vec![SymbolId(5), SymbolId(6)];

        let node1 = SubtreeNode {
            symbol_id: SymbolId(1),
            is_error: false,
            byte_range: 0..10,
        };
        let node2 = SubtreeNode {
            symbol_id: SymbolId(2),
            is_error: false,
            byte_range: 10..20,
        };
        let node3 = SubtreeNode {
            symbol_id: SymbolId(3),
            is_error: false,
            byte_range: 20..30,
        };
        let subtree1 = Arc::new(Subtree::new(node1, vec![]));
        let subtree2 = Arc::new(Subtree::new(node2, vec![]));
        let subtree3 = Arc::new(Subtree::new(node3, vec![]));

        // Insert first two
        cache.insert(tokens1.clone(), subtree1.clone());
        cache.insert(tokens2.clone(), subtree2.clone());

        // Access first to make it most recently used
        assert!(cache.get(&tokens1).is_some());

        // Insert third - should evict tokens2
        cache.insert(tokens3.clone(), subtree3.clone());

        // Check cache contents
        assert!(cache.get(&tokens1).is_some());
        assert!(cache.get(&tokens2).is_none()); // Evicted
        assert!(cache.get(&tokens3).is_some());
    }

    #[test]
    fn test_boundary_detector() {
        let detector = BoundaryDetector::new();

        let tokens = vec![
            GLRToken {
                symbol: SymbolId(1),
                text: b"if".to_vec(),
                start_byte: 0,
                end_byte: 2,
            },
            GLRToken {
                symbol: SymbolId(2),
                text: b"(".to_vec(),
                start_byte: 3,
                end_byte: 4,
            },
            GLRToken {
                symbol: SymbolId(3),
                text: b"x".to_vec(),
                start_byte: 4,
                end_byte: 5,
            },
            GLRToken {
                symbol: SymbolId(4),
                text: b")".to_vec(),
                start_byte: 5,
                end_byte: 6,
            },
        ];

        let edit = GLREdit {
            old_range: 4..5,
            new_text: b"y".to_vec(),
            old_token_range: 2..3,
            new_tokens: vec![],
            old_tokens: vec![],
            old_forest: None,
        };

        let (start, end) = detector.find_boundaries(&edit, &tokens);

        // Should expand to include the whole if statement
        assert!(start <= 2);
        assert!(end >= 3);
    }
}