Create curly braces when resynthesizing map and set literals

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

Author: bwilkerson

pkg/analyzer/lib/src/summary/expr_builder.dart

@@ -877,7 +877,12 @@ class ExprBuilder {
           : typeArguments.arguments[0].type;
       staticType = resynthesizer.typeProvider.setType.instantiate([valueType]);
     }
-    _push(AstTestFactory.setOrMapLiteral(Keyword.CONST, typeArguments, elements)
+    _push(astFactory.setOrMapLiteral(
+        constKeyword: TokenFactory.tokenFromKeyword(Keyword.CONST),
+        typeArguments: typeArguments,
+        leftBracket: TokenFactory.tokenFromType(TokenType.OPEN_CURLY_BRACKET),
+        elements: elements,
+        rightBracket: TokenFactory.tokenFromType(TokenType.CLOSE_CURLY_BRACKET))
       ..staticType = staticType);
   }
 

pkg/analyzer/test/src/summary/resynthesize_ast2_test.dart

@@ -1,4 +1,4 @@
-// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2019, the Dart project authors. Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 

pkg/analyzer/test/src/summary/test_all.dart

@@ -1,29 +1,37 @@
-// Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
-import 'expr_builder_test.dart' as expr_builder_test;
-import 'in_summary_source_test.dart' as in_summary_source_test;
-import 'linker_test.dart' as linker_test;
-import 'name_filter_test.dart' as name_filter_test;
-import 'package_bundle_reader_test.dart' as package_bundle_reader_test;
-import 'prelinker_test.dart' as prelinker_test;
-import 'resynthesize_ast_test.dart' as resynthesize_ast_test;
-import 'summarize_ast_strong_test.dart' as summarize_ast_strong_test;
-import 'top_level_inference_test.dart' as top_level_inference_test;
+import 'api_signature_test.dart' as api_signature;
+import 'dependency_walker_test.dart' as dependency_walker;
+import 'expr_builder_test.dart' as expr_builder;
+import 'flat_buffers_test.dart' as flat_buffers;
+import 'in_summary_source_test.dart' as in_summary_source;
+import 'linker_test.dart' as linker;
+import 'name_filter_test.dart' as name_filter;
+import 'package_bundle_reader_test.dart' as package_bundle_reader;
+import 'prelinker_test.dart' as prelinker;
+import 'resynthesize_ast2_test.dart' as resynthesize_ast2;
+import 'resynthesize_ast_test.dart' as resynthesize_ast;
+import 'summarize_ast_strong_test.dart' as summarize_ast_strong;
+import 'top_level_inference_test.dart' as top_level_inference;
 
 main() {
   defineReflectiveSuite(() {
-    expr_builder_test.main();
-    in_summary_source_test.main();
-    linker_test.main();
-    name_filter_test.main();
-    package_bundle_reader_test.main();
-    prelinker_test.main();
-    resynthesize_ast_test.main();
-    summarize_ast_strong_test.main();
-    top_level_inference_test.main();
+    api_signature.main();
+    dependency_walker.main();
+    expr_builder.main();
+    flat_buffers.main();
+    in_summary_source.main();
+    linker.main();
+    name_filter.main();
+    package_bundle_reader.main();
+    prelinker.main();
+    resynthesize_ast2.main();
+    resynthesize_ast.main();
+    summarize_ast_strong.main();
+    top_level_inference.main();
   }, name: 'summary');
 }