DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix the --empty flag to not try working with non-app templates (#141632)

Browse Source 
## Description

This adds a check to make sure that the `--empty` flag isn't applied to non-app templates.

## Related Issues
 - Fixes https://github.com/flutter/flutter/issues/141592

## Tests
 - Added a test.
This commit is contained in:
Greg Spencer 2024-01-17 08:51:03 -08:00 committed by GitHub
parent 9bbff1bb73
commit 4e3be0bf8e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/flutter_tools/lib/src/commands/create.dart
View File

@ -208,17 +208,19 @@ class CreateCommand extends CreateBase {
String? sampleCode;
final String? sampleArgument = stringArg('sample');
final bool emptyArgument = boolArg('empty');
final FlutterProjectType template = _getProjectType(projectDir);
if (sampleArgument != null) {
final String? templateArgument = stringArg('template');
if (templateArgument != null && FlutterProjectType.fromCliName(templateArgument) != FlutterProjectType.app) {
if (template != FlutterProjectType.app) {
throwToolExit('Cannot specify --sample with a project type other than '
'"${FlutterProjectType.app.cliName}"');
}
// Fetch the sample from the server.
sampleCode = await _fetchSampleFromServer(sampleArgument);
}
if (emptyArgument && template != FlutterProjectType.app) {
throwToolExit('The --empty flag is only supported for the app template.');
}
final FlutterProjectType template = _getProjectType(projectDir);
final bool generateModule = template == FlutterProjectType.module;
final bool generateMethodChannelsPlugin = template == FlutterProjectType.plugin;
final bool generateFfiPackage = template == FlutterProjectType.packageFfi;
@ -764,8 +766,15 @@ Your $application code is in $relativeAppMain.
int _removeTestDir(Directory directory) {
final Directory testDir = directory.childDirectory('test');
if (!testDir.existsSync()) {
return 0;
}
final List<FileSystemEntity> files = testDir.listSync(recursive: true);
testDir.deleteSync(recursive: true);
try {
testDir.deleteSync(recursive: true);
} on FileSystemException catch (exception) {
throwToolExit('Failed to delete test directory: $exception');
}
return -files.length;
}

20
packages/flutter_tools/test/commands.shard/permeable/create_test.dart
View File

@ -2038,6 +2038,26 @@ void main() {
isNot(contains('Getting Started')));
});
testUsingContext("can't create an empty non-application project", () async {
final String outputDir = globals.fs.path.join(tempDir.path, 'test_project');
final CreateCommand command = CreateCommand();
final CommandRunner<void> runner = createTestCommandRunner(command);
final List<String> args = <String>[
'create',
'--no-pub',
'--empty',
'--template=plugin',
outputDir,
];
await expectLater(
runner.run(args),
throwsToolExit(
message: 'The --empty flag is only supported for the app template.',
));
});
testUsingContext('can create a sample-based project', () async {
await _createAndAnalyzeProject(
projectDir,