This commit is contained in:
LZX committed 2026-09-18 13:59:38 +08:00
1 parent 96358eae07
commit 7a3db86a10
13 files changed
+625 -37

No files matched your search

+41
View File
@@ -1,10 +1,13 @@
import 'package:code_editor/l10n/app_localizations.dart';
import 'package:code_editor/providers/search_provider.dart';
import 'package:code_editor/providers/tab_provider.dart';
import 'package:code_editor/services/permission_service.dart';
import 'package:code_editor/views/terminal_view.dart';
import 'package:code_editor/widgets/terminal_entry_guard.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:path/path.dart' as p;
import 'package:provider/provider.dart';
import 'package:re_editor/re_editor.dart';
class CodeEditorAppBar extends StatelessWidget implements PreferredSizeWidget {
@@ -76,6 +79,11 @@ class CodeEditorAppBar extends StatelessWidget implements PreferredSizeWidget {
subtitleText = null;
}
final searchProvider = context.watch<SearchProvider?>();
final tabProvider = context.watch<TabProvider?>();
final hasSearchQuery = searchProvider != null && searchProvider.query.trim().isNotEmpty;
final isReplaceExpanded = searchProvider != null && searchProvider.isReplaceExpanded;
final isDark = theme.brightness == Brightness.dark;
return CodeEditorTapRegion(
@@ -111,6 +119,39 @@ class CodeEditorAppBar extends StatelessWidget implements PreferredSizeWidget {
],
),
actions: [
if (hasSearchQuery) ...[
Focus(
canRequestFocus: false,
skipTraversal: true,
child: IconButton(
visualDensity: VisualDensity.compact,
icon: const Icon(Icons.arrow_upward),
tooltip: l10n.searchPreviousMatch,
onPressed: () => tabProvider?.findPrevious(),
),
),
Focus(
canRequestFocus: false,
skipTraversal: true,
child: IconButton(
visualDensity: VisualDensity.compact,
icon: const Icon(Icons.arrow_downward),
tooltip: l10n.searchNextMatch,
onPressed: () => tabProvider?.findNext(),
),
),
if (isReplaceExpanded)
Focus(
canRequestFocus: false,
skipTraversal: true,
child: IconButton(
visualDensity: VisualDensity.compact,
icon: const Icon(Icons.find_replace),
tooltip: l10n.replaceCurrentMatch,
onPressed: () => tabProvider?.replaceCurrent(),
),
),
],
Focus(
canRequestFocus: false,
skipTraversal: true,
+173 -28
View File
@@ -14,6 +14,7 @@ import 'package:code_editor/services/code_completion/smart_prompts_builder.dart'
import 'package:code_editor/services/lsp/lsp_diagnostics_store.dart';
import 'package:code_editor/services/lsp/lsp_manager.dart';
import 'package:code_editor/services/lsp/lsp_protocol.dart';
import 'package:code_editor/utils/case_utils.dart';
import 'package:code_editor/utils/dialog_utils.dart';
import 'package:code_editor/utils/syntax_highlight_helper.dart';
import 'package:code_editor/widgets/code_autocomplete_view.dart';
@@ -488,6 +489,20 @@ class _CodeEditorWidgetState extends State<CodeEditorWidget> {
}
}
CodeFindValue _buildCurrentFindValue(SearchProvider? searchProvider) {
final isTextSearch = searchProvider?.options.mode == SearchMode.text;
final query = (isTextSearch ? searchProvider?.query : null) ?? '';
return CodeFindValue(
option: CodeFindOption(
pattern: query,
caseSensitive: searchProvider?.caseSensitive ?? false,
regex: searchProvider?.isRegex ?? false,
),
replaceMode: false,
searching: query.isNotEmpty,
);
}
void _syncSearchHighlight(SearchProvider? searchProvider) {
if (searchProvider == null || _findController == null) return;
// 仅在文本内容搜索模式(SearchMode.text)下才同步编辑区高亮;
@@ -501,13 +516,9 @@ class _CodeEditorWidgetState extends State<CodeEditorWidget> {
curOpt.pattern != query ||
curOpt.caseSensitive != searchProvider.caseSensitive ||
curOpt.regex != searchProvider.isRegex) {
// 严禁设置 _focusNode.canRequestFocus = false!
// 在 Flutter 框架中,当编辑区拥有焦点时(用户正在编辑代码输入),
// 将 canRequestFocus 置为 false 会强制触发 unfocus(),紧接着在输入时又重获焦点,
// 造成软键盘反复弹起收起(一跳一跳的致命抖动)。
// 同时此处保持 _findController.value 非 null(pattern 为 query),
// re_editor 在 pattern 为空时会自动将 matches 清空,既彻底清除了高亮,
// 又避免了在 value == null 时触发 re_editor 内部偷夺焦点的 requestFocus()。
if (_findController!.findInputController.text != query) {
_findController!.findInputController.text = query;
}
_findController!.value = CodeFindValue(
option: CodeFindOption(
pattern: query,
@@ -517,10 +528,130 @@ class _CodeEditorWidgetState extends State<CodeEditorWidget> {
replaceMode: false,
searching: query.isNotEmpty,
);
if (_findController!.findInputController.text != query) {
_findController!.findInputController.text = query;
_controller?.forceRepaint();
}
}
List<CodeLineSelection> _findAllMatches(RegExp regExp) {
if (_controller == null) return const [];
final matches = <CodeLineSelection>[];
final lines = _controller!.codeLines;
for (int i = 0; i < lines.length; i++) {
final lineText = lines[i].text;
for (final m in regExp.allMatches(lineText)) {
matches.add(CodeLineSelection(
baseIndex: i,
baseOffset: m.start,
extentIndex: i,
extentOffset: m.end,
));
}
}
return matches;
}
void _handleFindNext() {
if (!mounted || _controller == null) return;
SearchProvider? searchProvider;
try {
searchProvider = context.read<SearchProvider?>();
} catch (_) {}
if (searchProvider == null || searchProvider.query.trim().isEmpty) return;
final regExp = searchProvider.options.buildRegExp();
if (regExp == null) return;
final matches = _findAllMatches(regExp);
if (matches.isEmpty) return;
final curSelection = _controller!.selection;
final curEndLine = curSelection.endIndex;
final curEndOffset = curSelection.endOffset;
CodeLineSelection? target;
for (final match in matches) {
if (match.startIndex > curEndLine ||
(match.startIndex == curEndLine && match.startOffset >= curEndOffset)) {
target = match;
break;
}
}
target ??= matches.first;
_controller!.selection = target;
_controller!.makePositionCenterIfInvisible(target.start);
_syncSearchHighlight(searchProvider);
}
void _handleFindPrevious() {
if (!mounted || _controller == null) return;
SearchProvider? searchProvider;
try {
searchProvider = context.read<SearchProvider?>();
} catch (_) {}
if (searchProvider == null || searchProvider.query.trim().isEmpty) return;
final regExp = searchProvider.options.buildRegExp();
if (regExp == null) return;
final matches = _findAllMatches(regExp);
if (matches.isEmpty) return;
final curSelection = _controller!.selection;
final curStartLine = curSelection.startIndex;
final curStartOffset = curSelection.startOffset;
CodeLineSelection? target;
for (int i = matches.length - 1; i >= 0; i--) {
final match = matches[i];
if (match.endIndex < curStartLine ||
(match.endIndex == curStartLine && match.endOffset <= curStartOffset)) {
target = match;
break;
}
}
target ??= matches.last;
_controller!.selection = target;
_controller!.makePositionCenterIfInvisible(target.start);
_syncSearchHighlight(searchProvider);
}
void _handleReplaceCurrent() {
if (!mounted || _controller == null) return;
SearchProvider? searchProvider;
try {
searchProvider = context.read<SearchProvider?>();
} catch (_) {}
if (searchProvider == null || searchProvider.query.trim().isEmpty) return;
final selection = _controller!.selection;
if (selection.isCollapsed) return;
final selectedText = _controller!.selectedText;
final regExp = searchProvider.options.buildRegExp();
if (regExp == null) return;
// 先判断框选文本和搜索内容是否一致(全匹配校验)
final match = regExp.firstMatch(selectedText);
if (match == null || match.start != 0 || match.end != selectedText.length) {
// 不一致,静默失败
return;
}
// 计算替换文本(支持保留大小写)
String replacement = searchProvider.replaceText;
if (searchProvider.preserveCase) {
replacement = CaseUtils.applyPreserveCase(
original: selectedText,
replacement: replacement,
);
}
_controller!.replaceSelection(replacement);
// 替换后自动定位并框选下一个匹配
_handleFindNext();
}
void _onDiagnosticsChanged() {
@@ -571,7 +702,9 @@ class _CodeEditorWidgetState extends State<CodeEditorWidget> {
@override
void dispose() {
try {
_getTabProvider(context).registerSaveHandler(null);
final provider = _getTabProvider(context);
provider.registerSaveHandler(null);
provider.registerSearchHandlers();
} catch (_) {}
LspDiagnosticsStore.instance.removeListener(_onDiagnosticsChanged);
if (_currentLoadedPath != null) {
@@ -1110,19 +1243,19 @@ class _CodeEditorWidgetState extends State<CodeEditorWidget> {
);
_controller = newController;
SearchProvider? searchProvider;
try {
searchProvider = context.read<SearchProvider?>();
} catch (_) {}
final initialFindValue = _buildCurrentFindValue(searchProvider);
_findController?.dispose();
_findController = CodeFindController(
newController,
const CodeFindValue(
option: CodeFindOption(
pattern: '',
caseSensitive: false,
regex: false,
),
replaceMode: false,
searching: false,
),
initialFindValue,
);
if (initialFindValue.option.pattern.isNotEmpty) {
_findController!.findInputController.text = initialFindValue.option.pattern;
}
_currentLoadedPath = fullFilePath;
_currentIndentSize = activeIndentSize;
_errorMessage = null;
@@ -1145,6 +1278,11 @@ class _CodeEditorWidgetState extends State<CodeEditorWidget> {
try {
provider.setModified(tab.isModified);
provider.registerSaveHandler(() => _saveFile());
provider.registerSearchHandlers(
findNext: _handleFindNext,
findPrevious: _handleFindPrevious,
replace: _handleReplaceCurrent,
);
} catch (_) {}
if (mounted) {
@@ -1152,6 +1290,7 @@ class _CodeEditorWidgetState extends State<CodeEditorWidget> {
WidgetsBinding.instance.addPostFrameCallback((_) {
if (mounted) {
_handleNavigationTarget(provider);
_syncSearchHighlight(searchProvider);
}
});
}
@@ -1187,19 +1326,19 @@ class _CodeEditorWidgetState extends State<CodeEditorWidget> {
);
_controller = newController;
SearchProvider? searchProvider;
try {
searchProvider = context.read<SearchProvider?>();
} catch (_) {}
final initialFindValue = _buildCurrentFindValue(searchProvider);
_findController?.dispose();
_findController = CodeFindController(
newController,
const CodeFindValue(
option: CodeFindOption(
pattern: '',
caseSensitive: false,
regex: false,
),
replaceMode: false,
searching: false,
),
initialFindValue,
);
if (initialFindValue.option.pattern.isNotEmpty) {
_findController!.findInputController.text = initialFindValue.option.pattern;
}
_currentLoadedPath = fullFilePath;
_currentIndentSize = activeIndentSize;
_errorMessage = null;
@@ -1229,10 +1368,16 @@ class _CodeEditorWidgetState extends State<CodeEditorWidget> {
try {
provider.setModified(tab?.isModified ?? false);
provider.registerSaveHandler(() => _saveFile());
provider.registerSearchHandlers(
findNext: _handleFindNext,
findPrevious: _handleFindPrevious,
replace: _handleReplaceCurrent,
);
} catch (_) {}
WidgetsBinding.instance.addPostFrameCallback((_) {
if (mounted) {
_handleNavigationTarget(provider);
_syncSearchHighlight(searchProvider);
}
});
}
+118
View File
@@ -72,6 +72,114 @@ class _SearchPanelWidgetState extends State<SearchPanelWidget> {
}
final MenuController _menuController = MenuController();
final MenuController _replaceMenuController = MenuController();
/// 替换框右侧更多选项弹出菜单(保留大小写)
Widget _buildReplaceOptionsMenu(
SearchProvider searchProvider,
SearchOptions options,
ThemeData theme,
AppLocalizations l10n,
) {
final hasActiveFilter = options.preserveCase;
final colorScheme = theme.colorScheme;
return MenuAnchor(
controller: _replaceMenuController,
alignmentOffset: const Offset(0, 4),
style: MenuStyle(
elevation: const WidgetStatePropertyAll(4),
shape: WidgetStatePropertyAll(
RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)),
),
padding: const WidgetStatePropertyAll(
EdgeInsets.symmetric(vertical: 4),
),
),
menuChildren: [
StatefulBuilder(
builder: (context, setMenuState) {
final curOptions = searchProvider.options;
return SizedBox(
width: 220,
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
// 保留大小写
InkWell(
onTap: () {
searchProvider.togglePreserveCase();
setMenuState(() {});
},
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 4),
child: Row(
children: [
SizedBox(
width: 24,
child: Text(
'AB',
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 13,
color: curOptions.preserveCase
? colorScheme.primary
: colorScheme.onSurface,
),
),
),
const SizedBox(width: 8),
Expanded(
child: Text(
l10n.preserveCase,
style: const TextStyle(fontSize: 13),
),
),
Switch(
value: curOptions.preserveCase,
onChanged: (val) {
searchProvider.togglePreserveCase();
setMenuState(() {});
},
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
),
],
),
),
),
],
),
);
},
),
],
builder: (context, controller, child) {
return Tooltip(
message: l10n.replaceMoreOptions,
child: InkWell(
borderRadius: BorderRadius.circular(4),
onTap: () {
if (controller.isOpen) {
controller.close();
} else {
controller.open();
}
},
child: Padding(
padding: const EdgeInsets.all(2.0),
child: Icon(
Icons.more_vert,
size: 18,
color: hasActiveFilter
? colorScheme.primary
: colorScheme.onSurfaceVariant,
),
),
),
);
},
);
}
/// 搜索框右侧更多选项弹出菜单(区分大小写、全字匹配、正则表达式)
Widget _buildSearchOptionsMenu(
@@ -459,6 +567,13 @@ class _SearchPanelWidgetState extends State<SearchPanelWidget> {
maxLines: 1,
),
),
IconButton(
visualDensity: VisualDensity.compact,
iconSize: 18,
tooltip: l10n.searchRefresh,
icon: const Icon(Icons.refresh),
onPressed: () => searchProvider.triggerSearch(),
),
if (options.mode == SearchMode.fileName && result.fileResults.isNotEmpty) ...[
IconButton(
visualDensity: VisualDensity.compact,
@@ -721,6 +836,9 @@ class _SearchPanelWidgetState extends State<SearchPanelWidget> {
),
),
),
const SizedBox(width: 2),
// 更多替换选项菜单按钮(保留大小写)
_buildReplaceOptionsMenu(searchProvider, options, theme, l10n),
],
),
],