Merge branch 'master' into 0.1.85
diff --git a/example/all.yaml b/example/all.yaml
index a4016b7..602c1b5 100644
--- a/example/all.yaml
+++ b/example/all.yaml
@@ -107,6 +107,7 @@
- prefer_mixin
- prefer_null_aware_operators
- prefer_single_quotes
+ - prefer_spread_collections
- prefer_typing_uninitialized_variables
- prefer_void_to_null
- provide_deprecation_message
@@ -116,7 +117,6 @@
- sort_constructors_first
- sort_pub_dependencies
- sort_unnamed_constructors_first
- - spread_collections
- test_types_in_equals
- throw_in_finally
- type_annotate_public_apis
diff --git a/lib/src/rules.dart b/lib/src/rules.dart
index 712ba12..74cbe5c 100644
--- a/lib/src/rules.dart
+++ b/lib/src/rules.dart
@@ -108,6 +108,7 @@
import 'package:linter/src/rules/prefer_mixin.dart';
import 'package:linter/src/rules/prefer_null_aware_operators.dart';
import 'package:linter/src/rules/prefer_single_quotes.dart';
+import 'package:linter/src/rules/prefer_spread_collections.dart';
import 'package:linter/src/rules/prefer_typing_uninitialized_variables.dart';
import 'package:linter/src/rules/prefer_void_to_null.dart';
import 'package:linter/src/rules/provide_deprecation_message.dart';
@@ -118,7 +119,6 @@
import 'package:linter/src/rules/slash_for_doc_comments.dart';
import 'package:linter/src/rules/sort_constructors_first.dart';
import 'package:linter/src/rules/sort_unnamed_constructors_first.dart';
-import 'package:linter/src/rules/spread_collections.dart';
import 'package:linter/src/rules/super_goes_last.dart';
import 'package:linter/src/rules/test_types_in_equals.dart';
import 'package:linter/src/rules/throw_in_finally.dart';
@@ -255,6 +255,7 @@
..register(new PreferMixin())
..register(new PreferNullAwareOperators())
..register(new PreferSingleQuotes())
+ ..register(new PreferSpreadCollections())
..register(new PreferTypingUninitializedVariables())
..register(new PreferVoidToNull())
..register(new ProvideDeprecationMessage())
@@ -265,7 +266,6 @@
..register(new SortConstructorsFirst())
..register(new SortPubDependencies())
..register(new SortUnnamedConstructorsFirst())
- ..register(new SpreadCollections())
..register(new SuperGoesLast())
..register(new TestTypesInEquals())
..register(new ThrowInFinally())
diff --git a/lib/src/rules/spread_collections.dart b/lib/src/rules/prefer_spread_collections.dart
similarity index 93%
rename from lib/src/rules/spread_collections.dart
rename to lib/src/rules/prefer_spread_collections.dart
index 1ce7644..7f8b9c5 100644
--- a/lib/src/rules/spread_collections.dart
+++ b/lib/src/rules/prefer_spread_collections.dart
@@ -67,10 +67,10 @@
```
''';
-class SpreadCollections extends LintRule implements NodeLintRule {
- SpreadCollections()
+class PreferSpreadCollections extends LintRule implements NodeLintRule {
+ PreferSpreadCollections()
: super(
- name: 'spread_collections',
+ name: 'prefer_spread_collections',
description: _desc,
details: _details,
group: Group.style);
diff --git a/test/rules/spread_collections.dart b/test/rules/prefer_spread_collections.dart
similarity index 100%
rename from test/rules/spread_collections.dart
rename to test/rules/prefer_spread_collections.dart
