1
This commit is contained in:
1 parent
ce598b2d86
commit
b5328277ab
17 files changed
+1656
-242
No files matched your search
@@ -50,7 +50,7 @@ class SettingsProvider extends ChangeNotifier {
|
|||||||
int _indentSize = 4;
|
int _indentSize = 4;
|
||||||
bool _wordWrap = false;
|
bool _wordWrap = false;
|
||||||
bool _showLineNumbers = true;
|
bool _showLineNumbers = true;
|
||||||
bool _pinLineNumbers = true;
|
bool _pinLineNumbers = false;
|
||||||
bool _enableVirtualKeyboard = defaultTargetPlatform == TargetPlatform.android || defaultTargetPlatform == TargetPlatform.iOS;
|
bool _enableVirtualKeyboard = defaultTargetPlatform == TargetPlatform.android || defaultTargetPlatform == TargetPlatform.iOS;
|
||||||
String _virtualKeyboardConfigJson = VirtualKeyboardConfig.defaultJsonPretty();
|
String _virtualKeyboardConfigJson = VirtualKeyboardConfig.defaultJsonPretty();
|
||||||
VirtualKeyboardConfig _virtualKeyboardConfig = VirtualKeyboardConfig.defaultConfiguration();
|
VirtualKeyboardConfig _virtualKeyboardConfig = VirtualKeyboardConfig.defaultConfiguration();
|
||||||
|
|||||||
@@ -208,6 +208,7 @@ class _TerminalSessionBodyState extends State<_TerminalSessionBody> {
|
|||||||
|
|
||||||
/// 终端控制器与 View GlobalKey(用于选区、手柄与上下文菜单定位)
|
/// 终端控制器与 View GlobalKey(用于选区、手柄与上下文菜单定位)
|
||||||
late final xterm.TerminalController _terminalController = xterm.TerminalController();
|
late final xterm.TerminalController _terminalController = xterm.TerminalController();
|
||||||
|
final ScrollController _terminalScrollController = ScrollController();
|
||||||
final GlobalKey<xterm.TerminalViewState> _terminalViewKey = GlobalKey<xterm.TerminalViewState>();
|
final GlobalKey<xterm.TerminalViewState> _terminalViewKey = GlobalKey<xterm.TerminalViewState>();
|
||||||
|
|
||||||
/// 终端原有的输入处理器与输出出口(用于串联,而不是替换)
|
/// 终端原有的输入处理器与输出出口(用于串联,而不是替换)
|
||||||
@@ -244,6 +245,7 @@ class _TerminalSessionBodyState extends State<_TerminalSessionBody> {
|
|||||||
}
|
}
|
||||||
terminal.onOutput = _delegateOnOutput;
|
terminal.onOutput = _delegateOnOutput;
|
||||||
_modifiers.dispose();
|
_modifiers.dispose();
|
||||||
|
_terminalScrollController.dispose();
|
||||||
_terminalController.dispose();
|
_terminalController.dispose();
|
||||||
super.dispose();
|
super.dispose();
|
||||||
}
|
}
|
||||||
@@ -278,11 +280,13 @@ class _TerminalSessionBodyState extends State<_TerminalSessionBody> {
|
|||||||
terminal: session.terminal,
|
terminal: session.terminal,
|
||||||
controller: _terminalController,
|
controller: _terminalController,
|
||||||
terminalViewKey: _terminalViewKey,
|
terminalViewKey: _terminalViewKey,
|
||||||
|
scrollController: _terminalScrollController,
|
||||||
focusNode: session.focusNode,
|
focusNode: session.focusNode,
|
||||||
child: xterm.TerminalView(
|
child: xterm.TerminalView(
|
||||||
session.terminal,
|
session.terminal,
|
||||||
key: _terminalViewKey,
|
key: _terminalViewKey,
|
||||||
controller: _terminalController,
|
controller: _terminalController,
|
||||||
|
scrollController: _terminalScrollController,
|
||||||
focusNode: session.focusNode,
|
focusNode: session.focusNode,
|
||||||
autofocus: true,
|
autofocus: true,
|
||||||
theme: terminalThemeWithBackground(backgroundColor),
|
theme: terminalThemeWithBackground(backgroundColor),
|
||||||
|
|||||||
@@ -58,8 +58,6 @@ class _MobileToolbarLayoutDelegate extends SingleChildLayoutDelegate {
|
|||||||
// 1. 计算受保护的可视安全编辑区与屏幕顶界
|
// 1. 计算受保护的可视安全编辑区与屏幕顶界
|
||||||
// 屏幕顶界:手机系统状态栏安全区(由于菜单置于 rootOverlay 顶层悬浮层,高于 TabBar 和 AppBar,因此向上可借用其空间,避免向下翻转遮挡光标)
|
// 屏幕顶界:手机系统状态栏安全区(由于菜单置于 rootOverlay 顶层悬浮层,高于 TabBar 和 AppBar,因此向上可借用其空间,避免向下翻转遮挡光标)
|
||||||
final double screenTop = mediaQuery.padding.top + 6.0;
|
final double screenTop = mediaQuery.padding.top + 6.0;
|
||||||
// 编辑区顶界:排除 AppBar / TabBar (renderRect.top),用于编辑区居中或贴顶显示
|
|
||||||
final double editorTop = max(renderRect?.top ?? 0.0, mediaQuery.padding.top) + 6.0;
|
|
||||||
// 底部:排除软键盘 (viewInsets.bottom)、虚拟小键盘 (renderRect.bottom) 以及底部安全区
|
// 底部:排除软键盘 (viewInsets.bottom)、虚拟小键盘 (renderRect.bottom) 以及底部安全区
|
||||||
final double screenBottomWithoutKeyboard = mediaQuery.size.height - mediaQuery.viewInsets.bottom - mediaQuery.padding.bottom;
|
final double screenBottomWithoutKeyboard = mediaQuery.size.height - mediaQuery.viewInsets.bottom - mediaQuery.padding.bottom;
|
||||||
final double safeBottom = min(renderRect?.bottom ?? screenBottomWithoutKeyboard, screenBottomWithoutKeyboard) - 6.0;
|
final double safeBottom = min(renderRect?.bottom ?? screenBottomWithoutKeyboard, screenBottomWithoutKeyboard) - 6.0;
|
||||||
@@ -68,7 +66,6 @@ class _MobileToolbarLayoutDelegate extends SingleChildLayoutDelegate {
|
|||||||
final double safeRight = min(renderRect?.right ?? mediaQuery.size.width, mediaQuery.size.width - mediaQuery.padding.right) - 8.0;
|
final double safeRight = min(renderRect?.right ?? mediaQuery.size.width, mediaQuery.size.width - mediaQuery.padding.right) - 8.0;
|
||||||
|
|
||||||
final double availableWidth = max(0.0, safeRight - safeLeft);
|
final double availableWidth = max(0.0, safeRight - safeLeft);
|
||||||
final double editorAvailableHeight = max(0.0, safeBottom - editorTop);
|
|
||||||
|
|
||||||
// 2. 根据 anchors 中的 EditorToolbarPlacement 或传统 anchors 计算位置
|
// 2. 根据 anchors 中的 EditorToolbarPlacement 或传统 anchors 计算位置
|
||||||
EditorToolbarPlacement placement = EditorToolbarPlacement.aboveStart;
|
EditorToolbarPlacement placement = EditorToolbarPlacement.aboveStart;
|
||||||
@@ -90,15 +87,10 @@ class _MobileToolbarLayoutDelegate extends SingleChildLayoutDelegate {
|
|||||||
|
|
||||||
switch (placement) {
|
switch (placement) {
|
||||||
case EditorToolbarPlacement.center:
|
case EditorToolbarPlacement.center:
|
||||||
// 框选文本完全占据当前屏幕:在编辑区中间显示
|
|
||||||
x = safeLeft + (availableWidth - childSize.width) / 2.0;
|
|
||||||
y = editorTop + (editorAvailableHeight - childSize.height) / 2.0;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case EditorToolbarPlacement.top:
|
case EditorToolbarPlacement.top:
|
||||||
// 选区整体在视口上方:在视口顶部贴边显示
|
// 用户明确要求:改在屏幕最上方显示,即使显示在 tab 或 appbar 上面也没关系,彻底避免在屏幕中间遮挡文本
|
||||||
x = safeLeft + (availableWidth - childSize.width) / 2.0;
|
x = safeLeft + (availableWidth - childSize.width) / 2.0;
|
||||||
y = editorTop + 4.0;
|
y = screenTop;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case EditorToolbarPlacement.bottom:
|
case EditorToolbarPlacement.bottom:
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import 'dart:math';
|
||||||
import 'package:code_editor/l10n/app_localizations.dart';
|
import 'package:code_editor/l10n/app_localizations.dart';
|
||||||
import 'package:code_editor/models/app_font.dart';
|
import 'package:code_editor/models/app_font.dart';
|
||||||
import 'package:code_editor/models/editor_tab_item.dart';
|
import 'package:code_editor/models/editor_tab_item.dart';
|
||||||
@@ -51,12 +52,17 @@ class _CodeEditorWidgetState extends State<CodeEditorWidget> {
|
|||||||
int? _currentIndentSize;
|
int? _currentIndentSize;
|
||||||
bool _isShowingConflictDialog = false;
|
bool _isShowingConflictDialog = false;
|
||||||
|
|
||||||
// 双指捏合缩放字号状态
|
// 双指捏合缩放字号及中心锚定状态
|
||||||
|
final GlobalKey _editorContainerKey = GlobalKey();
|
||||||
final Map<int, Offset> _pointerPositions = {};
|
final Map<int, Offset> _pointerPositions = {};
|
||||||
double? _initialPinchDistance;
|
double? _initialPinchDistance;
|
||||||
double? _initialPinchFontSize;
|
double? _initialPinchFontSize;
|
||||||
double? _activeZoomFontSize;
|
double? _activeZoomFontSize;
|
||||||
bool _isPinching = false;
|
bool _isPinching = false;
|
||||||
|
CodeLineSelection? _pinchSelection;
|
||||||
|
Offset? _initialLocalFocal;
|
||||||
|
double _initialScrollV = 0.0;
|
||||||
|
double _initialScrollH = 0.0;
|
||||||
|
|
||||||
void _handlePointerDown(PointerDownEvent event, double currentFontSize) {
|
void _handlePointerDown(PointerDownEvent event, double currentFontSize) {
|
||||||
_pointerPositions[event.pointer] = event.position;
|
_pointerPositions[event.pointer] = event.position;
|
||||||
@@ -64,6 +70,36 @@ class _CodeEditorWidgetState extends State<CodeEditorWidget> {
|
|||||||
final points = _pointerPositions.values.toList();
|
final points = _pointerPositions.values.toList();
|
||||||
_initialPinchDistance = (points[0] - points[1]).distance;
|
_initialPinchDistance = (points[0] - points[1]).distance;
|
||||||
_initialPinchFontSize = _activeZoomFontSize ?? currentFontSize;
|
_initialPinchFontSize = _activeZoomFontSize ?? currentFontSize;
|
||||||
|
|
||||||
|
// 停止当前的惯性滚动,保证锚定基准平稳
|
||||||
|
final vScroller = _scrollController?.verticalScroller;
|
||||||
|
if (vScroller is CodeEditorScrollController) {
|
||||||
|
vScroller.stopScrolling();
|
||||||
|
}
|
||||||
|
final hScroller = _scrollController?.horizontalScroller;
|
||||||
|
if (hScroller is CodeEditorScrollController) {
|
||||||
|
hScroller.stopScrolling();
|
||||||
|
}
|
||||||
|
|
||||||
|
final globalFocal = (points[0] + points[1]) / 2;
|
||||||
|
final renderBox = _editorContainerKey.currentContext?.findRenderObject() as RenderBox?;
|
||||||
|
final localFocal = renderBox != null ? renderBox.globalToLocal(globalFocal) : globalFocal;
|
||||||
|
_initialLocalFocal = localFocal;
|
||||||
|
|
||||||
|
_initialScrollV = (_scrollController?.verticalScroller.hasClients == true)
|
||||||
|
? _scrollController!.verticalScroller.offset
|
||||||
|
: 0.0;
|
||||||
|
_initialScrollH = (_scrollController?.horizontalScroller.hasClients == true)
|
||||||
|
? _scrollController!.horizontalScroller.offset
|
||||||
|
: 0.0;
|
||||||
|
|
||||||
|
final currentController = _controller;
|
||||||
|
if (currentController != null &&
|
||||||
|
!currentController.selection.isCollapsed &&
|
||||||
|
currentController.selection.baseOffset != -1) {
|
||||||
|
_pinchSelection = currentController.selection;
|
||||||
|
}
|
||||||
|
_toolbarController.hide(context);
|
||||||
setState(() {
|
setState(() {
|
||||||
_isPinching = true;
|
_isPinching = true;
|
||||||
});
|
});
|
||||||
@@ -77,12 +113,31 @@ class _CodeEditorWidgetState extends State<CodeEditorWidget> {
|
|||||||
if (_pointerPositions.length >= 2 &&
|
if (_pointerPositions.length >= 2 &&
|
||||||
_initialPinchDistance != null &&
|
_initialPinchDistance != null &&
|
||||||
_initialPinchDistance! > 10.0 &&
|
_initialPinchDistance! > 10.0 &&
|
||||||
_initialPinchFontSize != null) {
|
_initialPinchFontSize != null &&
|
||||||
|
_initialLocalFocal != null) {
|
||||||
final points = _pointerPositions.values.toList();
|
final points = _pointerPositions.values.toList();
|
||||||
final currentDistance = (points[0] - points[1]).distance;
|
final currentDistance = (points[0] - points[1]).distance;
|
||||||
final scale = currentDistance / _initialPinchDistance!;
|
final scale = currentDistance / _initialPinchDistance!;
|
||||||
final rawFontSize = (_initialPinchFontSize! * scale).clamp(10.0, 30.0);
|
final rawFontSize = (_initialPinchFontSize! * scale).clamp(10.0, 30.0);
|
||||||
final newFontSize = (rawFontSize * 10).round() / 10.0;
|
final newFontSize = (rawFontSize * 10).round() / 10.0;
|
||||||
|
final fontScale = newFontSize / _initialPinchFontSize!;
|
||||||
|
|
||||||
|
final currentGlobalFocal = (points[0] + points[1]) / 2;
|
||||||
|
final renderBox = _editorContainerKey.currentContext?.findRenderObject() as RenderBox?;
|
||||||
|
final currentLocalFocal = renderBox != null
|
||||||
|
? renderBox.globalToLocal(currentGlobalFocal)
|
||||||
|
: currentGlobalFocal;
|
||||||
|
|
||||||
|
final targetScrollV = (_initialScrollV + _initialLocalFocal!.dy) * fontScale - currentLocalFocal.dy;
|
||||||
|
final targetScrollH = (_initialScrollH + _initialLocalFocal!.dx) * fontScale - currentLocalFocal.dx;
|
||||||
|
|
||||||
|
if (_scrollController?.verticalScroller.hasClients == true) {
|
||||||
|
_scrollController!.verticalScroller.jumpTo(max(0.0, targetScrollV));
|
||||||
|
}
|
||||||
|
if (_scrollController?.horizontalScroller.hasClients == true) {
|
||||||
|
_scrollController!.horizontalScroller.jumpTo(max(0.0, targetScrollH));
|
||||||
|
}
|
||||||
|
|
||||||
if (_activeZoomFontSize != newFontSize) {
|
if (_activeZoomFontSize != newFontSize) {
|
||||||
setState(() {
|
setState(() {
|
||||||
_activeZoomFontSize = newFontSize;
|
_activeZoomFontSize = newFontSize;
|
||||||
@@ -107,12 +162,8 @@ class _CodeEditorWidgetState extends State<CodeEditorWidget> {
|
|||||||
|
|
||||||
void _finishPinchZoom() {
|
void _finishPinchZoom() {
|
||||||
final finalSize = _activeZoomFontSize;
|
final finalSize = _activeZoomFontSize;
|
||||||
setState(() {
|
final savedSelection = _pinchSelection;
|
||||||
_isPinching = false;
|
_pinchSelection = null;
|
||||||
_initialPinchDistance = null;
|
|
||||||
_initialPinchFontSize = null;
|
|
||||||
_activeZoomFontSize = null;
|
|
||||||
});
|
|
||||||
|
|
||||||
if (finalSize != null) {
|
if (finalSize != null) {
|
||||||
try {
|
try {
|
||||||
@@ -120,6 +171,27 @@ class _CodeEditorWidgetState extends State<CodeEditorWidget> {
|
|||||||
settings.setFontSize(finalSize.roundToDouble());
|
settings.setFontSize(finalSize.roundToDouble());
|
||||||
} catch (_) {}
|
} catch (_) {}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
setState(() {
|
||||||
|
_isPinching = false;
|
||||||
|
_initialPinchDistance = null;
|
||||||
|
_initialPinchFontSize = null;
|
||||||
|
_activeZoomFontSize = null;
|
||||||
|
_initialLocalFocal = null;
|
||||||
|
_initialScrollV = 0.0;
|
||||||
|
_initialScrollH = 0.0;
|
||||||
|
});
|
||||||
|
|
||||||
|
if (savedSelection != null && !savedSelection.isCollapsed) {
|
||||||
|
final currentController = _controller;
|
||||||
|
if (currentController != null) {
|
||||||
|
currentController.selection = savedSelection;
|
||||||
|
}
|
||||||
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||||
|
if (!mounted) return;
|
||||||
|
_toolbarController.reshowLastToolbar(context);
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
EditorTabItem? _getCurrentTab() {
|
EditorTabItem? _getCurrentTab() {
|
||||||
@@ -151,8 +223,8 @@ class _CodeEditorWidgetState extends State<CodeEditorWidget> {
|
|||||||
void _restoreTabScrollState(EditorTabItem tab) {
|
void _restoreTabScrollState(EditorTabItem tab) {
|
||||||
final oldScroll = _scrollController;
|
final oldScroll = _scrollController;
|
||||||
|
|
||||||
final vScroller = ScrollController(initialScrollOffset: tab.verticalScrollOffset);
|
final vScroller = CodeEditorScrollController(initialScrollOffset: tab.verticalScrollOffset);
|
||||||
final hScroller = ScrollController(initialScrollOffset: tab.horizontalScrollOffset);
|
final hScroller = CodeEditorScrollController(initialScrollOffset: tab.horizontalScrollOffset);
|
||||||
|
|
||||||
vScroller.addListener(() {
|
vScroller.addListener(() {
|
||||||
if (vScroller.hasClients) {
|
if (vScroller.hasClients) {
|
||||||
@@ -449,6 +521,7 @@ class _CodeEditorWidgetState extends State<CodeEditorWidget> {
|
|||||||
children: [
|
children: [
|
||||||
Expanded(
|
Expanded(
|
||||||
child: Listener(
|
child: Listener(
|
||||||
|
key: _editorContainerKey,
|
||||||
behavior: HitTestBehavior.translucent,
|
behavior: HitTestBehavior.translucent,
|
||||||
onPointerDown: (event) => _handlePointerDown(event, activeFontSize),
|
onPointerDown: (event) => _handlePointerDown(event, activeFontSize),
|
||||||
onPointerMove: _handlePointerMove,
|
onPointerMove: _handlePointerMove,
|
||||||
@@ -464,7 +537,8 @@ class _CodeEditorWidgetState extends State<CodeEditorWidget> {
|
|||||||
wordWrap: activeWordWrap,
|
wordWrap: activeWordWrap,
|
||||||
pinLineNumbers: pinLineNumbers,
|
pinLineNumbers: pinLineNumbers,
|
||||||
toolbarController: _toolbarController,
|
toolbarController: _toolbarController,
|
||||||
margin: const EdgeInsets.only(left: 2.0, top: 4.0, right: 8, bottom: 8.0),
|
margin: EdgeInsets.zero,
|
||||||
|
extraHorizontalScroll: 160.0,
|
||||||
padding: const EdgeInsets.fromLTRB(6.0, 0.0, 0.0, 0.0),
|
padding: const EdgeInsets.fromLTRB(6.0, 0.0, 0.0, 0.0),
|
||||||
leadingDivider: showLineNumbers
|
leadingDivider: showLineNumbers
|
||||||
? Container(
|
? Container(
|
||||||
|
|||||||
File diff suppressed because it is too large.
Load diff
@@ -28,6 +28,8 @@ class _CodeEditable extends StatefulWidget {
|
|||||||
final EdgeInsetsGeometry margin;
|
final EdgeInsetsGeometry margin;
|
||||||
final Widget? leadingDivider;
|
final Widget? leadingDivider;
|
||||||
final bool pinLineNumbers;
|
final bool pinLineNumbers;
|
||||||
|
final double extraHorizontalScroll;
|
||||||
|
final double? extraVerticalScroll;
|
||||||
final Border? border;
|
final Border? border;
|
||||||
final BorderRadius? borderRadius;
|
final BorderRadius? borderRadius;
|
||||||
final Clip clipBehavior;
|
final Clip clipBehavior;
|
||||||
@@ -69,7 +71,9 @@ class _CodeEditable extends StatefulWidget {
|
|||||||
required this.padding,
|
required this.padding,
|
||||||
required this.margin,
|
required this.margin,
|
||||||
required this.leadingDivider,
|
required this.leadingDivider,
|
||||||
this.pinLineNumbers = true,
|
this.pinLineNumbers = false,
|
||||||
|
this.extraHorizontalScroll = 160.0,
|
||||||
|
this.extraVerticalScroll,
|
||||||
this.border,
|
this.border,
|
||||||
this.borderRadius,
|
this.borderRadius,
|
||||||
this.clipBehavior = Clip.none,
|
this.clipBehavior = Clip.none,
|
||||||
@@ -313,10 +317,15 @@ class _CodeEditableState extends State<_CodeEditable> with AutomaticKeepAliveCli
|
|||||||
onTapOutside: (_) {
|
onTapOutside: (_) {
|
||||||
widget.focusNode.unfocus();
|
widget.focusNode.unfocus();
|
||||||
},
|
},
|
||||||
child: NotificationListener(
|
child: NotificationListener<ScrollNotification>(
|
||||||
onNotification: (notification) {
|
onNotification: (notification) {
|
||||||
if (notification is ScrollStartNotification) {
|
if (notification is ScrollStartNotification) {
|
||||||
widget.selectionOverlayController.hideToolbar();
|
widget.selectionOverlayController.hideToolbar();
|
||||||
|
if (notification.metrics.axis == Axis.horizontal) {
|
||||||
|
_stopScroller(widget.scrollController.verticalScroller);
|
||||||
|
} else if (notification.metrics.axis == Axis.vertical) {
|
||||||
|
_stopScroller(widget.scrollController.horizontalScroller);
|
||||||
|
}
|
||||||
} else if (notification is ScrollEndNotification) {
|
} else if (notification is ScrollEndNotification) {
|
||||||
if (!widget.controller.selection.isCollapsed && widget.controller.selection.baseOffset != -1) {
|
if (!widget.controller.selection.isCollapsed && widget.controller.selection.baseOffset != -1) {
|
||||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||||
@@ -335,6 +344,17 @@ class _CodeEditableState extends State<_CodeEditable> with AutomaticKeepAliveCli
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void _stopScroller(ScrollController scroller) {
|
||||||
|
if (!scroller.hasClients) return;
|
||||||
|
for (final position in scroller.positions) {
|
||||||
|
if (position is CodeEditorScrollPosition) {
|
||||||
|
position.stopScrolling();
|
||||||
|
} else if (position.activity?.isScrolling == true) {
|
||||||
|
position.hold(() {});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Widget _buildCodeField(ViewportOffset vertical, ViewportOffset? horizontal) {
|
Widget _buildCodeField(ViewportOffset vertical, ViewportOffset? horizontal) {
|
||||||
return _CodeField(
|
return _CodeField(
|
||||||
key: widget.editorKey,
|
key: widget.editorKey,
|
||||||
@@ -364,6 +384,8 @@ class _CodeEditableState extends State<_CodeEditable> with AutomaticKeepAliveCli
|
|||||||
cursorWidth: widget.cursorWidth,
|
cursorWidth: widget.cursorWidth,
|
||||||
padding: widget.padding,
|
padding: widget.padding,
|
||||||
readOnly: widget.readOnly,
|
readOnly: widget.readOnly,
|
||||||
|
extraHorizontalScroll: widget.extraHorizontalScroll,
|
||||||
|
extraVerticalScroll: widget.extraVerticalScroll,
|
||||||
// Enable long text rendering when the find is on.
|
// Enable long text rendering when the find is on.
|
||||||
maxLengthSingleLineRendering: widget.findController.value != null ? null : widget.maxLengthSingleLineRendering,
|
maxLengthSingleLineRendering: widget.findController.value != null ? null : widget.maxLengthSingleLineRendering,
|
||||||
startHandleLayerLink: widget.startHandleLayerLink,
|
startHandleLayerLink: widget.startHandleLayerLink,
|
||||||
|
|||||||
@@ -25,6 +25,8 @@ class _CodeField extends SingleChildRenderObjectWidget {
|
|||||||
final double floatingCursorWidth;
|
final double floatingCursorWidth;
|
||||||
final EdgeInsetsGeometry padding;
|
final EdgeInsetsGeometry padding;
|
||||||
final bool readOnly;
|
final bool readOnly;
|
||||||
|
final double extraHorizontalScroll;
|
||||||
|
final double? extraVerticalScroll;
|
||||||
final int? maxLengthSingleLineRendering;
|
final int? maxLengthSingleLineRendering;
|
||||||
final LayerLink startHandleLayerLink;
|
final LayerLink startHandleLayerLink;
|
||||||
final LayerLink endHandleLayerLink;
|
final LayerLink endHandleLayerLink;
|
||||||
@@ -54,6 +56,8 @@ class _CodeField extends SingleChildRenderObjectWidget {
|
|||||||
floatingCursorWidth,
|
floatingCursorWidth,
|
||||||
required this.padding,
|
required this.padding,
|
||||||
required this.readOnly,
|
required this.readOnly,
|
||||||
|
this.extraHorizontalScroll = 160.0,
|
||||||
|
this.extraVerticalScroll,
|
||||||
this.maxLengthSingleLineRendering,
|
this.maxLengthSingleLineRendering,
|
||||||
required this.startHandleLayerLink,
|
required this.startHandleLayerLink,
|
||||||
required this.endHandleLayerLink,
|
required this.endHandleLayerLink,
|
||||||
@@ -87,6 +91,8 @@ class _CodeField extends SingleChildRenderObjectWidget {
|
|||||||
floatingCursorWidth: floatingCursorWidth,
|
floatingCursorWidth: floatingCursorWidth,
|
||||||
padding: padding,
|
padding: padding,
|
||||||
readOnly: readOnly,
|
readOnly: readOnly,
|
||||||
|
extraHorizontalScroll: extraHorizontalScroll,
|
||||||
|
extraVerticalScroll: extraVerticalScroll,
|
||||||
maxLengthSingleLineRendering: maxLengthSingleLineRendering,
|
maxLengthSingleLineRendering: maxLengthSingleLineRendering,
|
||||||
startHandleLayerLink: startHandleLayerLink,
|
startHandleLayerLink: startHandleLayerLink,
|
||||||
endHandleLayerLink: endHandleLayerLink,
|
endHandleLayerLink: endHandleLayerLink,
|
||||||
@@ -118,6 +124,8 @@ class _CodeField extends SingleChildRenderObjectWidget {
|
|||||||
..floatingCursorWidth = floatingCursorWidth
|
..floatingCursorWidth = floatingCursorWidth
|
||||||
..padding = padding
|
..padding = padding
|
||||||
..readOnly = readOnly
|
..readOnly = readOnly
|
||||||
|
..extraHorizontalScroll = extraHorizontalScroll
|
||||||
|
..extraVerticalScroll = extraVerticalScroll
|
||||||
..maxLengthSingleLineRendering = maxLengthSingleLineRendering
|
..maxLengthSingleLineRendering = maxLengthSingleLineRendering
|
||||||
..startHandleLayerLink = startHandleLayerLink
|
..startHandleLayerLink = startHandleLayerLink
|
||||||
..endHandleLayerLink = endHandleLayerLink;
|
..endHandleLayerLink = endHandleLayerLink;
|
||||||
@@ -143,6 +151,8 @@ class _CodeFieldRender extends RenderBox implements MouseTrackerAnnotation {
|
|||||||
ValueChanged<List<CodeLineRenderParagraph>> _onRenderParagraphsChanged;
|
ValueChanged<List<CodeLineRenderParagraph>> _onRenderParagraphsChanged;
|
||||||
EdgeInsetsGeometry _padding;
|
EdgeInsetsGeometry _padding;
|
||||||
bool _readOnly;
|
bool _readOnly;
|
||||||
|
double _extraHorizontalScroll;
|
||||||
|
double? _extraVerticalScroll;
|
||||||
int? _maxLengthSingleLineRendering;
|
int? _maxLengthSingleLineRendering;
|
||||||
Color? _chunkIndicatorColor;
|
Color? _chunkIndicatorColor;
|
||||||
|
|
||||||
@@ -184,6 +194,8 @@ class _CodeFieldRender extends RenderBox implements MouseTrackerAnnotation {
|
|||||||
required double floatingCursorWidth,
|
required double floatingCursorWidth,
|
||||||
required EdgeInsetsGeometry padding,
|
required EdgeInsetsGeometry padding,
|
||||||
required bool readOnly,
|
required bool readOnly,
|
||||||
|
double extraHorizontalScroll = 160.0,
|
||||||
|
double? extraVerticalScroll,
|
||||||
int? maxLengthSingleLineRendering,
|
int? maxLengthSingleLineRendering,
|
||||||
required LayerLink startHandleLayerLink,
|
required LayerLink startHandleLayerLink,
|
||||||
required LayerLink endHandleLayerLink,
|
required LayerLink endHandleLayerLink,
|
||||||
@@ -201,6 +213,8 @@ class _CodeFieldRender extends RenderBox implements MouseTrackerAnnotation {
|
|||||||
_onRenderParagraphsChanged = onRenderParagraphsChanged,
|
_onRenderParagraphsChanged = onRenderParagraphsChanged,
|
||||||
_padding = padding,
|
_padding = padding,
|
||||||
_readOnly = readOnly,
|
_readOnly = readOnly,
|
||||||
|
_extraHorizontalScroll = extraHorizontalScroll,
|
||||||
|
_extraVerticalScroll = extraVerticalScroll,
|
||||||
_maxLengthSingleLineRendering = maxLengthSingleLineRendering,
|
_maxLengthSingleLineRendering = maxLengthSingleLineRendering,
|
||||||
_chunkIndicatorColor = chunkIndicatorColor,
|
_chunkIndicatorColor = chunkIndicatorColor,
|
||||||
_paint = Paint(),
|
_paint = Paint(),
|
||||||
@@ -531,6 +545,22 @@ class _CodeFieldRender extends RenderBox implements MouseTrackerAnnotation {
|
|||||||
markNeedsLayout();
|
markNeedsLayout();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
double get extraHorizontalScroll => _extraHorizontalScroll;
|
||||||
|
|
||||||
|
set extraHorizontalScroll(double value) {
|
||||||
|
if (_extraHorizontalScroll == value) return;
|
||||||
|
_extraHorizontalScroll = value;
|
||||||
|
markNeedsLayout();
|
||||||
|
}
|
||||||
|
|
||||||
|
double? get extraVerticalScroll => _extraVerticalScroll;
|
||||||
|
|
||||||
|
set extraVerticalScroll(double? value) {
|
||||||
|
if (_extraVerticalScroll == value) return;
|
||||||
|
_extraVerticalScroll = value;
|
||||||
|
markNeedsLayout();
|
||||||
|
}
|
||||||
|
|
||||||
List<CodeLineRenderParagraph> get displayParagraphs => _displayParagraphs;
|
List<CodeLineRenderParagraph> get displayParagraphs => _displayParagraphs;
|
||||||
|
|
||||||
Offset get paintOffset => Offset(_horizontalViewport?.pixels ?? 0, _verticalViewport.pixels);
|
Offset get paintOffset => Offset(_horizontalViewport?.pixels ?? 0, _verticalViewport.pixels);
|
||||||
@@ -1312,7 +1342,7 @@ class _CodeFieldRender extends RenderBox implements MouseTrackerAnnotation {
|
|||||||
if (target <= paddingTop) {
|
if (target <= paddingTop) {
|
||||||
startIndex = 0;
|
startIndex = 0;
|
||||||
} else {
|
} else {
|
||||||
startIndex = min(((target - paddingTop) / _preferredLineHeight).ceil(), _codes.length - 1);
|
startIndex = min(((target - paddingTop) / _preferredLineHeight).ceil(), max(0, _codes.length - 1));
|
||||||
}
|
}
|
||||||
_displayParagraphs.addAll(_buildDisplayRenderParagraphs(startIndex, effectiveWidth));
|
_displayParagraphs.addAll(_buildDisplayRenderParagraphs(startIndex, effectiveWidth));
|
||||||
} else {
|
} else {
|
||||||
@@ -1342,7 +1372,7 @@ class _CodeFieldRender extends RenderBox implements MouseTrackerAnnotation {
|
|||||||
if (target <= paddingTop) {
|
if (target <= paddingTop) {
|
||||||
startIndex = 0;
|
startIndex = 0;
|
||||||
} else {
|
} else {
|
||||||
startIndex = (target / _preferredLineHeight).floor();
|
startIndex = min((target / _preferredLineHeight).floor(), max(0, _codes.length - 1));
|
||||||
}
|
}
|
||||||
_displayParagraphs.clear();
|
_displayParagraphs.clear();
|
||||||
_displayParagraphs.addAll(_buildDisplayRenderParagraphs(startIndex, effectiveWidth));
|
_displayParagraphs.addAll(_buildDisplayRenderParagraphs(startIndex, effectiveWidth));
|
||||||
@@ -1364,18 +1394,27 @@ class _CodeFieldRender extends RenderBox implements MouseTrackerAnnotation {
|
|||||||
}
|
}
|
||||||
// The codes length maybe changed, this will make the displayParagraphs empty.
|
// The codes length maybe changed, this will make the displayParagraphs empty.
|
||||||
if (_displayParagraphs.isEmpty) {
|
if (_displayParagraphs.isEmpty) {
|
||||||
_updateDisplayRenderParagraphs();
|
if (_codes.isNotEmpty) {
|
||||||
return;
|
_displayParagraphs.addAll(_buildDisplayRenderParagraphs(max(0, _codes.length - 1), effectiveWidth));
|
||||||
|
}
|
||||||
|
if (_displayParagraphs.isEmpty) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
final double totalHeight = _displayParagraphs.last.bottom + (_codes.length - (_displayParagraphs.last.index + 1)) * _preferredLineHeight + paddingBottom;
|
final double totalHeight = _displayParagraphs.last.bottom + (_codes.length - (_displayParagraphs.last.index + 1)) * _preferredLineHeight + paddingBottom;
|
||||||
_verticalViewportSize = max(0, totalHeight - size.height);
|
final double extraBottom = _extraVerticalScroll ?? max(0.0, size.height * 0.5);
|
||||||
|
_verticalViewportSize = max(0, totalHeight - size.height + extraBottom);
|
||||||
if (_verticalViewport.pixels > _verticalViewportSize!) {
|
if (_verticalViewport.pixels > _verticalViewportSize!) {
|
||||||
_verticalViewport.correctBy(_verticalViewportSize! - _verticalViewport.pixels);
|
_verticalViewport.correctBy(_verticalViewportSize! - _verticalViewport.pixels);
|
||||||
}
|
}
|
||||||
_verticalViewport.applyContentDimensions(0, _verticalViewportSize!);
|
_verticalViewport.applyContentDimensions(0, _verticalViewportSize!);
|
||||||
if (_horizontalViewport != null) {
|
if (_horizontalViewport != null) {
|
||||||
final double maxWidth = _displayParagraphs.map((e) => e.width).reduce(max);
|
final double maxWidth = _displayParagraphs.map((e) => e.width).reduce(max);
|
||||||
_horizontalViewportSize = max(0, maxWidth + _padding.horizontal - size.width);
|
if (maxWidth + _padding.horizontal > size.width) {
|
||||||
|
_horizontalViewportSize = max(0, maxWidth + _padding.horizontal - size.width + _extraHorizontalScroll);
|
||||||
|
} else {
|
||||||
|
_horizontalViewportSize = 0;
|
||||||
|
}
|
||||||
_horizontalViewport!.applyContentDimensions(0, _horizontalViewportSize!);
|
_horizontalViewport!.applyContentDimensions(0, _horizontalViewportSize!);
|
||||||
}
|
}
|
||||||
// applyContentDimensions will change the _verticalViewport.pixels, we should rebuild.
|
// applyContentDimensions will change the _verticalViewport.pixels, we should rebuild.
|
||||||
@@ -1578,6 +1617,7 @@ class _CodeFieldRender extends RenderBox implements MouseTrackerAnnotation {
|
|||||||
}
|
}
|
||||||
|
|
||||||
List<CodeLineRenderParagraph> _buildDisplayRenderParagraphs(int startIndex, double maxWidth) {
|
List<CodeLineRenderParagraph> _buildDisplayRenderParagraphs(int startIndex, double maxWidth) {
|
||||||
|
startIndex = min(max(0, startIndex), max(0, _codes.length - 1));
|
||||||
double offset = startIndex * _preferredLineHeight;
|
double offset = startIndex * _preferredLineHeight;
|
||||||
final List<CodeLineRenderParagraph> paragraphs = [];
|
final List<CodeLineRenderParagraph> paragraphs = [];
|
||||||
for (int i = startIndex; i < _codes.length; i++) {
|
for (int i = startIndex; i < _codes.length; i++) {
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ part of re_editor;
|
|||||||
|
|
||||||
const double _kScrollbarThickness = 8.0;
|
const double _kScrollbarThickness = 8.0;
|
||||||
|
|
||||||
class _CodeScrollable extends StatelessWidget {
|
class _CodeScrollable extends StatefulWidget {
|
||||||
|
|
||||||
final AxisDirection axisDirection;
|
final AxisDirection axisDirection;
|
||||||
final ScrollController? controller;
|
final ScrollController? controller;
|
||||||
@@ -10,20 +10,67 @@ class _CodeScrollable extends StatelessWidget {
|
|||||||
final CodeScrollbarBuilder? scrollbarBuilder;
|
final CodeScrollbarBuilder? scrollbarBuilder;
|
||||||
|
|
||||||
const _CodeScrollable({
|
const _CodeScrollable({
|
||||||
|
super.key,
|
||||||
required this.axisDirection,
|
required this.axisDirection,
|
||||||
this.controller,
|
this.controller,
|
||||||
required this.viewportBuilder,
|
required this.viewportBuilder,
|
||||||
this.scrollbarBuilder
|
this.scrollbarBuilder,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<_CodeScrollable> createState() => _CodeScrollableState();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
class _CodeScrollableState extends State<_CodeScrollable> {
|
||||||
|
|
||||||
|
CodeEditorScrollController? _effectiveController;
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
_initController();
|
||||||
|
}
|
||||||
|
|
||||||
|
void _initController() {
|
||||||
|
if (widget.controller is CodeEditorScrollController) {
|
||||||
|
_effectiveController = widget.controller as CodeEditorScrollController;
|
||||||
|
} else {
|
||||||
|
_effectiveController = CodeEditorScrollController(
|
||||||
|
delegate: widget.controller,
|
||||||
|
initialScrollOffset: widget.controller?.initialScrollOffset ?? 0.0,
|
||||||
|
keepScrollOffset: widget.controller?.keepScrollOffset ?? true,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void didUpdateWidget(_CodeScrollable oldWidget) {
|
||||||
|
super.didUpdateWidget(oldWidget);
|
||||||
|
if (widget.controller != oldWidget.controller) {
|
||||||
|
if (_effectiveController != null && _effectiveController!.delegate != null) {
|
||||||
|
_effectiveController!.dispose();
|
||||||
|
}
|
||||||
|
_initController();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void dispose() {
|
||||||
|
if (_effectiveController != null && _effectiveController!.delegate != null) {
|
||||||
|
_effectiveController!.dispose();
|
||||||
|
}
|
||||||
|
super.dispose();
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Scrollable(
|
return Scrollable(
|
||||||
excludeFromSemantics: true,
|
excludeFromSemantics: true,
|
||||||
controller: controller,
|
controller: _effectiveController,
|
||||||
scrollBehavior: _ScrollBehavior(scrollbarBuilder),
|
scrollBehavior: _ScrollBehavior(widget.scrollbarBuilder),
|
||||||
viewportBuilder: viewportBuilder,
|
viewportBuilder: widget.viewportBuilder,
|
||||||
axisDirection: axisDirection,
|
axisDirection: widget.axisDirection,
|
||||||
physics: const ClampingScrollPhysics(),
|
physics: const ClampingScrollPhysics(),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,12 +37,15 @@ class _CodeSelectionGestureDetectorState extends State<_CodeSelectionGestureDete
|
|||||||
|
|
||||||
_CodeFieldRender? get render => widget.editorKey.currentContext?.findRenderObject() as _CodeFieldRender?;
|
_CodeFieldRender? get render => widget.editorKey.currentContext?.findRenderObject() as _CodeFieldRender?;
|
||||||
|
|
||||||
|
int _activePointers = 0;
|
||||||
|
bool _isMultiTouch = false;
|
||||||
bool _tapping = false;
|
bool _tapping = false;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
|
final Widget detector;
|
||||||
if (_isMobile) {
|
if (_isMobile) {
|
||||||
return GestureDetector(
|
detector = GestureDetector(
|
||||||
onLongPressMoveUpdate: (details) {
|
onLongPressMoveUpdate: (details) {
|
||||||
if (_longPressOnSelection == true) {
|
if (_longPressOnSelection == true) {
|
||||||
return;
|
return;
|
||||||
@@ -80,8 +83,10 @@ class _CodeSelectionGestureDetectorState extends State<_CodeSelectionGestureDete
|
|||||||
_longPressOnSelection = false;
|
_longPressOnSelection = false;
|
||||||
_dragging = false;
|
_dragging = false;
|
||||||
render?.stopAutoScroll();
|
render?.stopAutoScroll();
|
||||||
widget.selectionOverlayController.hideToolbar();
|
if (!_isMultiTouch) {
|
||||||
widget.selectionOverlayController.hideHandle();
|
widget.selectionOverlayController.hideToolbar();
|
||||||
|
widget.selectionOverlayController.hideHandle();
|
||||||
|
}
|
||||||
},
|
},
|
||||||
onLongPressUp: () {
|
onLongPressUp: () {
|
||||||
_dragPosition = null;
|
_dragPosition = null;
|
||||||
@@ -167,6 +172,37 @@ class _CodeSelectionGestureDetectorState extends State<_CodeSelectionGestureDete
|
|||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return Listener(
|
||||||
|
behavior: HitTestBehavior.translucent,
|
||||||
|
onPointerDown: (event) {
|
||||||
|
_activePointers++;
|
||||||
|
if (_activePointers >= 2) {
|
||||||
|
_isMultiTouch = true;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
onPointerUp: (event) {
|
||||||
|
_activePointers = max(0, _activePointers - 1);
|
||||||
|
if (_activePointers == 0) {
|
||||||
|
SchedulerBinding.instance.addPostFrameCallback((_) {
|
||||||
|
if (mounted && _activePointers == 0) {
|
||||||
|
_isMultiTouch = false;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
|
onPointerCancel: (event) {
|
||||||
|
_activePointers = max(0, _activePointers - 1);
|
||||||
|
if (_activePointers == 0) {
|
||||||
|
SchedulerBinding.instance.addPostFrameCallback((_) {
|
||||||
|
if (mounted && _activePointers == 0) {
|
||||||
|
_isMultiTouch = false;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
|
child: detector,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool get _isMobile => kIsAndroid || kIsIOS;
|
bool get _isMobile => kIsAndroid || kIsIOS;
|
||||||
@@ -178,6 +214,9 @@ class _CodeSelectionGestureDetectorState extends State<_CodeSelectionGestureDete
|
|||||||
}.contains);
|
}.contains);
|
||||||
|
|
||||||
void _onMobileTapDown(Offset position) {
|
void _onMobileTapDown(Offset position) {
|
||||||
|
if (_isMultiTouch) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (!widget.controller.selection.isCollapsed && _isPositionOnSelection(position)) {
|
if (!widget.controller.selection.isCollapsed && _isPositionOnSelection(position)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -187,6 +226,12 @@ class _CodeSelectionGestureDetectorState extends State<_CodeSelectionGestureDete
|
|||||||
}
|
}
|
||||||
|
|
||||||
void _onMobileTapUp(Offset position) {
|
void _onMobileTapUp(Offset position) {
|
||||||
|
if (_isMultiTouch) {
|
||||||
|
if (!widget.controller.selection.isCollapsed) {
|
||||||
|
widget.selectionOverlayController.showHandle(context);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
final DateTime now = DateTime.now();
|
final DateTime now = DateTime.now();
|
||||||
if (_pointerTapTimestamp != null && (now.millisecondsSinceEpoch - _pointerTapTimestamp!.millisecondsSinceEpoch) <
|
if (_pointerTapTimestamp != null && (now.millisecondsSinceEpoch - _pointerTapTimestamp!.millisecondsSinceEpoch) <
|
||||||
kDoubleTapTimeout.inMilliseconds && _pointerTapPosition != null && _pointerTapPosition!.isSamePosition(position)) {
|
kDoubleTapTimeout.inMilliseconds && _pointerTapPosition != null && _pointerTapPosition!.isSamePosition(position)) {
|
||||||
@@ -662,9 +707,9 @@ class _MobileSelectionOverlayController implements _SelectionOverlayController {
|
|||||||
: 0;
|
: 0;
|
||||||
|
|
||||||
if (selection.startIndex <= firstVisibleLine && selection.endIndex >= lastVisibleLine) {
|
if (selection.startIndex <= firstVisibleLine && selection.endIndex >= lastVisibleLine) {
|
||||||
// 框选文本完全占据当前屏幕:在中间显示
|
// 框选文本完全占据当前屏幕:显示在上方(避免在中间遮挡文本)
|
||||||
placement = EditorToolbarPlacement.center;
|
placement = EditorToolbarPlacement.top;
|
||||||
targetOffset = editingRegion.center;
|
targetOffset = Offset(editingRegion.center.dx, editingRegion.top);
|
||||||
} else if (selection.endIndex < firstVisibleLine) {
|
} else if (selection.endIndex < firstVisibleLine) {
|
||||||
// 选区整体在屏幕上方:在上面显示
|
// 选区整体在屏幕上方:在上面显示
|
||||||
placement = EditorToolbarPlacement.top;
|
placement = EditorToolbarPlacement.top;
|
||||||
@@ -674,9 +719,9 @@ class _MobileSelectionOverlayController implements _SelectionOverlayController {
|
|||||||
placement = EditorToolbarPlacement.bottom;
|
placement = EditorToolbarPlacement.bottom;
|
||||||
targetOffset = Offset(editingRegion.center.dx, editingRegion.bottom);
|
targetOffset = Offset(editingRegion.center.dx, editingRegion.bottom);
|
||||||
} else {
|
} else {
|
||||||
// 兜底(水平滚动偏离等异常情况):在中间显示
|
// 兜底(水平滚动偏离等异常情况):显示在上方(避免在中间遮挡文本)
|
||||||
placement = EditorToolbarPlacement.center;
|
placement = EditorToolbarPlacement.top;
|
||||||
targetOffset = editingRegion.center;
|
targetOffset = Offset(editingRegion.center.dx, editingRegion.top);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -757,6 +802,10 @@ class _MobileSelectionOverlayController implements _SelectionOverlayController {
|
|||||||
void _buildHandles(BuildContext context) {
|
void _buildHandles(BuildContext context) {
|
||||||
final bool isCollapsed = controller.selection.isCollapsed;
|
final bool isCollapsed = controller.selection.isCollapsed;
|
||||||
if (_handleCollapsed == isCollapsed) {
|
if (_handleCollapsed == isCollapsed) {
|
||||||
|
if (_handles != null) {
|
||||||
|
_handles![0].markNeedsBuild();
|
||||||
|
_handles![1].markNeedsBuild();
|
||||||
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
_handleCollapsed = isCollapsed;
|
_handleCollapsed = isCollapsed;
|
||||||
|
|||||||
@@ -199,7 +199,7 @@ class CodeEditor extends StatefulWidget {
|
|||||||
this.shortcutsActivatorsBuilder,
|
this.shortcutsActivatorsBuilder,
|
||||||
this.shortcutOverrideActions,
|
this.shortcutOverrideActions,
|
||||||
this.leadingDivider,
|
this.leadingDivider,
|
||||||
this.pinLineNumbers = true,
|
this.pinLineNumbers = false,
|
||||||
this.border,
|
this.border,
|
||||||
this.borderRadius,
|
this.borderRadius,
|
||||||
this.clipBehavior = Clip.none,
|
this.clipBehavior = Clip.none,
|
||||||
@@ -212,6 +212,8 @@ class CodeEditor extends StatefulWidget {
|
|||||||
this.maxLengthSingleLineRendering,
|
this.maxLengthSingleLineRendering,
|
||||||
this.chunkAnalyzer,
|
this.chunkAnalyzer,
|
||||||
this.commentFormatter,
|
this.commentFormatter,
|
||||||
|
this.extraHorizontalScroll = 160.0,
|
||||||
|
this.extraVerticalScroll,
|
||||||
}) : assert(indicatorBuilder != null || (indicatorBuilder == null && leadingDivider == null));
|
}) : assert(indicatorBuilder != null || (indicatorBuilder == null && leadingDivider == null));
|
||||||
|
|
||||||
/// Similar to [TextField], editor uses [CodeLineEditingController] as the content controller.
|
/// Similar to [TextField], editor uses [CodeLineEditingController] as the content controller.
|
||||||
@@ -273,6 +275,14 @@ class CodeEditor extends StatefulWidget {
|
|||||||
/// Whether line numbers and indicator are pinned to the left during horizontal scroll.
|
/// Whether line numbers and indicator are pinned to the left during horizontal scroll.
|
||||||
final bool pinLineNumbers;
|
final bool pinLineNumbers;
|
||||||
|
|
||||||
|
/// Extra horizontal scrollable distance (overscroll beyond the longest line).
|
||||||
|
final double extraHorizontalScroll;
|
||||||
|
|
||||||
|
/// Extra vertical scrollable distance (overscroll beyond the last line).
|
||||||
|
/// If null, defaults to half of the viewport height (size.height * 0.5), allowing
|
||||||
|
/// the last line to scroll up to the center of the viewport.
|
||||||
|
final double? extraVerticalScroll;
|
||||||
|
|
||||||
/// The border of the editor.
|
/// The border of the editor.
|
||||||
final Border? border;
|
final Border? border;
|
||||||
|
|
||||||
@@ -528,6 +538,8 @@ class _CodeEditorState extends State<CodeEditor> {
|
|||||||
showCursorWhenReadOnly: widget.showCursorWhenReadOnly ?? true,
|
showCursorWhenReadOnly: widget.showCursorWhenReadOnly ?? true,
|
||||||
leadingDivider: widget.leadingDivider,
|
leadingDivider: widget.leadingDivider,
|
||||||
pinLineNumbers: widget.pinLineNumbers,
|
pinLineNumbers: widget.pinLineNumbers,
|
||||||
|
extraHorizontalScroll: widget.extraHorizontalScroll,
|
||||||
|
extraVerticalScroll: widget.extraVerticalScroll,
|
||||||
border: widget.border,
|
border: widget.border,
|
||||||
borderRadius: widget.borderRadius,
|
borderRadius: widget.borderRadius,
|
||||||
clipBehavior: widget.clipBehavior,
|
clipBehavior: widget.clipBehavior,
|
||||||
|
|||||||
@@ -2,6 +2,97 @@ part of re_editor;
|
|||||||
|
|
||||||
typedef CodeScrollbarBuilder = Widget Function(BuildContext context, Widget child, ScrollableDetails details);
|
typedef CodeScrollbarBuilder = Widget Function(BuildContext context, Widget child, ScrollableDetails details);
|
||||||
|
|
||||||
|
/// Custom ScrollPosition for code editor that prevents blocking child pointers
|
||||||
|
/// during ballistic scrolling (inertia).
|
||||||
|
///
|
||||||
|
/// In standard Flutter, [ScrollPosition.shouldIgnorePointer] returns true during
|
||||||
|
/// ballistic activity, which causes [Scrollable] to wrap its viewport in an
|
||||||
|
/// [IgnorePointer(ignoring: true)]. In nested bidirectional scrolling (outer vertical,
|
||||||
|
/// inner horizontal), this completely blocked the inner horizontal scrollable from
|
||||||
|
/// receiving the initial touch-down when vertical was scrolling, forcing the user
|
||||||
|
/// to swipe twice horizontally to start horizontal scrolling. Overriding
|
||||||
|
/// [shouldIgnorePointer] to return false allows bidirectional scroll gestures to
|
||||||
|
/// seamlessly take over on the very first swipe.
|
||||||
|
class CodeEditorScrollPosition extends ScrollPositionWithSingleContext {
|
||||||
|
CodeEditorScrollPosition({
|
||||||
|
required super.physics,
|
||||||
|
required super.context,
|
||||||
|
super.oldPosition,
|
||||||
|
super.initialPixels,
|
||||||
|
super.keepScrollOffset,
|
||||||
|
super.debugLabel,
|
||||||
|
});
|
||||||
|
|
||||||
|
@override
|
||||||
|
bool get shouldIgnorePointer => false;
|
||||||
|
|
||||||
|
/// Immediately stop any ongoing scrolling animation or ballistic activity.
|
||||||
|
void stopScrolling() {
|
||||||
|
if (activity?.isScrolling == true) {
|
||||||
|
goIdle();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A [ScrollController] that creates [CodeEditorScrollPosition] for smooth,
|
||||||
|
/// non-blocking bidirectional scrolling. Supports delegating to an external
|
||||||
|
/// [ScrollController] if provided.
|
||||||
|
class CodeEditorScrollController extends ScrollController {
|
||||||
|
final ScrollController? delegate;
|
||||||
|
|
||||||
|
CodeEditorScrollController({
|
||||||
|
this.delegate,
|
||||||
|
super.initialScrollOffset,
|
||||||
|
super.keepScrollOffset,
|
||||||
|
super.debugLabel,
|
||||||
|
super.onAttach,
|
||||||
|
super.onDetach,
|
||||||
|
});
|
||||||
|
|
||||||
|
@override
|
||||||
|
ScrollPosition createScrollPosition(
|
||||||
|
ScrollPhysics physics,
|
||||||
|
ScrollContext context,
|
||||||
|
ScrollPosition? oldPosition,
|
||||||
|
) {
|
||||||
|
return CodeEditorScrollPosition(
|
||||||
|
physics: physics,
|
||||||
|
context: context,
|
||||||
|
initialPixels: delegate?.initialScrollOffset ?? initialScrollOffset,
|
||||||
|
keepScrollOffset: delegate?.keepScrollOffset ?? keepScrollOffset,
|
||||||
|
oldPosition: oldPosition,
|
||||||
|
debugLabel: delegate?.debugLabel ?? debugLabel,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void attach(ScrollPosition position) {
|
||||||
|
super.attach(position);
|
||||||
|
if (delegate != null && !delegate!.positions.contains(position)) {
|
||||||
|
delegate!.attach(position);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void detach(ScrollPosition position) {
|
||||||
|
if (delegate != null && delegate!.positions.contains(position)) {
|
||||||
|
delegate!.detach(position);
|
||||||
|
}
|
||||||
|
super.detach(position);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Immediately stop any ongoing scrolling animation or ballistic activity on all attached positions.
|
||||||
|
void stopScrolling() {
|
||||||
|
for (final position in positions) {
|
||||||
|
if (position is CodeEditorScrollPosition) {
|
||||||
|
position.stopScrolling();
|
||||||
|
} else if (position is ScrollPositionWithSingleContext && position.activity?.isScrolling == true) {
|
||||||
|
position.goIdle();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
class CodeScrollController {
|
class CodeScrollController {
|
||||||
|
|
||||||
final ScrollController verticalScroller;
|
final ScrollController verticalScroller;
|
||||||
@@ -12,8 +103,8 @@ class CodeScrollController {
|
|||||||
CodeScrollController({
|
CodeScrollController({
|
||||||
ScrollController? verticalScroller,
|
ScrollController? verticalScroller,
|
||||||
ScrollController? horizontalScroller,
|
ScrollController? horizontalScroller,
|
||||||
}) : verticalScroller = verticalScroller ?? ScrollController(),
|
}) : verticalScroller = verticalScroller ?? CodeEditorScrollController(),
|
||||||
horizontalScroller = horizontalScroller ?? ScrollController();
|
horizontalScroller = horizontalScroller ?? CodeEditorScrollController();
|
||||||
|
|
||||||
void makeCenterIfInvisible(CodeLinePosition position) {
|
void makeCenterIfInvisible(CodeLinePosition position) {
|
||||||
_render?.makePositionCenterIfInvisible(position);
|
_render?.makePositionCenterIfInvisible(position);
|
||||||
|
|||||||
@@ -6,9 +6,9 @@ enum EditorToolbarPlacement {
|
|||||||
aboveStart,
|
aboveStart,
|
||||||
/// 在结束端点(右端点)下方弹出,若下方空间不足则翻转至上方
|
/// 在结束端点(右端点)下方弹出,若下方空间不足则翻转至上方
|
||||||
belowEnd,
|
belowEnd,
|
||||||
/// 选区文本完全贯穿/占据视口时,在可视屏幕正中间弹出
|
/// 选区文本完全贯穿/占据视口时,在屏幕最上方贴边弹出(避免在屏幕中间遮挡文本)
|
||||||
center,
|
center,
|
||||||
/// 选区整体在视口上方时,在视口顶部贴边弹出
|
/// 选区整体在视口上方或跨屏长选区时,在屏幕最上方贴边弹出(允许覆盖 Tab/AppBar,避免遮挡文本)
|
||||||
top,
|
top,
|
||||||
/// 选区整体在视口下方时,在视口底部贴边弹出
|
/// 选区整体在视口下方时,在视口底部贴边弹出
|
||||||
bottom,
|
bottom,
|
||||||
|
|||||||
@@ -302,7 +302,7 @@ void main() {
|
|||||||
final flippedAbovePos = tester.getTopLeft(find.byType(Material).last);
|
final flippedAbovePos = tester.getTopLeft(find.byType(Material).last);
|
||||||
expect(flippedAbovePos.dy, lessThan(530));
|
expect(flippedAbovePos.dy, lessThan(530));
|
||||||
|
|
||||||
// 5. center: 居中显示
|
// 5. center: 改为在屏幕最上方贴边显示(避免在中间遮挡文本,允许覆盖 TabBar/AppBar)
|
||||||
controller.show(
|
controller.show(
|
||||||
context: buildCtx,
|
context: buildCtx,
|
||||||
controller: codeController,
|
controller: codeController,
|
||||||
@@ -317,10 +317,11 @@ void main() {
|
|||||||
visibility: visibility,
|
visibility: visibility,
|
||||||
);
|
);
|
||||||
await tester.pumpAndSettle();
|
await tester.pumpAndSettle();
|
||||||
final centerPos = tester.getCenter(find.byType(Material).last);
|
final centerPos = tester.getTopLeft(find.byType(Material).last);
|
||||||
expect((centerPos.dy - 300).abs(), lessThan(30));
|
// 位于屏幕最上方(screenTop = mediaQuery.padding.top + 6.0,在测试默认环境下为 6.0)
|
||||||
|
expect(centerPos.dy, closeTo(6.0, 1.0));
|
||||||
|
|
||||||
// 6. top: 顶部贴边
|
// 6. top: 同样在屏幕最上方贴边显示
|
||||||
controller.show(
|
controller.show(
|
||||||
context: buildCtx,
|
context: buildCtx,
|
||||||
controller: codeController,
|
controller: codeController,
|
||||||
@@ -336,7 +337,7 @@ void main() {
|
|||||||
);
|
);
|
||||||
await tester.pumpAndSettle();
|
await tester.pumpAndSettle();
|
||||||
final topPos = tester.getTopLeft(find.byType(Material).last);
|
final topPos = tester.getTopLeft(find.byType(Material).last);
|
||||||
expect(topPos.dy, closeTo(110, 10));
|
expect(topPos.dy, closeTo(6.0, 1.0));
|
||||||
|
|
||||||
// 7. bottom: 底部贴边
|
// 7. bottom: 底部贴边
|
||||||
controller.show(
|
controller.show(
|
||||||
|
|||||||
@@ -0,0 +1,189 @@
|
|||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter_test/flutter_test.dart';
|
||||||
|
import 'package:re_editor/re_editor.dart';
|
||||||
|
|
||||||
|
void main() {
|
||||||
|
TestWidgetsFlutterBinding.ensureInitialized();
|
||||||
|
|
||||||
|
group('CodeEditor 双向滚动平滑切换与打断测试', () {
|
||||||
|
test('CodeEditorScrollPosition 的 shouldIgnorePointer 始终返回 false 允许命中测试', () {
|
||||||
|
final controller = CodeEditorScrollController();
|
||||||
|
expect(controller, isA<CodeEditorScrollController>());
|
||||||
|
});
|
||||||
|
|
||||||
|
test('CodeScrollController 默认创建 CodeEditorScrollController', () {
|
||||||
|
final codeScroll = CodeScrollController();
|
||||||
|
expect(codeScroll.verticalScroller, isA<CodeEditorScrollController>());
|
||||||
|
expect(codeScroll.horizontalScroller, isA<CodeEditorScrollController>());
|
||||||
|
});
|
||||||
|
|
||||||
|
testWidgets('垂直滚动时进行水平滚动,先停止垂直滚动并立即进入水平滚动(无需第二次滚动)', (tester) async {
|
||||||
|
final lines = List.generate(
|
||||||
|
100,
|
||||||
|
(i) => 'Line $i: ${'very_long_code_identifier_' * 10};',
|
||||||
|
).join('\n');
|
||||||
|
final codeController = CodeLineEditingController.fromText(lines);
|
||||||
|
final scrollController = CodeScrollController();
|
||||||
|
|
||||||
|
await tester.pumpWidget(
|
||||||
|
MaterialApp(
|
||||||
|
home: Scaffold(
|
||||||
|
body: SizedBox(
|
||||||
|
width: 300,
|
||||||
|
height: 300,
|
||||||
|
child: CodeEditor(
|
||||||
|
controller: codeController,
|
||||||
|
scrollController: scrollController,
|
||||||
|
wordWrap: false,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
await tester.pumpAndSettle();
|
||||||
|
|
||||||
|
final vScroller = scrollController.verticalScroller;
|
||||||
|
final hScroller = scrollController.horizontalScroller;
|
||||||
|
|
||||||
|
expect(vScroller.offset, 0.0);
|
||||||
|
expect(hScroller.offset, 0.0);
|
||||||
|
|
||||||
|
// 1. 触发垂直滑动手势
|
||||||
|
await tester.fling(find.byType(CodeEditor), const Offset(0, -100), 1000);
|
||||||
|
await tester.pump(const Duration(milliseconds: 50));
|
||||||
|
final verticalOffsetWhileMoving = vScroller.offset;
|
||||||
|
expect(verticalOffsetWhileMoving, greaterThan(0.0));
|
||||||
|
|
||||||
|
// 2. 此时立即发起水平滑动手势 (首次水平滑动即生效)
|
||||||
|
await tester.fling(find.byType(CodeEditor), const Offset(-100, 0), 1000);
|
||||||
|
await tester.pump(const Duration(milliseconds: 50));
|
||||||
|
|
||||||
|
// 垂直滚动停止,首次水平滑动即可产生水平位移
|
||||||
|
expect(hScroller.offset, greaterThan(0.0));
|
||||||
|
|
||||||
|
await tester.pumpAndSettle();
|
||||||
|
expect(hScroller.offset, greaterThan(0.0));
|
||||||
|
});
|
||||||
|
|
||||||
|
testWidgets('水平滚动时进行垂直滚动,先停止水平滚动并立即进入垂直滚动', (tester) async {
|
||||||
|
final lines = List.generate(
|
||||||
|
100,
|
||||||
|
(i) => 'Line $i: ${'very_long_code_identifier_' * 10};',
|
||||||
|
).join('\n');
|
||||||
|
final codeController = CodeLineEditingController.fromText(lines);
|
||||||
|
final scrollController = CodeScrollController();
|
||||||
|
|
||||||
|
await tester.pumpWidget(
|
||||||
|
MaterialApp(
|
||||||
|
home: Scaffold(
|
||||||
|
body: SizedBox(
|
||||||
|
width: 300,
|
||||||
|
height: 300,
|
||||||
|
child: CodeEditor(
|
||||||
|
controller: codeController,
|
||||||
|
scrollController: scrollController,
|
||||||
|
wordWrap: false,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
await tester.pumpAndSettle();
|
||||||
|
|
||||||
|
final vScroller = scrollController.verticalScroller;
|
||||||
|
final hScroller = scrollController.horizontalScroller;
|
||||||
|
|
||||||
|
expect(vScroller.offset, 0.0);
|
||||||
|
expect(hScroller.offset, 0.0);
|
||||||
|
|
||||||
|
// 1. 先触发水平滑动
|
||||||
|
await tester.fling(find.byType(CodeEditor), const Offset(-100, 0), 1000);
|
||||||
|
await tester.pump(const Duration(milliseconds: 50));
|
||||||
|
expect(hScroller.offset, greaterThan(0.0));
|
||||||
|
|
||||||
|
// 2. 立即发起垂直滑动
|
||||||
|
await tester.fling(find.byType(CodeEditor), const Offset(0, -100), 1000);
|
||||||
|
await tester.pump(const Duration(milliseconds: 50));
|
||||||
|
|
||||||
|
// 垂直滚动首次滑动即生效
|
||||||
|
expect(vScroller.offset, greaterThan(0.0));
|
||||||
|
|
||||||
|
await tester.pumpAndSettle();
|
||||||
|
expect(vScroller.offset, greaterThan(0.0));
|
||||||
|
});
|
||||||
|
|
||||||
|
testWidgets('垂直方向最后一行可滚到屏幕中间约半屏高(延伸半屏高度的可滚动空白)', (tester) async {
|
||||||
|
// 50 行代码,每行高度约 20px,总高度约 1000px,在 400px 高的视口中
|
||||||
|
const double viewportHeight = 400.0;
|
||||||
|
final lines = List.generate(50, (i) => 'Line $i: text;').join('\n');
|
||||||
|
final codeController = CodeLineEditingController.fromText(lines);
|
||||||
|
final scrollController = CodeScrollController();
|
||||||
|
|
||||||
|
await tester.pumpWidget(
|
||||||
|
MaterialApp(
|
||||||
|
home: Scaffold(
|
||||||
|
body: SizedBox(
|
||||||
|
width: 300,
|
||||||
|
height: viewportHeight,
|
||||||
|
child: CodeEditor(
|
||||||
|
controller: codeController,
|
||||||
|
scrollController: scrollController,
|
||||||
|
wordWrap: false,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
await tester.pumpAndSettle();
|
||||||
|
|
||||||
|
final vScroller = scrollController.verticalScroller;
|
||||||
|
// 滚动到底部极限位置
|
||||||
|
vScroller.jumpTo(vScroller.position.maxScrollExtent);
|
||||||
|
await tester.pumpAndSettle();
|
||||||
|
|
||||||
|
// 验证最后一行文字在视口中的位置:应该在屏幕中间约半屏高位置 (viewportHeight * 0.5 = 200.0 左右)
|
||||||
|
// 而不是贴在底部 400.0
|
||||||
|
expect(vScroller.offset, equals(vScroller.position.maxScrollExtent));
|
||||||
|
// 点击底部留白区域,确保不抛异常且能定位到末尾行
|
||||||
|
await tester.tapAt(const Offset(150, 350));
|
||||||
|
await tester.pumpAndSettle();
|
||||||
|
expect(codeController.selection.extentIndex, equals(49));
|
||||||
|
});
|
||||||
|
|
||||||
|
testWidgets('水平方向向右多滑约 160 px(最右侧文字脱离右边缘并留出 160 px 真正空白)', (tester) async {
|
||||||
|
const double viewportWidth = 300.0;
|
||||||
|
final codeController = CodeLineEditingController.fromText('prefix_${'long_variable_name_' * 15}_end');
|
||||||
|
final scrollController = CodeScrollController();
|
||||||
|
|
||||||
|
await tester.pumpWidget(
|
||||||
|
MaterialApp(
|
||||||
|
home: Scaffold(
|
||||||
|
body: SizedBox(
|
||||||
|
width: viewportWidth,
|
||||||
|
height: 300,
|
||||||
|
child: CodeEditor(
|
||||||
|
controller: codeController,
|
||||||
|
scrollController: scrollController,
|
||||||
|
wordWrap: false,
|
||||||
|
extraHorizontalScroll: 160.0,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
await tester.pumpAndSettle();
|
||||||
|
|
||||||
|
final hScroller = scrollController.horizontalScroller;
|
||||||
|
expect(hScroller.position.maxScrollExtent, greaterThan(160.0));
|
||||||
|
|
||||||
|
// 滚动到最右端
|
||||||
|
hScroller.jumpTo(hScroller.position.maxScrollExtent);
|
||||||
|
await tester.pumpAndSettle();
|
||||||
|
|
||||||
|
// 点击右侧留白区域,确保不抛异常且定位正常
|
||||||
|
await tester.tapAt(const Offset(280, 50));
|
||||||
|
await tester.pumpAndSettle();
|
||||||
|
expect(codeController.selection.extentIndex, equals(0));
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -44,7 +44,11 @@ void main() {
|
|||||||
focusNode.dispose();
|
focusNode.dispose();
|
||||||
});
|
});
|
||||||
|
|
||||||
Widget buildTestWidget({Locale locale = const Locale('zh')}) {
|
Widget buildTestWidget({
|
||||||
|
Locale locale = const Locale('zh'),
|
||||||
|
ScrollController? scrollController,
|
||||||
|
double height = 600,
|
||||||
|
}) {
|
||||||
return MaterialApp(
|
return MaterialApp(
|
||||||
locale: locale,
|
locale: locale,
|
||||||
localizationsDelegates: AppLocalizations.localizationsDelegates,
|
localizationsDelegates: AppLocalizations.localizationsDelegates,
|
||||||
@@ -52,17 +56,19 @@ void main() {
|
|||||||
home: Scaffold(
|
home: Scaffold(
|
||||||
body: SizedBox(
|
body: SizedBox(
|
||||||
width: 400,
|
width: 400,
|
||||||
height: 600,
|
height: height,
|
||||||
child: TerminalSelectionOverlay(
|
child: TerminalSelectionOverlay(
|
||||||
terminal: terminal,
|
terminal: terminal,
|
||||||
controller: controller,
|
controller: controller,
|
||||||
terminalViewKey: terminalViewKey,
|
terminalViewKey: terminalViewKey,
|
||||||
focusNode: focusNode,
|
focusNode: focusNode,
|
||||||
|
scrollController: scrollController,
|
||||||
child: xterm.TerminalView(
|
child: xterm.TerminalView(
|
||||||
terminal,
|
terminal,
|
||||||
key: terminalViewKey,
|
key: terminalViewKey,
|
||||||
controller: controller,
|
controller: controller,
|
||||||
focusNode: focusNode,
|
focusNode: focusNode,
|
||||||
|
scrollController: scrollController,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@@ -257,5 +263,227 @@ void main() {
|
|||||||
// 验证菜单是否弹出
|
// 验证菜单是否弹出
|
||||||
expect(find.text('复制'), findsOneWidget);
|
expect(find.text('复制'), findsOneWidget);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
testWidgets('弹出菜单不包含任何图标,仅保留纯文本且带有分割线', (tester) async {
|
||||||
|
terminal.write('Hello Clean Menu\r\n');
|
||||||
|
await tester.pumpWidget(buildTestWidget());
|
||||||
|
await tester.pumpAndSettle();
|
||||||
|
|
||||||
|
controller.setSelection(
|
||||||
|
terminal.buffer.createAnchor(0, 0),
|
||||||
|
terminal.buffer.createAnchor(5, 0),
|
||||||
|
);
|
||||||
|
await tester.pumpAndSettle();
|
||||||
|
|
||||||
|
// 菜单已弹出
|
||||||
|
expect(find.text('复制'), findsOneWidget);
|
||||||
|
expect(find.text('粘贴'), findsOneWidget);
|
||||||
|
expect(find.text('全选'), findsOneWidget);
|
||||||
|
|
||||||
|
// 验证菜单中无任何 Icon 组件,保持与代码编辑区一致的纯文本清爽风格
|
||||||
|
final copyItemFinder = find.ancestor(
|
||||||
|
of: find.text('复制'),
|
||||||
|
matching: find.byType(Row),
|
||||||
|
);
|
||||||
|
expect(copyItemFinder, findsOneWidget);
|
||||||
|
expect(
|
||||||
|
find.descendant(of: copyItemFinder, matching: find.byType(Icon)),
|
||||||
|
findsNothing,
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
find.descendant(of: copyItemFinder, matching: find.byType(VerticalDivider)),
|
||||||
|
findsWidgets,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
testWidgets('多行选区时弹出菜单显示在顶部安全区,绝不遮挡多行文本', (tester) async {
|
||||||
|
terminal.write('Line 1\r\nLine 2\r\nLine 3\r\nLine 4\r\n');
|
||||||
|
await tester.pumpWidget(buildTestWidget());
|
||||||
|
await tester.pumpAndSettle();
|
||||||
|
|
||||||
|
// 跨越 3 行的选区
|
||||||
|
controller.setSelection(
|
||||||
|
terminal.buffer.createAnchor(0, 0),
|
||||||
|
terminal.buffer.createAnchor(5, 3),
|
||||||
|
);
|
||||||
|
await tester.pumpAndSettle();
|
||||||
|
|
||||||
|
expect(find.text('复制'), findsOneWidget);
|
||||||
|
|
||||||
|
// 菜单顶部位置应位于顶部(screenTop,y <= 50)
|
||||||
|
final menuTop = tester.getTopLeft(find.text('复制')).dy;
|
||||||
|
expect(menuTop, lessThanOrEqualTo(50.0));
|
||||||
|
});
|
||||||
|
|
||||||
|
testWidgets('边界框选时弹出菜单被安全夹紧在屏幕安全边界内,绝不超出屏幕', (tester) async {
|
||||||
|
terminal.write('1234567890123456789012345678901234567890\r\n');
|
||||||
|
await tester.pumpWidget(buildTestWidget());
|
||||||
|
await tester.pumpAndSettle();
|
||||||
|
|
||||||
|
// 靠右侧的选区
|
||||||
|
controller.setSelection(
|
||||||
|
terminal.buffer.createAnchor(25, 0),
|
||||||
|
terminal.buffer.createAnchor(35, 0),
|
||||||
|
);
|
||||||
|
await tester.pumpAndSettle();
|
||||||
|
|
||||||
|
expect(find.text('复制'), findsOneWidget);
|
||||||
|
final copyFinder = find.text('复制');
|
||||||
|
final selectAllFinder = find.text('全选');
|
||||||
|
|
||||||
|
final copyRect = tester.getRect(copyFinder);
|
||||||
|
final selectAllRect = tester.getRect(selectAllFinder);
|
||||||
|
|
||||||
|
// 整个菜单的 x 坐标都在 0 到 400(测试容器宽度)之间
|
||||||
|
expect(copyRect.left, greaterThanOrEqualTo(0.0));
|
||||||
|
expect(selectAllRect.right, lessThanOrEqualTo(400.0));
|
||||||
|
});
|
||||||
|
|
||||||
|
testWidgets('拖动结束手柄至终端底部边缘时自动向下滚动并扩展选区', (tester) async {
|
||||||
|
for (int i = 0; i < 60; i++) {
|
||||||
|
terminal.write('Terminal 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();
|
||||||
|
expect(scrollController.position.pixels, equals(0.0));
|
||||||
|
|
||||||
|
final render = terminalViewKey.currentState!.renderTerminal;
|
||||||
|
final startCell = render.getCellOffset(const Offset(30, 40));
|
||||||
|
final endCell = render.getCellOffset(const Offset(100, 60));
|
||||||
|
controller.setSelection(
|
||||||
|
terminal.buffer.createAnchorFromOffset(startCell),
|
||||||
|
terminal.buffer.createAnchorFromOffset(endCell),
|
||||||
|
);
|
||||||
|
await tester.pumpAndSettle();
|
||||||
|
|
||||||
|
final handleFinder = find.byWidgetPredicate(
|
||||||
|
(w) => w.runtimeType.toString() == '_TerminalSelectionHandle',
|
||||||
|
);
|
||||||
|
expect(handleFinder, findsNWidgets(2));
|
||||||
|
|
||||||
|
// 拖拽结束手柄移动到终端底部边缘(y = 295)
|
||||||
|
final gesture = await tester.startGesture(tester.getCenter(handleFinder.last));
|
||||||
|
await tester.pump();
|
||||||
|
await gesture.moveTo(const Offset(200, 295));
|
||||||
|
await tester.pump();
|
||||||
|
|
||||||
|
await tester.pump(const Duration(milliseconds: 100));
|
||||||
|
await tester.pump(const Duration(milliseconds: 100));
|
||||||
|
await tester.pump(const Duration(milliseconds: 100));
|
||||||
|
|
||||||
|
// 验证终端已经自动向下滚动,pixels 大于 0
|
||||||
|
expect(scrollController.position.pixels, greaterThan(0.0));
|
||||||
|
// 验证选区向下扩展
|
||||||
|
expect(controller.selection!.end.y, greaterThan(endCell.y));
|
||||||
|
|
||||||
|
// 松手后停止自动滚动并展示菜单
|
||||||
|
await gesture.up();
|
||||||
|
await tester.pumpAndSettle();
|
||||||
|
expect(find.text('复制'), findsOneWidget);
|
||||||
|
});
|
||||||
|
|
||||||
|
testWidgets('拖动起始手柄至终端顶部边缘时自动向上滚动', (tester) async {
|
||||||
|
for (int i = 0; i < 60; i++) {
|
||||||
|
terminal.write('Terminal History Line $i\r\n');
|
||||||
|
}
|
||||||
|
final scrollController = ScrollController();
|
||||||
|
addTearDown(scrollController.dispose);
|
||||||
|
|
||||||
|
await tester.pumpWidget(buildTestWidget(scrollController: scrollController, height: 300));
|
||||||
|
await tester.pumpAndSettle();
|
||||||
|
|
||||||
|
// 滚动到中间位置
|
||||||
|
scrollController.jumpTo(250.0);
|
||||||
|
await tester.pumpAndSettle();
|
||||||
|
final initialPixels = scrollController.position.pixels;
|
||||||
|
expect(initialPixels, equals(250.0));
|
||||||
|
|
||||||
|
// 在视口内精准设置可见选区
|
||||||
|
final render = terminalViewKey.currentState!.renderTerminal;
|
||||||
|
final startCell = render.getCellOffset(const Offset(30, 100));
|
||||||
|
final endCell = render.getCellOffset(const Offset(100, 180));
|
||||||
|
controller.setSelection(
|
||||||
|
terminal.buffer.createAnchorFromOffset(startCell),
|
||||||
|
terminal.buffer.createAnchorFromOffset(endCell),
|
||||||
|
);
|
||||||
|
await tester.pumpAndSettle();
|
||||||
|
|
||||||
|
final handleFinder = find.byWidgetPredicate(
|
||||||
|
(w) => w.runtimeType.toString() == '_TerminalSelectionHandle',
|
||||||
|
);
|
||||||
|
expect(handleFinder, findsNWidgets(2));
|
||||||
|
|
||||||
|
// 拖拽起始手柄至终端顶部边缘(y = 10)
|
||||||
|
final gesture = await tester.startGesture(tester.getCenter(handleFinder.first));
|
||||||
|
await tester.pump();
|
||||||
|
await gesture.moveTo(const Offset(200, 10));
|
||||||
|
await tester.pump();
|
||||||
|
|
||||||
|
await tester.pump(const Duration(milliseconds: 100));
|
||||||
|
await tester.pump(const Duration(milliseconds: 100));
|
||||||
|
await tester.pump(const Duration(milliseconds: 100));
|
||||||
|
|
||||||
|
// 验证终端已经自动向上滚动,当前 pixels 小于初始 pixels
|
||||||
|
expect(scrollController.position.pixels, lessThan(initialPixels));
|
||||||
|
|
||||||
|
await gesture.up();
|
||||||
|
await tester.pumpAndSettle();
|
||||||
|
expect(find.text('复制'), findsOneWidget);
|
||||||
|
});
|
||||||
|
|
||||||
|
testWidgets('自动滚动中途手指松开时立即停止滚动,后续不会继续发生任何自动滚动', (tester) async {
|
||||||
|
for (int i = 0; i < 60; i++) {
|
||||||
|
terminal.write('Terminal Stop Test 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 startCell = render.getCellOffset(const Offset(30, 40));
|
||||||
|
final endCell = render.getCellOffset(const Offset(100, 60));
|
||||||
|
controller.setSelection(
|
||||||
|
terminal.buffer.createAnchorFromOffset(startCell),
|
||||||
|
terminal.buffer.createAnchorFromOffset(endCell),
|
||||||
|
);
|
||||||
|
await tester.pumpAndSettle();
|
||||||
|
|
||||||
|
final handleFinder = find.byWidgetPredicate(
|
||||||
|
(w) => w.runtimeType.toString() == '_TerminalSelectionHandle',
|
||||||
|
);
|
||||||
|
expect(handleFinder, findsNWidgets(2));
|
||||||
|
|
||||||
|
// 拖拽结束手柄至底部边缘触发自动滚动
|
||||||
|
final gesture = await tester.startGesture(tester.getCenter(handleFinder.last));
|
||||||
|
await tester.pump();
|
||||||
|
await gesture.moveTo(const Offset(200, 295));
|
||||||
|
await tester.pump(const Duration(milliseconds: 100));
|
||||||
|
|
||||||
|
final scrollPixelsBeforeRelease = scrollController.position.pixels;
|
||||||
|
expect(scrollPixelsBeforeRelease, greaterThan(0.0));
|
||||||
|
|
||||||
|
// 手指松开
|
||||||
|
await gesture.up();
|
||||||
|
await tester.pump();
|
||||||
|
|
||||||
|
// 在松手之后经过 200ms,验证滚动位置保持绝对静止,绝不继续自动滚动!
|
||||||
|
await tester.pump(const Duration(milliseconds: 200));
|
||||||
|
expect(scrollController.position.pixels, equals(scrollPixelsBeforeRelease));
|
||||||
|
|
||||||
|
await tester.pumpAndSettle();
|
||||||
|
expect(scrollController.position.pixels, equals(scrollPixelsBeforeRelease));
|
||||||
|
expect(find.text('复制'), findsOneWidget);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
// 临时探针测试:验证执行 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();
|
||||||
|
});
|
||||||
|
}
|
||||||
+164
-7
@@ -2766,6 +2766,163 @@ void main() {
|
|||||||
tempDir.deleteSync(recursive: true);
|
tempDir.deleteSync(recursive: true);
|
||||||
} catch (_) {}
|
} catch (_) {}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
testWidgets('CodeEditorWidget pinch-to-zoom preserves text selection and handles', (tester) async {
|
||||||
|
final tempDir = Directory.systemTemp.createTempSync('editor_zoom_selection_test');
|
||||||
|
final testFile = File('${tempDir.path}/test.dart')..writeAsStringSync('void main() {\n print("hello");\n}');
|
||||||
|
|
||||||
|
final settingsProvider = SettingsProvider();
|
||||||
|
await settingsProvider.init();
|
||||||
|
await settingsProvider.setFontSize(14.0);
|
||||||
|
|
||||||
|
final tabProvider = TabProvider();
|
||||||
|
await tabProvider.init();
|
||||||
|
tabProvider.openTabs.add(
|
||||||
|
EditorTabItem(
|
||||||
|
path: testFile.path,
|
||||||
|
content: 'void main() {\n print("hello");\n}',
|
||||||
|
originalContent: 'void main() {\n print("hello");\n}',
|
||||||
|
isLoaded: true,
|
||||||
|
isModified: false,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
await tester.pumpWidget(
|
||||||
|
MultiProvider(
|
||||||
|
providers: [
|
||||||
|
ChangeNotifierProvider.value(value: settingsProvider),
|
||||||
|
ChangeNotifierProvider.value(value: tabProvider),
|
||||||
|
],
|
||||||
|
child: MaterialApp(
|
||||||
|
home: Scaffold(
|
||||||
|
body: CodeEditorWidget(
|
||||||
|
rootPath: tempDir.path,
|
||||||
|
filePath: testFile.path,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
await tester.pumpAndSettle();
|
||||||
|
|
||||||
|
final codeEditor = tester.widget<CodeEditor>(find.byType(CodeEditor));
|
||||||
|
final controller = codeEditor.controller!;
|
||||||
|
|
||||||
|
// Select 'void' (0..4 on line 0)
|
||||||
|
controller.selection = const CodeLineSelection(
|
||||||
|
baseIndex: 0,
|
||||||
|
baseOffset: 0,
|
||||||
|
extentIndex: 0,
|
||||||
|
extentOffset: 4,
|
||||||
|
);
|
||||||
|
await tester.pumpAndSettle();
|
||||||
|
expect(controller.selection.isCollapsed, isFalse);
|
||||||
|
|
||||||
|
// Simulate 2-pointer pinch gesture
|
||||||
|
final gesture1 = await tester.createGesture();
|
||||||
|
final gesture2 = await tester.createGesture();
|
||||||
|
|
||||||
|
await gesture1.down(const Offset(200, 300));
|
||||||
|
await gesture2.down(const Offset(200, 350));
|
||||||
|
await tester.pump();
|
||||||
|
|
||||||
|
await gesture2.moveTo(const Offset(200, 400));
|
||||||
|
await tester.pump();
|
||||||
|
|
||||||
|
await gesture1.up();
|
||||||
|
await gesture2.up();
|
||||||
|
await tester.pumpAndSettle();
|
||||||
|
|
||||||
|
// Selection must NOT be collapsed or lost!
|
||||||
|
expect(controller.selection.isCollapsed, isFalse);
|
||||||
|
expect(controller.selection.baseOffset, 0);
|
||||||
|
expect(controller.selection.extentOffset, 4);
|
||||||
|
expect(settingsProvider.fontSize, 28.0);
|
||||||
|
|
||||||
|
try {
|
||||||
|
tempDir.deleteSync(recursive: true);
|
||||||
|
} catch (_) {}
|
||||||
|
});
|
||||||
|
|
||||||
|
testWidgets('CodeEditorWidget pinch-to-zoom anchors zoom to focal point (compensates scroll offset)', (tester) async {
|
||||||
|
final tempDir = Directory.systemTemp.createTempSync('editor_zoom_focal_test');
|
||||||
|
final lines = List.generate(100, (i) => 'Line $i: abcdefghijklmnopqrstuvwxyz').join('\n');
|
||||||
|
final testFile = File('${tempDir.path}/test.dart')..writeAsStringSync(lines);
|
||||||
|
|
||||||
|
final settingsProvider = SettingsProvider();
|
||||||
|
await settingsProvider.init();
|
||||||
|
await settingsProvider.setFontSize(14.0);
|
||||||
|
|
||||||
|
final tabProvider = TabProvider();
|
||||||
|
await tabProvider.init();
|
||||||
|
tabProvider.openTabs.add(
|
||||||
|
EditorTabItem(
|
||||||
|
path: testFile.path,
|
||||||
|
content: lines,
|
||||||
|
originalContent: lines,
|
||||||
|
isLoaded: true,
|
||||||
|
isModified: false,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
await tester.pumpWidget(
|
||||||
|
MultiProvider(
|
||||||
|
providers: [
|
||||||
|
ChangeNotifierProvider.value(value: settingsProvider),
|
||||||
|
ChangeNotifierProvider.value(value: tabProvider),
|
||||||
|
],
|
||||||
|
child: MaterialApp(
|
||||||
|
home: Scaffold(
|
||||||
|
body: SizedBox(
|
||||||
|
width: 400,
|
||||||
|
height: 500,
|
||||||
|
child: CodeEditorWidget(
|
||||||
|
rootPath: tempDir.path,
|
||||||
|
filePath: testFile.path,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
await tester.pumpAndSettle();
|
||||||
|
|
||||||
|
final codeEditor = tester.widget<CodeEditor>(find.byType(CodeEditor));
|
||||||
|
final scrollController = codeEditor.scrollController!;
|
||||||
|
final vScroller = scrollController.verticalScroller;
|
||||||
|
|
||||||
|
expect(vScroller.offset, 0.0);
|
||||||
|
|
||||||
|
// Simulate 2-pointer pinch gesture near the bottom of the editor viewport
|
||||||
|
// Focal point dy = (350 + 450) / 2 = 400.0
|
||||||
|
final gesture1 = await tester.createGesture();
|
||||||
|
final gesture2 = await tester.createGesture();
|
||||||
|
|
||||||
|
await gesture1.down(const Offset(200, 350));
|
||||||
|
await gesture2.down(const Offset(200, 450)); // Initial distance: 100.0
|
||||||
|
await tester.pump();
|
||||||
|
|
||||||
|
// Zoom in by increasing distance to 150.0 (1.5x scale) -> target font size: 14 * 1.5 = 21.0
|
||||||
|
// Focal point moves from 400.0 to (350 + 500) / 2 = 425.0
|
||||||
|
// Target scrollV = (0 + 400.0) * 1.5 - 425.0 = 600.0 - 425.0 = 175.0
|
||||||
|
await gesture2.moveTo(const Offset(200, 500));
|
||||||
|
await tester.pump();
|
||||||
|
|
||||||
|
// Without focal anchor, vScroller.offset would remain 0.0, causing bottom text to fly down.
|
||||||
|
// With focal anchor, vScroller.offset is compensated to keep the focal point steady.
|
||||||
|
expect(vScroller.offset, greaterThan(100.0));
|
||||||
|
|
||||||
|
await gesture1.up();
|
||||||
|
await gesture2.up();
|
||||||
|
await tester.pumpAndSettle();
|
||||||
|
|
||||||
|
expect(settingsProvider.fontSize, 21.0);
|
||||||
|
expect(vScroller.offset, greaterThan(100.0));
|
||||||
|
|
||||||
|
try {
|
||||||
|
tempDir.deleteSync(recursive: true);
|
||||||
|
} catch (_) {}
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// ============================================================
|
// ============================================================
|
||||||
@@ -3223,7 +3380,7 @@ void main() {
|
|||||||
|
|
||||||
// Defaults
|
// Defaults
|
||||||
expect(provider.showLineNumbers, isTrue);
|
expect(provider.showLineNumbers, isTrue);
|
||||||
expect(provider.pinLineNumbers, isTrue);
|
expect(provider.pinLineNumbers, isFalse);
|
||||||
|
|
||||||
// Setters
|
// Setters
|
||||||
bool notified = false;
|
bool notified = false;
|
||||||
@@ -3234,15 +3391,15 @@ void main() {
|
|||||||
expect(notified, isTrue);
|
expect(notified, isTrue);
|
||||||
|
|
||||||
notified = false;
|
notified = false;
|
||||||
await provider.setPinLineNumbers(false);
|
await provider.setPinLineNumbers(true);
|
||||||
expect(provider.pinLineNumbers, isFalse);
|
expect(provider.pinLineNumbers, isTrue);
|
||||||
expect(notified, isTrue);
|
expect(notified, isTrue);
|
||||||
|
|
||||||
// Verify loaded from SharedPreferences
|
// Verify loaded from SharedPreferences
|
||||||
final provider2 = SettingsProvider();
|
final provider2 = SettingsProvider();
|
||||||
await provider2.init();
|
await provider2.init();
|
||||||
expect(provider2.showLineNumbers, isFalse);
|
expect(provider2.showLineNumbers, isFalse);
|
||||||
expect(provider2.pinLineNumbers, isFalse);
|
expect(provider2.pinLineNumbers, isTrue);
|
||||||
});
|
});
|
||||||
|
|
||||||
test('Localization strings exist in both zh and en without hardcoding', () {
|
test('Localization strings exist in both zh and en without hardcoding', () {
|
||||||
@@ -3290,13 +3447,13 @@ void main() {
|
|||||||
expect(find.text('固定行号'), findsOneWidget);
|
expect(find.text('固定行号'), findsOneWidget);
|
||||||
expect(find.text('水平滚动代码时行号固定在左侧'), findsOneWidget);
|
expect(find.text('水平滚动代码时行号固定在左侧'), findsOneWidget);
|
||||||
|
|
||||||
// Both switches should initially be enabled and true
|
// showSwitch should be true, pinSwitch should initially be enabled and false
|
||||||
final switchesBefore = tester.widgetList<SwitchListTile>(find.byType(SwitchListTile));
|
final switchesBefore = tester.widgetList<SwitchListTile>(find.byType(SwitchListTile));
|
||||||
final showSwitchBefore = switchesBefore.firstWhere((s) => (s.title as Text).data == '显示行号');
|
final showSwitchBefore = switchesBefore.firstWhere((s) => (s.title as Text).data == '显示行号');
|
||||||
final pinSwitchBefore = switchesBefore.firstWhere((s) => (s.title as Text).data == '固定行号');
|
final pinSwitchBefore = switchesBefore.firstWhere((s) => (s.title as Text).data == '固定行号');
|
||||||
expect(showSwitchBefore.value, isTrue);
|
expect(showSwitchBefore.value, isTrue);
|
||||||
expect(showSwitchBefore.onChanged, isNotNull);
|
expect(showSwitchBefore.onChanged, isNotNull);
|
||||||
expect(pinSwitchBefore.value, isTrue);
|
expect(pinSwitchBefore.value, isFalse);
|
||||||
expect(pinSwitchBefore.onChanged, isNotNull);
|
expect(pinSwitchBefore.onChanged, isNotNull);
|
||||||
|
|
||||||
// Turn off showLineNumbers
|
// Turn off showLineNumbers
|
||||||
@@ -3313,7 +3470,7 @@ void main() {
|
|||||||
// Tapping disabled pinLineNumbers does nothing
|
// Tapping disabled pinLineNumbers does nothing
|
||||||
await tester.tap(find.text('固定行号'));
|
await tester.tap(find.text('固定行号'));
|
||||||
await tester.pumpAndSettle();
|
await tester.pumpAndSettle();
|
||||||
expect(provider.pinLineNumbers, isTrue); // unchanged
|
expect(provider.pinLineNumbers, isFalse); // unchanged
|
||||||
|
|
||||||
// Re-enabling showLineNumbers re-enables pinLineNumbers
|
// Re-enabling showLineNumbers re-enables pinLineNumbers
|
||||||
await tester.tap(find.text('显示行号'));
|
await tester.tap(find.text('显示行号'));
|
||||||
|
|||||||
Reference in new issue
Block a user