Commit 91b9d5b
committed
fix: resolve merge conflicts with main (R + ObjC) (docs check acknowledged)
Resolved merge with origin/main (44a3505 R extractor). Combined both
ObjC and R additions to:
- crates/codegraph-core/src/file_collector.rs SUPPORTED_EXTENSIONS
(keep both 'm' and 'r'/'R')
- crates/codegraph-core/src/parser_registry.rs LanguageKind::all()
(keep ObjC and R in declaration order)
- Bumped EXPECTED_LEN from 30 to 31 to match the new variant count.
- tests/parsers/native-drop-classification.test.ts: decrement the
unsupported-by-native count from 6 to 5 since the merge correctly
removed 'src/k.m' from the input array (ObjC is now natively
supported) but main's side of the conflict left the old count.
This is a merge resolution — no new features, no doc changes needed
(ObjC language support docs were already added in an earlier commit
on this branch; R docs landed on main with #1102).13 files changed
Lines changed: 603 additions & 11 deletions
File tree
- crates/codegraph-core
- src
- extractors
- src
- ast-analysis/rules
- domain
- extractors
- tests
- benchmarks
- parsers
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
| 43 | + | |
43 | 44 | | |
44 | 45 | | |
45 | 46 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
417 | 417 | | |
418 | 418 | | |
419 | 419 | | |
| 420 | + | |
| 421 | + | |
| 422 | + | |
| 423 | + | |
| 424 | + | |
| 425 | + | |
| 426 | + | |
| 427 | + | |
| 428 | + | |
| 429 | + | |
| 430 | + | |
420 | 431 | | |
421 | 432 | | |
422 | 433 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
| 23 | + | |
23 | 24 | | |
24 | 25 | | |
25 | 26 | | |
| |||
147 | 148 | | |
148 | 149 | | |
149 | 150 | | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
150 | 154 | | |
151 | 155 | | |
152 | 156 | | |
| |||
0 commit comments