Unverified Commit 83e5a8a0 authored by Alexandre Ardhuin's avatar Alexandre Ardhuin Committed by GitHub

some formatting changes (#41640)

parent 85a3da3a
...@@ -176,7 +176,7 @@ void main() { ...@@ -176,7 +176,7 @@ void main() {
primaryColor: Colors.black, primaryColor: Colors.black,
primaryColorDark: Colors.black, primaryColorDark: Colors.black,
primaryColorLight: Colors.black, primaryColorLight: Colors.black,
valueIndicatorTextStyle: const TextStyle(color: Colors.black) valueIndicatorTextStyle: const TextStyle(color: Colors.black),
); );
final ChipThemeData chipTheme = ChipThemeData.fromDefaults( final ChipThemeData chipTheme = ChipThemeData.fromDefaults(
...@@ -260,7 +260,7 @@ void main() { ...@@ -260,7 +260,7 @@ void main() {
primaryColor: Colors.white, primaryColor: Colors.white,
primaryColorDark: Colors.white, primaryColorDark: Colors.white,
primaryColorLight: Colors.white, primaryColorLight: Colors.white,
valueIndicatorTextStyle: const TextStyle(color: Colors.white) valueIndicatorTextStyle: const TextStyle(color: Colors.white),
); );
final ChipThemeData otherChipTheme = ChipThemeData.fromDefaults( final ChipThemeData otherChipTheme = ChipThemeData.fromDefaults(
......
...@@ -574,24 +574,22 @@ class AndroidDevice extends Device { ...@@ -574,24 +574,22 @@ class AndroidDevice extends Device {
...<String>['--ez', 'trace-systrace', 'true'], ...<String>['--ez', 'trace-systrace', 'true'],
if (debuggingOptions.dumpSkpOnShaderCompilation) if (debuggingOptions.dumpSkpOnShaderCompilation)
...<String>['--ez', 'dump-skp-on-shader-compilation', 'true'], ...<String>['--ez', 'dump-skp-on-shader-compilation', 'true'],
if (debuggingOptions.debuggingEnabled) if (debuggingOptions.debuggingEnabled) ...<String>[
...<String>[ if (debuggingOptions.buildInfo.isDebug) ...<String>[
if (debuggingOptions.buildInfo.isDebug) ...<String>['--ez', 'enable-checked-mode', 'true'],
...<String>[ ...<String>['--ez', 'verify-entry-points', 'true'],
...<String>['--ez', 'enable-checked-mode', 'true'],
...<String>['--ez', 'verify-entry-points', 'true'],
],
if (debuggingOptions.startPaused)
...<String>['--ez', 'start-paused', 'true'],
if (debuggingOptions.disableServiceAuthCodes)
...<String>['--ez', 'disable-service-auth-codes', 'true'],
if (debuggingOptions.dartFlags.isNotEmpty)
...<String>['--es', 'dart-flags', debuggingOptions.dartFlags],
if (debuggingOptions.useTestFonts)
...<String>['--ez', 'use-test-fonts', 'true'],
if (debuggingOptions.verboseSystemLogs)
...<String>['--ez', 'verbose-logging', 'true'],
], ],
if (debuggingOptions.startPaused)
...<String>['--ez', 'start-paused', 'true'],
if (debuggingOptions.disableServiceAuthCodes)
...<String>['--ez', 'disable-service-auth-codes', 'true'],
if (debuggingOptions.dartFlags.isNotEmpty)
...<String>['--es', 'dart-flags', debuggingOptions.dartFlags],
if (debuggingOptions.useTestFonts)
...<String>['--ez', 'use-test-fonts', 'true'],
if (debuggingOptions.verboseSystemLogs)
...<String>['--ez', 'verbose-logging', 'true'],
],
apk.launchActivity, apk.launchActivity,
]; ];
final String result = (await runAdbCheckedAsync(cmd)).stdout; final String result = (await runAdbCheckedAsync(cmd)).stdout;
......
...@@ -125,9 +125,7 @@ class MultirootFileBasedAssetReader extends core.FileBasedAssetReader { ...@@ -125,9 +125,7 @@ class MultirootFileBasedAssetReader extends core.FileBasedAssetReader {
@override @override
Stream<AssetId> findAssets(Glob glob, {String package}) async* { Stream<AssetId> findAssets(Glob glob, {String package}) async* {
if (package == null || packageGraph.root.name == package) { if (package == null || packageGraph.root.name == package) {
final String generatedRoot = fs.path.join( final String generatedRoot = fs.path.join(generatedDirectory.path, packageGraph.root.name);
generatedDirectory.path, packageGraph.root.name
);
await for (io.FileSystemEntity entity in glob.list(followLinks: true, root: packageGraph.root.path)) { await for (io.FileSystemEntity entity in glob.list(followLinks: true, root: packageGraph.root.path)) {
if (entity is io.File && _isNotHidden(entity) && !fs.path.isWithin(generatedRoot, entity.path)) { if (entity is io.File && _isNotHidden(entity) && !fs.path.isWithin(generatedRoot, entity.path)) {
yield _fileToAssetId(entity, packageGraph.root); yield _fileToAssetId(entity, packageGraph.root);
......
...@@ -204,7 +204,7 @@ abstract class Target { ...@@ -204,7 +204,7 @@ abstract class Target {
return <String, Object>{ return <String, Object>{
'name': name, 'name': name,
'dependencies': <String>[ 'dependencies': <String>[
for (Target target in dependencies) target.name for (Target target in dependencies) target.name,
], ],
'inputs': <String>[ 'inputs': <String>[
for (File file in resolveInputs(environment).sources) file.path, for (File file in resolveInputs(environment).sources) file.path,
......
...@@ -313,4 +313,4 @@ class _DepfileSource implements Source { ...@@ -313,4 +313,4 @@ class _DepfileSource implements Source {
@override @override
bool get implicit => false; bool get implicit => false;
} }
\ No newline at end of file
...@@ -732,12 +732,11 @@ class FlutterSdk extends EngineCachedArtifact { ...@@ -732,12 +732,11 @@ class FlutterSdk extends EngineCachedArtifact {
return <List<String>>[ return <List<String>>[
<String>['common', 'flutter_patched_sdk.zip'], <String>['common', 'flutter_patched_sdk.zip'],
<String>['common', 'flutter_patched_sdk_product.zip'], <String>['common', 'flutter_patched_sdk_product.zip'],
if (cache.includeAllPlatforms) if (cache.includeAllPlatforms) ...<List<String>>[
...<List<String>>[ <String>['windows-x64', 'windows-x64/artifacts.zip'],
<String>['windows-x64', 'windows-x64/artifacts.zip'], <String>['linux-x64', 'linux-x64/artifacts.zip'],
<String>['linux-x64', 'linux-x64/artifacts.zip'], <String>['darwin-x64', 'darwin-x64/artifacts.zip'],
<String>['darwin-x64', 'darwin-x64/artifacts.zip'], ]
]
else if (platform.isWindows) else if (platform.isWindows)
<String>['windows-x64', 'windows-x64/artifacts.zip'] <String>['windows-x64', 'windows-x64/artifacts.zip']
else if (platform.isMacOS) else if (platform.isMacOS)
...@@ -831,25 +830,17 @@ class AndroidGenSnapshotArtifacts extends EngineCachedArtifact { ...@@ -831,25 +830,17 @@ class AndroidGenSnapshotArtifacts extends EngineCachedArtifact {
@override @override
List<List<String>> getBinaryDirs() { List<List<String>> getBinaryDirs() {
return <List<String>>[ return <List<String>>[
if (cache.includeAllPlatforms) if (cache.includeAllPlatforms) ...<List<String>>[
...<List<String>>[ ..._osxBinaryDirs,
..._osxBinaryDirs, ..._linuxBinaryDirs,
..._linuxBinaryDirs, ..._windowsBinaryDirs,
..._windowsBinaryDirs, ..._dartSdks,
..._dartSdks, ] else if (platform.isWindows)
] ..._windowsBinaryDirs
else if (platform.isWindows)
...<List<String>>[
..._windowsBinaryDirs,
]
else if (platform.isMacOS) else if (platform.isMacOS)
...<List<String>>[ ..._osxBinaryDirs
..._osxBinaryDirs,
]
else if (platform.isLinux) else if (platform.isLinux)
...<List<String>>[ ..._linuxBinaryDirs,
..._linuxBinaryDirs,
],
]; ];
} }
......
...@@ -52,7 +52,7 @@ export PROJECT_DIR=${linuxProject.project.directory.path} ...@@ -52,7 +52,7 @@ export PROJECT_DIR=${linuxProject.project.directory.path}
'make', 'make',
'-C', '-C',
linuxProject.makeFile.parent.path, linuxProject.makeFile.parent.path,
'BUILD=$buildFlag' 'BUILD=$buildFlag',
]); ]);
final Status status = logger.startProgress( final Status status = logger.startProgress(
'Building Linux application...', 'Building Linux application...',
......
...@@ -40,7 +40,7 @@ void main() { ...@@ -40,7 +40,7 @@ void main() {
await IOOverrides.runWithIOOverrides(() async { await IOOverrides.runWithIOOverrides(() async {
final MultirootFileBasedAssetReader reader = MultirootFileBasedAssetReader( final MultirootFileBasedAssetReader reader = MultirootFileBasedAssetReader(
packageGraph, packageGraph,
fs.directory(fs.path.join('.dart_tool', 'build', 'generated')) fs.directory(fs.path.join('.dart_tool', 'build', 'generated')),
); );
expect(await reader.canRead(AssetId('foobar', 'lib/bar.dart')), true); expect(await reader.canRead(AssetId('foobar', 'lib/bar.dart')), true);
expect(await reader.canRead(AssetId('foobar', 'lib/main.dart')), true); expect(await reader.canRead(AssetId('foobar', 'lib/main.dart')), true);
......
...@@ -195,9 +195,9 @@ void main() { ...@@ -195,9 +195,9 @@ void main() {
await project.ensureReadyForPlatformSpecificTooling(); await project.ensureReadyForPlatformSpecificTooling();
expectExists(project.macos.managedDirectory.childFile('GeneratedPluginRegistrant.swift')); expectExists(project.macos.managedDirectory.childFile('GeneratedPluginRegistrant.swift'));
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
FileSystem: () => MemoryFileSystem(), FileSystem: () => MemoryFileSystem(),
FeatureFlags: () => TestFeatureFlags(isMacOSEnabled: true), FeatureFlags: () => TestFeatureFlags(isMacOSEnabled: true),
FlutterProjectFactory: () => FlutterProjectFactory(), FlutterProjectFactory: () => FlutterProjectFactory(),
}); });
testUsingContext('generates Xcode configuration for macOS', () async { testUsingContext('generates Xcode configuration for macOS', () async {
final FlutterProject project = await someProject(); final FlutterProject project = await someProject();
...@@ -205,9 +205,9 @@ void main() { ...@@ -205,9 +205,9 @@ void main() {
await project.ensureReadyForPlatformSpecificTooling(); await project.ensureReadyForPlatformSpecificTooling();
expectExists(project.macos.generatedXcodePropertiesFile); expectExists(project.macos.generatedXcodePropertiesFile);
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
FileSystem: () => MemoryFileSystem(), FileSystem: () => MemoryFileSystem(),
FeatureFlags: () => TestFeatureFlags(isMacOSEnabled: true), FeatureFlags: () => TestFeatureFlags(isMacOSEnabled: true),
FlutterProjectFactory: () => FlutterProjectFactory(), FlutterProjectFactory: () => FlutterProjectFactory(),
}); });
testUsingContext('injects plugins for Linux', () async { testUsingContext('injects plugins for Linux', () async {
final FlutterProject project = await someProject(); final FlutterProject project = await someProject();
...@@ -216,9 +216,9 @@ void main() { ...@@ -216,9 +216,9 @@ void main() {
expectExists(project.linux.managedDirectory.childFile('generated_plugin_registrant.h')); expectExists(project.linux.managedDirectory.childFile('generated_plugin_registrant.h'));
expectExists(project.linux.managedDirectory.childFile('generated_plugin_registrant.cc')); expectExists(project.linux.managedDirectory.childFile('generated_plugin_registrant.cc'));
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
FileSystem: () => MemoryFileSystem(), FileSystem: () => MemoryFileSystem(),
FeatureFlags: () => TestFeatureFlags(isLinuxEnabled: true), FeatureFlags: () => TestFeatureFlags(isLinuxEnabled: true),
FlutterProjectFactory: () => FlutterProjectFactory(), FlutterProjectFactory: () => FlutterProjectFactory(),
}); });
testUsingContext('injects plugins for Windows', () async { testUsingContext('injects plugins for Windows', () async {
final FlutterProject project = await someProject(); final FlutterProject project = await someProject();
...@@ -227,9 +227,9 @@ void main() { ...@@ -227,9 +227,9 @@ void main() {
expectExists(project.windows.managedDirectory.childFile('generated_plugin_registrant.h')); expectExists(project.windows.managedDirectory.childFile('generated_plugin_registrant.h'));
expectExists(project.windows.managedDirectory.childFile('generated_plugin_registrant.cc')); expectExists(project.windows.managedDirectory.childFile('generated_plugin_registrant.cc'));
}, overrides: <Type, Generator>{ }, overrides: <Type, Generator>{
FileSystem: () => MemoryFileSystem(), FileSystem: () => MemoryFileSystem(),
FeatureFlags: () => TestFeatureFlags(isWindowsEnabled: true), FeatureFlags: () => TestFeatureFlags(isWindowsEnabled: true),
FlutterProjectFactory: () => FlutterProjectFactory(), FlutterProjectFactory: () => FlutterProjectFactory(),
}); });
testInMemory('creates Android library in module', () async { testInMemory('creates Android library in module', () async {
final FlutterProject project = await aModuleProject(); final FlutterProject project = await aModuleProject();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment