Version 2.15.0-25.0.dev

Merge commit '099c5a5c939280c30a3de79c1432846a75bf7011' into 'dev'

.dart_tool/package_config.json

@@ -220,7 +220,7 @@
       "name": "dart2js_tools",
       "rootUri": "../pkg/dart2js_tools",
       "packageUri": "lib/",
-      "languageVersion": "2.3"
+      "languageVersion": "2.12"
     },
     {
       "name": "dart2native",
@@ -812,4 +812,4 @@
       "languageVersion": "2.12"
     }
   ]
-}
+}

pkg/analysis_server/test/analysis/notification_navigation_test.dart

@@ -805,20 +805,19 @@ void f(A a) {
     );
 
     var generatedContent = generatedFile.readAsStringSync();
-    // TODO(scheglov) Improve macro to be more formatted.
     expect(generatedContent, r'''
 import 'macro_annotations.dart';
 
 class A {
   @observable
   int _foo = 0;
 
-int get foo => _foo;
+  int get foo => _foo;
 
-set foo(int val) {
-  print('Setting foo to ${val}');
-  _foo = val;
-}
+  set foo(int val) {
+    print('Setting foo to ${val}');
+    _foo = val;
+  }
 }
 
 void f(A a) {

pkg/analyzer/lib/src/dart/analysis/driver.dart

@@ -80,7 +80,7 @@ import 'package:meta/meta.dart';
 /// TODO(scheglov) Clean up the list of implicitly analyzed files.
 class AnalysisDriver implements AnalysisDriverGeneric {
   /// The version of data format, should be incremented on every format change.
-  static const int DATA_VERSION = 169;
+  static const int DATA_VERSION = 170;
 
   /// The number of exception contexts allowed to write. Once this field is
   /// zero, we stop writing any new exception contexts in this process.

pkg/analyzer/lib/src/macro/builders/data_class.dart

@@ -39,6 +39,20 @@ class AutoConstructorMacro implements ClassDeclarationMacro {
   }
 }
 
+class DataClassMacro implements ClassDeclarationMacro {
+  const DataClassMacro();
+
+  @override
+  void visitClassDeclaration(
+    ast.ClassDeclaration declaration,
+    ClassDeclarationBuilder builder,
+  ) {
+    const AutoConstructorMacro().visitClassDeclaration(declaration, builder);
+    const HashCodeMacro().visitClassDeclaration(declaration, builder);
+    const ToStringMacro().visitClassDeclaration(declaration, builder);
+  }
+}
+
 class HashCodeMacro implements ClassDeclarationMacro {
   const HashCodeMacro();
 
@@ -52,8 +66,9 @@ class HashCodeMacro implements ClassDeclarationMacro {
         .join(' ^ ');
     builder.addToClass(
       Declaration('''
-@override
-int get hashCode => $expression;'''),
+  @override
+  int get hashCode => $expression;
+'''),
     );
   }
 }
@@ -73,8 +88,9 @@ class ToStringMacro implements ClassDeclarationMacro {
     }).join(', ');
     builder.addToClass(
       Declaration('''
-@override
-String toString() => '${classElement.name}($fieldsCode)';'''),
+  @override
+  String toString() => '${classElement.name}($fieldsCode)';
+'''),
     );
   }
 }

pkg/analyzer/lib/src/macro/builders/observable.dart

@@ -33,15 +33,16 @@ class ObservableMacro implements FieldDeclarationMacro {
       var publicName = name.substring(1);
 
       var getter = Declaration(
-        '$typeCode get $publicName => $name;',
+        '  $typeCode get $publicName => $name;',
       );
       builder.addToClass(getter);
 
       var setter = Declaration('''
-set $publicName($typeCode val) {
-  print('Setting $publicName to \${val}');
-  $name = val;
-}''');
+  set $publicName($typeCode val) {
+    print('Setting $publicName to \${val}');
+    $name = val;
+  }
+''');
       builder.addToClass(setter);
     }
   }

pkg/analyzer/lib/src/macro/impl/macro.dart

@@ -114,7 +114,7 @@ class MacroGeneratedContent {
       return a.data.id - b.data.id;
     });
 
-    const classMemberCodePrefix = '\n';
+    const classMemberCodePrefix = '\n  ';
     const classMemberCodeSuffix = '\n';
     // TODO(scheglov) make it required?
     var generatedContent = linkingUnit.input.sourceContent!;

pkg/analyzer/lib/src/summary2/informative_data.dart

@@ -669,7 +669,7 @@ class InformativeDataApplier {
   ) {
     var macroGenerationDataList = unitElement.macroGenerationDataList;
     if (macroGenerationDataList != null) {
-      const classMemberCodePrefix = '\n';
+      const classMemberCodePrefix = '\n  ';
       const classMemberCodeSuffix = '\n';
       var generatedContent = unitInfoData.content;
       var shift = 0;

pkg/analyzer/lib/src/summary2/library_builder.dart

@@ -248,6 +248,12 @@ class LibraryBuilder {
               classBuilder,
             );
           }
+          if (hasMacroAnnotation(declaration, 'dataClass')) {
+            macro.DataClassMacro().visitClassDeclaration(
+              declaration,
+              classBuilder,
+            );
+          }
           if (hasMacroAnnotation(declaration, 'hashCode')) {
             macro.HashCodeMacro().visitClassDeclaration(
               declaration,