From 161219473b2a6c769bcbf8e28226e9083568291d Mon Sep 17 00:00:00 2001
From: Ben Konyi <bkonyi@google.com>
Date: Thu, 1 Aug 2024 14:45:15 -0400
Subject: [PATCH 1/2] Disable 'variable scope variables in function' in
 'variable_scope_test.dart'

See https://github.com/dart-lang/webdev/issues/2469
---
 dwds/test/variable_scope_test.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dwds/test/variable_scope_test.dart b/dwds/test/variable_scope_test.dart
index 1567f7188..070a34991 100644
--- a/dwds/test/variable_scope_test.dart
+++ b/dwds/test/variable_scope_test.dart
@@ -206,7 +206,7 @@ void main() {
           'testClass',
         ]),
       );
-    });
+    }, skip: 'See https://github.com/dart-lang/webdev/issues/2469');
 
     test('variables in closure nested in method', () async {
       stack = await breakAt('nestedClosure', mainScript);

From d42f27cea893fd068dec47d537091641ca3ea661 Mon Sep 17 00:00:00 2001
From: Ben Konyi <bkonyi@google.com>
Date: Thu, 1 Aug 2024 14:49:35 -0400
Subject: [PATCH 2/2] Formatting

---
 dwds/test/variable_scope_test.dart | 44 ++++++++++++++++--------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/dwds/test/variable_scope_test.dart b/dwds/test/variable_scope_test.dart
index 070a34991..bb0f18763 100644
--- a/dwds/test/variable_scope_test.dart
+++ b/dwds/test/variable_scope_test.dart
@@ -187,26 +187,30 @@ void main() {
       expect(variableNames, containsAll(['formal']));
     });
 
-    test('variables in function', () async {
-      stack = await breakAt('nestedFunction', mainScript);
-      final variables = getFrameVariables(stack.frames!.first);
-      await expectDartVariables(variables);
-
-      final variableNames = variables.keys.toList()..sort();
-      expect(
-        variableNames,
-        containsAll([
-          'aClass',
-          'another',
-          'intLocalInMain',
-          'local',
-          'localThatsNull',
-          'nestedFunction',
-          'parameter',
-          'testClass',
-        ]),
-      );
-    }, skip: 'See https://github.com/dart-lang/webdev/issues/2469');
+    test(
+      'variables in function',
+      () async {
+        stack = await breakAt('nestedFunction', mainScript);
+        final variables = getFrameVariables(stack.frames!.first);
+        await expectDartVariables(variables);
+
+        final variableNames = variables.keys.toList()..sort();
+        expect(
+          variableNames,
+          containsAll([
+            'aClass',
+            'another',
+            'intLocalInMain',
+            'local',
+            'localThatsNull',
+            'nestedFunction',
+            'parameter',
+            'testClass',
+          ]),
+        );
+      },
+      skip: 'See https://github.com/dart-lang/webdev/issues/2469',
+    );
 
     test('variables in closure nested in method', () async {
       stack = await breakAt('nestedClosure', mainScript);