1
This commit is contained in:
1 parent
b5328277ab
commit
1ab5d52449
89 files changed
+14197
-65
No files matched your search
@@ -485,5 +485,148 @@ void main() {
|
||||
expect(scrollController.position.pixels, equals(scrollPixelsBeforeRelease));
|
||||
expect(find.text('复制'), findsOneWidget);
|
||||
});
|
||||
|
||||
testWidgets('执行 clear(含 ESC[3J 清空回滚缓冲)之后仍可正常框选、手柄与复制可用', (tester) async {
|
||||
for (int i = 0; i < 60; i++) {
|
||||
terminal.write('Line $i\r\n');
|
||||
}
|
||||
|
||||
await tester.pumpWidget(buildTestWidget(height: 300));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
// shell 的 clear / Ctrl+L:清屏 + 清空回滚缓冲(xterm-256color 带 E3 能力)
|
||||
terminal.write('\x1b[H\x1b[2J\x1b[3J');
|
||||
terminal.write('Hello Clear World\r\n');
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
final terminalTopLeft = tester.getTopLeft(find.byType(xterm.TerminalView));
|
||||
final gesture = await tester.startGesture(
|
||||
terminalTopLeft + const Offset(15, 15),
|
||||
kind: PointerDeviceKind.mouse,
|
||||
);
|
||||
await tester.pump();
|
||||
await gesture.moveBy(const Offset(60, 0));
|
||||
await tester.pump();
|
||||
await gesture.up();
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
// 选区行号必须落在真实缓冲区范围内(补丁前行号会整体偏移出界,选区根本无法绘制)
|
||||
expect(controller.selection, isNotNull);
|
||||
expect(controller.selection!.isCollapsed, isFalse);
|
||||
expect(controller.selection!.begin.y, lessThan(terminal.buffer.height));
|
||||
expect(controller.selection!.end.y, lessThan(terminal.buffer.height));
|
||||
|
||||
final handleFinder = find.byWidgetPredicate(
|
||||
(w) => w.runtimeType.toString() == '_TerminalSelectionHandle',
|
||||
);
|
||||
expect(handleFinder, findsNWidgets(2));
|
||||
expect(find.text('复制'), findsOneWidget);
|
||||
|
||||
// 复制内容真实有效(补丁前 getText(selection) 会得到空串)
|
||||
await tester.tap(find.text('复制'));
|
||||
await tester.pump();
|
||||
await tester.pump(const Duration(seconds: 3));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
final clipData = await Clipboard.getData(Clipboard.kTextPlain);
|
||||
expect(clipData?.text?.trim(), isNotEmpty);
|
||||
expect(terminal.buffer.getText(), contains(clipData!.text!.trim()));
|
||||
});
|
||||
|
||||
testWidgets('执行 clear 使选区所在行被裁掉后,残留手柄与菜单会被自动清理', (tester) async {
|
||||
for (int i = 0; i < 60; i++) {
|
||||
terminal.write('Line $i\r\n');
|
||||
}
|
||||
final scrollController = ScrollController();
|
||||
addTearDown(scrollController.dispose);
|
||||
|
||||
await tester.pumpWidget(buildTestWidget(scrollController: scrollController, height: 300));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
// 滚到顶部,使首行位于可见视口内
|
||||
scrollController.jumpTo(0.0);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
// 先建立选区:手柄与菜单出现
|
||||
controller.setSelection(
|
||||
terminal.buffer.createAnchor(0, 0),
|
||||
terminal.buffer.createAnchor(5, 0),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
final handleFinder = find.byWidgetPredicate(
|
||||
(w) => w.runtimeType.toString() == '_TerminalSelectionHandle',
|
||||
);
|
||||
expect(handleFinder, findsNWidgets(2));
|
||||
expect(find.text('复制'), findsOneWidget);
|
||||
|
||||
// 清空回滚缓冲:选区锚点随被裁掉的行一起失效
|
||||
terminal.write('\x1b[3J');
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(controller.selection, isNull);
|
||||
expect(handleFinder, findsNothing);
|
||||
expect(find.text('复制'), findsNothing);
|
||||
});
|
||||
|
||||
testWidgets('多行选区整体位于可见视口下方时,菜单贴视口底边而不是屏幕顶部', (tester) async {
|
||||
for (int i = 0; i < 60; i++) {
|
||||
terminal.write('Line $i\r\n');
|
||||
}
|
||||
final scrollController = ScrollController();
|
||||
addTearDown(scrollController.dispose);
|
||||
|
||||
await tester.pumpWidget(buildTestWidget(scrollController: scrollController, height: 300));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
scrollController.jumpTo(0.0);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
final render = terminalViewKey.currentState!.renderTerminal;
|
||||
final lastVisibleRow = render.getCellOffset(Offset(0, render.size.height)).y;
|
||||
|
||||
// 跨 3 行、且整体位于可见视口下方
|
||||
controller.setSelection(
|
||||
terminal.buffer.createAnchor(0, lastVisibleRow + 3),
|
||||
terminal.buffer.createAnchor(5, lastVisibleRow + 5),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(find.text('复制'), findsOneWidget);
|
||||
final menuBottom = tester.getBottomLeft(find.byType(Material).last).dy;
|
||||
final menuTop = tester.getTopLeft(find.byType(Material).last).dy;
|
||||
|
||||
// 参考编辑区 EditorToolbarPlacement.bottom:贴视口底边(safeBottom = 300 - 6 = 294)
|
||||
expect(menuBottom, closeTo(290.0, 10.0));
|
||||
expect(menuTop, greaterThan(200.0), reason: '不得被钉在屏幕顶部');
|
||||
});
|
||||
|
||||
testWidgets('单行选区整体位于可见视口下方时,菜单同样贴视口底边显示', (tester) async {
|
||||
for (int i = 0; i < 60; i++) {
|
||||
terminal.write('Line $i\r\n');
|
||||
}
|
||||
final scrollController = ScrollController();
|
||||
addTearDown(scrollController.dispose);
|
||||
|
||||
await tester.pumpWidget(buildTestWidget(scrollController: scrollController, height: 300));
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
scrollController.jumpTo(0.0);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
final render = terminalViewKey.currentState!.renderTerminal;
|
||||
final lastVisibleRow = render.getCellOffset(Offset(0, render.size.height)).y;
|
||||
|
||||
controller.setSelection(
|
||||
terminal.buffer.createAnchor(0, lastVisibleRow + 3),
|
||||
terminal.buffer.createAnchor(5, lastVisibleRow + 3),
|
||||
);
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
expect(find.text('复制'), findsOneWidget);
|
||||
final copyRect = tester.getRect(find.text('复制'));
|
||||
expect(copyRect.top, greaterThan(200.0), reason: '不得被钉在屏幕顶部');
|
||||
expect(copyRect.bottom, closeTo(290.0 - 9.0, 12.0), reason: '应贴视口底边');
|
||||
});
|
||||
});
|
||||
}
|
||||
@@ -1,46 +0,0 @@
|
||||
// 临时探针测试:验证执行 clear(含 ESC[3J 清空回滚缓冲)之后
|
||||
// 终端 BufferLine.index / CellAnchor.offset 是否与真实行号错位。
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:xterm/xterm.dart' as xterm;
|
||||
|
||||
void main() {
|
||||
test('probe: ESC[3J clearScrollback 之后行索引与锚点是否错位', () {
|
||||
final terminal = xterm.Terminal(maxLines: 100);
|
||||
for (int i = 0; i < 60; i++) {
|
||||
terminal.write('Line $i\r\n');
|
||||
}
|
||||
|
||||
final beforeHeight = terminal.buffer.height;
|
||||
final viewHeight = terminal.viewHeight;
|
||||
// ignore: avoid_print
|
||||
print('BEFORE height=$beforeHeight viewHeight=$viewHeight '
|
||||
'line0.index=${terminal.buffer.lines[0].index} '
|
||||
'lineLast.index=${terminal.buffer.lines[beforeHeight - 1].index}');
|
||||
|
||||
// 真实 clear 命令(xterm-256color, E3)输出序列
|
||||
terminal.write('\x1b[H\x1b[2J\x1b[3J');
|
||||
|
||||
final afterHeight = terminal.buffer.height;
|
||||
// ignore: avoid_print
|
||||
print('AFTER height=$afterHeight viewHeight=${terminal.viewHeight} '
|
||||
'line0.index=${terminal.buffer.lines[0].index} '
|
||||
'lineLast.index=${terminal.buffer.lines[afterHeight - 1].index}');
|
||||
|
||||
// 模拟用户在可见区域第一行选中一个词
|
||||
final anchor = terminal.buffer.createAnchorFromOffset(const xterm.CellOffset(0, 0));
|
||||
final anchor2 = terminal.buffer.createAnchorFromOffset(const xterm.CellOffset(4, 0));
|
||||
// ignore: avoid_print
|
||||
print('visible row0 anchor y=${anchor.offset.y} (期望 0) row0 anchor2 y=${anchor2.offset.y}');
|
||||
|
||||
final range = xterm.BufferRangeLine(anchor.offset, anchor2.offset).normalized;
|
||||
// ignore: avoid_print
|
||||
print('selection range begin=${range.begin} end=${range.end}');
|
||||
// ignore: avoid_print
|
||||
print('paint guard: lines.length=$afterHeight segment lines='
|
||||
'${range.toSegments().map((s) => s.line).toList()}');
|
||||
// ignore: avoid_print
|
||||
print('getText(selection)="${terminal.buffer.getText(range)}"');
|
||||
|
||||
terminal.dispose();
|
||||
});
|
||||
}
|
||||
@@ -0,0 +1,110 @@
|
||||
// 守护测试:验证内置(vendored)xterm 的 IndexAwareCircularBuffer.trimStart() 补丁。
|
||||
//
|
||||
// 上游 4.0.0 的 trimStart() 只调整 _startIndex/_length,导致:
|
||||
// ① 存活行 index 偏移“被裁掉的行数” → CellAnchor.offset 错位、选区画不出、复制为空;
|
||||
// ② 被裁掉的行从不 _detach → 僵尸锚点(attached 仍为 true,静默指向别的行)。
|
||||
// 触发链:shell 的 clear / Ctrl+L → ESC[3J → Buffer.clearScrollback() → trimStart()。
|
||||
//
|
||||
// 若将来升级 xterm 后本文件失败,说明补丁丢失(或上游改动了实现),
|
||||
// 处理方式见 packages/xterm/PATCHES.md。
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:xterm/xterm.dart' as xterm;
|
||||
|
||||
/// 核心不变量:列表中第 i 行的 `index` 必须等于 i(`CellAnchor.y` 依赖它当行号用)。
|
||||
void expectIndexInvariant(xterm.Terminal terminal) {
|
||||
final buffer = terminal.buffer;
|
||||
for (var i = 0; i < buffer.height; i++) {
|
||||
expect(
|
||||
buffer.lines[i].index,
|
||||
i,
|
||||
reason: '第 $i 行的 index 与行号不一致 —— trimStart 补丁失效',
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/// 当前可见视口(不含回滚缓冲)的文本快照。
|
||||
String visibleText(xterm.Terminal terminal) {
|
||||
final buffer = terminal.buffer;
|
||||
final scrollBack = buffer.scrollBack;
|
||||
final builder = StringBuffer();
|
||||
for (var i = 0; i < buffer.viewHeight; i++) {
|
||||
builder.writeln(buffer.lines[scrollBack + i].getText().trimRight());
|
||||
}
|
||||
return builder.toString();
|
||||
}
|
||||
|
||||
xterm.Terminal buildFilledTerminal() {
|
||||
final terminal = xterm.Terminal(maxLines: 30);
|
||||
terminal.resize(80, 10);
|
||||
for (var i = 0; i < 40; i++) {
|
||||
terminal.write('L$i\r\n');
|
||||
}
|
||||
return terminal;
|
||||
}
|
||||
|
||||
void main() {
|
||||
group('vendored xterm trimStart 补丁守护测试', () {
|
||||
test('push 溢出裁剪(maxLines 上限)保持行索引不变式', () {
|
||||
final terminal = buildFilledTerminal();
|
||||
|
||||
// 溢出裁剪由 push 完成,本身维持不变式,作为对照组
|
||||
expect(terminal.buffer.height, 30);
|
||||
expect(terminal.buffer.scrollBack, greaterThan(0));
|
||||
expectIndexInvariant(terminal);
|
||||
});
|
||||
|
||||
test('ESC[3J 清空回滚缓冲后行索引归一、可见画面保留', () {
|
||||
final terminal = buildFilledTerminal();
|
||||
final heightBefore = terminal.buffer.height;
|
||||
final visibleBefore = visibleText(terminal);
|
||||
|
||||
terminal.write('\x1b[3J');
|
||||
|
||||
expect(terminal.buffer.height, lessThan(heightBefore));
|
||||
expect(terminal.buffer.height, terminal.buffer.viewHeight);
|
||||
expect(terminal.buffer.scrollBack, 0);
|
||||
// 补丁前:lines[0].index == 20(被裁掉的行数)
|
||||
expectIndexInvariant(terminal);
|
||||
expect(visibleText(terminal), visibleBefore, reason: '清除回滚不得改动可见画面');
|
||||
});
|
||||
|
||||
test('被裁掉行上的锚点被正确失效,存活行上的锚点重新对齐', () {
|
||||
final terminal = buildFilledTerminal();
|
||||
final buffer = terminal.buffer;
|
||||
|
||||
final droppedAnchor = buffer.createAnchorFromOffset(const xterm.CellOffset(0, 0));
|
||||
final survivingAnchor =
|
||||
buffer.createAnchorFromOffset(xterm.CellOffset(0, buffer.height - 1));
|
||||
expect(droppedAnchor.attached, isTrue);
|
||||
expect(survivingAnchor.attached, isTrue);
|
||||
|
||||
terminal.write('\x1b[3J');
|
||||
|
||||
// ① 被裁掉的行走 _dropChild -> detach,旧锚点不再“僵尸”存活
|
||||
expect(droppedAnchor.attached, isFalse, reason: '被裁掉的行必须被 detach');
|
||||
// ② 存活下来的行索引重新对齐到新行号
|
||||
expect(survivingAnchor.attached, isTrue);
|
||||
expect(survivingAnchor.offset.y, buffer.height - 1);
|
||||
expect(survivingAnchor.line, same(buffer.lines[buffer.height - 1]));
|
||||
});
|
||||
|
||||
test('清空回滚缓冲后新建选区落在可见行范围内且能读出文本', () {
|
||||
final terminal = buildFilledTerminal();
|
||||
|
||||
// 真实 clear 命令序列(xterm-256color 带 E3 能力)
|
||||
terminal.write('\x1b[H\x1b[2J\x1b[3J');
|
||||
terminal.write('\x1b[31mERROR\x1b[0m hello world\r\nsecond line\r\n');
|
||||
|
||||
expectIndexInvariant(terminal);
|
||||
|
||||
final begin = terminal.buffer.createAnchorFromOffset(const xterm.CellOffset(0, 0));
|
||||
final end = terminal.buffer.createAnchorFromOffset(const xterm.CellOffset(5, 0));
|
||||
expect(begin.offset.y, 0);
|
||||
expect(end.offset.y, 0);
|
||||
expect(begin.offset.y, lessThan(terminal.buffer.height));
|
||||
|
||||
final range = xterm.BufferRangeLine(begin.offset, end.offset).normalized;
|
||||
expect(terminal.buffer.getText(range), 'ERROR');
|
||||
});
|
||||
});
|
||||
}
|
||||
Reference in new issue
Block a user