Fine. Fix for linkNodeTokens(), test reordering enum constants.

Change-Id: Ibaadef9453e1776c75a37dcbe30f8b97df6e695d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/449078
Reviewed-by: Johnni Winther <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

pkg/analyzer/lib/src/dart/ast/ast.dart

@@ -1497,19 +1497,25 @@ sealed class AstNodeImpl implements AstNode {
     return offset <= rangeOffset && end >= rangeEnd;
   }
 
-  static void linkNodeTokens(AstNode parent) {
+  static void linkNodeTokens(AstNodeImpl root) {
     Token? lastToken;
-    for (var entity in parent.childEntities) {
+    var stack = <Object>[root];
+    while (stack.isNotEmpty) {
+      var entity = stack.removeLast();
       switch (entity) {
         case Token token:
           lastToken?.next = token;
           token.previous = lastToken;
           lastToken = token;
-        case AstNode node:
-          linkNodeTokens(node);
-          lastToken?.next = node.beginToken;
-          node.beginToken.previous = lastToken;
-          lastToken = node.endToken;
+        case NodeListImpl nodeList:
+          // Push in reverse order, so process in source order.
+          stack.addAll(nodeList.reversed);
+        case AstNodeImpl node:
+          // Push in reverse order, so process in source order.
+          var entities = node._childEntities.entities;
+          stack.addAll(entities.reversed.map((e) => e.value));
+        default:
+          throw UnimplementedError('${entity.runtimeType}');
       }
     }
   }

pkg/analyzer/test/src/dart/analysis/driver_test.dart

@@ -59934,6 +59934,70 @@ const d = b;
     );
   }
 
+  test_manifest_enum_constants_reorder() async {
+    await _runLibraryManifestScenario(
+      initialCode: r'''
+enum A {
+  c1, c2
+}
+''',
+      expectedInitialEvents: r'''
+[operation] linkLibraryCycle SDK
+[operation] linkLibraryCycle
+  package:test/test.dart
+    declaredEnums
+      A: #M0
+        declaredFields
+          c1: #M1
+          c2: #M2
+          values: #M3
+        declaredGetters
+          c1: #M4
+          c2: #M5
+          values: #M6
+        interface: #M7
+          map
+            index: #M8
+          implemented
+            index: #M8
+          superImplemented
+            [0]
+              index: #M8
+          inherited
+            index: #M8
+''',
+      updatedCode: r'''
+enum A {
+  c2, c1
+}
+''',
+      expectedUpdatedEvents: r'''
+[operation] linkLibraryCycle
+  package:test/test.dart
+    declaredEnums
+      A: #M0
+        declaredFields
+          c1: #M1
+          c2: #M2
+          values: #M9
+        declaredGetters
+          c1: #M4
+          c2: #M5
+          values: #M6
+        interface: #M7
+          map
+            index: #M8
+          implemented
+            index: #M8
+          superImplemented
+            [0]
+              index: #M8
+          inherited
+            index: #M8
+''',
+    );
+  }
+
   test_manifest_enum_constants_replace() async {
     await _runLibraryManifestScenario(
       initialCode: r'''