Version 2.19.0-434.0.dev

Merge cdf2221 into dev

Author: Dart CI

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

@@ -9921,6 +9921,9 @@ class PatternVariableDeclarationImpl extends AnnotatedNodeImpl
   @override
   final DartPatternImpl pattern;
 
+  /// Variables declared in [pattern].
+  late final List<VariablePatternBindElementImpl> elements;
+
   PatternVariableDeclarationImpl({
     required this.keyword,
     required this.pattern,

pkg/analyzer/lib/src/dart/resolver/resolution_visitor.dart

@@ -991,11 +991,15 @@ class ResolutionVisitor extends RecursiveAstVisitor<void> {
   }
 
   @override
-  void visitPatternVariableDeclarationStatement(
-      PatternVariableDeclarationStatement node) {
+  void visitPatternVariableDeclaration(
+    covariant PatternVariableDeclarationImpl node,
+  ) {
     _patternVariables.casePatternStart();
-    super.visitPatternVariableDeclarationStatement(node);
-    _patternVariables.casePatternFinish();
+    super.visitPatternVariableDeclaration(node);
+    var variablesMap = _patternVariables.casePatternFinish();
+    node.elements = variablesMap.values
+        .whereType<VariablePatternBindElementImpl>()
+        .toList();
   }
 
   @override

pkg/analyzer/lib/src/error/duplicate_definition_verifier.dart

@@ -9,6 +9,7 @@ import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/error/error.dart';
 import 'package:analyzer/error/listener.dart';
+import 'package:analyzer/src/dart/ast/ast.dart';
 import 'package:analyzer/src/dart/element/inheritance_manager3.dart';
 import 'package:analyzer/src/diagnostic/diagnostic_factory.dart';
 import 'package:analyzer/src/error/codes.dart';
@@ -290,6 +291,11 @@ class DuplicateDefinitionVerifier {
           statement.functionDeclaration.name,
           element: statement.functionDeclaration.declaredElement!,
         );
+      } else if (statement is PatternVariableDeclarationStatementImpl) {
+        for (var variable in statement.declaration.elements) {
+          _checkDuplicateIdentifier(definedNames, variable.node.name,
+              element: variable);
+        }
       }
     }
   }

pkg/analyzer/lib/src/generated/resolver.dart

@@ -2843,7 +2843,6 @@ class ResolverVisitor extends ThrowingAstVisitor<void>
     analyzePatternVariableDeclarationStatement(
         node, declaration.pattern, declaration.expression,
         isFinal: declaration.keyword.keyword == Keyword.FINAL, isLate: false);
-    // node.visitChildren(this);
     popRewrite(); // expression
   }
 

pkg/analyzer/test/src/diagnostics/duplicate_definition_test.dart

@@ -1421,6 +1421,58 @@ mixin M {
 
 @reflectiveTest
 class DuplicateDefinitionTest extends PubPackageResolutionTest {
+  test_block_localVariable_localVariable() async {
+    await assertErrorsInCode(r'''
+void f() {
+  var a = 0;
+  var a = 1;
+}
+''', [
+      error(HintCode.UNUSED_LOCAL_VARIABLE, 17, 1),
+      error(HintCode.UNUSED_LOCAL_VARIABLE, 30, 1),
+      error(CompileTimeErrorCode.DUPLICATE_DEFINITION, 30, 1,
+          contextMessages: [message('/home/test/lib/test.dart', 17, 1)]),
+    ]);
+  }
+
+  test_block_localVariable_patternVariable() async {
+    await assertErrorsInCode(r'''
+void f() {
+  var a = 0;
+  var (var a) = 1;
+}
+''', [
+      error(HintCode.UNUSED_LOCAL_VARIABLE, 17, 1),
+      error(CompileTimeErrorCode.DUPLICATE_DEFINITION, 35, 1,
+          contextMessages: [message('/home/test/lib/test.dart', 17, 1)]),
+    ]);
+  }
+
+  test_block_patternVariable_localVariable() async {
+    await assertErrorsInCode(r'''
+void f() {
+  var (var a) = 1;
+  var a = 0;
+}
+''', [
+      error(CompileTimeErrorCode.DUPLICATE_DEFINITION, 36, 1,
+          contextMessages: [message('/home/test/lib/test.dart', 22, 1)]),
+      error(HintCode.UNUSED_LOCAL_VARIABLE, 36, 1),
+    ]);
+  }
+
+  test_block_patternVariable_patternVariable() async {
+    await assertErrorsInCode(r'''
+void f() {
+  var (var a) = 0;
+  var (var a) = 1;
+}
+''', [
+      error(CompileTimeErrorCode.DUPLICATE_DEFINITION, 41, 1,
+          contextMessages: [message('/home/test/lib/test.dart', 22, 1)]),
+    ]);
+  }
+
   test_catch() async {
     await assertErrorsInCode(r'''
 main() {

pkg/analyzer/test/src/diagnostics/duplicate_variable_pattern_test.dart

@@ -69,4 +69,15 @@ BinaryPattern
       type: int
 ''');
   }
+
+  test_variableDeclaration() async {
+    await assertErrorsInCode(r'''
+void f(x) {
+  var (var a, var a) = x;
+}
+''', [
+      error(CompileTimeErrorCode.DUPLICATE_VARIABLE_PATTERN, 30, 1,
+          contextMessages: [message('/home/test/lib/test.dart', 23, 1)]),
+    ]);
+  }
 }

tools/VERSION

@@ -27,5 +27,5 @@ CHANNEL dev
 MAJOR 2
 MINOR 19
 PATCH 0
-PRERELEASE 433
+PRERELEASE 434
 PRERELEASE_PATCH 0