-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Expand file tree
/
Copy pathxtabCustomDiffPatchResponseHandler.spec.ts
More file actions
284 lines (254 loc) · 8.24 KB
/
xtabCustomDiffPatchResponseHandler.spec.ts
File metadata and controls
284 lines (254 loc) · 8.24 KB
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
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { beforeEach, describe, expect, it } from 'vitest';
import { DocumentId } from '../../../../platform/inlineEdits/common/dataTypes/documentId';
import { NoNextEditReason, StreamedEdit } from '../../../../platform/inlineEdits/common/statelessNextEditProvider';
import { TestLogService } from '../../../../platform/testing/common/testLogService';
import { AsyncIterUtils } from '../../../../util/common/asyncIterableUtils';
import { CancellationTokenSource } from '../../../../util/vs/base/common/cancellation';
import { Position } from '../../../../util/vs/editor/common/core/position';
import { StringText } from '../../../../util/vs/editor/common/core/text/abstractText';
import { ensureDependenciesAreSet } from '../../../../util/vs/editor/common/core/text/positionToOffset';
import { CurrentDocument } from '../../common/xtabCurrentDocument';
import { XtabCustomDiffPatchResponseHandler } from '../../node/xtabCustomDiffPatchResponseHandler';
async function consumeHandleResponse(
...args: Parameters<typeof XtabCustomDiffPatchResponseHandler.handleResponse>
): Promise<{ edits: StreamedEdit[]; returnValue: NoNextEditReason }> {
const gen = XtabCustomDiffPatchResponseHandler.handleResponse(...args);
const edits: StreamedEdit[] = [];
for (; ;) {
const result = await gen.next();
if (result.done) {
return { edits, returnValue: result.value };
}
edits.push(result.value);
}
}
describe('XtabCustomDiffPatchResponseHandler', () => {
beforeEach(() => {
ensureDependenciesAreSet();
});
async function collectPatches(patchText: string): Promise<string> {
const linesStream = AsyncIterUtils.fromArray(patchText.split('\n'));
const patches = await AsyncIterUtils.toArray(XtabCustomDiffPatchResponseHandler.extractEdits(linesStream));
return patches.map(p => p.toString()).join('\n');
}
it('should parse a simple patch correctly', async () => {
const patchText = `file1.txt:10
-Old line 1
-Old line 2
+New line 1
+New line 2`;
const patches = await collectPatches(patchText);
expect(patches).toEqual(patchText);
});
it('should parse a simple patch correctly despite trailing newline', async () => {
const patchText = `file1.txt:10
-Old line 1
-Old line 2
+New line 1
+New line 2
`;
const patches = await collectPatches(patchText);
expect(patches).toEqual(patchText.trim());
});
it('should parse a simple patch correctly', async () => {
const patchText = `/absolutePath/to/my_file.ts:1
-Old line 1
+New line 1
+New line 2
relative/path/to/another_file.js:42
-Removed line
+Added line`;
const patches = await collectPatches(patchText);
expect(patches).toEqual(patchText);
});
it('discard a patch if no valid header', async () => {
const patchText = `myFile.ts:
+New line 1
+New line 2
another_file.js:32
-Removed line
+Added line`;
const patches = await collectPatches(patchText);
expect(patches).toMatchInlineSnapshot(`
"another_file.js:32
-Removed line
+Added line"
`);
});
it('discard a patch if no valid header - 2', async () => {
const patchText = `myFile.ts:42
+New line 1
+New line 2
another_file.js:
-Removed line
+Added line`;
const patches = await collectPatches(patchText);
expect(patches).toMatchInlineSnapshot(`
"myFile.ts:42
+New line 1
+New line 2"
`);
});
it('discard a patch has no removed lines', async () => {
const patchText = `myFile.ts:42
+New line 1
+New line 2`;
const patches = await collectPatches(patchText);
expect(patches).toMatchInlineSnapshot(`
"myFile.ts:42
+New line 1
+New line 2"
`);
});
it('discard a patch has no new lines', async () => {
const patchText = `myFile.ts:42
-Old line 1
-Old line 2`;
const patches = await collectPatches(patchText);
expect(patches).toMatchInlineSnapshot(`
"myFile.ts:42
-Old line 1
-Old line 2"
`);
});
it('no-op diff', async () => {
const patchText = `myFile.ts:42
-Old line 1
+Old line 1`;
const patches = await collectPatches(patchText);
expect(patches).toMatchInlineSnapshot(`
"myFile.ts:42
-Old line 1
+Old line 1"
`);
});
it('stops yielding edits when getFetchFailure returns a failure', async () => {
const patchText = `/file.ts:0
-old
+new
/file.ts:5
-another old
+another new`;
const linesStream = AsyncIterUtils.fromArray(patchText.split('\n'));
const docId = DocumentId.create('file:///file.ts');
const documentBeforeEdits = new CurrentDocument(new StringText('old\n'), new Position(1, 1));
let yieldCount = 0;
const cancellationReason = new NoNextEditReason.GotCancelled('afterFetchCall');
const { edits, returnValue } = await consumeHandleResponse(
linesStream,
documentBeforeEdits,
docId,
undefined,
undefined,
new TestLogService(),
() => {
// Signal failure after the first edit has been yielded
if (yieldCount++ > 0) {
return cancellationReason;
}
return undefined;
},
);
expect(edits).toHaveLength(1);
expect(returnValue).toBe(cancellationReason);
});
it('does not yield incomplete patch when fetch is cancelled mid-stream', async () => {
// Stream is truncated before the last line "+one more new" is emitted,
// simulating a cancellation that cuts off the response mid-patch.
const truncatedPatchText = `/file.ts:0
-old
+new
/file.ts:5
-another old
+another new`;
const linesStream = AsyncIterUtils.fromArray(truncatedPatchText.split('\n'));
const docId = DocumentId.create('file:///file.ts');
const documentBeforeEdits = new CurrentDocument(new StringText('old\n'), new Position(1, 1));
const cancellationReason = new NoNextEditReason.GotCancelled('afterFetchCall');
const { edits, returnValue } = await consumeHandleResponse(
linesStream,
documentBeforeEdits,
docId,
undefined,
undefined,
new TestLogService(),
() => {
// Fetch was cancelled — the full patch had "+one more new" but the
// stream was resolved early so it's missing from the second patch.
return cancellationReason;
},
);
expect(edits).toHaveLength(0);
expect(returnValue).toBe(cancellationReason);
});
it('returns GotCancelled when the cancellation token is already cancelled', async () => {
const patchText = `/file.ts:0
-old
+new
/file.ts:5
-another old
+another new`;
const linesStream = AsyncIterUtils.fromArray(patchText.split('\n'));
const docId = DocumentId.create('file:///file.ts');
const documentBeforeEdits = new CurrentDocument(new StringText('old\n'), new Position(1, 1));
const cts = new CancellationTokenSource();
cts.cancel();
const { edits, returnValue } = await consumeHandleResponse(
linesStream,
documentBeforeEdits,
docId,
undefined,
undefined,
new TestLogService(),
undefined,
cts.token,
);
expect(edits).toHaveLength(0);
expect(returnValue).toBeInstanceOf(NoNextEditReason.GotCancelled);
expect((returnValue as NoNextEditReason.GotCancelled).message).toBe('duringStreaming');
});
it('stops yielding edits when the cancellation token is cancelled mid-stream', async () => {
const patchText = `/file.ts:0
-old
+new
/file.ts:5
-another old
+another new`;
const linesStream = AsyncIterUtils.fromArray(patchText.split('\n'));
const docId = DocumentId.create('file:///file.ts');
const documentBeforeEdits = new CurrentDocument(new StringText('old\n'), new Position(1, 1));
const cts = new CancellationTokenSource();
let yieldCount = 0;
const gen = XtabCustomDiffPatchResponseHandler.handleResponse(
linesStream,
documentBeforeEdits,
docId,
undefined,
undefined,
new TestLogService(),
undefined,
cts.token,
);
const edits: StreamedEdit[] = [];
for (; ;) {
const result = await gen.next();
if (result.done) {
// Verify cancellation is returned
expect(result.value).toBeInstanceOf(NoNextEditReason.GotCancelled);
expect((result.value as NoNextEditReason.GotCancelled).message).toBe('duringStreaming');
break;
}
edits.push(result.value);
yieldCount++;
if (yieldCount === 1) {
// Cancel after first edit is yielded
cts.cancel();
}
}
expect(edits).toHaveLength(1);
});
});