diff --git a/dev/manual_tests/overlay_geometry.dart b/dev/manual_tests/overlay_geometry.dart index 4c283b1449f..1417aced287 100644 --- a/dev/manual_tests/overlay_geometry.dart +++ b/dev/manual_tests/overlay_geometry.dart @@ -134,7 +134,7 @@ class CardBuilder extends SliverChildDelegate { class OverlayGeometryAppState extends State { List cardModels; - Map markers = new Map(); + Map markers = {}; double markersScrollOffset = 0.0; @override diff --git a/examples/flutter_gallery/lib/demo/calculator/logic.dart b/examples/flutter_gallery/lib/demo/calculator/logic.dart index bc36b3f2ea3..b6b381a0843 100644 --- a/examples/flutter_gallery/lib/demo/calculator/logic.dart +++ b/examples/flutter_gallery/lib/demo/calculator/logic.dart @@ -303,7 +303,7 @@ class CalcExpression { assert(false); } } - final List outList = new List(); + final List outList = []; outList.add(new ResultToken(currentTermValue)); return new CalcExpression(outList, ExpressionState.Result); } diff --git a/examples/flutter_gallery/test_driver/transitions_perf_test.dart b/examples/flutter_gallery/test_driver/transitions_perf_test.dart index 24021adc366..cc6c29accaa 100644 --- a/examples/flutter_gallery/test_driver/transitions_perf_test.dart +++ b/examples/flutter_gallery/test_driver/transitions_perf_test.dart @@ -82,7 +82,7 @@ Future saveDurationsHistogram(List> events, String ou startEvent = event; } else if (startEvent != null && eventName == 'Frame') { final String routeName = startEvent['args']['to']; - durations[routeName] ??= new List(); + durations[routeName] ??= []; durations[routeName].add(event['dur']); startEvent = null; } diff --git a/packages/flutter/lib/src/foundation/observer_list.dart b/packages/flutter/lib/src/foundation/observer_list.dart index fa5ab150dbc..be14d12034c 100644 --- a/packages/flutter/lib/src/foundation/observer_list.dart +++ b/packages/flutter/lib/src/foundation/observer_list.dart @@ -9,7 +9,7 @@ import 'dart:collection'; /// Consider using an [ObserverList] instead of a [List] when the number of /// [contains] calls dominates the number of [add] and [remove] calls. class ObserverList extends Iterable { - final List _list = new List(); + final List _list = []; bool _isDirty = false; HashSet _set; diff --git a/packages/flutter/lib/src/gestures/arena.dart b/packages/flutter/lib/src/gestures/arena.dart index 00d22e33981..0a08e79b135 100644 --- a/packages/flutter/lib/src/gestures/arena.dart +++ b/packages/flutter/lib/src/gestures/arena.dart @@ -49,7 +49,7 @@ class GestureArenaEntry { } class _GestureArena { - final List members = new List(); + final List members = []; bool isOpen = true; bool isHeld = false; bool hasPendingSweep = false; @@ -71,7 +71,7 @@ class _GestureArena { /// See [https://flutter.io/gestures/#gesture-disambiguation] for more /// information about the role this class plays in the gesture system. class GestureArenaManager { - final Map _arenas = new Map(); + final Map _arenas = {}; /// Adds a new member (e.g., gesture recognizer) to the arena. GestureArenaEntry add(int pointer, GestureArenaMember member) { diff --git a/packages/flutter/lib/src/gestures/drag.dart b/packages/flutter/lib/src/gestures/drag.dart index 4bf17e7b108..b774862fb8d 100644 --- a/packages/flutter/lib/src/gestures/drag.dart +++ b/packages/flutter/lib/src/gestures/drag.dart @@ -264,7 +264,7 @@ abstract class DragGestureRecognizer extends OneSequenceGestureRecognizer { double _getPrimaryValueFromOffset(Offset value); bool get _hasSufficientPendingDragDeltaToAccept; - Map _velocityTrackers = new Map(); + Map _velocityTrackers = {}; @override void addPointer(PointerEvent event) { diff --git a/packages/flutter/lib/src/gestures/multitap.dart b/packages/flutter/lib/src/gestures/multitap.dart index 93d95b99ca7..ac3b1b33dcd 100644 --- a/packages/flutter/lib/src/gestures/multitap.dart +++ b/packages/flutter/lib/src/gestures/multitap.dart @@ -94,7 +94,7 @@ class DoubleTapGestureRecognizer extends GestureRecognizer { Timer _doubleTapTimer; _TapTracker _firstTap; - final Map _trackers = new Map(); + final Map _trackers = {}; @override void addPointer(PointerEvent event) { @@ -341,7 +341,7 @@ class MultiTapGestureRecognizer extends GestureRecognizer { /// particular location after [longTapDelay]. GestureMultiTapDownCallback onLongTapDown; - final Map _gestureMap = new Map(); + final Map _gestureMap = {}; @override void addPointer(PointerEvent event) { diff --git a/packages/flutter/lib/src/gestures/pointer_router.dart b/packages/flutter/lib/src/gestures/pointer_router.dart index 468a553d486..c8cd7584958 100644 --- a/packages/flutter/lib/src/gestures/pointer_router.dart +++ b/packages/flutter/lib/src/gestures/pointer_router.dart @@ -13,7 +13,7 @@ typedef void PointerRoute(PointerEvent event); /// A routing table for [PointerEvent] events. class PointerRouter { - final Map> _routeMap = new Map>(); + final Map> _routeMap = >{}; final LinkedHashSet _globalRoutes = new LinkedHashSet(); /// Adds a route to the routing table. diff --git a/packages/flutter/lib/src/gestures/scale.dart b/packages/flutter/lib/src/gestures/scale.dart index 50c6554ad09..95f6fd704ad 100644 --- a/packages/flutter/lib/src/gestures/scale.dart +++ b/packages/flutter/lib/src/gestures/scale.dart @@ -115,7 +115,7 @@ class ScaleGestureRecognizer extends OneSequenceGestureRecognizer { double _initialSpan; double _currentSpan; Map _pointerLocations; - Map _velocityTrackers = new Map(); + Map _velocityTrackers = {}; double get _scaleFactor => _initialSpan > 0.0 ? _currentSpan / _initialSpan : 1.0; @@ -127,7 +127,7 @@ class ScaleGestureRecognizer extends OneSequenceGestureRecognizer { _state = ScaleState.possible; _initialSpan = 0.0; _currentSpan = 0.0; - _pointerLocations = new Map(); + _pointerLocations = {}; } } diff --git a/packages/flutter/lib/src/gestures/team.dart b/packages/flutter/lib/src/gestures/team.dart index 8544edb186d..fbef0b85b1b 100644 --- a/packages/flutter/lib/src/gestures/team.dart +++ b/packages/flutter/lib/src/gestures/team.dart @@ -90,7 +90,7 @@ class _CombiningGestureArenaMember extends GestureArenaMember { /// To assign a gesture recognizer to a team, see /// [OneSequenceGestureRecognizer.team]. class GestureArenaTeam { - final Map _combiners = new Map(); + final Map _combiners = {}; /// Adds a new member to the arena on behalf of this team. /// diff --git a/packages/flutter/lib/src/gestures/velocity_tracker.dart b/packages/flutter/lib/src/gestures/velocity_tracker.dart index 3cc053984da..cbcc5e1ec1e 100644 --- a/packages/flutter/lib/src/gestures/velocity_tracker.dart +++ b/packages/flutter/lib/src/gestures/velocity_tracker.dart @@ -63,10 +63,10 @@ class _LeastSquaresVelocityTrackerStrategy extends _VelocityTrackerStrategy { @override _Estimate getEstimate() { // Iterate over movement samples in reverse time order and collect samples. - final List x = new List(); - final List y = new List(); - final List w = new List(); - final List time = new List(); + final List x = []; + final List y = []; + final List w = []; + final List time = []; int m = 0; int index = _index; diff --git a/packages/flutter/lib/src/material/dialog.dart b/packages/flutter/lib/src/material/dialog.dart index 70da99e635d..6fe4fe92576 100644 --- a/packages/flutter/lib/src/material/dialog.dart +++ b/packages/flutter/lib/src/material/dialog.dart @@ -134,7 +134,7 @@ class AlertDialog extends StatelessWidget { @override Widget build(BuildContext context) { - final List children = new List(); + final List children = []; if (title != null) { children.add(new Padding( diff --git a/packages/flutter/lib/src/material/scaffold.dart b/packages/flutter/lib/src/material/scaffold.dart index d32f4f41558..41aa130ca8b 100644 --- a/packages/flutter/lib/src/material/scaffold.dart +++ b/packages/flutter/lib/src/material/scaffold.dart @@ -233,7 +233,7 @@ class _FloatingActionButtonTransitionState extends State<_FloatingActionButtonTr @override Widget build(BuildContext context) { - final List children = new List(); + final List children = []; if (_previousAnimation.status != AnimationStatus.dismissed) { children.add(new ScaleTransition( scale: _previousAnimation, @@ -777,7 +777,7 @@ class ScaffoldState extends State with TickerProviderStateMixin { } } - final List children = new List(); + final List children = []; _addIfNonNull(children, config.body, _ScaffoldSlot.body); diff --git a/packages/flutter/lib/src/material/stepper.dart b/packages/flutter/lib/src/material/stepper.dart index 5edbf44ddff..7ac5f548052 100644 --- a/packages/flutter/lib/src/material/stepper.dart +++ b/packages/flutter/lib/src/material/stepper.dart @@ -178,7 +178,7 @@ class Stepper extends StatefulWidget { class _StepperState extends State with TickerProviderStateMixin { List _keys; - final Map _oldStates = new Map(); + final Map _oldStates = {}; @override void initState() { diff --git a/packages/flutter/lib/src/painting/box_painter.dart b/packages/flutter/lib/src/painting/box_painter.dart index 5c15f29190c..e421c5e79f1 100644 --- a/packages/flutter/lib/src/painting/box_painter.dart +++ b/packages/flutter/lib/src/painting/box_painter.dart @@ -578,10 +578,10 @@ class BoxShadow { if (a == null && b == null) return null; if (a == null) - a = new List(); + a = []; if (b == null) - b = new List(); - final List result = new List(); + b = []; + final List result = []; final int commonLength = math.min(a.length, b.length); for (int i = 0; i < commonLength; ++i) result.add(BoxShadow.lerp(a[i], b[i], t)); diff --git a/packages/flutter/lib/src/rendering/box.dart b/packages/flutter/lib/src/rendering/box.dart index ee7793e6814..6ab035cf362 100644 --- a/packages/flutter/lib/src/rendering/box.dart +++ b/packages/flutter/lib/src/rendering/box.dart @@ -1483,7 +1483,7 @@ abstract class RenderBox extends RenderObject { double getDistanceToActualBaseline(TextBaseline baseline) { assert(_debugDoingBaseline); if (_cachedBaselines == null) - _cachedBaselines = new Map(); + _cachedBaselines = {}; _cachedBaselines.putIfAbsent(baseline, () => computeDistanceToActualBaseline(baseline)); return _cachedBaselines[baseline]; } diff --git a/packages/flutter/lib/src/rendering/custom_layout.dart b/packages/flutter/lib/src/rendering/custom_layout.dart index 6cf2ca69deb..6030b3bb686 100644 --- a/packages/flutter/lib/src/rendering/custom_layout.dart +++ b/packages/flutter/lib/src/rendering/custom_layout.dart @@ -170,7 +170,7 @@ abstract class MultiChildLayoutDelegate { }); try { - _idToChild = new Map(); + _idToChild = {}; RenderBox child = firstChild; while (child != null) { final MultiChildLayoutParentData childParentData = child.parentData; diff --git a/packages/flutter/lib/src/rendering/table.dart b/packages/flutter/lib/src/rendering/table.dart index a3666924d78..a8a045c77da 100644 --- a/packages/flutter/lib/src/rendering/table.dart +++ b/packages/flutter/lib/src/rendering/table.dart @@ -494,7 +494,7 @@ class RenderTable extends RenderBox { assert(configuration != null); _columns = columns ?? (children != null && children.isNotEmpty ? children.first.length : 0); _rows = rows ?? 0; - _children = new List()..length = _columns * _rows; + _children = []..length = _columns * _rows; _columnWidths = columnWidths ?? new HashMap(); _defaultColumnWidth = defaultColumnWidth; _border = border; @@ -529,7 +529,7 @@ class RenderTable extends RenderBox { final int oldColumns = columns; final List oldChildren = _children; _columns = value; - _children = new List()..length = columns * rows; + _children = []..length = columns * rows; final int columnsToCopy = math.min(columns, oldColumns); for (int y = 0; y < rows; y += 1) { for (int x = 0; x < columnsToCopy; x += 1) diff --git a/packages/flutter/lib/src/scheduler/binding.dart b/packages/flutter/lib/src/scheduler/binding.dart index 06753d79a9e..709950c19d4 100644 --- a/packages/flutter/lib/src/scheduler/binding.dart +++ b/packages/flutter/lib/src/scheduler/binding.dart @@ -402,7 +402,7 @@ abstract class SchedulerBinding extends BindingBase { }); } - final List _persistentCallbacks = new List(); + final List _persistentCallbacks = []; /// Adds a persistent frame callback. /// @@ -420,7 +420,7 @@ abstract class SchedulerBinding extends BindingBase { _persistentCallbacks.add(callback); } - final List _postFrameCallbacks = new List(); + final List _postFrameCallbacks = []; /// Schedule a callback for the end of this frame. /// @@ -637,7 +637,7 @@ abstract class SchedulerBinding extends BindingBase { Timeline.startSync('Animate'); assert(schedulerPhase == SchedulerPhase.transientCallbacks); final Map callbacks = _transientCallbacks; - _transientCallbacks = new Map(); + _transientCallbacks = {}; callbacks.forEach((int id, _FrameCallbackEntry callbackEntry) { if (!_removedIds.contains(id)) _invokeFrameCallback(callbackEntry.callback, timeStamp, callbackEntry.debugStack); diff --git a/packages/flutter/lib/src/services/image_cache.dart b/packages/flutter/lib/src/services/image_cache.dart index c4b5ff670bb..3b2d53afce5 100644 --- a/packages/flutter/lib/src/services/image_cache.dart +++ b/packages/flutter/lib/src/services/image_cache.dart @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'dart:collection'; - import 'image_stream.dart'; const int _kDefaultSize = 1000; @@ -27,7 +25,7 @@ const int _kDefaultSize = 1000; /// Generally this class is not used directly. The [ImageProvider] class and its /// subclasses automatically handle the caching of images. class ImageCache { - final LinkedHashMap _cache = new LinkedHashMap(); + final Map _cache = {}; /// Maximum number of entries to store in the cache. /// diff --git a/packages/flutter/lib/src/services/message_codecs.dart b/packages/flutter/lib/src/services/message_codecs.dart index 68bb4c8cae7..44cd5ca5f7e 100644 --- a/packages/flutter/lib/src/services/message_codecs.dart +++ b/packages/flutter/lib/src/services/message_codecs.dart @@ -358,7 +358,7 @@ class StandardMessageCodec implements MessageCodec { break; case _kMap: final int length = _readSize(buffer); - result = new Map(); + result = {}; for (int i = 0; i < length; i++) { result[_readValue(buffer)] = _readValue(buffer); } @@ -418,4 +418,3 @@ class StandardMethodCodec implements MethodCodec { throw new FormatException('Invalid envelope'); } } - diff --git a/packages/flutter/lib/src/widgets/drag_target.dart b/packages/flutter/lib/src/widgets/drag_target.dart index 713bdb3b035..db8a7c54983 100644 --- a/packages/flutter/lib/src/widgets/drag_target.dart +++ b/packages/flutter/lib/src/widgets/drag_target.dart @@ -380,8 +380,8 @@ List _mapAvatarsToData(List<_DragAvatar> avatars) { } class _DragTargetState extends State> { - final List<_DragAvatar> _candidateAvatars = new List<_DragAvatar>(); - final List<_DragAvatar> _rejectedAvatars = new List<_DragAvatar>(); + final List<_DragAvatar> _candidateAvatars = <_DragAvatar>[]; + final List<_DragAvatar> _rejectedAvatars = <_DragAvatar>[]; bool didEnter(_DragAvatar avatar) { assert(!_candidateAvatars.contains(avatar)); diff --git a/packages/flutter/lib/src/widgets/framework.dart b/packages/flutter/lib/src/widgets/framework.dart index ebe49f6ade4..4edc7308ae0 100644 --- a/packages/flutter/lib/src/widgets/framework.dart +++ b/packages/flutter/lib/src/widgets/framework.dart @@ -167,11 +167,11 @@ abstract class GlobalKey> extends Key { /// constructor. const GlobalKey.constructor() : super._(); - static final Map _registry = new Map(); - static final Map> _removeListeners = new Map>(); + static final Map _registry = {}; + static final Map> _removeListeners = >{}; static final Set _removedKeys = new HashSet(); static final Set _debugIllFatedElements = new HashSet(); - static final Map _debugReservations = new Map(); + static final Map _debugReservations = {}; void _register(Element element) { assert(() { @@ -3421,7 +3421,7 @@ class InheritedElement extends ProxyElement { if (incomingWidgets != null) _inheritedWidgets = new Map.from(incomingWidgets); else - _inheritedWidgets = new Map(); + _inheritedWidgets = {}; _inheritedWidgets[widget.runtimeType] = this; } @@ -3789,7 +3789,7 @@ abstract class RenderObjectElement extends BuildableElement { final bool haveOldChildren = oldChildrenTop <= oldChildrenBottom; Map oldKeyedChildren; if (haveOldChildren) { - oldKeyedChildren = new Map(); + oldKeyedChildren = {}; while (oldChildrenTop <= oldChildrenBottom) { final Element oldChild = replaceWithNullIfForgotten(oldChildren[oldChildrenTop]); assert(oldChild == null || oldChild._debugLifecycleState == _ElementLifecycle.active); diff --git a/packages/flutter/lib/src/widgets/navigator.dart b/packages/flutter/lib/src/widgets/navigator.dart index 76a8de87c97..cfa5c97d958 100644 --- a/packages/flutter/lib/src/widgets/navigator.dart +++ b/packages/flutter/lib/src/widgets/navigator.dart @@ -697,7 +697,7 @@ class Navigator extends StatefulWidget { /// The state for a [Navigator] widget. class NavigatorState extends State with TickerProviderStateMixin { final GlobalKey _overlayKey = new GlobalKey(); - final List> _history = new List>(); + final List> _history = >[]; final Set> _poppedRoutes = new Set>(); @override diff --git a/packages/flutter/lib/src/widgets/overlay.dart b/packages/flutter/lib/src/widgets/overlay.dart index 9d5f4a57cec..8df621c7ba6 100644 --- a/packages/flutter/lib/src/widgets/overlay.dart +++ b/packages/flutter/lib/src/widgets/overlay.dart @@ -266,7 +266,7 @@ class Overlay extends StatefulWidget { /// Used to insert [OverlayEntry]s into the overlay using the [insert] and /// [insertAll] functions. class OverlayState extends State with TickerProviderStateMixin { - final List _entries = new List(); + final List _entries = []; @override void initState() { diff --git a/packages/flutter/test/widgets/listener_test.dart b/packages/flutter/test/widgets/listener_test.dart index ceec6d587ae..316db5dce8f 100644 --- a/packages/flutter/test/widgets/listener_test.dart +++ b/packages/flutter/test/widgets/listener_test.dart @@ -7,7 +7,7 @@ import 'package:flutter/widgets.dart'; void main() { testWidgets('Events bubble up the tree', (WidgetTester tester) async { - final List log = new List(); + final List log = []; await tester.pumpWidget( new Listener( diff --git a/packages/flutter_tools/lib/src/devfs.dart b/packages/flutter_tools/lib/src/devfs.dart index 78b35eb2b2a..e4656a7dd1b 100644 --- a/packages/flutter_tools/lib/src/devfs.dart +++ b/packages/flutter_tools/lib/src/devfs.dart @@ -330,7 +330,7 @@ class DevFS { final Set assetPathsToEvict = new Set(); final List>> _pendingOperations = - new List>>(); + >>[]; Uri _baseUri; Uri get baseUri => _baseUri; @@ -376,7 +376,7 @@ class DevFS { // Handle deletions. printTrace('Scanning for deleted files'); final String assetBuildDirPrefix = _asUriPath(getAssetBuildDirectory()); - final List toRemove = new List(); + final List toRemove = []; _entries.forEach((Uri deviceUri, DevFSContent content) { if (!content._exists) { final Future> operation = diff --git a/packages/flutter_tools/lib/src/ios/devices.dart b/packages/flutter_tools/lib/src/ios/devices.dart index 9075daf25b0..eb30f7952c2 100644 --- a/packages/flutter_tools/lib/src/ios/devices.dart +++ b/packages/flutter_tools/lib/src/ios/devices.dart @@ -434,7 +434,7 @@ class _IOSDeviceLogReader extends DeviceLogReader { } class _IOSDevicePortForwarder extends DevicePortForwarder { - _IOSDevicePortForwarder(this.device) : _forwardedPorts = new List(); + _IOSDevicePortForwarder(this.device) : _forwardedPorts = []; final IOSDevice device; diff --git a/packages/flutter_tools/lib/src/run_hot.dart b/packages/flutter_tools/lib/src/run_hot.dart index c56a7852636..7473c6f964b 100644 --- a/packages/flutter_tools/lib/src/run_hot.dart +++ b/packages/flutter_tools/lib/src/run_hot.dart @@ -61,7 +61,7 @@ class HotRunner extends ResidentRunner { Uri _observatoryUri; final bool benchmarkMode; - final Map benchmarkData = new Map(); + final Map benchmarkData = {}; // The initial launch is from a snapshot. bool _runningFromSnapshot = true; String kernelFilePath; @@ -141,7 +141,7 @@ class HotRunner extends ResidentRunner { return 1; } - final Map platformArgs = new Map(); + final Map platformArgs = {}; await startEchoingDeviceLog(package); diff --git a/packages/flutter_tools/lib/src/template.dart b/packages/flutter_tools/lib/src/template.dart index a1c31978d1b..abf77310c14 100644 --- a/packages/flutter_tools/lib/src/template.dart +++ b/packages/flutter_tools/lib/src/template.dart @@ -24,7 +24,7 @@ const String _kCopyTemplateExtension = '.copy.tmpl'; /// extensions. class Template { Template(Directory templateSource, Directory baseDir) { - _templateFilePaths = new Map(); + _templateFilePaths = {}; if (!templateSource.existsSync()) { return; diff --git a/packages/flutter_tools/lib/src/vmservice.dart b/packages/flutter_tools/lib/src/vmservice.dart index 574fe7608de..8d547ec80d7 100644 --- a/packages/flutter_tools/lib/src/vmservice.dart +++ b/packages/flutter_tools/lib/src/vmservice.dart @@ -505,14 +505,14 @@ class VM extends ServiceObjectOwner { _removeDeadIsolates(map['isolates']); } - final Map _cache = new Map(); - final Map _isolateCache = new Map(); + final Map _cache = {}; + final Map _isolateCache = {}; /// The list of live isolates, ordered by isolate start time. - final List isolates = new List(); + final List isolates = []; /// The set of live views. - final Map _viewCache = new Map(); + final Map _viewCache = {}; int _compareIsolates(Isolate a, Isolate b) { final DateTime aStart = a.startTime; @@ -767,7 +767,7 @@ class Isolate extends ServiceObjectOwner { DateTime startTime; ServiceEvent pauseEvent; - final Map _cache = new Map(); + final Map _cache = {}; @override ServiceObject getFromMap(Map map) { @@ -967,7 +967,7 @@ class Isolate extends ServiceObjectOwner { class ServiceMap extends ServiceObject implements Map { ServiceMap._empty(ServiceObjectOwner owner) : super._empty(owner); - final Map _map = new Map(); + final Map _map = {}; @override void _update(Map map, bool mapIsRef) { diff --git a/packages/flutter_tools/test/src/mocks.dart b/packages/flutter_tools/test/src/mocks.dart index 3aac5b56d92..a8c83dfa8f5 100644 --- a/packages/flutter_tools/test/src/mocks.dart +++ b/packages/flutter_tools/test/src/mocks.dart @@ -77,7 +77,7 @@ void applyMocksToCommand(FlutterCommand command) { /// Common functionality for tracking mock interaction class BasicMock { - final List messages = new List(); + final List messages = []; void expectMessages(List expectedMessages) { final List actualMessages = new List.from(messages);