Commit 2888139c authored by Alexandre Ardhuin's avatar Alexandre Ardhuin Committed by Adam Barth

prefer const constructor (#8292)

parent 8b820ccc
...@@ -40,7 +40,7 @@ void main() { ...@@ -40,7 +40,7 @@ void main() {
expect(b.width, 100.0); expect(b.width, 100.0);
expect(b.height, 200.0); expect(b.height, 200.0);
Positioned c = new Positioned.fromRelativeRect( Positioned c = new Positioned.fromRelativeRect(
rect: new RelativeRect.fromLTRB( rect: const RelativeRect.fromLTRB(
103.0, 103.0,
303.0, 303.0,
203.0, 203.0,
......
...@@ -249,7 +249,7 @@ class _Renderer implements md.NodeVisitor { ...@@ -249,7 +249,7 @@ class _Renderer implements md.NodeVisitor {
linkInfo = _linkHandler.createLinkInfo(element.attributes['href']); linkInfo = _linkHandler.createLinkInfo(element.attributes['href']);
} }
TextStyle style = _markdownStyle.styles[element.tag] ?? new TextStyle(); TextStyle style = _markdownStyle.styles[element.tag] ?? const TextStyle();
List<_MarkdownNode> styleElement = <_MarkdownNode>[new _MarkdownNodeTextStyle(style, linkInfo)]; List<_MarkdownNode> styleElement = <_MarkdownNode>[new _MarkdownNodeTextStyle(style, linkInfo)];
_currentBlock.stack.add(new _MarkdownNodeList(styleElement)); _currentBlock.stack.add(new _MarkdownNodeList(styleElement));
} }
...@@ -338,7 +338,7 @@ class _Block { ...@@ -338,7 +338,7 @@ class _Block {
_Block(this.tag, this.attributes, this.markdownStyle, this.listIndents, this.blockPosition) { _Block(this.tag, this.attributes, this.markdownStyle, this.listIndents, this.blockPosition) {
TextStyle style = markdownStyle.styles[tag]; TextStyle style = markdownStyle.styles[tag];
if (style == null) if (style == null)
style = new TextStyle(color: const Color(0xffff0000)); style = const TextStyle(color: const Color(0xffff0000));
stack = <_MarkdownNode>[new _MarkdownNodeList(<_MarkdownNode>[new _MarkdownNodeTextStyle(style)])]; stack = <_MarkdownNode>[new _MarkdownNodeList(<_MarkdownNode>[new _MarkdownNodeTextStyle(style)])];
subBlocks = <_Block>[]; subBlocks = <_Block>[];
...@@ -398,7 +398,7 @@ class _Block { ...@@ -398,7 +398,7 @@ class _Block {
} }
else { else {
bullet = new Padding( bullet = new Padding(
padding: new EdgeInsets.only(right: 5.0), padding: const EdgeInsets.only(right: 5.0),
child: new Text( child: new Text(
"${blockPosition + 1}.", "${blockPosition + 1}.",
textAlign: TextAlign.right textAlign: TextAlign.right
......
...@@ -25,8 +25,8 @@ class MarkdownStyle extends MarkdownStyleRaw{ ...@@ -25,8 +25,8 @@ class MarkdownStyle extends MarkdownStyleRaw{
h4: theme.textTheme.body2, h4: theme.textTheme.body2,
h5: theme.textTheme.body2, h5: theme.textTheme.body2,
h6: theme.textTheme.body2, h6: theme.textTheme.body2,
em: new TextStyle(fontStyle: FontStyle.italic), em: const TextStyle(fontStyle: FontStyle.italic),
strong: new TextStyle(fontWeight: FontWeight.bold), strong: const TextStyle(fontWeight: FontWeight.bold),
blockquote: theme.textTheme.body1, blockquote: theme.textTheme.body1,
blockSpacing: 8.0, blockSpacing: 8.0,
listIndent: 32.0, listIndent: 32.0,
...@@ -59,8 +59,8 @@ class MarkdownStyle extends MarkdownStyleRaw{ ...@@ -59,8 +59,8 @@ class MarkdownStyle extends MarkdownStyleRaw{
h4: theme.textTheme.headline, h4: theme.textTheme.headline,
h5: theme.textTheme.title, h5: theme.textTheme.title,
h6: theme.textTheme.subhead, h6: theme.textTheme.subhead,
em: new TextStyle(fontStyle: FontStyle.italic), em: const TextStyle(fontStyle: FontStyle.italic),
strong: new TextStyle(fontWeight: FontWeight.bold), strong: const TextStyle(fontWeight: FontWeight.bold),
blockquote: theme.textTheme.body1, blockquote: theme.textTheme.body1,
blockSpacing: 8.0, blockSpacing: 8.0,
listIndent: 32.0, listIndent: 32.0,
......
...@@ -39,9 +39,9 @@ Future<Null> main(List<String> args) async { ...@@ -39,9 +39,9 @@ Future<Null> main(List<String> args) async {
executableContext.setVariable(Logger, new StdoutLogger()); executableContext.setVariable(Logger, new StdoutLogger());
executableContext.runInZone(() { executableContext.runInZone(() {
// Initialize the context with some defaults. // Initialize the context with some defaults.
context.putIfAbsent(Platform, () => new LocalPlatform()); context.putIfAbsent(Platform, () => const LocalPlatform());
context.putIfAbsent(FileSystem, () => new LocalFileSystem()); context.putIfAbsent(FileSystem, () => const LocalFileSystem());
context.putIfAbsent(ProcessManager, () => new LocalProcessManager()); context.putIfAbsent(ProcessManager, () => const LocalProcessManager());
context.putIfAbsent(Logger, () => new StdoutLogger()); context.putIfAbsent(Logger, () => new StdoutLogger());
context.putIfAbsent(Cache, () => new Cache()); context.putIfAbsent(Cache, () => new Cache());
context.putIfAbsent(Config, () => new Config()); context.putIfAbsent(Config, () => new Config());
......
...@@ -102,9 +102,9 @@ Future<Null> main(List<String> args) async { ...@@ -102,9 +102,9 @@ Future<Null> main(List<String> args) async {
// in those locations as well to see if you need a similar update there. // in those locations as well to see if you need a similar update there.
// Seed these context entries first since others depend on them // Seed these context entries first since others depend on them
context.putIfAbsent(Platform, () => new LocalPlatform()); context.putIfAbsent(Platform, () => const LocalPlatform());
context.putIfAbsent(FileSystem, () => new LocalFileSystem()); context.putIfAbsent(FileSystem, () => const LocalFileSystem());
context.putIfAbsent(ProcessManager, () => new LocalProcessManager()); context.putIfAbsent(ProcessManager, () => const LocalProcessManager());
context.putIfAbsent(Logger, () => platform.isWindows ? new WindowsStdoutLogger() : new StdoutLogger()); context.putIfAbsent(Logger, () => platform.isWindows ? new WindowsStdoutLogger() : new StdoutLogger());
context.putIfAbsent(Config, () => new Config()); context.putIfAbsent(Config, () => new Config());
......
...@@ -459,7 +459,7 @@ class AndroidDevice extends Device { ...@@ -459,7 +459,7 @@ class AndroidDevice extends Device {
'shell', 'am', 'broadcast', '-a', 'io.flutter.view.DISCOVER' 'shell', 'am', 'broadcast', '-a', 'io.flutter.view.DISCOVER'
])); ]));
return new Future<List<DiscoveredApp>>.delayed(new Duration(seconds: 1), () { return new Future<List<DiscoveredApp>>.delayed(const Duration(seconds: 1), () {
logs.cancel(); logs.cancel();
return result; return result;
}); });
......
...@@ -37,7 +37,7 @@ class Config { ...@@ -37,7 +37,7 @@ class Config {
} }
void _flushValues() { void _flushValues() {
String json = new JsonEncoder.withIndent(' ').convert(_values); String json = const JsonEncoder.withIndent(' ').convert(_values);
json = '$json\n'; json = '$json\n';
_configFile.writeAsStringSync(json); _configFile.writeAsStringSync(json);
} }
......
...@@ -295,7 +295,7 @@ class _AnsiStatus extends Status { ...@@ -295,7 +295,7 @@ class _AnsiStatus extends Status {
stdout.write('${message.padRight(52)} '); stdout.write('${message.padRight(52)} ');
stdout.write('${_progress[0]}'); stdout.write('${_progress[0]}');
timer = new Timer.periodic(new Duration(milliseconds: 100), _callback); timer = new Timer.periodic(const Duration(milliseconds: 100), _callback);
} }
static final List<String> _progress = <String>['-', r'\', '|', r'/', '-', r'\', '|', '/']; static final List<String> _progress = <String>['-', r'\', '|', r'/', '-', r'\', '|', '/'];
......
...@@ -29,7 +29,7 @@ ProcessManager get processManager => context[ProcessManager]; ...@@ -29,7 +29,7 @@ ProcessManager get processManager => context[ProcessManager];
/// subdirectory. /// subdirectory.
void enableRecordingProcessManager(String location) { void enableRecordingProcessManager(String location) {
Directory dir = getRecordingSink(location, _kRecordingType); Directory dir = getRecordingSink(location, _kRecordingType);
ProcessManager delegate = new LocalProcessManager(); ProcessManager delegate = const LocalProcessManager();
RecordingProcessManager manager = new RecordingProcessManager(delegate, dir); RecordingProcessManager manager = new RecordingProcessManager(delegate, dir);
addShutdownHook(() => manager.flush(finishRunningProcesses: true)); addShutdownHook(() => manager.flush(finishRunningProcesses: true));
context.setVariable(ProcessManager, manager); context.setVariable(ProcessManager, manager);
......
...@@ -73,7 +73,7 @@ File getUniqueFile(Directory dir, String baseName, String ext) { ...@@ -73,7 +73,7 @@ File getUniqueFile(Directory dir, String baseName, String ext) {
} }
String toPrettyJson(Object jsonable) { String toPrettyJson(Object jsonable) {
return new JsonEncoder.withIndent(' ').convert(jsonable) + '\n'; return const JsonEncoder.withIndent(' ').convert(jsonable) + '\n';
} }
/// Return a String - with units - for the size in MB of the given number of bytes. /// Return a String - with units - for the size in MB of the given number of bytes.
......
...@@ -464,7 +464,7 @@ class AppDomain extends Domain { ...@@ -464,7 +464,7 @@ class AppDomain extends Domain {
if (app == null) if (app == null)
throw "app '$appId' not found"; throw "app '$appId' not found";
return app.stop().timeout(new Duration(seconds: 5)).then<bool>((_) { return app.stop().timeout(const Duration(seconds: 5)).then<bool>((_) {
return true; return true;
}).catchError((dynamic error) { }).catchError((dynamic error) {
_sendAppEvent(app, 'log', <String, dynamic>{ 'log': '$error', 'error': true }); _sendAppEvent(app, 'log', <String, dynamic>{ 'log': '$error', 'error': true });
......
...@@ -97,7 +97,7 @@ class TestCommand extends FlutterCommand { ...@@ -97,7 +97,7 @@ class TestCommand extends FlutterCommand {
Future<bool> _collectCoverageData(CoverageCollector collector, { bool mergeCoverageData: false }) async { Future<bool> _collectCoverageData(CoverageCollector collector, { bool mergeCoverageData: false }) async {
Status status = logger.startProgress('Collecting coverage information...'); Status status = logger.startProgress('Collecting coverage information...');
String coverageData = await collector.finalizeCoverage( String coverageData = await collector.finalizeCoverage(
timeout: new Duration(seconds: 30), timeout: const Duration(seconds: 30),
); );
status.stop(); status.stop();
printTrace('coverage information collection complete'); printTrace('coverage information collection complete');
......
...@@ -83,7 +83,7 @@ class SimControl { ...@@ -83,7 +83,7 @@ class SimControl {
connected = _isAnyConnected(); connected = _isAnyConnected();
if (!connected) { if (!connected) {
printStatus('Still waiting for iOS Simulator to boot...'); printStatus('Still waiting for iOS Simulator to boot...');
await new Future<Null>.delayed(new Duration(seconds: 1)); await new Future<Null>.delayed(const Duration(seconds: 1));
} }
attempted++; attempted++;
} }
......
...@@ -218,7 +218,7 @@ abstract class ResidentRunner { ...@@ -218,7 +218,7 @@ abstract class ResidentRunner {
for (int i = 0; vmService.vm.mainView == null && i < 5; i++) { for (int i = 0; vmService.vm.mainView == null && i < 5; i++) {
// If the VM doesn't yet have a view, wait for one to show up. // If the VM doesn't yet have a view, wait for one to show up.
printTrace('Waiting for Flutter view'); printTrace('Waiting for Flutter view');
await new Future<Null>.delayed(new Duration(seconds: 1)); await new Future<Null>.delayed(const Duration(seconds: 1));
await vmService.vm.refreshViews(); await vmService.vm.refreshViews();
} }
currentView = vmService.vm.mainView; currentView = vmService.vm.mainView;
...@@ -354,7 +354,7 @@ abstract class ResidentRunner { ...@@ -354,7 +354,7 @@ abstract class ResidentRunner {
if ((currentView != null) && (currentView.uiIsolate != null)) { if ((currentView != null) && (currentView.uiIsolate != null)) {
// TODO(johnmccutchan): Wait for the exit command to complete. // TODO(johnmccutchan): Wait for the exit command to complete.
currentView.uiIsolate.flutterExit(); currentView.uiIsolate.flutterExit();
await new Future<Null>.delayed(new Duration(milliseconds: 100)); await new Future<Null>.delayed(const Duration(milliseconds: 100));
} }
} }
appFinished(); appFinished();
......
...@@ -314,7 +314,7 @@ class HotRunner extends ResidentRunner { ...@@ -314,7 +314,7 @@ class HotRunner extends ResidentRunner {
if (_devFS != null) { if (_devFS != null) {
// Cleanup the devFS; don't wait indefinitely, and ignore any errors. // Cleanup the devFS; don't wait indefinitely, and ignore any errors.
await _devFS.destroy() await _devFS.destroy()
.timeout(new Duration(milliseconds: 250)) .timeout(const Duration(milliseconds: 250))
.catchError((dynamic error) { .catchError((dynamic error) {
printTrace('$error'); printTrace('$error');
}); });
......
...@@ -96,7 +96,7 @@ class Usage { ...@@ -96,7 +96,7 @@ class Usage {
// TODO(devoncarew): This may delay tool exit and could cause some analytics // TODO(devoncarew): This may delay tool exit and could cause some analytics
// events to not be reported. Perhaps we could send the analytics pings // events to not be reported. Perhaps we could send the analytics pings
// out-of-process from flutter_tools? // out-of-process from flutter_tools?
await _analytics.waitForLastPing(timeout: new Duration(milliseconds: 250)); await _analytics.waitForLastPing(timeout: const Duration(milliseconds: 250));
} }
void printUsage() { void printUsage() {
......
...@@ -10,7 +10,7 @@ import 'package:test/test.dart'; ...@@ -10,7 +10,7 @@ import 'package:test/test.dart';
void main() { void main() {
// Create a temporary directory and write a single file into it. // Create a temporary directory and write a single file into it.
FileSystem fs = new LocalFileSystem(); FileSystem fs = const LocalFileSystem();
Directory tempDir = fs.systemTempDirectory.createTempSync(); Directory tempDir = fs.systemTempDirectory.createTempSync();
String projectRoot = tempDir.path; String projectRoot = tempDir.path;
String assetPath = 'banana.txt'; String assetPath = 'banana.txt';
......
...@@ -32,7 +32,7 @@ void main() { ...@@ -32,7 +32,7 @@ void main() {
setUp(() { setUp(() {
appContext = new AppContext(); appContext = new AppContext();
notifyingLogger = new NotifyingLogger(); notifyingLogger = new NotifyingLogger();
appContext.setVariable(Platform, new LocalPlatform()); appContext.setVariable(Platform, const LocalPlatform());
appContext.setVariable(Logger, notifyingLogger); appContext.setVariable(Logger, notifyingLogger);
appContext.setVariable(Doctor, new Doctor()); appContext.setVariable(Doctor, new Doctor());
if (platform.isMacOS) if (platform.isMacOS)
......
...@@ -88,7 +88,7 @@ void main() { ...@@ -88,7 +88,7 @@ void main() {
String destinationPath = '/some/test/location'; String destinationPath = '/some/test/location';
// Copy the golden input and let the test run in an isolated temporary in-memory file system. // Copy the golden input and let the test run in an isolated temporary in-memory file system.
copyDirectorySync( copyDirectorySync(
new LocalFileSystem().directory(fs.path.join(dataPath, 'changed_sdk_location')), const LocalFileSystem().directory(fs.path.join(dataPath, 'changed_sdk_location')),
fs.directory(destinationPath)); fs.directory(destinationPath));
fs.currentDirectory = destinationPath; fs.currentDirectory = destinationPath;
......
...@@ -236,7 +236,7 @@ void main() { ...@@ -236,7 +236,7 @@ void main() {
]); ]);
expect(devFS.assetPathsToEvict, isEmpty); expect(devFS.assetPathsToEvict, isEmpty);
expect(bytes, 31); expect(bytes, 31);
}, timeout: new Timeout(new Duration(seconds: 5))); }, timeout: const Timeout(const Duration(seconds: 5)));
testUsingContext('delete dev file system', () async { testUsingContext('delete dev file system', () async {
await devFS.destroy(); await devFS.destroy();
...@@ -340,4 +340,4 @@ Future<Null> _createPackage(String pkgName, String pkgFileName) async { ...@@ -340,4 +340,4 @@ Future<Null> _createPackage(String pkgName, String pkgFileName) async {
fs.file(fs.path.join(_tempDirs[0].path, '.packages')).writeAsStringSync(sb.toString()); fs.file(fs.path.join(_tempDirs[0].path, '.packages')).writeAsStringSync(sb.toString());
} }
String _inAssetBuildDirectory(String filename) => fs.path.join(getAssetBuildDirectory(), filename); String _inAssetBuildDirectory(String filename) => fs.path.join(getAssetBuildDirectory(), filename);
\ No newline at end of file
...@@ -42,9 +42,9 @@ void testUsingContext(String description, dynamic testMethod(), { ...@@ -42,9 +42,9 @@ void testUsingContext(String description, dynamic testMethod(), {
// Initialize the test context with some default mocks. // Initialize the test context with some default mocks.
// Seed these context entries first since others depend on them // Seed these context entries first since others depend on them
testContext.putIfAbsent(Platform, () => new LocalPlatform()); testContext.putIfAbsent(Platform, () => const LocalPlatform());
testContext.putIfAbsent(FileSystem, () => new LocalFileSystem()); testContext.putIfAbsent(FileSystem, () => const LocalFileSystem());
testContext.putIfAbsent(ProcessManager, () => new LocalProcessManager()); testContext.putIfAbsent(ProcessManager, () => const LocalProcessManager());
testContext.putIfAbsent(Logger, () => new BufferLogger()); testContext.putIfAbsent(Logger, () => new BufferLogger());
testContext.putIfAbsent(Config, () => new Config()); testContext.putIfAbsent(Config, () => new Config());
......
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