Enable prefer_collection_literals in three packages

Other than the following changes, all of the changes were made by dartfix:
- the analysis options files
- one line to enable the fix through dartfix (missed in an earlier CL)
- three places where a bug in the fix produced invalid code (issue and fix TBD)

Change-Id: If8660700792561805f4d1c96ccecd81abcebfeb8
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/131209
Reviewed-by: Konstantin Shcheglov <[email protected]>
Commit-Queue: Brian Wilkerson <[email protected]>

Author: bwilkerson

pkg/analysis_server/analysis_options.yaml

@@ -38,7 +38,7 @@ linter:
     - camel_case_extensions
     #- omit_local_variable_types # 8650
     - prefer_adjacent_string_concatenation
-    #- prefer_collection_literals # 130
+    - prefer_collection_literals
     - prefer_conditional_assignment
     #- prefer_final_fields # 35
     - prefer_for_elements_to_map_fromIterable

pkg/analysis_server/benchmark/benchmarks.dart

@@ -219,7 +219,7 @@ class CompoundBenchMarkResult extends BenchMarkResult {
 
     CompoundBenchMarkResult combined = CompoundBenchMarkResult(name);
     List<String> keys =
-        (Set<String>()..addAll(results.keys)..addAll(o.results.keys)).toList();
+        (<String>{}..addAll(results.keys)..addAll(o.results.keys)).toList();
 
     for (String key in keys) {
       combined.add(key, _combine(results[key], o.results[key]));

pkg/analysis_server/benchmark/integration/driver.dart

@@ -153,7 +153,7 @@ class Driver extends IntegrationTestMixin {
 class Measurement {
   final String tag;
   final bool notification;
-  final List<Duration> elapsedTimes = List<Duration>();
+  final List<Duration> elapsedTimes = <Duration>[];
   int errorCount = 0;
   int unexpectedResultCount = 0;
 
@@ -223,7 +223,7 @@ class Measurement {
  * while running the analysis server
  */
 class Results {
-  Map<String, Measurement> measurements = Map<String, Measurement>();
+  Map<String, Measurement> measurements = <String, Measurement>{};
 
   /**
    * Display results on stdout.

pkg/analysis_server/benchmark/integration/input_converter.dart

@@ -23,7 +23,7 @@ import 'operation.dart';
 abstract class CommonInputConverter extends Converter<String, Operation> {
   static final ERROR_PREFIX = 'Server responded with an error: ';
   final Logger logger = Logger('InstrumentationInputConverter');
-  final Set<String> eventsSeen = Set<String>();
+  final Set<String> eventsSeen = <String>{};
 
   /**
    * A mapping from request/response id to request json
@@ -256,7 +256,7 @@ abstract class CommonInputConverter extends Converter<String, Operation> {
       return result;
     }
     if (json is Map) {
-      Map<String, dynamic> result = Map<String, dynamic>();
+      Map<String, dynamic> result = <String, dynamic>{};
       json.forEach((origKey, value) {
         result[translateSrcPaths(origKey)] = translateSrcPaths(value);
       });

pkg/analysis_server/benchmark/integration/instrumentation_input_converter.dart

@@ -18,7 +18,7 @@ final int COLON = ':'.codeUnitAt(0);
  * into a series of operations to be sent to the analysis server.
  */
 class InstrumentationInputConverter extends CommonInputConverter {
-  final Set<String> codesSeen = Set<String>();
+  final Set<String> codesSeen = <String>{};
 
   /**
    * [readBuffer] holds the contents of the file being read from disk
@@ -106,7 +106,7 @@ class InstrumentationInputConverter extends CommonInputConverter {
    * Extract fields from the given [line].
    */
   static List<String> _parseFields(String line) {
-    List<String> fields = List<String>();
+    List<String> fields = <String>[];
     int index = 0;
     StringBuffer sb = StringBuffer();
     while (index < line.length) {

pkg/analysis_server/lib/src/analysis_server_abstract.dart

@@ -72,7 +72,7 @@ abstract class AbstractAnalysisServer {
   final ServerPerformance performanceDuringStartup = ServerPerformance();
 
   /// The set of the files that are currently priority.
-  final Set<String> priorityFiles = Set<String>();
+  final Set<String> priorityFiles = <String>{};
 
   final List<String> analyzableFilePatterns = <String>[
     '**/*.${AnalysisEngine.SUFFIX_DART}',

pkg/analysis_server/lib/src/computer/computer_closingLabels.dart

@@ -15,8 +15,8 @@ class DartUnitClosingLabelsComputer {
   final LineInfo _lineInfo;
   final CompilationUnit _unit;
   final List<ClosingLabel> _closingLabels = [];
-  final Set<ClosingLabel> hasNestingSet = Set();
-  final Set<ClosingLabel> isSingleLineSet = Set();
+  final Set<ClosingLabel> hasNestingSet = {};
+  final Set<ClosingLabel> isSingleLineSet = {};
 
   DartUnitClosingLabelsComputer(this._lineInfo, this._unit);
 

pkg/analysis_server/lib/src/context_manager.dart

@@ -120,7 +120,7 @@ class ContextInfo {
    * be watched for changes.  I believe the use case for watching these files
    * is no longer relevant.
    */
-  Set<String> _dependencies = Set<String>();
+  Set<String> _dependencies = <String>{};
 
   /**
    * The analysis driver that was created for the [folder].
@@ -1062,7 +1062,7 @@ class ContextManagerImpl implements ContextManager {
       // TODO(paulberry): We shouldn't be using JavaFile here because it
       // makes the code untestable (see dartbug.com/23909).
       JavaFile packagesDirOrFile = JavaFile(packageRoot);
-      Map<String, List<Folder>> packageMap = Map<String, List<Folder>>();
+      Map<String, List<Folder>> packageMap = <String, List<Folder>>{};
       if (packagesDirOrFile.isDirectory()) {
         for (JavaFile file in packagesDirOrFile.listFiles()) {
           // Ensure symlinks in packages directory are canonicalized

pkg/analysis_server/lib/src/domain_analysis.dart

@@ -484,7 +484,7 @@ class AnalysisDomainHandler extends AbstractRequestHandler {
     // options
     var params = AnalysisUpdateOptionsParams.fromRequest(request);
     AnalysisOptions newOptions = params.options;
-    List<OptionUpdater> updaters = List<OptionUpdater>();
+    List<OptionUpdater> updaters = <OptionUpdater>[];
     if (newOptions.generateDart2jsHints != null) {
       updaters.add((engine.AnalysisOptionsImpl options) {
         options.dart2jsHint = newOptions.generateDart2jsHints;

pkg/analysis_server/lib/src/domain_completion.dart

@@ -41,7 +41,7 @@ class CompletionDomainHandler extends AbstractRequestHandler {
   /**
    * The completion services that the client is currently subscribed.
    */
-  final Set<CompletionService> subscriptions = Set<CompletionService>();
+  final Set<CompletionService> subscriptions = <CompletionService>{};
 
   /**
    * The next completion response id.
@@ -354,8 +354,8 @@ class CompletionDomainHandler extends AbstractRequestHandler {
     Set<String> includedElementNames;
     List<IncludedSuggestionRelevanceTag> includedSuggestionRelevanceTags;
     if (subscriptions.contains(CompletionService.AVAILABLE_SUGGESTION_SETS)) {
-      includedElementKinds = Set<ElementKind>();
-      includedElementNames = Set<String>();
+      includedElementKinds = <ElementKind>{};
+      includedElementNames = <String>{};
       includedSuggestionRelevanceTags = <IncludedSuggestionRelevanceTag>[];
     }