1
This commit is contained in:
1 parent
85fe316cf1
commit
96358eae07
29 files changed
+11610
-503
No files matched your search
@@ -1,10 +1,13 @@
|
||||
import 'dart:io';
|
||||
import 'package:code_editor/l10n/app_localizations.dart';
|
||||
import 'package:code_editor/models/project_history.dart';
|
||||
import 'package:code_editor/providers/git_provider.dart';
|
||||
import 'package:code_editor/providers/project_provider.dart';
|
||||
import 'package:code_editor/providers/run_provider.dart';
|
||||
import 'package:code_editor/providers/search_provider.dart';
|
||||
import 'package:code_editor/providers/settings_provider.dart';
|
||||
import 'package:code_editor/providers/tab_provider.dart';
|
||||
import 'package:code_editor/services/git_service.dart';
|
||||
import 'package:code_editor/services/internal_project_service.dart';
|
||||
import 'package:code_editor/widgets/code_editor_drawer.dart';
|
||||
import 'package:code_editor/widgets/file_tree_widget.dart';
|
||||
@@ -24,6 +27,8 @@ void main() {
|
||||
late TabProvider tabProvider;
|
||||
late SettingsProvider settingsProvider;
|
||||
late RunProvider runProvider;
|
||||
late SearchProvider searchProvider;
|
||||
late GitProvider gitProvider;
|
||||
|
||||
setUp(() async {
|
||||
SharedPreferences.setMockInitialValues({});
|
||||
@@ -37,6 +42,8 @@ void main() {
|
||||
tabProvider = TabProvider()..bindProjectProvider(projectProvider);
|
||||
settingsProvider = SettingsProvider();
|
||||
runProvider = RunProvider();
|
||||
searchProvider = SearchProvider()..bindRootPath(testProjectDir.path);
|
||||
gitProvider = GitProvider();
|
||||
|
||||
await projectProvider.switchProject(
|
||||
ProjectHistory(
|
||||
@@ -47,6 +54,7 @@ void main() {
|
||||
});
|
||||
|
||||
tearDown(() {
|
||||
GitService.instance.resetForTesting();
|
||||
InternalProjectService.instance.customProjectsDir = null;
|
||||
if (tempBaseDir.existsSync()) {
|
||||
tempBaseDir.deleteSync(recursive: true);
|
||||
@@ -60,6 +68,8 @@ void main() {
|
||||
ChangeNotifierProvider<TabProvider>.value(value: tabProvider),
|
||||
ChangeNotifierProvider<SettingsProvider>.value(value: settingsProvider),
|
||||
ChangeNotifierProvider<RunProvider>.value(value: runProvider),
|
||||
ChangeNotifierProvider<SearchProvider>.value(value: searchProvider),
|
||||
ChangeNotifierProvider<GitProvider>.value(value: gitProvider),
|
||||
],
|
||||
child: MaterialApp(
|
||||
localizationsDelegates: const [
|
||||
|
||||
@@ -0,0 +1,158 @@
|
||||
import 'package:code_editor/models/file_item.dart';
|
||||
import 'package:code_editor/models/git_model.dart';
|
||||
import 'package:code_editor/providers/git_provider.dart';
|
||||
import 'package:code_editor/providers/project_provider.dart';
|
||||
import 'package:code_editor/providers/tab_provider.dart';
|
||||
import 'package:code_editor/utils/git_decoration_utils.dart';
|
||||
import 'package:code_editor/widgets/file_item_widget.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
|
||||
void main() {
|
||||
group('GitDecorationUtils Tests', () {
|
||||
test('getStatusLetter returns correct letter for each type', () {
|
||||
expect(GitDecorationUtils.getStatusLetter(GitFileStatusType.modified), 'M');
|
||||
expect(GitDecorationUtils.getStatusLetter(GitFileStatusType.untracked), 'U');
|
||||
expect(GitDecorationUtils.getStatusLetter(GitFileStatusType.added), 'A');
|
||||
expect(GitDecorationUtils.getStatusLetter(GitFileStatusType.deleted), 'D');
|
||||
expect(GitDecorationUtils.getStatusLetter(GitFileStatusType.unmerged), '!');
|
||||
expect(GitDecorationUtils.getStatusLetter(GitFileStatusType.renamed), 'R');
|
||||
expect(GitDecorationUtils.getStatusLetter(GitFileStatusType.ignored), isNull);
|
||||
});
|
||||
|
||||
test('getPriority orders conflict > deleted > modified > added > untracked', () {
|
||||
final unmergedP = GitDecorationUtils.getPriority(GitFileStatusType.unmerged);
|
||||
final deletedP = GitDecorationUtils.getPriority(GitFileStatusType.deleted);
|
||||
final modifiedP = GitDecorationUtils.getPriority(GitFileStatusType.modified);
|
||||
final addedP = GitDecorationUtils.getPriority(GitFileStatusType.added);
|
||||
final untrackedP = GitDecorationUtils.getPriority(GitFileStatusType.untracked);
|
||||
|
||||
expect(unmergedP > deletedP, isTrue);
|
||||
expect(deletedP > modifiedP, isTrue);
|
||||
expect(modifiedP > addedP, isTrue);
|
||||
expect(addedP > untrackedP, isTrue);
|
||||
});
|
||||
});
|
||||
|
||||
group('GitProvider File Tree Map Tests', () {
|
||||
test('getFileStatus and getDirectoryStatus aggregate bottom-up correctly', () {
|
||||
final provider = GitProvider();
|
||||
const root = '/mock/repo';
|
||||
final changedFiles = [
|
||||
const GitFileStatus(
|
||||
path: '/mock/repo/lib/widgets/button.dart',
|
||||
relativePath: 'lib/widgets/button.dart',
|
||||
statusType: GitFileStatusType.modified,
|
||||
),
|
||||
const GitFileStatus(
|
||||
path: '/mock/repo/lib/main.dart',
|
||||
relativePath: 'lib/main.dart',
|
||||
statusType: GitFileStatusType.untracked,
|
||||
),
|
||||
const GitFileStatus(
|
||||
path: '/mock/repo/lib/widgets/header.dart',
|
||||
relativePath: 'lib/widgets/header.dart',
|
||||
statusType: GitFileStatusType.unmerged,
|
||||
),
|
||||
];
|
||||
|
||||
provider.setStateForTesting(
|
||||
rootPath: root,
|
||||
currentRepoPath: root,
|
||||
changedFiles: changedFiles,
|
||||
);
|
||||
|
||||
// 直接查文件
|
||||
final btnStatus = provider.getFileStatus('/mock/repo/lib/widgets/button.dart');
|
||||
expect(btnStatus, isNotNull);
|
||||
expect(btnStatus!.statusType, GitFileStatusType.modified);
|
||||
|
||||
final mainStatus = provider.getFileStatus('/mock/repo/lib/main.dart');
|
||||
expect(mainStatus, isNotNull);
|
||||
expect(mainStatus!.statusType, GitFileStatusType.untracked);
|
||||
|
||||
// 查目录:/mock/repo/lib/widgets 同时含有 modified 和 unmerged -> 聚合出 unmerged(最高优先级)
|
||||
final widgetsDirStatus = provider.getDirectoryStatus('/mock/repo/lib/widgets');
|
||||
expect(widgetsDirStatus, GitFileStatusType.unmerged);
|
||||
|
||||
// 查父级目录:/mock/repo/lib 继承最高优先级 unmerged
|
||||
final libDirStatus = provider.getDirectoryStatus('/mock/repo/lib');
|
||||
expect(libDirStatus, GitFileStatusType.unmerged);
|
||||
|
||||
// 查不存在的文件
|
||||
final absent = provider.getFileStatus('/mock/repo/lib/unknown.dart');
|
||||
expect(absent, isNull);
|
||||
});
|
||||
});
|
||||
|
||||
group('FileItemWidget Git Decoration UI Tests', () {
|
||||
testWidgets('renders letter trailing for modified file and colored dot for folder', (tester) async {
|
||||
final gitProvider = GitProvider();
|
||||
final projectProvider = ProjectProvider();
|
||||
final tabProvider = TabProvider();
|
||||
|
||||
const filePath = '/test/project/file.dart';
|
||||
const dirPath = '/test/project/dir';
|
||||
|
||||
gitProvider.setStateForTesting(
|
||||
rootPath: '/test/project',
|
||||
currentRepoPath: '/test/project',
|
||||
changedFiles: [
|
||||
const GitFileStatus(
|
||||
path: filePath,
|
||||
relativePath: 'file.dart',
|
||||
statusType: GitFileStatusType.modified,
|
||||
),
|
||||
const GitFileStatus(
|
||||
path: '/test/project/dir/nested.dart',
|
||||
relativePath: 'dir/nested.dart',
|
||||
statusType: GitFileStatusType.untracked,
|
||||
),
|
||||
],
|
||||
);
|
||||
|
||||
final fileItem = FileItem(
|
||||
path: filePath,
|
||||
name: 'file.dart',
|
||||
isDirectory: false,
|
||||
depth: 0,
|
||||
);
|
||||
|
||||
final dirItem = FileItem(
|
||||
path: dirPath,
|
||||
name: 'dir',
|
||||
isDirectory: true,
|
||||
depth: 0,
|
||||
);
|
||||
|
||||
await tester.pumpWidget(
|
||||
MultiProvider(
|
||||
providers: [
|
||||
ChangeNotifierProvider.value(value: gitProvider),
|
||||
ChangeNotifierProvider.value(value: projectProvider),
|
||||
ChangeNotifierProvider.value(value: tabProvider),
|
||||
],
|
||||
child: MaterialApp(
|
||||
home: Scaffold(
|
||||
body: Column(
|
||||
children: [
|
||||
FileItemWidget(fileItem: fileItem),
|
||||
FileItemWidget(fileItem: dirItem),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
await tester.pumpAndSettle();
|
||||
|
||||
// 验证文件项中出现了 'M' 标识
|
||||
expect(find.text('M'), findsOneWidget);
|
||||
|
||||
// 验证文件夹项中没有文本字母标识,但渲染了实心圆点
|
||||
expect(find.text('dir'), findsOneWidget);
|
||||
});
|
||||
});
|
||||
}
|
||||
File diff suppressed because it is too large.
Load diff
@@ -1,7 +1,9 @@
|
||||
import 'dart:io';
|
||||
import 'package:code_editor/l10n/app_localizations.dart';
|
||||
import 'package:code_editor/models/editor_tab_item.dart';
|
||||
import 'package:code_editor/models/project_history.dart';
|
||||
import 'package:code_editor/models/search_model.dart';
|
||||
import 'package:code_editor/providers/git_provider.dart';
|
||||
import 'package:code_editor/providers/project_provider.dart';
|
||||
import 'package:code_editor/providers/run_provider.dart';
|
||||
import 'package:code_editor/providers/search_provider.dart';
|
||||
@@ -13,6 +15,7 @@ import 'package:code_editor/widgets/code_editor_drawer.dart';
|
||||
import 'package:code_editor/widgets/code_editor_widget.dart';
|
||||
import 'package:code_editor/widgets/search/search_panel_widget.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:re_editor/re_editor.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:path/path.dart' as p;
|
||||
import 'package:provider/provider.dart';
|
||||
@@ -28,6 +31,7 @@ void main() {
|
||||
late SettingsProvider settingsProvider;
|
||||
late RunProvider runProvider;
|
||||
late SearchProvider searchProvider;
|
||||
late GitProvider gitProvider;
|
||||
|
||||
setUp(() async {
|
||||
SharedPreferences.setMockInitialValues({});
|
||||
@@ -42,6 +46,7 @@ void main() {
|
||||
settingsProvider = SettingsProvider();
|
||||
runProvider = RunProvider();
|
||||
searchProvider = SearchProvider()..bindRootPath(testProjectDir.path);
|
||||
gitProvider = GitProvider();
|
||||
|
||||
await projectProvider.switchProject(
|
||||
ProjectHistory(
|
||||
@@ -197,6 +202,7 @@ void main() {
|
||||
ChangeNotifierProvider<SettingsProvider>.value(value: settingsProvider),
|
||||
ChangeNotifierProvider<RunProvider>.value(value: runProvider),
|
||||
ChangeNotifierProvider<SearchProvider>.value(value: searchProvider),
|
||||
ChangeNotifierProvider<GitProvider>.value(value: gitProvider),
|
||||
],
|
||||
child: MaterialApp(
|
||||
localizationsDelegates: AppLocalizations.localizationsDelegates,
|
||||
@@ -396,6 +402,7 @@ void main() {
|
||||
ChangeNotifierProvider<SettingsProvider>.value(value: settingsProvider),
|
||||
ChangeNotifierProvider<RunProvider>.value(value: runProvider),
|
||||
ChangeNotifierProvider<SearchProvider>.value(value: searchProvider),
|
||||
ChangeNotifierProvider<GitProvider>.value(value: gitProvider),
|
||||
],
|
||||
child: const MaterialApp(
|
||||
localizationsDelegates: AppLocalizations.localizationsDelegates,
|
||||
@@ -570,6 +577,7 @@ void main() {
|
||||
ChangeNotifierProvider<SettingsProvider>.value(value: settingsProvider),
|
||||
ChangeNotifierProvider<RunProvider>.value(value: runProvider),
|
||||
ChangeNotifierProvider<SearchProvider>.value(value: searchProvider),
|
||||
ChangeNotifierProvider<GitProvider>.value(value: gitProvider),
|
||||
],
|
||||
child: MaterialApp(
|
||||
localizationsDelegates: AppLocalizations.localizationsDelegates,
|
||||
@@ -658,5 +666,75 @@ void main() {
|
||||
expect(mockFiles[1].isExpanded, isTrue);
|
||||
expect(searchProvider.scrollOffset, equals(150.0));
|
||||
});
|
||||
|
||||
testWidgets('Editor focus and keyboard stability: focus is not lost or bounced during editing or search clear', (tester) async {
|
||||
final mainPath = p.normalize(p.join(testProjectDir.path, 'lib', 'main.dart'));
|
||||
final tabMain = EditorTabItem(
|
||||
path: mainPath,
|
||||
content: 'void main() {\n print("hello");\n}\n',
|
||||
originalContent: 'void main() {\n print("hello");\n}\n',
|
||||
isLoaded: true,
|
||||
isModified: false,
|
||||
);
|
||||
tabProvider.setOpenTabsForTesting([tabMain], activePath: mainPath);
|
||||
|
||||
await tester.pumpWidget(
|
||||
MultiProvider(
|
||||
providers: [
|
||||
ChangeNotifierProvider<ProjectProvider>.value(value: projectProvider),
|
||||
ChangeNotifierProvider<TabProvider>.value(value: tabProvider),
|
||||
ChangeNotifierProvider<SettingsProvider>.value(value: settingsProvider),
|
||||
ChangeNotifierProvider<RunProvider>.value(value: runProvider),
|
||||
ChangeNotifierProvider<SearchProvider>.value(value: searchProvider),
|
||||
],
|
||||
child: MaterialApp(
|
||||
localizationsDelegates: AppLocalizations.localizationsDelegates,
|
||||
supportedLocales: AppLocalizations.supportedLocales,
|
||||
locale: const Locale('zh'),
|
||||
home: Scaffold(
|
||||
body: CodeEditorWidget(
|
||||
filePath: mainPath,
|
||||
rootPath: testProjectDir.path,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
await tester.pump();
|
||||
await tester.pump(const Duration(milliseconds: 300));
|
||||
await tester.pump();
|
||||
|
||||
// Find CodeEditor focus node
|
||||
final codeEditorFinder = find.byType(CodeEditor);
|
||||
expect(codeEditorFinder, findsOneWidget);
|
||||
final codeEditor = tester.widget<CodeEditor>(codeEditorFinder);
|
||||
final focusNode = codeEditor.focusNode!;
|
||||
|
||||
// 1. Focus the editor (user taps editor to bring up soft keyboard)
|
||||
focusNode.requestFocus();
|
||||
await tester.pump();
|
||||
await tester.pump(const Duration(milliseconds: 50));
|
||||
expect(focusNode.hasFocus, isTrue);
|
||||
expect(focusNode.canRequestFocus, isTrue);
|
||||
|
||||
// 2. Perform search in text mode
|
||||
searchProvider.setMode(SearchMode.text);
|
||||
searchProvider.setQuery('void');
|
||||
await tester.pump();
|
||||
await tester.pump(const Duration(milliseconds: 50));
|
||||
|
||||
// Focus should NOT be lost or disabled
|
||||
expect(focusNode.hasFocus, isTrue);
|
||||
expect(focusNode.canRequestFocus, isTrue);
|
||||
|
||||
// 3. Clear search query to empty (simulating user deleting search text)
|
||||
searchProvider.setQuery('');
|
||||
await tester.pump();
|
||||
await tester.pump(const Duration(milliseconds: 50));
|
||||
|
||||
// Focus must remain rock solid! canRequestFocus must NEVER be set to false!
|
||||
expect(focusNode.hasFocus, isTrue);
|
||||
expect(focusNode.canRequestFocus, isTrue);
|
||||
});
|
||||
});
|
||||
}
|
||||
Reference in new issue
Block a user