jpmschweitzerandClaude
203f8e7681
test / unit + widget + golden + a11y (push) Failing after 25s
test / integration_test (xvfb) (push) Has been skipped
test / bundle smoke (xvfb 5s) (push) Has been skipped
test / daemon subprocess + web WASM smoke (push) Has been skipped
test / dart doc (lib API) (push) Failing after 24s
Follow-up to the multi-tab editor: extends the controller and view tests to the close-tab, type-to-edit, and Ctrl+S-save paths, plus a handful of controller edge branches (read errors, null-id events, the suppressed self-echo, sibling-dirty marking). Adds a SyntaxTextController suite driving a fake TreeSitterService so the span→TextSpan rendering and byte→char mapping (including surrogate pairs) are exercised without the native grammar. Restores total line coverage above the 95% floor. Co-Authored-By: Claude <noreply@anthropic.com>
433 lines
13 KiB
Dart
433 lines
13 KiB
Dart
/// Tests the multi-buffer tracking in EditorController (the UI mirror
|
|
/// of the daemon's editor model): hydrate populates the open-buffer
|
|
/// list, events keep it in sync, and activate/close route to IPC.
|
|
library;
|
|
|
|
import 'package:clide/builtin/editor/src/editor_controller.dart';
|
|
import 'package:clide/clide.dart';
|
|
import 'package:clide/kernel/kernel.dart';
|
|
import 'package:flutter_test/flutter_test.dart';
|
|
|
|
import '../../helpers/fake_ipc.dart';
|
|
|
|
IpcResponse _ok(Map<String, Object?> data) => IpcResponse.ok(id: '', data: data);
|
|
|
|
Map<String, Object?> _buf(String id, String path, {bool dirty = false}) => {'id': id, 'path': path, 'dirty': dirty};
|
|
|
|
Map<String, Object?> _read(String id, String path, String content, {bool dirty = false}) => {
|
|
'id': id,
|
|
'path': path,
|
|
'content': content,
|
|
'selection': {'start': 0, 'end': 0},
|
|
'dirty': dirty,
|
|
};
|
|
|
|
void emitEditor(DaemonBus bus, String kind, Map<String, Object?> data) {
|
|
bus.emit(DaemonEvent(subsystem: 'editor', kind: kind, data: data, ts: DateTime.now().toUtc()));
|
|
}
|
|
|
|
void main() {
|
|
late DaemonBus bus;
|
|
late FakeDaemonClient ipc;
|
|
late EditorController c;
|
|
|
|
setUp(() {
|
|
bus = DaemonBus();
|
|
ipc = FakeDaemonClient(log: Logger(), events: bus);
|
|
c = EditorController(ipc: ipc, events: bus);
|
|
});
|
|
|
|
tearDown(() async {
|
|
c.dispose();
|
|
await bus.dispose();
|
|
});
|
|
|
|
group('hydrate', () {
|
|
test('populates the open-buffer list and loads the active buffer', () async {
|
|
ipc.stub(
|
|
'editor.list',
|
|
(_) async => _ok({
|
|
'buffers': [_buf('b_1', 'lib/a.dart'), _buf('b_2', 'lib/b.dart', dirty: true)]
|
|
}));
|
|
ipc.stub(
|
|
'editor.active',
|
|
(_) async => _ok({
|
|
'active': {'id': 'b_1'}
|
|
}));
|
|
ipc.stub('editor.read', (a) async => _ok(_read('b_1', 'lib/a.dart', 'hello')));
|
|
|
|
await c.hydrate();
|
|
|
|
expect(c.buffers.map((b) => b.id).toList(), ['b_1', 'b_2']);
|
|
expect(c.buffers[1].dirty, isTrue);
|
|
expect(c.activeId, 'b_1');
|
|
expect(c.content, 'hello');
|
|
});
|
|
|
|
test('with no active buffer leaves the list but no active content', () async {
|
|
ipc.stub(
|
|
'editor.list',
|
|
(_) async => _ok({
|
|
'buffers': [_buf('b_1', 'lib/a.dart')]
|
|
}));
|
|
ipc.stub('editor.active', (_) async => _ok(const {})); // no `active` key
|
|
|
|
await c.hydrate();
|
|
|
|
expect(c.buffers, hasLength(1));
|
|
expect(c.activeId, isNull);
|
|
expect(c.content, '');
|
|
});
|
|
});
|
|
|
|
group('routing tab gestures to IPC', () {
|
|
test('activate(id) issues editor.activate', () async {
|
|
String? activated;
|
|
ipc.stub('editor.activate', (a) async {
|
|
activated = a['id'] as String?;
|
|
return _ok({'active': a['id']});
|
|
});
|
|
await c.activate('b_7');
|
|
expect(activated, 'b_7');
|
|
});
|
|
|
|
test('activate is a no-op when the id is already active', () async {
|
|
ipc.stub(
|
|
'editor.list',
|
|
(_) async => _ok({
|
|
'buffers': [_buf('b_1', 'a.dart')]
|
|
}));
|
|
ipc.stub(
|
|
'editor.active',
|
|
(_) async => _ok({
|
|
'active': {'id': 'b_1'}
|
|
}));
|
|
ipc.stub('editor.read', (_) async => _ok(_read('b_1', 'a.dart', 'x')));
|
|
await c.hydrate();
|
|
|
|
var calls = 0;
|
|
ipc.stub('editor.activate', (a) async {
|
|
calls++;
|
|
return _ok({'active': a['id']});
|
|
});
|
|
await c.activate('b_1'); // already active
|
|
expect(calls, 0);
|
|
});
|
|
|
|
test('closeBuffer(id) issues editor.close', () async {
|
|
String? closed;
|
|
ipc.stub('editor.close', (a) async {
|
|
closed = a['id'] as String?;
|
|
return _ok(const {});
|
|
});
|
|
await c.closeBuffer('b_3');
|
|
expect(closed, 'b_3');
|
|
});
|
|
});
|
|
|
|
group('event sync', () {
|
|
test('editor.opened refreshes the list and loads the new active buffer', () async {
|
|
var listVersion = 1;
|
|
ipc.stub(
|
|
'editor.list',
|
|
(_) async => _ok({
|
|
'buffers': listVersion == 1 ? [_buf('b_1', 'a.dart')] : [_buf('b_1', 'a.dart'), _buf('b_2', 'b.dart')]
|
|
}));
|
|
ipc.stub(
|
|
'editor.active',
|
|
(_) async => _ok({
|
|
'active': {'id': 'b_1'}
|
|
}));
|
|
ipc.stub('editor.read', (a) async {
|
|
final id = a['id'] as String;
|
|
return _ok(_read(id, id == 'b_1' ? 'a.dart' : 'b.dart', 'content-$id'));
|
|
});
|
|
await c.hydrate();
|
|
expect(c.buffers, hasLength(1));
|
|
|
|
listVersion = 2;
|
|
emitEditor(bus, 'editor.opened', {'id': 'b_2'});
|
|
await pumpEventQueue();
|
|
|
|
expect(c.buffers.map((b) => b.id).toList(), ['b_1', 'b_2']);
|
|
expect(c.activeId, 'b_2');
|
|
expect(c.content, 'content-b_2');
|
|
});
|
|
|
|
test('editor.closed refreshes the list and clears active when it was active', () async {
|
|
var listVersion = 1;
|
|
ipc.stub(
|
|
'editor.list',
|
|
(_) async => _ok({
|
|
'buffers': listVersion == 1 ? [_buf('b_1', 'a.dart'), _buf('b_2', 'b.dart')] : [_buf('b_2', 'b.dart')]
|
|
}));
|
|
ipc.stub(
|
|
'editor.active',
|
|
(_) async => _ok({
|
|
'active': {'id': 'b_1'}
|
|
}));
|
|
ipc.stub('editor.read', (a) async => _ok(_read(a['id'] as String, 'a.dart', 'x')));
|
|
await c.hydrate();
|
|
expect(c.buffers, hasLength(2));
|
|
|
|
listVersion = 2;
|
|
emitEditor(bus, 'editor.closed', {'id': 'b_1'});
|
|
await pumpEventQueue();
|
|
|
|
expect(c.buffers.map((b) => b.id).toList(), ['b_2']);
|
|
expect(c.activeId, isNull); // cleared until an active-changed arrives
|
|
});
|
|
|
|
test('editor.saved clears the dirty marker on the buffer', () async {
|
|
ipc.stub(
|
|
'editor.list',
|
|
(_) async => _ok({
|
|
'buffers': [_buf('b_1', 'a.dart', dirty: true)]
|
|
}));
|
|
ipc.stub(
|
|
'editor.active',
|
|
(_) async => _ok({
|
|
'active': {'id': 'b_1'}
|
|
}));
|
|
ipc.stub('editor.read', (_) async => _ok(_read('b_1', 'a.dart', 'x', dirty: true)));
|
|
await c.hydrate();
|
|
expect(c.buffers.single.dirty, isTrue);
|
|
|
|
emitEditor(bus, 'editor.saved', {'id': 'b_1'});
|
|
await pumpEventQueue();
|
|
|
|
expect(c.buffers.single.dirty, isFalse);
|
|
expect(c.dirty, isFalse);
|
|
});
|
|
|
|
test('editor.edited marks the right buffer dirty, leaving siblings alone', () async {
|
|
ipc.stub(
|
|
'editor.list',
|
|
(_) async => _ok({
|
|
'buffers': [_buf('b_1', 'a.dart'), _buf('b_2', 'b.dart')]
|
|
}));
|
|
ipc.stub(
|
|
'editor.active',
|
|
(_) async => _ok({
|
|
'active': {'id': 'b_1'}
|
|
}));
|
|
ipc.stub('editor.read', (a) async => _ok(_read(a['id'] as String, 'a.dart', 'x')));
|
|
await c.hydrate();
|
|
expect(c.buffers.every((b) => !b.dirty), isTrue);
|
|
|
|
// A remote edit of b_2 (not our own). b_1 stays clean — exercises
|
|
// the untouched-sibling branch of the dirty marker.
|
|
emitEditor(bus, 'editor.edited', {'id': 'b_2'});
|
|
await pumpEventQueue();
|
|
|
|
expect(c.buffers.firstWhere((b) => b.id == 'b_2').dirty, isTrue);
|
|
expect(c.buffers.firstWhere((b) => b.id == 'b_1').dirty, isFalse);
|
|
});
|
|
|
|
test('editor.active-changed to a different buffer loads its content', () async {
|
|
ipc.stub(
|
|
'editor.list',
|
|
(_) async => _ok({
|
|
'buffers': [_buf('b_1', 'a.dart'), _buf('b_2', 'b.dart')]
|
|
}));
|
|
ipc.stub(
|
|
'editor.active',
|
|
(_) async => _ok({
|
|
'active': {'id': 'b_1'}
|
|
}));
|
|
ipc.stub('editor.read', (a) async {
|
|
final id = a['id'] as String;
|
|
return _ok(_read(id, id == 'b_1' ? 'a.dart' : 'b.dart', 'body-$id'));
|
|
});
|
|
await c.hydrate();
|
|
expect(c.activeId, 'b_1');
|
|
|
|
emitEditor(bus, 'editor.active-changed', {'id': 'b_2'});
|
|
await pumpEventQueue();
|
|
|
|
expect(c.activeId, 'b_2');
|
|
expect(c.content, 'body-b_2');
|
|
});
|
|
});
|
|
|
|
group('local edits', () {
|
|
test('pushLocalEdit marks the active buffer dirty and mirrors to IPC', () async {
|
|
ipc.stub(
|
|
'editor.list',
|
|
(_) async => _ok({
|
|
'buffers': [_buf('b_1', 'a.dart')]
|
|
}));
|
|
ipc.stub(
|
|
'editor.active',
|
|
(_) async => _ok({
|
|
'active': {'id': 'b_1'}
|
|
}));
|
|
ipc.stub('editor.read', (_) async => _ok(_read('b_1', 'a.dart', 'x')));
|
|
await c.hydrate();
|
|
|
|
Map<String, Object?>? setArgs;
|
|
ipc.stub('editor.set-content', (a) async {
|
|
setArgs = a;
|
|
return _ok(const {});
|
|
});
|
|
c.pushLocalEdit(newContent: 'xy', newSelection: const Selection.collapsed(2));
|
|
await pumpEventQueue();
|
|
|
|
expect(c.dirty, isTrue);
|
|
expect(c.buffers.single.dirty, isTrue);
|
|
expect(setArgs?['id'], 'b_1');
|
|
expect(setArgs?['text'], 'xy');
|
|
});
|
|
|
|
test('save() issues editor.save for the active buffer', () async {
|
|
ipc.stub(
|
|
'editor.list',
|
|
(_) async => _ok({
|
|
'buffers': [_buf('b_1', 'a.dart')]
|
|
}));
|
|
ipc.stub(
|
|
'editor.active',
|
|
(_) async => _ok({
|
|
'active': {'id': 'b_1'}
|
|
}));
|
|
ipc.stub('editor.read', (_) async => _ok(_read('b_1', 'a.dart', 'x')));
|
|
await c.hydrate();
|
|
|
|
String? saved;
|
|
ipc.stub('editor.save', (a) async {
|
|
saved = a['id'] as String?;
|
|
return _ok(const {});
|
|
});
|
|
await c.save();
|
|
expect(saved, 'b_1');
|
|
});
|
|
|
|
test('save() is a no-op with no active buffer', () async {
|
|
var calls = 0;
|
|
ipc.stub('editor.save', (_) async {
|
|
calls++;
|
|
return _ok(const {});
|
|
});
|
|
await c.save(); // never hydrated → no active
|
|
expect(calls, 0);
|
|
});
|
|
});
|
|
|
|
group('edge cases', () {
|
|
test('editor.active-changed to null clears the active buffer', () async {
|
|
ipc.stub(
|
|
'editor.list',
|
|
(_) async => _ok({
|
|
'buffers': [_buf('b_1', 'a.dart')]
|
|
}));
|
|
ipc.stub(
|
|
'editor.active',
|
|
(_) async => _ok({
|
|
'active': {'id': 'b_1'}
|
|
}));
|
|
ipc.stub('editor.read', (_) async => _ok(_read('b_1', 'a.dart', 'x')));
|
|
await c.hydrate();
|
|
expect(c.activeId, 'b_1');
|
|
|
|
emitEditor(bus, 'editor.active-changed', const {}); // no id
|
|
await pumpEventQueue();
|
|
expect(c.activeId, isNull);
|
|
expect(c.content, '');
|
|
});
|
|
|
|
test('hydrate surfaces an error when editor.active fails', () async {
|
|
ipc.stub('editor.list', (_) async => _ok({'buffers': const []}));
|
|
ipc.stub(
|
|
'editor.active',
|
|
(_) async => IpcResponse.err(
|
|
id: '',
|
|
error: IpcError(code: IpcExitCode.toolError, kind: IpcErrorKind.toolError, message: 'boom'),
|
|
),
|
|
);
|
|
await c.hydrate();
|
|
expect(c.error, 'boom');
|
|
});
|
|
|
|
test('a missing-stub editor.list (not ok) leaves the buffer list empty', () async {
|
|
// No editor.list stub registered → FakeDaemonClient returns a
|
|
// notFound error; _refreshList bails without crashing.
|
|
ipc.stub('editor.active', (_) async => _ok(const {}));
|
|
await c.hydrate();
|
|
expect(c.buffers, isEmpty);
|
|
});
|
|
|
|
test('editor.opened with no id clears the active buffer', () async {
|
|
ipc.stub(
|
|
'editor.list',
|
|
(_) async => _ok({
|
|
'buffers': [_buf('b_1', 'a.dart')]
|
|
}));
|
|
ipc.stub(
|
|
'editor.active',
|
|
(_) async => _ok({
|
|
'active': {'id': 'b_1'}
|
|
}));
|
|
ipc.stub('editor.read', (_) async => _ok(_read('b_1', 'a.dart', 'x')));
|
|
await c.hydrate();
|
|
expect(c.activeId, 'b_1');
|
|
|
|
emitEditor(bus, 'editor.opened', const {}); // no id
|
|
await pumpEventQueue();
|
|
expect(c.activeId, isNull);
|
|
});
|
|
|
|
test('a failing editor.read surfaces the error', () async {
|
|
ipc.stub(
|
|
'editor.list',
|
|
(_) async => _ok({
|
|
'buffers': [_buf('b_1', 'a.dart')]
|
|
}));
|
|
ipc.stub(
|
|
'editor.active',
|
|
(_) async => _ok({
|
|
'active': {'id': 'b_1'}
|
|
}));
|
|
ipc.stub(
|
|
'editor.read',
|
|
(_) async => IpcResponse.err(
|
|
id: '',
|
|
error: IpcError(code: IpcExitCode.toolError, kind: IpcErrorKind.toolError, message: 'read failed'),
|
|
),
|
|
);
|
|
await c.hydrate();
|
|
expect(c.error, 'read failed');
|
|
});
|
|
|
|
test('our own edit echo (editor.edited) is suppressed once, not reloaded', () async {
|
|
ipc.stub(
|
|
'editor.list',
|
|
(_) async => _ok({
|
|
'buffers': [_buf('b_1', 'a.dart')]
|
|
}));
|
|
ipc.stub(
|
|
'editor.active',
|
|
(_) async => _ok({
|
|
'active': {'id': 'b_1'}
|
|
}));
|
|
ipc.stub('editor.read', (_) async => _ok(_read('b_1', 'a.dart', 'original')));
|
|
ipc.stub('editor.set-content', (_) async => _ok(const {}));
|
|
await c.hydrate();
|
|
|
|
// Local edit arms _suppressNextRemoteEdit.
|
|
c.pushLocalEdit(newContent: 'local', newSelection: const Selection.collapsed(5));
|
|
var reads = 0;
|
|
ipc.stub('editor.read', (_) async {
|
|
reads++;
|
|
return _ok(_read('b_1', 'a.dart', 'reloaded'));
|
|
});
|
|
// The echo of our own set-content comes back as editor.edited.
|
|
emitEditor(bus, 'editor.edited', {'id': 'b_1'});
|
|
await pumpEventQueue();
|
|
|
|
// Suppressed: no reload, local content preserved.
|
|
expect(reads, 0);
|
|
expect(c.content, 'local');
|
|
});
|
|
});
|
|
}
|