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() {
primaryColor: Colors.black,
primaryColorDark: Colors.black,
primaryColorLight: Colors.black,
valueIndicatorTextStyle: const TextStyle(color: Colors.black)
valueIndicatorTextStyle: const TextStyle(color: Colors.black),
);
final ChipThemeData chipTheme = ChipThemeData.fromDefaults(
......@@ -260,7 +260,7 @@ void main() {
primaryColor: Colors.white,
primaryColorDark: Colors.white,
primaryColorLight: Colors.white,
valueIndicatorTextStyle: const TextStyle(color: Colors.white)
valueIndicatorTextStyle: const TextStyle(color: Colors.white),
);
final ChipThemeData otherChipTheme = ChipThemeData.fromDefaults(
......
......@@ -574,10 +574,8 @@ class AndroidDevice extends Device {
...<String>['--ez', 'trace-systrace', 'true'],
if (debuggingOptions.dumpSkpOnShaderCompilation)
...<String>['--ez', 'dump-skp-on-shader-compilation', 'true'],
if (debuggingOptions.debuggingEnabled)
...<String>[
if (debuggingOptions.buildInfo.isDebug)
...<String>[
if (debuggingOptions.debuggingEnabled) ...<String>[
if (debuggingOptions.buildInfo.isDebug) ...<String>[
...<String>['--ez', 'enable-checked-mode', 'true'],
...<String>['--ez', 'verify-entry-points', 'true'],
],
......
......@@ -125,9 +125,7 @@ class MultirootFileBasedAssetReader extends core.FileBasedAssetReader {
@override
Stream<AssetId> findAssets(Glob glob, {String package}) async* {
if (package == null || packageGraph.root.name == package) {
final String generatedRoot = fs.path.join(
generatedDirectory.path, packageGraph.root.name
);
final String generatedRoot = fs.path.join(generatedDirectory.path, packageGraph.root.name);
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)) {
yield _fileToAssetId(entity, packageGraph.root);
......
......@@ -204,7 +204,7 @@ abstract class Target {
return <String, Object>{
'name': name,
'dependencies': <String>[
for (Target target in dependencies) target.name
for (Target target in dependencies) target.name,
],
'inputs': <String>[
for (File file in resolveInputs(environment).sources) file.path,
......
......@@ -732,8 +732,7 @@ class FlutterSdk extends EngineCachedArtifact {
return <List<String>>[
<String>['common', 'flutter_patched_sdk.zip'],
<String>['common', 'flutter_patched_sdk_product.zip'],
if (cache.includeAllPlatforms)
...<List<String>>[
if (cache.includeAllPlatforms) ...<List<String>>[
<String>['windows-x64', 'windows-x64/artifacts.zip'],
<String>['linux-x64', 'linux-x64/artifacts.zip'],
<String>['darwin-x64', 'darwin-x64/artifacts.zip'],
......@@ -831,25 +830,17 @@ class AndroidGenSnapshotArtifacts extends EngineCachedArtifact {
@override
List<List<String>> getBinaryDirs() {
return <List<String>>[
if (cache.includeAllPlatforms)
...<List<String>>[
if (cache.includeAllPlatforms) ...<List<String>>[
..._osxBinaryDirs,
..._linuxBinaryDirs,
..._windowsBinaryDirs,
..._dartSdks,
]
else if (platform.isWindows)
...<List<String>>[
..._windowsBinaryDirs,
]
] else if (platform.isWindows)
..._windowsBinaryDirs
else if (platform.isMacOS)
...<List<String>>[
..._osxBinaryDirs,
]
..._osxBinaryDirs
else if (platform.isLinux)
...<List<String>>[
..._linuxBinaryDirs,
],
];
}
......
......@@ -52,7 +52,7 @@ export PROJECT_DIR=${linuxProject.project.directory.path}
'make',
'-C',
linuxProject.makeFile.parent.path,
'BUILD=$buildFlag'
'BUILD=$buildFlag',
]);
final Status status = logger.startProgress(
'Building Linux application...',
......
......@@ -40,7 +40,7 @@ void main() {
await IOOverrides.runWithIOOverrides(() async {
final MultirootFileBasedAssetReader reader = MultirootFileBasedAssetReader(
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/main.dart')), true);
......
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