diff --git a/analysis_options.yaml b/analysis_options.yaml index 8a1a3a9f852..0f3f70d3cca 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -120,7 +120,7 @@ linter: # - parameter_assignments # we do this commonly - prefer_adjacent_string_concatenation - prefer_asserts_in_initializer_lists - # - prefer_collection_literals # temporary until all platforms support set literals + - prefer_collection_literals - prefer_conditional_assignment - prefer_const_constructors - prefer_const_constructors_in_immutables diff --git a/dev/bots/analyze.dart b/dev/bots/analyze.dart index dd26179a6e8..b6c4ab1784e 100644 --- a/dev/bots/analyze.dart +++ b/dev/bots/analyze.dart @@ -401,7 +401,7 @@ Set _findFlutterDependencies(String srcPath, List errors, { bool return Directory(srcPath).listSync(recursive: true).where((FileSystemEntity entity) { return entity is File && path.extension(entity.path) == '.dart'; }).map>((FileSystemEntity entity) { - final Set result = Set(); + final Set result = {}; final File file = entity; for (String line in file.readAsLinesSync()) { Match match = _importPattern.firstMatch(line); @@ -419,7 +419,7 @@ Set _findFlutterDependencies(String srcPath, List errors, { bool } return result; }).reduce((Set value, Set element) { - value ??= Set(); + value ??= {}; value.addAll(element); return value; }); @@ -434,7 +434,7 @@ List _deepSearch(Map> map, T start, [ Set seen ]) { final List result = _deepSearch( map, key, - (seen == null ? Set.from([start]) : Set.from(seen))..add(key), + (seen == null ? {start} : Set.from(seen))..add(key), ); if (result != null) { result.insert(0, start); @@ -543,7 +543,7 @@ Future _verifyGeneratedPluginRegistrants(String flutterRoot) async { } } - final Set outOfDate = Set(); + final Set outOfDate = {}; for (String package in packageToRegistrants.keys) { final Map fileToContent = {}; diff --git a/dev/manual_tests/lib/text.dart b/dev/manual_tests/lib/text.dart index d6309bfd3d7..6382fb3b8fb 100644 --- a/dev/manual_tests/lib/text.dart +++ b/dev/manual_tests/lib/text.dart @@ -1382,7 +1382,7 @@ String zalgo(math.Random random, int targetLength, { bool includeSpacingCombinin 0x16F7E, 0x1D165, 0x1D166, 0x1D16D, 0x1D16E, 0x1D16F, 0x1D170, 0x1D171, 0x1D172, ]; - final Set these = Set(); + final Set these = {}; int combiningCount = enclosingCombiningMarks.length + nonspacingCombiningMarks.length; if (includeSpacingCombiningMarks) combiningCount += spacingCombiningMarks.length; diff --git a/dev/tools/gen_localizations.dart b/dev/tools/gen_localizations.dart index 00577d60252..87459dceee3 100644 --- a/dev/tools/gen_localizations.dart +++ b/dev/tools/gen_localizations.dart @@ -80,7 +80,7 @@ final Map> localeToResourceAttributes = assumedLocales = Set(); +final Set assumedLocales = {}; /// Return `s` as a Dart-parseable raw string in single or double quotes. /// @@ -124,15 +124,15 @@ String generateTranslationBundles() { final Map> languageToScriptCodes = >{}; // Used to calculate if there are any corresponding countries for a given language and script. final Map> languageAndScriptToCountryCodes = >{}; - final Set allResourceIdentifiers = Set(); + final Set allResourceIdentifiers = {}; for (LocaleInfo locale in localeToResources.keys.toList()..sort()) { if (locale.scriptCode != null) { - languageToScriptCodes[locale.languageCode] ??= Set(); + languageToScriptCodes[locale.languageCode] ??= {}; languageToScriptCodes[locale.languageCode].add(locale.scriptCode); } if (locale.countryCode != null && locale.scriptCode != null) { final LocaleInfo key = LocaleInfo.fromString(locale.languageCode + '_' + locale.scriptCode); - languageAndScriptToCountryCodes[key] ??= Set(); + languageAndScriptToCountryCodes[key] ??= {}; languageAndScriptToCountryCodes[key].add(locale.countryCode); } languageToLocales[locale.languageCode] ??= []; diff --git a/dev/tools/update_icons.dart b/dev/tools/update_icons.dart index 1984cdf2ce1..cd604db9d3b 100644 --- a/dev/tools/update_icons.dart +++ b/dev/tools/update_icons.dart @@ -71,7 +71,7 @@ const Map kIdentifierRewrites = { }; -final Set kMirroredIcons = Set.from([ +const Set kMirroredIcons = { // This list is obtained from: // http://google.github.io/material-design-icons/#icons-in-rtl 'arrow_back', @@ -145,7 +145,7 @@ final Set kMirroredIcons = Set.from([ 'view_list', 'view_quilt', 'wrap_text', -]); +}; void main(List args) { // If we're run from the `tools` dir, set the cwd to the repo root. diff --git a/examples/flutter_gallery/lib/demo/material/chip_demo.dart b/examples/flutter_gallery/lib/demo/material/chip_demo.dart index 39c3e15abdf..d531d4298a1 100644 --- a/examples/flutter_gallery/lib/demo/material/chip_demo.dart +++ b/examples/flutter_gallery/lib/demo/material/chip_demo.dart @@ -54,20 +54,20 @@ const Map _avatars = { 'customer': 'people/square/peter.png', }; -final Map> _toolActions = >{ - 'hammer': Set()..addAll(['flake', 'fragment', 'splinter']), - 'chisel': Set()..addAll(['flake', 'nick', 'splinter']), - 'fryer': Set()..addAll(['fry']), - 'fabricator': Set()..addAll(['solder']), - 'customer': Set()..addAll(['cash in', 'eat']), +const Map> _toolActions = >{ + 'hammer': {'flake', 'fragment', 'splinter'}, + 'chisel': {'flake', 'nick', 'splinter'}, + 'fryer': {'fry'}, + 'fabricator': {'solder'}, + 'customer': {'cash in', 'eat'}, }; -final Map> _materialActions = >{ - 'poker': Set()..addAll(['cash in']), - 'tortilla': Set()..addAll(['fry', 'eat']), - 'fish and': Set()..addAll(['fry', 'eat']), - 'micro': Set()..addAll(['solder', 'fragment']), - 'wood': Set()..addAll(['flake', 'cut', 'splinter', 'nick']), +const Map> _materialActions = >{ + 'poker': {'cash in'}, + 'tortilla': {'fry', 'eat'}, + 'fish and': {'fry', 'eat'}, + 'micro': {'solder', 'fragment'}, + 'wood': {'flake', 'cut', 'splinter', 'nick'}, }; class _ChipsTile extends StatelessWidget { @@ -134,12 +134,12 @@ class _ChipDemoState extends State { _reset(); } - final Set _materials = Set(); + final Set _materials = {}; String _selectedMaterial = ''; String _selectedAction = ''; - final Set _tools = Set(); - final Set _selectedTools = Set(); - final Set _actions = Set(); + final Set _tools = {}; + final Set _selectedTools = {}; + final Set _actions = {}; bool _showShapeBorder = false; // Initialize members with the default data. @@ -262,7 +262,7 @@ class _ChipDemoState extends State { ); }).toList(); - Set allowedActions = Set(); + Set allowedActions = {}; if (_selectedMaterial != null && _selectedMaterial.isNotEmpty) { for (String tool in _selectedTools) { allowedActions.addAll(_toolActions[tool]); diff --git a/examples/flutter_gallery/lib/demo/pesto_demo.dart b/examples/flutter_gallery/lib/demo/pesto_demo.dart index c6e0e745d16..67b271eba14 100644 --- a/examples/flutter_gallery/lib/demo/pesto_demo.dart +++ b/examples/flutter_gallery/lib/demo/pesto_demo.dart @@ -21,7 +21,7 @@ const double _kAppBarHeight = 128.0; const double _kFabHalfSize = 28.0; // TODO(mpcomplete): needs to adapt to screen size const double _kRecipePageMaxWidth = 500.0; -final Set _favoriteRecipes = Set(); +final Set _favoriteRecipes = {}; final ThemeData _kTheme = ThemeData( brightness: Brightness.light, diff --git a/packages/flutter/lib/src/cupertino/route.dart b/packages/flutter/lib/src/cupertino/route.dart index e577a0a688d..3cfebf1fb29 100644 --- a/packages/flutter/lib/src/cupertino/route.dart +++ b/packages/flutter/lib/src/cupertino/route.dart @@ -193,7 +193,7 @@ class CupertinoPageRoute extends PageRoute { /// * [popGestureEnabled], which returns true if a user-triggered pop gesture /// would be allowed. static bool isPopGestureInProgress(PageRoute route) => _popGestureInProgress.contains(route); - static final Set> _popGestureInProgress = Set>(); + static final Set> _popGestureInProgress = >{}; /// True if a Cupertino pop gesture is currently underway for this route. /// diff --git a/packages/flutter/lib/src/gestures/mouse_tracking.dart b/packages/flutter/lib/src/gestures/mouse_tracking.dart index da65c24b960..5c93d4f6597 100644 --- a/packages/flutter/lib/src/gestures/mouse_tracking.dart +++ b/packages/flutter/lib/src/gestures/mouse_tracking.dart @@ -70,7 +70,7 @@ class _TrackedAnnotation { /// /// This is used to detect layers that used to have the mouse pointer inside /// them, but now no longer do (to facilitate exit notification). - Set activeDevices = Set(); + Set activeDevices = {}; } /// Describes a function that finds an annotation given an offset in logical diff --git a/packages/flutter/lib/src/material/time_picker.dart b/packages/flutter/lib/src/material/time_picker.dart index 077d6b3f085..caf2c58b856 100644 --- a/packages/flutter/lib/src/material/time_picker.dart +++ b/packages/flutter/lib/src/material/time_picker.dart @@ -965,10 +965,10 @@ class _DialPainter extends CustomPainter { textDirection: textDirection, onTap: label.onTap, ), - tags: Set.from(const [ + tags: { // Used by tests to find this node. - SemanticsTag('dial-label'), - ]), + const SemanticsTag('dial-label'), + }, ); nodes.add(node); labelTheta += labelThetaIncrement; diff --git a/packages/flutter/lib/src/rendering/custom_layout.dart b/packages/flutter/lib/src/rendering/custom_layout.dart index e8a53c847ff..f51ba310e77 100644 --- a/packages/flutter/lib/src/rendering/custom_layout.dart +++ b/packages/flutter/lib/src/rendering/custom_layout.dart @@ -183,7 +183,7 @@ abstract class MultiChildLayoutDelegate { Set debugPreviousChildrenNeedingLayout; assert(() { debugPreviousChildrenNeedingLayout = _debugChildrenNeedingLayout; - _debugChildrenNeedingLayout = Set(); + _debugChildrenNeedingLayout = {}; return true; }()); diff --git a/packages/flutter/lib/src/rendering/object.dart b/packages/flutter/lib/src/rendering/object.dart index 69df9421a8d..d4a86558336 100644 --- a/packages/flutter/lib/src/rendering/object.dart +++ b/packages/flutter/lib/src/rendering/object.dart @@ -921,7 +921,7 @@ class PipelineOwner { } bool _debugDoingSemantics = false; - final Set _nodesNeedingSemantics = Set(); + final Set _nodesNeedingSemantics = {}; /// Update the semantics for render objects marked as needing a semantics /// update. @@ -2422,7 +2422,7 @@ abstract class RenderObject extends AbstractNode with DiagnosticableTreeMixin im final bool producesForkingFragment = !config.hasBeenAnnotated && !config.isSemanticBoundary; final List<_InterestingSemanticsFragment> fragments = <_InterestingSemanticsFragment>[]; - final Set<_InterestingSemanticsFragment> toBeMarkedExplicit = Set<_InterestingSemanticsFragment>(); + final Set<_InterestingSemanticsFragment> toBeMarkedExplicit = <_InterestingSemanticsFragment>{}; final bool childrenMergeIntoParent = mergeIntoParent || config.isMergingSemanticsOfDescendants; // When set to true there's currently not enough information in this subtree @@ -3244,7 +3244,7 @@ abstract class _InterestingSemanticsFragment extends _SemanticsFragment { void addTags(Iterable tags) { if (tags == null || tags.isEmpty) return; - _tagsForChildren ??= Set(); + _tagsForChildren ??= {}; _tagsForChildren.addAll(tags); } diff --git a/packages/flutter/lib/src/rendering/platform_view.dart b/packages/flutter/lib/src/rendering/platform_view.dart index d81693982a0..dfd1f4e5d84 100644 --- a/packages/flutter/lib/src/rendering/platform_view.dart +++ b/packages/flutter/lib/src/rendering/platform_view.dart @@ -481,7 +481,7 @@ class _AndroidViewGestureRecognizer extends OneSequenceGestureRecognizer { // Pointer for which we have already won the arena, events for pointers in this set are // immediately dispatched to the Android view. - final Set forwardedPointers = Set(); + final Set forwardedPointers = {}; // We use OneSequenceGestureRecognizers as they support gesture arena teams. // TODO(amirh): get a list of GestureRecognizers here. diff --git a/packages/flutter/lib/src/semantics/semantics.dart b/packages/flutter/lib/src/semantics/semantics.dart index 828c399754d..8df9bf9e80b 100644 --- a/packages/flutter/lib/src/semantics/semantics.dart +++ b/packages/flutter/lib/src/semantics/semantics.dart @@ -1284,7 +1284,7 @@ class SemanticsNode extends AbstractNode with DiagnosticableTreeMixin { return true; }()); assert(() { - final Set seenChildren = Set(); + final Set seenChildren = {}; for (SemanticsNode child in newChildren) assert(seenChildren.add(child)); // check for duplicate adds return true; @@ -1742,7 +1742,7 @@ class SemanticsNode extends AbstractNode with DiagnosticableTreeMixin { double scrollExtentMin = _scrollExtentMin; final double elevation = _elevation; double thickness = _thickness; - final Set customSemanticsActionIds = Set(); + final Set customSemanticsActionIds = {}; for (CustomSemanticsAction action in _customSemanticsActions.keys) customSemanticsActionIds.add(CustomSemanticsAction.getIdentifier(action)); if (hintOverrides != null) { @@ -1781,7 +1781,7 @@ class SemanticsNode extends AbstractNode with DiagnosticableTreeMixin { if (decreasedValue == '' || decreasedValue == null) decreasedValue = node._decreasedValue; if (node.tags != null) { - mergedTags ??= Set(); + mergedTags ??= {}; mergedTags.addAll(node.tags); } if (node._customSemanticsActions != null) { @@ -2270,7 +2270,7 @@ class _SemanticsSortGroup extends Comparable<_SemanticsSortGroup> { } final List sortedIds = []; - final Set visitedIds = Set(); + final Set visitedIds = {}; final List startNodes = nodes.toList()..sort((SemanticsNode a, SemanticsNode b) { final Offset aTopLeft = _pointInParentCoordinates(a, a.rect.topLeft); final Offset bTopLeft = _pointInParentCoordinates(b, b.rect.topLeft); @@ -2410,9 +2410,9 @@ class _TraversalSortNode implements Comparable<_TraversalSortNode> { /// obtain a [SemanticsHandle]. This will create a [SemanticsOwner] if /// necessary. class SemanticsOwner extends ChangeNotifier { - final Set _dirtyNodes = Set(); + final Set _dirtyNodes = {}; final Map _nodes = {}; - final Set _detachedNodes = Set(); + final Set _detachedNodes = {}; final Map _actions = {}; /// The root node of the semantics tree, if any. @@ -2432,7 +2432,7 @@ class SemanticsOwner extends ChangeNotifier { void sendSemanticsUpdate() { if (_dirtyNodes.isEmpty) return; - final Set customSemanticsActionIds = Set(); + final Set customSemanticsActionIds = {}; final List visitedNodes = []; while (_dirtyNodes.isNotEmpty) { final List localDirtyNodes = _dirtyNodes.where((SemanticsNode node) => !_detachedNodes.contains(node)).toList(); @@ -3551,7 +3551,7 @@ class SemanticsConfiguration { /// * [RenderSemanticsGestureHandler.excludeFromScrolling] for an example of /// how tags are used. void addTagForChildren(SemanticsTag tag) { - _tagsForChildren ??= Set(); + _tagsForChildren ??= {}; _tagsForChildren.add(tag); } diff --git a/packages/flutter/lib/src/services/raw_keyboard.dart b/packages/flutter/lib/src/services/raw_keyboard.dart index ee5bce982c4..02c1441dcbc 100644 --- a/packages/flutter/lib/src/services/raw_keyboard.dart +++ b/packages/flutter/lib/src/services/raw_keyboard.dart @@ -478,7 +478,7 @@ class RawKeyboard { } } - final Set _keysPressed = Set(); + final Set _keysPressed = {}; /// Returns the set of keys currently pressed. Set get keysPressed { diff --git a/packages/flutter/lib/src/widgets/animated_switcher.dart b/packages/flutter/lib/src/widgets/animated_switcher.dart index ea21fa86f02..9f3a1a19c0b 100644 --- a/packages/flutter/lib/src/widgets/animated_switcher.dart +++ b/packages/flutter/lib/src/widgets/animated_switcher.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 'package:flutter/animation.dart'; import 'package:flutter/foundation.dart'; @@ -278,7 +276,7 @@ class AnimatedSwitcher extends StatefulWidget { class _AnimatedSwitcherState extends State with TickerProviderStateMixin { _ChildEntry _currentEntry; - final Set<_ChildEntry> _outgoingEntries = LinkedHashSet<_ChildEntry>(); + final Set<_ChildEntry> _outgoingEntries = <_ChildEntry>{}; List _outgoingWidgets = const []; int _childNumber = 0; diff --git a/packages/flutter/lib/src/widgets/form.dart b/packages/flutter/lib/src/widgets/form.dart index 96844ddf6fb..c511cd37c7c 100644 --- a/packages/flutter/lib/src/widgets/form.dart +++ b/packages/flutter/lib/src/widgets/form.dart @@ -83,7 +83,7 @@ class Form extends StatefulWidget { /// Typically obtained via [Form.of]. class FormState extends State
{ int _generation = 0; - final Set> _fields = Set>(); + final Set> _fields = >{}; // Called when a form field has changed. This will cause all form fields // to rebuild, useful if form fields have interdependencies. diff --git a/packages/flutter/lib/src/widgets/localizations.dart b/packages/flutter/lib/src/widgets/localizations.dart index b9bb81c4a9b..c3a4712f32c 100644 --- a/packages/flutter/lib/src/widgets/localizations.dart +++ b/packages/flutter/lib/src/widgets/localizations.dart @@ -44,7 +44,7 @@ Future> _loadAll(Locale locale, Iterable types = Set(); + final Set types = {}; final List> delegates = >[]; for (LocalizationsDelegate delegate in allDelegates) { if (!types.contains(delegate.type) && delegate.isSupported(locale)) { diff --git a/packages/flutter/lib/src/widgets/navigator.dart b/packages/flutter/lib/src/widgets/navigator.dart index 13c92241cc0..0564c3c28bd 100644 --- a/packages/flutter/lib/src/widgets/navigator.dart +++ b/packages/flutter/lib/src/widgets/navigator.dart @@ -1465,7 +1465,7 @@ class Navigator extends StatefulWidget { class NavigatorState extends State with TickerProviderStateMixin { final GlobalKey _overlayKey = GlobalKey(); final List> _history = >[]; - final Set> _poppedRoutes = Set>(); + final Set> _poppedRoutes = >{}; /// The [FocusScopeNode] for the [FocusScope] that encloses the routes. final FocusScopeNode focusScopeNode = FocusScopeNode(); @@ -2145,7 +2145,7 @@ class NavigatorState extends State with TickerProviderStateMixin { } } - final Set _activePointers = Set(); + final Set _activePointers = {}; void _handlePointerDown(PointerDownEvent event) { _activePointers.add(event.pointer); diff --git a/packages/flutter/lib/src/widgets/platform_view.dart b/packages/flutter/lib/src/widgets/platform_view.dart index 9f16ae11a50..73c5d4ecb3d 100644 --- a/packages/flutter/lib/src/widgets/platform_view.dart +++ b/packages/flutter/lib/src/widgets/platform_view.dart @@ -297,7 +297,7 @@ class _AndroidViewState extends State { bool _initialized = false; static final Set> _emptyRecognizersSet = - Set>(); + >{}; @override Widget build(BuildContext context) { @@ -380,7 +380,7 @@ class _UiKitViewState extends State { bool _initialized = false; static final Set> _emptyRecognizersSet = - Set>(); + >{}; @override Widget build(BuildContext context) { diff --git a/packages/flutter/lib/src/widgets/routes.dart b/packages/flutter/lib/src/widgets/routes.dart index 84ab501e473..eb23e0095f9 100644 --- a/packages/flutter/lib/src/widgets/routes.dart +++ b/packages/flutter/lib/src/widgets/routes.dart @@ -1363,7 +1363,7 @@ class RouteObserver> extends NavigatorObserver { void subscribe(RouteAware routeAware, R route) { assert(routeAware != null); assert(route != null); - final Set subscribers = _listeners.putIfAbsent(route, () => Set()); + final Set subscribers = _listeners.putIfAbsent(route, () => {}); if (subscribers.add(routeAware)) { routeAware.didPush(); } diff --git a/packages/flutter/lib/src/widgets/scroll_position.dart b/packages/flutter/lib/src/widgets/scroll_position.dart index c6b1bb0a8e1..3018a17f4a6 100644 --- a/packages/flutter/lib/src/widgets/scroll_position.dart +++ b/packages/flutter/lib/src/widgets/scroll_position.dart @@ -432,7 +432,7 @@ abstract class ScrollPosition extends ViewportOffset with ScrollMetrics { break; } - final Set actions = Set(); + final Set actions = {}; if (pixels > minScrollExtent) actions.add(backward); if (pixels < maxScrollExtent) diff --git a/packages/flutter/lib/src/widgets/table.dart b/packages/flutter/lib/src/widgets/table.dart index acc21f21931..e71b2a74574 100644 --- a/packages/flutter/lib/src/widgets/table.dart +++ b/packages/flutter/lib/src/widgets/table.dart @@ -308,7 +308,7 @@ class _TableElement extends RenderObjectElement { } final Iterator<_TableElementRow> oldUnkeyedRows = _children.where((_TableElementRow row) => row.key == null).iterator; final List<_TableElementRow> newChildren = <_TableElementRow>[]; - final Set> taken = Set>(); + final Set> taken = >{}; for (TableRow row in newWidget.children) { List oldChildren; if (row.key != null && oldKeyedRows.containsKey(row.key)) { diff --git a/packages/flutter/lib/src/widgets/ticker_provider.dart b/packages/flutter/lib/src/widgets/ticker_provider.dart index 2eb79ca066d..57db697b0aa 100644 --- a/packages/flutter/lib/src/widgets/ticker_provider.dart +++ b/packages/flutter/lib/src/widgets/ticker_provider.dart @@ -157,7 +157,7 @@ mixin TickerProviderStateMixin on State implements @override Ticker createTicker(TickerCallback onTick) { - _tickers ??= Set<_WidgetTicker>(); + _tickers ??= <_WidgetTicker>{}; final _WidgetTicker result = _WidgetTicker(onTick, this, debugLabel: 'created by $this'); _tickers.add(result); return result; diff --git a/packages/flutter/lib/src/widgets/widget_inspector.dart b/packages/flutter/lib/src/widgets/widget_inspector.dart index 97779590510..cd48ec9fe2d 100644 --- a/packages/flutter/lib/src/widgets/widget_inspector.dart +++ b/packages/flutter/lib/src/widgets/widget_inspector.dart @@ -3,7 +3,6 @@ // found in the LICENSE file. import 'dart:async'; -import 'dart:collection'; import 'dart:convert'; import 'dart:developer' as developer; import 'dart:math' as math; @@ -2259,7 +2258,7 @@ class _WidgetInspectorState extends State return size == null ? double.maxFinite : size.width * size.height; } regularHits.sort((RenderObject a, RenderObject b) => _area(a).compareTo(_area(b))); - final Set hits = LinkedHashSet(); + final Set hits = {}; hits..addAll(edgeHits)..addAll(regularHits); return hits.toList(); } diff --git a/packages/flutter/test/rendering/proxy_box_test.dart b/packages/flutter/test/rendering/proxy_box_test.dart index fe900a2b6c9..09519e95b8a 100644 --- a/packages/flutter/test/rendering/proxy_box_test.dart +++ b/packages/flutter/test/rendering/proxy_box_test.dart @@ -89,7 +89,7 @@ void main() { expect(config.getActionHandler(SemanticsAction.scrollRight), isNotNull); config = SemanticsConfiguration(); - renderObj.validActions = [SemanticsAction.tap, SemanticsAction.scrollLeft].toSet(); + renderObj.validActions = {SemanticsAction.tap, SemanticsAction.scrollLeft}; renderObj.describeSemanticsConfiguration(config); expect(config.getActionHandler(SemanticsAction.tap), isNotNull); diff --git a/packages/flutter/test/semantics/semantics_test.dart b/packages/flutter/test/semantics/semantics_test.dart index d7afc13fa3d..66fcfd3905e 100644 --- a/packages/flutter/test/semantics/semantics_test.dart +++ b/packages/flutter/test/semantics/semantics_test.dart @@ -26,7 +26,7 @@ void main() { expect(node.isTagged(tag1), isFalse); expect(node.isTagged(tag2), isFalse); - node.tags = Set()..add(tag1); + node.tags = {tag1}; expect(node.isTagged(tag1), isTrue); expect(node.isTagged(tag2), isFalse); @@ -36,9 +36,7 @@ void main() { }); test('getSemanticsData includes tags', () { - final Set tags = Set() - ..add(tag1) - ..add(tag2); + final Set tags = {tag1, tag2}; final SemanticsNode node = SemanticsNode() ..rect = Rect.fromLTRB(0.0, 0.0, 10.0, 10.0) diff --git a/packages/flutter/test/services/fake_platform_views.dart b/packages/flutter/test/services/fake_platform_views.dart index fcea5dbe9c3..735db57dc00 100644 --- a/packages/flutter/test/services/fake_platform_views.dart +++ b/packages/flutter/test/services/fake_platform_views.dart @@ -20,7 +20,7 @@ class FakeAndroidPlatformViewsController { final Map> motionEvents = >{}; - final Set _registeredViewTypes = Set(); + final Set _registeredViewTypes = {}; int _textureCounter = 0; @@ -153,7 +153,7 @@ class FakeIosPlatformViewsController { Iterable get views => _views.values; final Map _views = {}; - final Set _registeredViewTypes = Set(); + final Set _registeredViewTypes = {}; // When this completer is non null, the 'create' method channel call will be // delayed until it completes. diff --git a/packages/flutter/test/widgets/inherited_model_test.dart b/packages/flutter/test/widgets/inherited_model_test.dart index 57201f82631..bb4f4c4f39c 100644 --- a/packages/flutter/test/widgets/inherited_model_test.dart +++ b/packages/flutter/test/widgets/inherited_model_test.dart @@ -241,7 +241,7 @@ void main() { child: ABCModel( // The "inner" model a: 100 + _a, b: 100 + _b, - aspects: Set.of(['a']), + aspects: {'a'}, child: Center( child: Column( mainAxisSize: MainAxisSize.min, @@ -328,7 +328,7 @@ void main() { int _a = 0; int _b = 1; int _c = 2; - Set _innerModelAspects = Set.of(['a']); + Set _innerModelAspects = {'a'}; // Same as in abcPage in the "Inner InheritedModel shadows the outer one" // test except: the "Add b aspect" changes adds 'b' to the set of @@ -406,14 +406,14 @@ void main() { }, ); - _innerModelAspects = Set.of(['a']); + _innerModelAspects = {'a'}; await tester.pumpWidget(MaterialApp(home: abcPage)); expect(find.text('a: 100 [0]'), findsOneWidget); // showA depends on the inner model expect(find.text('b: 1 [0]'), findsOneWidget); // showB depends on the outer model expect(find.text('c: 2 [0]'), findsOneWidget); expect(find.text('a: 100 b: 101 c: null'), findsOneWidget); // inner model's a, b, c - _innerModelAspects = Set.of(['a', 'b']); + _innerModelAspects = {'a', 'b'}; await tester.tap(find.text('rebuild')); await tester.pumpAndSettle(); expect(find.text('a: 100 [1]'), findsOneWidget); // rebuilt showA still depend on the inner model @@ -448,7 +448,7 @@ void main() { expect(find.text('c: 3 [2]'), findsOneWidget); // rebuilt showC still depends on the outer model expect(find.text('a: 101 b: 102 c: null'), findsOneWidget); - _innerModelAspects = Set.of(['a', 'b', 'c']); + _innerModelAspects = {'a', 'b', 'c'}; await tester.tap(find.text('rebuild')); await tester.pumpAndSettle(); expect(find.text('a: 101 [3]'), findsOneWidget); // rebuilt showA still depend on the inner model @@ -457,7 +457,7 @@ void main() { expect(find.text('a: 101 b: 102 c: null'), findsOneWidget); // inner model's a, b, c // Now the inner model supports no aspects - _innerModelAspects = Set.of([]); + _innerModelAspects = {}; await tester.tap(find.text('rebuild')); await tester.pumpAndSettle(); expect(find.text('a: 1 [4]'), findsOneWidget); // rebuilt showA now depends on the outer model diff --git a/packages/flutter/test/widgets/list_wheel_scroll_view_test.dart b/packages/flutter/test/widgets/list_wheel_scroll_view_test.dart index 65a5ba886f9..cc6a937bad6 100644 --- a/packages/flutter/test/widgets/list_wheel_scroll_view_test.dart +++ b/packages/flutter/test/widgets/list_wheel_scroll_view_test.dart @@ -277,7 +277,7 @@ void main() { }); testWidgets('builder is never called twice for same index', (WidgetTester tester) async { - final Set builtChildren = Set(); + final Set builtChildren = {}; final FixedExtentScrollController controller = FixedExtentScrollController(); diff --git a/packages/flutter/test/widgets/platform_view_test.dart b/packages/flutter/test/widgets/platform_view_test.dart index 4b4ecae99c0..057ec209071 100644 --- a/packages/flutter/test/widgets/platform_view_test.dart +++ b/packages/flutter/test/widgets/platform_view_test.dart @@ -590,11 +590,11 @@ void main() { height: 100.0, child: AndroidView( viewType: 'webview', - gestureRecognizers: >[ + gestureRecognizers: >{ Factory( () => VerticalDragGestureRecognizer(), ), - ].toSet(), + }, layoutDirection: TextDirection.ltr, ), ), @@ -727,11 +727,11 @@ void main() { height: 100.0, child: AndroidView( viewType: 'webview', - gestureRecognizers: >[ + gestureRecognizers: >{ Factory( () => EagerGestureRecognizer(), ), - ].toSet(), + }, layoutDirection: TextDirection.ltr, ), ), @@ -760,11 +760,11 @@ void main() { final AndroidView androidView = AndroidView( viewType: 'webview', - gestureRecognizers: >[ + gestureRecognizers: >{ Factory( () => EagerGestureRecognizer(), ), - ].toSet(), + }, layoutDirection: TextDirection.ltr, ); @@ -786,9 +786,9 @@ void main() { await tester.pumpWidget( AndroidView( viewType: 'webview', - gestureRecognizers: >[ + gestureRecognizers: >{ Factory(constructRecognizer), - ].toSet(), + }, layoutDirection: TextDirection.ltr, ), ); @@ -797,9 +797,9 @@ void main() { AndroidView( viewType: 'webview', hitTestBehavior: PlatformViewHitTestBehavior.translucent, - gestureRecognizers: >[ + gestureRecognizers: >{ Factory(constructRecognizer), - ].toSet(), + }, layoutDirection: TextDirection.ltr, ), ); @@ -1214,11 +1214,11 @@ void main() { height: 100.0, child: UiKitView( viewType: 'webview', - gestureRecognizers: >[ + gestureRecognizers: >{ Factory( () => VerticalDragGestureRecognizer(), ), - ].toSet(), + }, layoutDirection: TextDirection.ltr, ), ), @@ -1338,11 +1338,11 @@ void main() { height: 100.0, child: UiKitView( viewType: 'webview', - gestureRecognizers: >[ + gestureRecognizers: >{ Factory( () => EagerGestureRecognizer(), ), - ].toSet(), + }, layoutDirection: TextDirection.ltr, ), ), @@ -1407,9 +1407,9 @@ void main() { await tester.pumpWidget( UiKitView( viewType: 'webview', - gestureRecognizers: >[ + gestureRecognizers: >{ Factory(constructRecognizer), - ].toSet(), + }, layoutDirection: TextDirection.ltr, ), ); @@ -1418,9 +1418,9 @@ void main() { UiKitView( viewType: 'webview', hitTestBehavior: PlatformViewHitTestBehavior.translucent, - gestureRecognizers: >[ + gestureRecognizers: >{ Factory(constructRecognizer), - ].toSet(), + }, layoutDirection: TextDirection.ltr, ), ); diff --git a/packages/flutter/test/widgets/semantics_tester.dart b/packages/flutter/test/widgets/semantics_tester.dart index 3db3f67c5b6..7b22c791382 100644 --- a/packages/flutter/test/widgets/semantics_tester.dart +++ b/packages/flutter/test/widgets/semantics_tester.dart @@ -61,7 +61,7 @@ class TestSemantics { assert(decreasedValue != null), assert(hint != null), assert(children != null), - tags = tags?.toSet() ?? Set(); + tags = tags?.toSet() ?? {}; /// Creates an object with some test semantics data, with the [id] and [rect] /// set to the appropriate values for the root node. @@ -92,7 +92,7 @@ class TestSemantics { elevation = 0.0, thickness = 0.0, assert(children != null), - tags = tags?.toSet() ?? Set(); + tags = tags?.toSet() ?? {}; /// Creates an object with some test semantics data, with the [id] and [rect] /// set to the appropriate values for direct children of the root node. @@ -131,7 +131,7 @@ class TestSemantics { assert(hint != null), transform = _applyRootChildScale(transform), assert(children != null), - tags = tags?.toSet() ?? Set(); + tags = tags?.toSet() ?? {}; /// The unique identifier for this node. /// diff --git a/packages/flutter_localizations/lib/src/material_localizations.dart b/packages/flutter_localizations/lib/src/material_localizations.dart index 53690d04979..93181f245bc 100644 --- a/packages/flutter_localizations/lib/src/material_localizations.dart +++ b/packages/flutter_localizations/lib/src/material_localizations.dart @@ -573,7 +573,7 @@ class _MaterialLocalizationsDelegate extends LocalizationsDelegate initializedLocales = Set(); + final Set initializedLocales = {}; date_localizations.dateSymbols.forEach((String locale, dynamic data) { // Strip scriptCode from the locale, as we do not distinguish between scripts // for dates. diff --git a/packages/flutter_test/lib/src/test_compat.dart b/packages/flutter_test/lib/src/test_compat.dart index f21dd4e20c4..c987fecaef2 100644 --- a/packages/flutter_test/lib/src/test_compat.dart +++ b/packages/flutter_test/lib/src/test_compat.dart @@ -365,7 +365,7 @@ class _Reporter { String _lastProgressSuffix; /// The set of all subscriptions to various streams. - final Set> _subscriptions = Set>(); + final Set> _subscriptions = >{}; /// A callback called when the engine begins running [liveTest]. void _onTestStarted(LiveTest liveTest) { diff --git a/packages/flutter_test/lib/src/widget_tester.dart b/packages/flutter_test/lib/src/widget_tester.dart index 0ff7bd2b554..b15d313c318 100644 --- a/packages/flutter_test/lib/src/widget_tester.dart +++ b/packages/flutter_test/lib/src/widget_tester.dart @@ -551,7 +551,7 @@ class WidgetTester extends WidgetController implements HitTestDispatcher, Ticker @override Ticker createTicker(TickerCallback onTick) { - _tickers ??= Set<_TestTicker>(); + _tickers ??= <_TestTicker>{}; final _TestTicker result = _TestTicker(onTick, _removeTicker); _tickers.add(result); return result; diff --git a/packages/flutter_tools/lib/src/android/gradle.dart b/packages/flutter_tools/lib/src/android/gradle.dart index af9b3e8f359..0fcbd77992e 100644 --- a/packages/flutter_tools/lib/src/android/gradle.dart +++ b/packages/flutter_tools/lib/src/android/gradle.dart @@ -682,7 +682,7 @@ class GradleProject { .trim(); // Extract build types and product flavors. - final Set variants = Set(); + final Set variants = {}; for (String s in tasks.split('\n')) { final Match match = _assembleTaskPattern.matchAsPrefix(s); if (match != null) { @@ -691,8 +691,8 @@ class GradleProject { variants.add(variant); } } - final Set buildTypes = Set(); - final Set productFlavors = Set(); + final Set buildTypes = {}; + final Set productFlavors = {}; for (final String variant1 in variants) { for (final String variant2 in variants) { if (variant2.startsWith(variant1) && variant2 != variant1) { diff --git a/packages/flutter_tools/lib/src/asset.dart b/packages/flutter_tools/lib/src/asset.dart index 2918097b9bc..70e2ec7daef 100644 --- a/packages/flutter_tools/lib/src/asset.dart +++ b/packages/flutter_tools/lib/src/asset.dart @@ -320,7 +320,7 @@ Future _obtainLicenses( // example, a package might itself contain code from multiple third-party // sources, and might need to include a license for each one.) final Map> packageLicenses = >{}; - final Set allPackages = Set(); + final Set allPackages = {}; for (String packageName in packageMap.map.keys) { final Uri package = packageMap.map[packageName]; if (package != null && package.scheme == 'file') { @@ -342,7 +342,7 @@ Future _obtainLicenses( packageNames = [packageName]; licenseText = rawLicense; } - packageLicenses.putIfAbsent(licenseText, () => Set()) + packageLicenses.putIfAbsent(licenseText, () => {}) ..addAll(packageNames); allPackages.addAll(packageNames); } diff --git a/packages/flutter_tools/lib/src/base/build.dart b/packages/flutter_tools/lib/src/base/build.dart index 8e601204282..5c525348dc6 100644 --- a/packages/flutter_tools/lib/src/base/build.dart +++ b/packages/flutter_tools/lib/src/base/build.dart @@ -118,7 +118,7 @@ class AOTSnapshotter { final String vmServicePath = fs.path.join(skyEnginePkg, 'sdk_ext', 'vmservice_io.dart'); final List inputPaths = [uiPath, vmServicePath, mainPath]; - final Set outputPaths = Set(); + final Set outputPaths = {}; final String depfilePath = fs.path.join(outputDir.path, 'snapshot.d'); final List genSnapshotArgs = [ @@ -458,7 +458,7 @@ class JITSnapshotter { genSnapshotArgs.addAll(extraGenSnapshotOptions); } - final Set outputPaths = Set(); + final Set outputPaths = {}; outputPaths.addAll([isolateSnapshotData]); if (!createPatch) { outputPaths.add(isolateSnapshotInstructions); diff --git a/packages/flutter_tools/lib/src/base/utils.dart b/packages/flutter_tools/lib/src/base/utils.dart index a309293e0e6..a18ae8bf44a 100644 --- a/packages/flutter_tools/lib/src/base/utils.dart +++ b/packages/flutter_tools/lib/src/base/utils.dart @@ -146,7 +146,7 @@ String getDisplayPath(String fullPath) { /// available. class ItemListNotifier { ItemListNotifier() { - _items = Set(); + _items = {}; } ItemListNotifier.from(List items) { diff --git a/packages/flutter_tools/lib/src/commands/analyze_continuously.dart b/packages/flutter_tools/lib/src/commands/analyze_continuously.dart index 1be67c68341..4d79959e186 100644 --- a/packages/flutter_tools/lib/src/commands/analyze_continuously.dart +++ b/packages/flutter_tools/lib/src/commands/analyze_continuously.dart @@ -26,7 +26,7 @@ class AnalyzeContinuously extends AnalyzeBase { String analysisTarget; bool firstAnalysis = true; - Set analyzedPaths = Set(); + Set analyzedPaths = {}; Map> analysisErrors = >{}; Stopwatch analysisTimer; int lastErrorCount = 0; diff --git a/packages/flutter_tools/lib/src/commands/channel.dart b/packages/flutter_tools/lib/src/commands/channel.dart index 7716db84327..dce73af8034 100644 --- a/packages/flutter_tools/lib/src/commands/channel.dart +++ b/packages/flutter_tools/lib/src/commands/channel.dart @@ -52,7 +52,7 @@ class ChannelCommand extends FlutterCommand { // Beware: currentBranch could contain PII. See getBranchName(). final String currentChannel = FlutterVersion.instance.channel; final String currentBranch = FlutterVersion.instance.getBranchName(); - final Set seenChannels = Set(); + final Set seenChannels = {}; final List rawOutput = []; showAll = showAll || currentChannel != currentBranch; diff --git a/packages/flutter_tools/lib/src/commands/create.dart b/packages/flutter_tools/lib/src/commands/create.dart index faaf109cf54..e3d1d0eebc5 100644 --- a/packages/flutter_tools/lib/src/commands/create.dart +++ b/packages/flutter_tools/lib/src/commands/create.dart @@ -612,7 +612,7 @@ String _createUTIIdentifier(String organization, String name) { return segments.join('.'); } -final Set _packageDependencies = Set.from([ +const Set _packageDependencies = { 'analyzer', 'args', 'async', @@ -639,7 +639,7 @@ final Set _packageDependencies = Set.from([ 'utf', 'watcher', 'yaml', -]); +}; /// Return null if the project name is legal. Return a validation message if /// we should disallow the project name. diff --git a/packages/flutter_tools/lib/src/commands/ide_config.dart b/packages/flutter_tools/lib/src/commands/ide_config.dart index e9777794c23..2e14108c029 100644 --- a/packages/flutter_tools/lib/src/commands/ide_config.dart +++ b/packages/flutter_tools/lib/src/commands/ide_config.dart @@ -121,7 +121,7 @@ class IdeConfigCommand extends FlutterCommand { return; } - final Set manifest = Set(); + final Set manifest = {}; final List flutterFiles = _flutterRoot.listSync(recursive: true); for (FileSystemEntity entity in flutterFiles) { final String relativePath = fs.path.relative(entity.path, from: _flutterRoot.absolute.path); diff --git a/packages/flutter_tools/lib/src/commands/update_packages.dart b/packages/flutter_tools/lib/src/commands/update_packages.dart index 76de4327389..254826ab70b 100644 --- a/packages/flutter_tools/lib/src/commands/update_packages.dart +++ b/packages/flutter_tools/lib/src/commands/update_packages.dart @@ -200,7 +200,7 @@ class UpdatePackagesCommand extends FlutterCommand { // First, collect up the explicit dependencies: final List pubspecs = []; final Map dependencies = {}; - final Set specialDependencies = Set(); + final Set specialDependencies = {}; for (Directory directory in packages) { // these are all the directories with pubspec.yamls we care about printTrace('Reading pubspec.yaml from: ${directory.path}'); PubspecYaml pubspec; @@ -279,7 +279,7 @@ class UpdatePackagesCommand extends FlutterCommand { for (PubspecDependency dependency in pubspec.dependencies) { if (dependency.kind == DependencyKind.normal) { tree._versions[package] = version; - tree._dependencyTree[package] ??= Set(); + tree._dependencyTree[package] ??= {}; tree._dependencyTree[package].add(dependency.name); } } @@ -341,7 +341,7 @@ class UpdatePackagesCommand extends FlutterCommand { throwToolExit('Package $to not found in the dependency tree.'); final Queue<_DependencyLink> traversalQueue = Queue<_DependencyLink>(); - final Set visited = Set(); + final Set visited = {}; final List<_DependencyLink> paths = <_DependencyLink>[]; traversalQueue.addFirst(_DependencyLink(from: null, to: from)); @@ -625,8 +625,8 @@ class PubspecYaml { void apply(PubDependencyTree versions, Set specialDependencies) { assert(versions != null); final List output = []; // the string data to output to the file, line by line - final Set directDependencies = Set(); // packages this pubspec directly depends on (i.e. not transitive) - final Set devDependencies = Set(); + final Set directDependencies = {}; // packages this pubspec directly depends on (i.e. not transitive) + final Set devDependencies = {}; Section section = Section.other; // the section we're currently handling // the line number where we're going to insert the transitive dependencies. @@ -723,8 +723,8 @@ class PubspecYaml { final List transitiveDevDependencyOutput = []; // Which dependencies we need to handle for the transitive and dev dependency sections. - final Set transitiveDependencies = Set(); - final Set transitiveDevDependencies = Set(); + final Set transitiveDependencies = {}; + final Set transitiveDevDependencies = {}; // Merge the lists of dependencies we've seen in this file from dependencies, dev dependencies, // and the dependencies we know this file mentions that are already pinned @@ -735,7 +735,7 @@ class PubspecYaml { // Create a new set to hold the list of packages we've already processed, so // that we don't redundantly process them multiple times. - final Set done = Set(); + final Set done = {}; for (String package in directDependencies) transitiveDependencies.addAll(versions.getTransitiveDependenciesFor(package, seen: done, exclude: implied)); for (String package in devDependencies) @@ -752,7 +752,7 @@ class PubspecYaml { transitiveDevDependencyOutput.add(' $package: ${versions.versionFor(package)} $kTransitiveMagicString'); // Build a sorted list of all dependencies for the checksum. - final Set checksumDependencies = Set() + final Set checksumDependencies = {} ..addAll(directDependencies) ..addAll(devDependencies) ..addAll(transitiveDependenciesAsList) diff --git a/packages/flutter_tools/lib/src/dependency_checker.dart b/packages/flutter_tools/lib/src/dependency_checker.dart index bcc9407d116..8f0aea74467 100644 --- a/packages/flutter_tools/lib/src/dependency_checker.dart +++ b/packages/flutter_tools/lib/src/dependency_checker.dart @@ -11,7 +11,7 @@ class DependencyChecker { DependencyChecker(this.builder, this.assets); final DartDependencySetBuilder builder; - final Set _dependencies = Set(); + final Set _dependencies = {}; final AssetBundle assets; /// Returns [true] if any components have been modified after [threshold] or diff --git a/packages/flutter_tools/lib/src/devfs.dart b/packages/flutter_tools/lib/src/devfs.dart index e6dabb14577..7940e8bb064 100644 --- a/packages/flutter_tools/lib/src/devfs.dart +++ b/packages/flutter_tools/lib/src/devfs.dart @@ -403,7 +403,7 @@ class DevFS { final Directory rootDirectory; String _packagesFilePath; final Map _entries = {}; - final Set assetPathsToEvict = Set(); + final Set assetPathsToEvict = {}; final List>> _pendingOperations = >>[]; @@ -533,7 +533,7 @@ class DevFS { // run with no changes is supposed to be fast (considering that it is // initiated by user key press). final List invalidatedFiles = []; - final Set filesUris = Set(); + final Set filesUris = {}; for (Uri uri in dirtyEntries.keys.toList()) { if (!uri.path.startsWith(assetBuildDirPrefix)) { final DevFSContent content = dirtyEntries[uri]; diff --git a/packages/flutter_tools/lib/src/flutter_manifest.dart b/packages/flutter_tools/lib/src/flutter_manifest.dart index 0c094f7019c..7b39071cbb2 100644 --- a/packages/flutter_tools/lib/src/flutter_manifest.dart +++ b/packages/flutter_tools/lib/src/flutter_manifest.dart @@ -391,9 +391,9 @@ void _validateFonts(YamlList fonts, List errors) { if (fonts == null) { return; } - final Set fontWeights = Set.from(const [ + const Set fontWeights = { 100, 200, 300, 400, 500, 600, 700, 800, 900, - ]); + }; for (final YamlMap fontMap in fonts) { for (dynamic key in fontMap.keys.where((dynamic key) => key != 'family' && key != 'fonts')) { errors.add('Unexpected child "$key" found under "fonts".'); diff --git a/packages/flutter_tools/lib/src/ios/mac.dart b/packages/flutter_tools/lib/src/ios/mac.dart index 648547e5531..b45f4fe0502 100644 --- a/packages/flutter_tools/lib/src/ios/mac.dart +++ b/packages/flutter_tools/lib/src/ios/mac.dart @@ -733,7 +733,7 @@ Future upgradePbxProjWithFlutterAssets(IosProject project) async { final RegExp oldAssets = RegExp(r'\/\* (flutter_assets|app\.flx)'); final StringBuffer buffer = StringBuffer(); - final Set printedStatuses = Set(); + final Set printedStatuses = {}; for (final String line in lines) { final Match match = oldAssets.firstMatch(line); diff --git a/packages/flutter_tools/lib/src/version.dart b/packages/flutter_tools/lib/src/version.dart index e1968166131..db71d60c01f 100644 --- a/packages/flutter_tools/lib/src/version.dart +++ b/packages/flutter_tools/lib/src/version.dart @@ -43,12 +43,12 @@ class FlutterVersion { String _repositoryUrl; String get repositoryUrl => _repositoryUrl; - static Set officialChannels = Set.from([ + static const Set officialChannels = { 'master', 'dev', 'beta', 'stable', - ]); + }; /// This maps old branch names to the names of branches that replaced them. /// diff --git a/packages/flutter_tools/lib/src/vmservice.dart b/packages/flutter_tools/lib/src/vmservice.dart index f0d69ebeecb..8a5a7117528 100644 --- a/packages/flutter_tools/lib/src/vmservice.dart +++ b/packages/flutter_tools/lib/src/vmservice.dart @@ -272,7 +272,7 @@ class VMService { final Map> _eventControllers = >{}; - final Set _listeningFor = Set(); + final Set _listeningFor = {}; /// Whether our connection to the VM service has been closed; bool get isClosed => _peer.isClosed; @@ -749,7 +749,7 @@ class VM extends ServiceObjectOwner { void _removeDeadIsolates(List newIsolates) { // Build a set of new isolates. - final Set newIsolateSet = Set(); + final Set newIsolateSet = {}; for (Isolate iso in newIsolates) newIsolateSet.add(iso.id); diff --git a/packages/flutter_tools/test/devfs_test.dart b/packages/flutter_tools/test/devfs_test.dart index db86a6bad72..318ed1b6b2d 100644 --- a/packages/flutter_tools/test/devfs_test.dart +++ b/packages/flutter_tools/test/devfs_test.dart @@ -300,7 +300,7 @@ void main() { const String packageName = 'doubleslashpkg'; await _createPackage(fs, packageName, 'somefile.txt', doubleSlash: true); - final Set fileFilter = Set(); + final Set fileFilter = {}; final List pkgUris = [fs.path.toUri(basePath)]..addAll(_packages.values); for (Uri pkgUri in pkgUris) { if (!pkgUri.isAbsolute) { diff --git a/packages/flutter_tools/test/hot_test.dart b/packages/flutter_tools/test/hot_test.dart index f681f424758..a9efb24d944 100644 --- a/packages/flutter_tools/test/hot_test.dart +++ b/packages/flutter_tools/test/hot_test.dart @@ -114,7 +114,7 @@ void main() { pathToReload: anyNamed('pathToReload'), )).thenAnswer((Invocation _) => Future.value( UpdateFSReport(success: true, syncedBytes: 1000, invalidatedSourcesCount: 1))); - when(mockDevFs.assetPathsToEvict).thenReturn(Set()); + when(mockDevFs.assetPathsToEvict).thenReturn({}); when(mockDevFs.baseUri).thenReturn(Uri.file('test')); setUp(() { diff --git a/packages/flutter_tools/test/utils_test.dart b/packages/flutter_tools/test/utils_test.dart index 5ac06491ebe..cbbe16ef006 100644 --- a/packages/flutter_tools/test/utils_test.dart +++ b/packages/flutter_tools/test/utils_test.dart @@ -62,7 +62,7 @@ baz=qux }); test('is pretty random', () { - final Set set = Set(); + final Set set = {}; Uuid uuid = Uuid(); for (int i = 0; i < 64; i++) { diff --git a/packages/fuchsia_remote_debug_protocol/lib/src/fuchsia_remote_connection.dart b/packages/fuchsia_remote_debug_protocol/lib/src/fuchsia_remote_connection.dart index 99b06e60045..88c62a19cb2 100644 --- a/packages/fuchsia_remote_debug_protocol/lib/src/fuchsia_remote_connection.dart +++ b/packages/fuchsia_remote_debug_protocol/lib/src/fuchsia_remote_connection.dart @@ -117,7 +117,7 @@ class FuchsiaRemoteConnection { final Map _dartVmPortMap = {}; /// Tracks stale ports so as not to reconnect while polling. - final Set _stalePorts = Set(); + final Set _stalePorts = {}; /// A broadcast stream that emits events relating to Dart VM's as they update. Stream get onDartVmEvent => _onDartVmEvent;