Version 2.19.0-435.0.dev

Merge ba097c6 into dev
flutter · Nov 27, 2022 · 3ed1fc1 · 3ed1fc1
2 parents 4851720 + ba097c6
commit 3ed1fc1
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 83 deletions.
diff --git a/pkg/analyzer/lib/src/generated/error_verifier.dart b/pkg/analyzer/lib/src/generated/error_verifier.dart
@@ -1245,6 +1245,14 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
     });
   }
 
+  @override
+  void visitSwitchPatternCase(SwitchPatternCase node) {
+    _withHiddenElements(node.statements, () {
+      _duplicateDefinitionVerifier.checkStatements(node.statements);
+      super.visitSwitchPatternCase(node);
+    });
+  }
+
   @override
   void visitSwitchStatement(SwitchStatement node) {
     _checkForSwitchExpressionNotAssignable(node);

diff --git a/pkg/analyzer/test/src/diagnostics/duplicate_definition_test.dart b/pkg/analyzer/test/src/diagnostics/duplicate_definition_test.dart
@@ -1515,88 +1515,6 @@ bool get a => true;
 ''');
   }
 
-  test_locals_block_if() async {
-    await assertErrorsInCode(r'''
-void f(int p) {
-  if (p != 0) {
-    var a;
-    var a;
-  }
-}
-''', [
-      error(HintCode.UNUSED_LOCAL_VARIABLE, 40, 1),
-      error(HintCode.UNUSED_LOCAL_VARIABLE, 51, 1),
-      error(CompileTimeErrorCode.DUPLICATE_DEFINITION, 51, 1,
-          contextMessages: [message('/home/test/lib/test.dart', 40, 1)]),
-    ]);
-  }
-
-  test_locals_block_method() async {
-    await assertErrorsInCode(r'''
-class A {
-  m() {
-    int a;
-    int a;
-  }
-}
-''', [
-      error(HintCode.UNUSED_LOCAL_VARIABLE, 26, 1),
-      error(CompileTimeErrorCode.DUPLICATE_DEFINITION, 37, 1,
-          contextMessages: [message('/home/test/lib/test.dart', 26, 1)]),
-      error(HintCode.UNUSED_LOCAL_VARIABLE, 37, 1),
-    ]);
-  }
-
-  @FailingTest(issue: 'https://github.com/dart-lang/sdk/issues/50502')
-  test_locals_block_switchCase() async {
-    await assertErrorsInCode(r'''
-main() {
-  switch(1) {
-    case 1:
-      var a;
-      var a;
-  }
-}
-''', [
-      error(HintCode.UNUSED_LOCAL_VARIABLE, 45, 1),
-      error(HintCode.UNUSED_LOCAL_VARIABLE, 58, 1),
-      error(CompileTimeErrorCode.DUPLICATE_DEFINITION, 58, 1,
-          contextMessages: [message('/home/test/lib/test.dart', 45, 1)]),
-    ]);
-  }
-
-  test_locals_block_switchCase_language218() async {
-    await assertErrorsInCode(r'''
-// @dart = 2.18
-main() {
-  switch(1) {
-    case 1:
-      var a;
-      var a;
-  }
-}
-''', [
-      error(HintCode.UNUSED_LOCAL_VARIABLE, 61, 1),
-      error(HintCode.UNUSED_LOCAL_VARIABLE, 74, 1),
-      error(CompileTimeErrorCode.DUPLICATE_DEFINITION, 74, 1,
-          contextMessages: [message('/home/test/lib/test.dart', 61, 1)]),
-    ]);
-  }
-
-  test_locals_block_topLevelFunction() async {
-    await assertErrorsInCode(r'''
-main() {
-  int m = 0;
-  m(a) {}
-}
-''', [
-      error(HintCode.UNUSED_LOCAL_VARIABLE, 15, 1),
-      error(CompileTimeErrorCode.DUPLICATE_DEFINITION, 24, 1,
-          contextMessages: [message('/home/test/lib/test.dart', 15, 1)]),
-      error(HintCode.UNUSED_ELEMENT, 24, 1),
-    ]);
-  }
-
   test_parameters_constructor_field_first() async {
     await assertErrorsInCode(r'''
 class A {
@@ -1673,6 +1591,58 @@ f(int a, double a) {}
     ]);
   }
 
+  test_switchCase_localVariable_localVariable() async {
+    await assertErrorsInCode(r'''
+// @dart = 2.18
+void f() {
+  switch (0) {
+    case 0:
+      var a;
+      var a;
+  }
+}
+''', [
+      error(HintCode.UNUSED_LOCAL_VARIABLE, 64, 1),
+      error(CompileTimeErrorCode.DUPLICATE_DEFINITION, 77, 1,
+          contextMessages: [message('/home/test/lib/test.dart', 64, 1)]),
+      error(HintCode.UNUSED_LOCAL_VARIABLE, 77, 1),
+    ]);
+  }
+
+  test_switchDefault_localVariable_localVariable() async {
+    await assertErrorsInCode(r'''
+void f() {
+  switch (0) {
+    default:
+      var a;
+      var a;
+  }
+}
+''', [
+      error(HintCode.UNUSED_LOCAL_VARIABLE, 49, 1),
+      error(CompileTimeErrorCode.DUPLICATE_DEFINITION, 62, 1,
+          contextMessages: [message('/home/test/lib/test.dart', 49, 1)]),
+      error(HintCode.UNUSED_LOCAL_VARIABLE, 62, 1),
+    ]);
+  }
+
+  test_switchPatternCase_localVariable_localVariable() async {
+    await assertErrorsInCode(r'''
+void f() {
+  switch (0) {
+    case 0:
+      var a;
+      var a;
+  }
+}
+''', [
+      error(HintCode.UNUSED_LOCAL_VARIABLE, 48, 1),
+      error(CompileTimeErrorCode.DUPLICATE_DEFINITION, 61, 1,
+          contextMessages: [message('/home/test/lib/test.dart', 48, 1)]),
+      error(HintCode.UNUSED_LOCAL_VARIABLE, 61, 1),
+    ]);
+  }
+
   test_typeParameters_class() async {
     await assertErrorsInCode(r'''
 class A<T, T> {}

diff --git a/tools/VERSION b/tools/VERSION
@@ -27,5 +27,5 @@ CHANNEL dev
 MAJOR 2
 MINOR 19
 PATCH 0
-PRERELEASE 434
+PRERELEASE 435
 PRERELEASE_PATCH 0