dk-engine 0.2.80

dkod code analysis engine — semantic parsing, indexing, and search
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

use dk_engine::conflict::{build_conflict_detail, build_conflict_block};
use dk_engine::parser::ParserRegistry;

fn registry() -> ParserRegistry {
    ParserRegistry::new()
}

#[test]
fn test_payload_contains_base_their_your_versions() {
    let base = r#"fn process(x: i32) -> i32 {
    x + 1
}
"#;

    let theirs = r#"fn process(x: i32) -> i32 {
    x * 2
}
"#;

    let yours = r#"fn process(x: i32) -> i32 {
    x + 10
}
"#;

    let detail = build_conflict_detail(
        &registry(),
        "lib.rs",
        "process",
        "agent-other",
        base,
        theirs,
        yours,
    )
    .unwrap();

    assert_eq!(detail.file_path, "lib.rs");
    assert_eq!(detail.qualified_name, "process");
    assert_eq!(detail.kind, "function");
    assert_eq!(detail.conflicting_agent, "agent-other");

    // Base version present
    assert_eq!(detail.base_version.change_type, "base");
    assert!(detail.base_version.body.contains("x + 1"));

    // Their version present
    assert_eq!(detail.their_change.change_type, "modified");
    assert!(detail.their_change.body.contains("x * 2"));

    // Your version present
    assert_eq!(detail.your_change.change_type, "modified");
    assert!(detail.your_change.body.contains("x + 10"));
}

#[test]
fn test_payload_description_captures_signature_change() {
    let base = r#"fn compute(x: i32) -> i32 {
    x
}
"#;

    let theirs = r#"fn compute(x: i32, y: i32) -> i32 {
    x + y
}
"#;

    let yours = r#"fn compute(x: i32) -> i32 {
    x * 2
}
"#;

    let detail = build_conflict_detail(
        &registry(),
        "math.rs",
        "compute",
        "agent-b",
        base,
        theirs,
        yours,
    )
    .unwrap();

    // Their change should mention the signature change
    assert!(
        detail.their_change.description.contains("Signature changed"),
        "Expected signature change description, got: {}",
        detail.their_change.description
    );

    // Their signature should reflect the new params
    assert!(detail.their_change.signature.contains("y: i32"));
}

#[test]
fn test_payload_for_new_symbol() {
    // Symbol doesn't exist in base
    let base = r#"fn existing() -> bool {
    true
}
"#;

    let theirs = r#"fn existing() -> bool {
    true
}

fn new_fn() -> String {
    "hello".to_string()
}
"#;

    let yours = r#"fn existing() -> bool {
    true
}

fn new_fn() -> i32 {
    42
}
"#;

    let detail = build_conflict_detail(
        &registry(),
        "lib.rs",
        "new_fn",
        "agent-x",
        base,
        theirs,
        yours,
    )
    .unwrap();

    // Base version should be empty since the symbol didn't exist
    assert!(detail.base_version.body.is_empty());
    assert_eq!(detail.base_version.change_type, "base");
    assert!(detail.base_version.description.contains("does not exist"));

    // Both sides should be "added"
    assert_eq!(detail.their_change.change_type, "added");
    assert_eq!(detail.your_change.change_type, "added");
}

#[test]
fn test_build_conflict_block_message() {
    let base = r#"fn alpha() -> i32 { 1 }
"#;
    let theirs = r#"fn alpha() -> i32 { 2 }
"#;
    let yours = r#"fn alpha() -> i32 { 3 }
"#;

    let conflicts = vec![(
        "src/lib.rs",
        "alpha",
        "agent-other",
        base,
        theirs,
        yours,
    )];

    let block = build_conflict_block(&registry(), &conflicts).unwrap();
    assert_eq!(block.conflicting_symbols.len(), 1);
    assert!(block.message.contains("1 symbol conflict"));
    assert!(block.message.contains("src/lib.rs"));
}

#[test]
fn test_build_conflict_block_multiple_files() {
    let base_a = r#"fn fa() -> i32 { 1 }
"#;
    let theirs_a = r#"fn fa() -> i32 { 2 }
"#;
    let yours_a = r#"fn fa() -> i32 { 3 }
"#;

    let base_b = r#"fn fb() -> i32 { 1 }
"#;
    let theirs_b = r#"fn fb() -> i32 { 2 }
"#;
    let yours_b = r#"fn fb() -> i32 { 3 }
"#;

    let conflicts = vec![
        ("src/a.rs", "fa", "agent-1", base_a, theirs_a, yours_a),
        ("src/b.rs", "fb", "agent-2", base_b, theirs_b, yours_b),
    ];

    let block = build_conflict_block(&registry(), &conflicts).unwrap();
    assert_eq!(block.conflicting_symbols.len(), 2);
    assert!(block.message.contains("2 symbol conflicts"));
    assert!(block.message.contains("2 file(s)"));
}