mirror of
https://github.com/flutter/packages.git
synced 2026-03-13 10:40:37 +08:00
Makes the analysis options changes described in
https://github.com/flutter/flutter/issues/178827:
- Adding
[omit_obvious_local_variable_types](https://dart.dev/tools/linter-rules/omit_obvious_local_variable_types)
- Adding
[specify_nonobvious_local_variable_types](https://dart.dev/tools/linter-rules/specify_nonobvious_local_variable_types)
- Adding
[specify_nonobvious_property_types](https://dart.dev/tools/linter-rules/specify_nonobvious_property_types)
- Adding
[type_annotate_public_apis](https://dart.dev/tools/linter-rules/type_annotate_public_apis)
- Removing
[always_specify_types](https://dart.dev/tools/linter-rules/always_specify_types)
After those changes, makes the following repo-wide changes:
- `dart fix --apply` in all packages and in script/tool/
- `dart format` in all packages and in script/tool/
- `update-excerpts` repo tooling command to update excerpts based on the
changes to their sources
Also updates the min Flutter/Dart SDK version to 3.35/3.9 for the
following packages, to avoid `analyze` failures in the `N-2` legacy
analysis run due to what appears to be a 3.9 change in what the Dart
analyzer continues to be an obvious local type in loop iterations:
- go_router
- google_fonts
- google_identity_services_web
- google_maps_flutter_web
- local_auth_platform_interface
- metrics_center
- multicast_dns
- pigeon
- rfw
- shared_preferences
- two_dimensional_scrollables
- vector_graphics_compiler
- mustache_template
- path_parsing
Because this is causing a significant amount of format churn already, I
took this opportunity to update the repository tooling to a min Dart SDK
of 3.8 (the N-2 stable version, so the earliest version we need the
tooling to support) to pick up the new format style, so the amount of
automated formatter change is higher in script/tool/ than in the
packages.
This does contain two manual changes (other than the repo tooling min
version):
-
d700b45c7d
changes `dynamic` to `Object?` in a few places where `dynamic` caused
analyzer warnings under the new rule set.
- Updates the repo tooling to ignore `.dart_tool/` when looking for
unexpected local `analysis_options.yaml` files, to fix issues running
the repo tool's `analyze` command locally based on recent changes in
`dart` behavior.
This does not include any CHANGELOG or version updates; even though we
normally version any changes to production code, mass automated changes
like this aren't worth the churn of releasing. This includes changes to
lib/example/main.dart and to README.md excerpts; while the style changes
will be user-visible on pub.dev, it's fine for those changes to wait for
the next release of each package.
Part of https://github.com/flutter/flutter/issues/178827
625 lines
12 KiB
Dart
625 lines
12 KiB
Dart
// Copyright 2013 The Flutter Authors
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
import 'package:args/command_runner.dart';
|
|
import 'package:file/file.dart';
|
|
import 'package:flutter_plugin_tools/src/common/core.dart';
|
|
import 'package:flutter_plugin_tools/src/update_excerpts_command.dart';
|
|
import 'package:git/git.dart';
|
|
import 'package:test/test.dart';
|
|
|
|
import 'mocks.dart';
|
|
import 'util.dart';
|
|
|
|
void runAllTests(MockPlatform platform) {
|
|
late Directory packagesDir;
|
|
late CommandRunner<void> runner;
|
|
|
|
setUp(() {
|
|
final RecordingProcessRunner processRunner;
|
|
final GitDir gitDir;
|
|
(:packagesDir, :processRunner, gitProcessRunner: _, :gitDir) =
|
|
configureBaseCommandMocks(platform: platform);
|
|
runner = CommandRunner<void>('', '')
|
|
..addCommand(
|
|
UpdateExcerptsCommand(
|
|
packagesDir,
|
|
platform: platform,
|
|
processRunner: processRunner,
|
|
gitDir: gitDir,
|
|
),
|
|
);
|
|
});
|
|
|
|
Future<void> testInjection({
|
|
required String before,
|
|
required String source,
|
|
required String after,
|
|
required String filename,
|
|
bool failOnChange = false,
|
|
}) async {
|
|
final RepositoryPackage package = createFakePackage(
|
|
'a_package',
|
|
packagesDir,
|
|
);
|
|
package.readmeFile.writeAsStringSync(before);
|
|
package.directory.childFile(filename).writeAsStringSync(source);
|
|
Object? errorObject;
|
|
final List<String> output = await runCapturingPrint(
|
|
runner,
|
|
<String>['update-excerpts', if (failOnChange) '--fail-on-change'],
|
|
errorHandler: (Object error) {
|
|
errorObject = error;
|
|
},
|
|
);
|
|
if (errorObject != null) {
|
|
fail('Failed: $errorObject\n\nOutput from excerpt command:\n$output');
|
|
}
|
|
expect(package.readmeFile.readAsStringSync(), after);
|
|
}
|
|
|
|
test('succeeds when nothing has changed', () async {
|
|
const filename = 'main.dart';
|
|
|
|
const readme =
|
|
'''
|
|
Example:
|
|
|
|
<?code-excerpt "$filename (SomeSection)"?>
|
|
```dart
|
|
A B C
|
|
```
|
|
''';
|
|
const source = '''
|
|
FAIL
|
|
// #docregion SomeSection
|
|
A B C
|
|
// #enddocregion SomeSection
|
|
FAIL
|
|
''';
|
|
await testInjection(
|
|
before: readme,
|
|
source: source,
|
|
after: readme,
|
|
filename: filename,
|
|
);
|
|
});
|
|
|
|
test('fails if example injection fails', () async {
|
|
final RepositoryPackage package = createFakePackage(
|
|
'a_package',
|
|
packagesDir,
|
|
);
|
|
package.readmeFile.writeAsStringSync('''
|
|
Example:
|
|
|
|
<?code-excerpt "main.dart (UnknownSection)"?>
|
|
```dart
|
|
A B C
|
|
```
|
|
''');
|
|
package.directory.childFile('main.dart').writeAsStringSync('''
|
|
FAIL
|
|
// #docregion SomeSection
|
|
A B C
|
|
// #enddocregion SomeSection
|
|
FAIL
|
|
''');
|
|
|
|
Error? commandError;
|
|
final List<String> output = await runCapturingPrint(
|
|
runner,
|
|
<String>['update-excerpts'],
|
|
errorHandler: (Error e) {
|
|
commandError = e;
|
|
},
|
|
);
|
|
|
|
expect(commandError, isA<ToolExit>());
|
|
expect(
|
|
output,
|
|
containsAllInOrder(<Matcher>[
|
|
contains('Injecting excerpts failed:'),
|
|
contains(
|
|
'main.dart: did not find a "// #docregion UnknownSection" pragma',
|
|
),
|
|
]),
|
|
);
|
|
});
|
|
|
|
test('updates files', () async {
|
|
const filename = 'main.dart';
|
|
|
|
const before =
|
|
'''
|
|
Example:
|
|
|
|
<?code-excerpt "$filename (SomeSection)"?>
|
|
```dart
|
|
X Y Z
|
|
```
|
|
''';
|
|
|
|
const source = '''
|
|
FAIL
|
|
// #docregion SomeSection
|
|
A B C
|
|
// #enddocregion SomeSection
|
|
FAIL
|
|
''';
|
|
|
|
const after =
|
|
'''
|
|
Example:
|
|
|
|
<?code-excerpt "$filename (SomeSection)"?>
|
|
```dart
|
|
A B C
|
|
```
|
|
''';
|
|
|
|
await testInjection(
|
|
before: before,
|
|
source: source,
|
|
after: after,
|
|
filename: filename,
|
|
);
|
|
});
|
|
|
|
test('fails if READMEs are changed with --fail-on-change', () async {
|
|
final RepositoryPackage package = createFakePackage(
|
|
'a_package',
|
|
packagesDir,
|
|
);
|
|
package.readmeFile.writeAsStringSync('''
|
|
Example:
|
|
|
|
<?code-excerpt "main.dart (SomeSection)"?>
|
|
```dart
|
|
X Y Z
|
|
```
|
|
''');
|
|
package.directory.childFile('main.dart').writeAsStringSync('''
|
|
FAIL
|
|
// #docregion SomeSection
|
|
A B C
|
|
// #enddocregion SomeSection
|
|
FAIL
|
|
''');
|
|
|
|
Error? commandError;
|
|
final List<String> output = await runCapturingPrint(
|
|
runner,
|
|
<String>['update-excerpts', '--fail-on-change'],
|
|
errorHandler: (Error e) {
|
|
commandError = e;
|
|
},
|
|
);
|
|
|
|
expect(commandError, isA<ToolExit>());
|
|
expect(
|
|
output.join('\n'),
|
|
contains('The following files have out of date excerpts:'),
|
|
);
|
|
});
|
|
|
|
test(
|
|
'does not fail if READMEs are not changed with --fail-on-change',
|
|
() async {
|
|
const filename = 'main.dart';
|
|
|
|
const readme =
|
|
'''
|
|
Example:
|
|
|
|
<?code-excerpt "$filename (aa)"?>
|
|
```dart
|
|
A
|
|
```
|
|
<?code-excerpt "$filename (bb)"?>
|
|
```dart
|
|
B
|
|
```
|
|
''';
|
|
|
|
const source = '''
|
|
// #docregion aa
|
|
A
|
|
// #enddocregion aa
|
|
// #docregion bb
|
|
B
|
|
// #enddocregion bb
|
|
''';
|
|
|
|
await testInjection(
|
|
before: readme,
|
|
source: source,
|
|
after: readme,
|
|
filename: filename,
|
|
failOnChange: true,
|
|
);
|
|
},
|
|
);
|
|
|
|
test('indents the plaster', () async {
|
|
const filename = 'main.dart';
|
|
|
|
const before =
|
|
'''
|
|
Example:
|
|
|
|
<?code-excerpt "$filename (SomeSection)"?>
|
|
```dart
|
|
```
|
|
''';
|
|
|
|
const source = '''
|
|
// #docregion SomeSection
|
|
A
|
|
// #enddocregion SomeSection
|
|
// #docregion SomeSection
|
|
B
|
|
// #enddocregion SomeSection
|
|
''';
|
|
|
|
const after =
|
|
'''
|
|
Example:
|
|
|
|
<?code-excerpt "$filename (SomeSection)"?>
|
|
```dart
|
|
A
|
|
// ···
|
|
B
|
|
```
|
|
''';
|
|
|
|
await testInjection(
|
|
before: before,
|
|
source: source,
|
|
after: after,
|
|
filename: filename,
|
|
);
|
|
});
|
|
|
|
test('does not unindent blocks if plaster will not unindent', () async {
|
|
const filename = 'main.dart';
|
|
|
|
const before =
|
|
'''
|
|
Example:
|
|
|
|
<?code-excerpt "$filename (SomeSection)"?>
|
|
```dart
|
|
```
|
|
''';
|
|
|
|
const source = '''
|
|
// #docregion SomeSection
|
|
A
|
|
// #enddocregion SomeSection
|
|
// #docregion SomeSection
|
|
B
|
|
// #enddocregion SomeSection
|
|
''';
|
|
|
|
const after =
|
|
'''
|
|
Example:
|
|
|
|
<?code-excerpt "$filename (SomeSection)"?>
|
|
```dart
|
|
A
|
|
// ···
|
|
B
|
|
```
|
|
''';
|
|
|
|
await testInjection(
|
|
before: before,
|
|
source: source,
|
|
after: after,
|
|
filename: filename,
|
|
);
|
|
});
|
|
|
|
test('unindents blocks', () async {
|
|
const filename = 'main.dart';
|
|
|
|
const before =
|
|
'''
|
|
Example:
|
|
|
|
<?code-excerpt "$filename (SomeSection)"?>
|
|
```dart
|
|
```
|
|
''';
|
|
|
|
const source = '''
|
|
// #docregion SomeSection
|
|
A
|
|
// #enddocregion SomeSection
|
|
// #docregion SomeSection
|
|
B
|
|
// #enddocregion SomeSection
|
|
''';
|
|
|
|
const after =
|
|
'''
|
|
Example:
|
|
|
|
<?code-excerpt "$filename (SomeSection)"?>
|
|
```dart
|
|
A
|
|
// ···
|
|
B
|
|
```
|
|
''';
|
|
|
|
await testInjection(
|
|
before: before,
|
|
source: source,
|
|
after: after,
|
|
filename: filename,
|
|
);
|
|
});
|
|
|
|
test('unindents blocks and plaster', () async {
|
|
const filename = 'main.dart';
|
|
|
|
const before =
|
|
'''
|
|
Example:
|
|
|
|
<?code-excerpt "$filename (SomeSection)"?>
|
|
```dart
|
|
```
|
|
''';
|
|
|
|
const source = '''
|
|
// #docregion SomeSection
|
|
A
|
|
// #enddocregion SomeSection
|
|
// #docregion SomeSection
|
|
B
|
|
// #enddocregion SomeSection
|
|
''';
|
|
|
|
const after =
|
|
'''
|
|
Example:
|
|
|
|
<?code-excerpt "$filename (SomeSection)"?>
|
|
```dart
|
|
A
|
|
// ···
|
|
B
|
|
```
|
|
''';
|
|
|
|
await testInjection(
|
|
before: before,
|
|
source: source,
|
|
after: after,
|
|
filename: filename,
|
|
);
|
|
});
|
|
|
|
test('relative path bases', () async {
|
|
final RepositoryPackage package = createFakePackage(
|
|
'a_package',
|
|
packagesDir,
|
|
);
|
|
package.readmeFile.writeAsStringSync('''
|
|
<?code-excerpt "main.dart (a)"?>
|
|
```dart
|
|
```
|
|
<?code-excerpt "test/main.dart (a)"?>
|
|
```dart
|
|
```
|
|
<?code-excerpt "test/test/main.dart (a)"?>
|
|
```dart
|
|
```
|
|
<?code-excerpt path-base="test"?>
|
|
<?code-excerpt "main.dart (a)"?>
|
|
```dart
|
|
```
|
|
<?code-excerpt "../main.dart (a)"?>
|
|
```dart
|
|
```
|
|
<?code-excerpt "test/main.dart (a)"?>
|
|
```dart
|
|
```
|
|
<?code-excerpt path-base="/packages/a_package"?>
|
|
<?code-excerpt "main.dart (a)"?>
|
|
```dart
|
|
```
|
|
<?code-excerpt "test/main.dart (a)"?>
|
|
```dart
|
|
```
|
|
''');
|
|
package.directory.childFile('main.dart').writeAsStringSync('''
|
|
// #docregion a
|
|
X
|
|
// #enddocregion a
|
|
''');
|
|
package.directory.childDirectory('test').createSync();
|
|
package.directory
|
|
.childDirectory('test')
|
|
.childFile('main.dart')
|
|
.writeAsStringSync('''
|
|
// #docregion a
|
|
Y
|
|
// #enddocregion a
|
|
''');
|
|
package.directory
|
|
.childDirectory('test')
|
|
.childDirectory('test')
|
|
.createSync();
|
|
package.directory
|
|
.childDirectory('test')
|
|
.childDirectory('test')
|
|
.childFile('main.dart')
|
|
.writeAsStringSync('''
|
|
// #docregion a
|
|
Z
|
|
// #enddocregion a
|
|
''');
|
|
await runCapturingPrint(runner, <String>['update-excerpts']);
|
|
expect(package.readmeFile.readAsStringSync(), '''
|
|
<?code-excerpt "main.dart (a)"?>
|
|
```dart
|
|
X
|
|
```
|
|
<?code-excerpt "test/main.dart (a)"?>
|
|
```dart
|
|
Y
|
|
```
|
|
<?code-excerpt "test/test/main.dart (a)"?>
|
|
```dart
|
|
Z
|
|
```
|
|
<?code-excerpt path-base="test"?>
|
|
<?code-excerpt "main.dart (a)"?>
|
|
```dart
|
|
Y
|
|
```
|
|
<?code-excerpt "../main.dart (a)"?>
|
|
```dart
|
|
X
|
|
```
|
|
<?code-excerpt "test/main.dart (a)"?>
|
|
```dart
|
|
Z
|
|
```
|
|
<?code-excerpt path-base="/packages/a_package"?>
|
|
<?code-excerpt "main.dart (a)"?>
|
|
```dart
|
|
X
|
|
```
|
|
<?code-excerpt "test/main.dart (a)"?>
|
|
```dart
|
|
Y
|
|
```
|
|
''');
|
|
});
|
|
|
|
test('logs snippets checked', () async {
|
|
final RepositoryPackage package = createFakePackage(
|
|
'a_package',
|
|
packagesDir,
|
|
);
|
|
package.readmeFile.writeAsStringSync('''
|
|
Example:
|
|
|
|
<?code-excerpt "main.dart (SomeSection)"?>
|
|
```dart
|
|
A B C
|
|
```
|
|
''');
|
|
package.directory.childFile('main.dart').writeAsStringSync('''
|
|
FAIL
|
|
// #docregion SomeSection
|
|
A B C
|
|
// #enddocregion SomeSection
|
|
FAIL
|
|
''');
|
|
|
|
final List<String> output = await runCapturingPrint(runner, <String>[
|
|
'update-excerpts',
|
|
]);
|
|
|
|
expect(
|
|
output,
|
|
containsAllInOrder(<Matcher>[
|
|
contains('Checked 1 snippet(s) in README.md.'),
|
|
]),
|
|
);
|
|
});
|
|
|
|
group('File type tests', () {
|
|
const testCases = <Map<String, String>>[
|
|
<String, String>{'filename': 'main.cc', 'language': 'c++'},
|
|
<String, String>{'filename': 'main.cpp', 'language': 'c++'},
|
|
<String, String>{'filename': 'main.dart'},
|
|
<String, String>{'filename': 'main.js'},
|
|
<String, String>{'filename': 'main.kt', 'language': 'kotlin'},
|
|
<String, String>{'filename': 'main.java'},
|
|
<String, String>{'filename': 'main.gradle', 'language': 'groovy'},
|
|
<String, String>{'filename': 'main.m', 'language': 'objectivec'},
|
|
<String, String>{'filename': 'main.swift'},
|
|
<String, String>{
|
|
'filename': 'main.css',
|
|
'prefix': '/* ',
|
|
'suffix': ' */',
|
|
},
|
|
<String, String>{
|
|
'filename': 'main.html',
|
|
'prefix': '<!--',
|
|
'suffix': '-->',
|
|
},
|
|
<String, String>{
|
|
'filename': 'main.xml',
|
|
'prefix': '<!--',
|
|
'suffix': '-->',
|
|
},
|
|
<String, String>{'filename': 'main.yaml', 'prefix': '# '},
|
|
<String, String>{'filename': 'main.sh', 'prefix': '# '},
|
|
<String, String>{'filename': 'main', 'language': 'txt', 'prefix': ''},
|
|
];
|
|
|
|
void runTest(Map<String, String> testCase) {
|
|
test('updates ${testCase['filename']} files', () async {
|
|
final String filename = testCase['filename']!;
|
|
final String language = testCase['language'] ?? filename.split('.')[1];
|
|
final String prefix = testCase['prefix'] ?? '// ';
|
|
final String suffix = testCase['suffix'] ?? '';
|
|
|
|
final before =
|
|
'''
|
|
Example:
|
|
|
|
<?code-excerpt "$filename (SomeSection)"?>
|
|
```$language
|
|
X Y Z
|
|
```
|
|
''';
|
|
|
|
final source =
|
|
'''
|
|
FAIL
|
|
$prefix#docregion SomeSection$suffix
|
|
A B C
|
|
$prefix#enddocregion SomeSection$suffix
|
|
FAIL
|
|
''';
|
|
|
|
final after =
|
|
'''
|
|
Example:
|
|
|
|
<?code-excerpt "$filename (SomeSection)"?>
|
|
```$language
|
|
A B C
|
|
```
|
|
''';
|
|
|
|
await testInjection(
|
|
before: before,
|
|
source: source,
|
|
after: after,
|
|
filename: filename,
|
|
);
|
|
});
|
|
}
|
|
|
|
testCases.forEach(runTest);
|
|
});
|
|
}
|
|
|
|
void main() {
|
|
runAllTests(MockPlatform());
|
|
runAllTests(MockPlatform(isWindows: true));
|
|
}
|