Version 3.5.0-142.0.dev

Merge f7cc159 into dev

pkg/analyzer/analysis_options.yaml

@@ -46,5 +46,6 @@ linter:
     - library_annotations
     - unawaited_futures
     - unnecessary_breaks
+    - unnecessary_final
     - unnecessary_library_directive
     - unnecessary_parenthesis

pkg/analyzer/lib/exception/exception.dart

@@ -21,7 +21,7 @@ class AnalysisException implements Exception {
     buffer.write('$runtimeType: ');
     buffer.writeln(message);
 
-    final cause = this.cause;
+    var cause = this.cause;
     if (cause != null) {
       buffer.write('Caused by ');
       cause._writeOn(buffer);
@@ -75,7 +75,7 @@ class CaughtException implements Exception {
     if (message != null) {
       buffer.writeln(message);
     }
-    final exception = this.exception;
+    var exception = this.exception;
     if (exception is AnalysisException) {
       buffer.writeln(exception.message);
       buffer.writeln(stackTrace.toString());

pkg/analyzer/lib/src/analysis_options/analysis_options_provider.dart

@@ -64,7 +64,7 @@ class AnalysisOptionsProvider {
   YamlMap getOptionsFromSource(Source source) {
     YamlMap options = getOptionsFromString(_readAnalysisOptions(source));
     var node = options.valueAt(AnalyzerOptions.include);
-    final sourceFactory = this.sourceFactory;
+    var sourceFactory = this.sourceFactory;
     if (sourceFactory != null && node is YamlScalar) {
       var path = node.value;
       if (path is String) {

pkg/analyzer/lib/src/context/source.dart

@@ -40,7 +40,6 @@ class SourceFactoryImpl implements SourceFactory {
 
   @override
   DartSdk? get dartSdk {
-    final resolvers = this.resolvers;
     int length = resolvers.length;
     for (int i = 0; i < length; i++) {
       var resolver = resolvers[i];

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

@@ -1931,7 +1931,7 @@ class AnalysisDriver {
   }
 
   void _onNewFile(FileState file) {
-    final ownedFiles = this.ownedFiles;
+    var ownedFiles = this.ownedFiles;
     if (ownedFiles != null) {
       if (addedFiles.contains(file.path)) {
         ownedFiles.addAdded(file.uri, this);

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

@@ -232,7 +232,7 @@ class LibraryContext {
       }
 
       // If we can compile to kernel, check if there are macros.
-      final macroSupport = this.macroSupport;
+      var macroSupport = this.macroSupport;
       if (macroSupport is KernelMacroSupport && macroLibraries.isNotEmpty) {
         var kernelBytes = byteStore.get(cycle.macroKey);
         if (kernelBytes == null) {

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

@@ -826,7 +826,7 @@ final class AssignedVariablePatternImpl extends VariablePatternImpl
 
   @override
   DartType computePatternSchema(ResolverVisitor resolverVisitor) {
-    final element = this.element;
+    var element = this.element;
     if (element is PromotableElement) {
       return resolverVisitor.analyzeAssignedVariablePatternSchema(element);
     }
@@ -1102,8 +1102,8 @@ sealed class AstNodeImpl implements AstNode {
 
   @override
   int get length {
-    final beginToken = this.beginToken;
-    final endToken = this.endToken;
+    var beginToken = this.beginToken;
+    var endToken = this.endToken;
     return endToken.offset + endToken.length - beginToken.offset;
   }
 
@@ -1114,7 +1114,7 @@ sealed class AstNodeImpl implements AstNode {
 
   @override
   int get offset {
-    final beginToken = this.beginToken;
+    var beginToken = this.beginToken;
     return beginToken.offset;
   }
 
@@ -3582,7 +3582,7 @@ final class CompilationUnitImpl extends AstNodeImpl
 
   @override
   int get length {
-    final endToken = this.endToken;
+    var endToken = this.endToken;
     return endToken.offset + endToken.length;
   }
 
@@ -4954,7 +4954,7 @@ final class DeclaredVariablePatternImpl extends VariablePatternImpl
 
   /// The `final` keyword, or `null` if the `final` keyword isn't used.
   Token? get finalKeyword {
-    final keyword = this.keyword;
+    var keyword = this.keyword;
     if (keyword != null && keyword.keyword == Keyword.FINAL) {
       return keyword;
     }
@@ -6043,7 +6043,7 @@ sealed class ExpressionImpl extends AstNodeImpl
 
   @override
   ParameterElement? get staticParameterElement {
-    final parent = this.parent;
+    var parent = this.parent;
     if (parent is ArgumentListImpl) {
       return parent._getStaticParameterElementFor(this);
     } else if (parent is IndexExpressionImpl) {
@@ -6910,7 +6910,7 @@ final class FieldFormalParameterImpl extends NormalFormalParameterImpl
 
   @override
   Token get beginToken {
-    final metadata = this.metadata;
+    var metadata = this.metadata;
     if (metadata.isNotEmpty) {
       return metadata.beginToken!;
     } else if (requiredKeyword case var requiredKeyword?) {
@@ -8621,7 +8621,7 @@ final class FunctionTypedFormalParameterImpl extends NormalFormalParameterImpl
 
   @override
   Token get beginToken {
-    final metadata = this.metadata;
+    var metadata = this.metadata;
     if (metadata.isNotEmpty) {
       return metadata.beginToken!;
     } else if (requiredKeyword case var requiredKeyword?) {
@@ -9912,7 +9912,7 @@ final class IndexExpressionImpl extends ExpressionImpl
   ParameterElement? get _staticParameterElementForIndex {
     Element? element = staticElement;
 
-    final parent = this.parent;
+    var parent = this.parent;
     if (parent is CompoundAssignmentExpression) {
       element = parent.writeElement ?? parent.readElement;
     }
@@ -10907,7 +10907,7 @@ final class ListLiteralImpl extends TypedLiteralImpl implements ListLiteral {
     if (constKeyword case var constKeyword?) {
       return constKeyword;
     }
-    final typeArguments = this.typeArguments;
+    var typeArguments = this.typeArguments;
     if (typeArguments != null) {
       return typeArguments.beginToken;
     }
@@ -11610,7 +11610,7 @@ final class MethodDeclarationImpl extends ClassMemberImpl
 
   @override
   bool get isAbstract {
-    final body = this.body;
+    var body = this.body;
     return externalKeyword == null &&
         (body is EmptyFunctionBodyImpl && !body.semicolon.isSynthetic);
   }
@@ -12644,7 +12644,7 @@ sealed class NormalFormalParameterImpl extends FormalParameterImpl
 
   @override
   ParameterKind get kind {
-    final parent = this.parent;
+    var parent = this.parent;
     if (parent is DefaultFormalParameterImpl) {
       return parent.kind;
     }
@@ -15180,7 +15180,7 @@ final class SetOrMapLiteralImpl extends TypedLiteralImpl
     if (constKeyword case var constKeyword?) {
       return constKeyword;
     }
-    final typeArguments = this.typeArguments;
+    var typeArguments = this.typeArguments;
     if (typeArguments != null) {
       return typeArguments.beginToken;
     }
@@ -15325,7 +15325,7 @@ final class SimpleFormalParameterImpl extends NormalFormalParameterImpl
 
   @override
   Token get beginToken {
-    final metadata = this.metadata;
+    var metadata = this.metadata;
     if (metadata.isNotEmpty) {
       return metadata.beginToken!;
     } else if (requiredKeyword case var requiredKeyword?) {
@@ -15530,7 +15530,7 @@ final class SimpleIdentifierImpl extends IdentifierImpl
 
   @override
   bool inDeclarationContext() {
-    final parent = this.parent;
+    var parent = this.parent;
     switch (parent) {
       case ImportDirective():
         return parent.prefix == this;
@@ -16327,7 +16327,7 @@ final class SuperFormalParameterImpl extends NormalFormalParameterImpl
 
   @override
   Token get beginToken {
-    final metadata = this.metadata;
+    var metadata = this.metadata;
     if (metadata.isNotEmpty) {
       return metadata.beginToken!;
     } else if (requiredKeyword case var requiredKeyword?) {
@@ -17892,19 +17892,19 @@ final class VariableDeclarationImpl extends DeclarationImpl
 
   @override
   bool get isConst {
-    final parent = this.parent;
+    var parent = this.parent;
     return parent is VariableDeclarationList && parent.isConst;
   }
 
   @override
   bool get isFinal {
-    final parent = this.parent;
+    var parent = this.parent;
     return parent is VariableDeclarationList && parent.isFinal;
   }
 
   @override
   bool get isLate {
-    final parent = this.parent;
+    var parent = this.parent;
     return parent is VariableDeclarationList && parent.isLate;
   }
 
@@ -18311,7 +18311,7 @@ final class WildcardPatternImpl extends DartPatternImpl
 
   /// If [keyword] is `final`, returns it.
   Token? get finalKeyword {
-    final keyword = this.keyword;
+    var keyword = this.keyword;
     if (keyword != null && keyword.keyword == Keyword.FINAL) {
       return keyword;
     }

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

@@ -271,7 +271,7 @@ extension MethodDeclarationExtension on MethodDeclaration {
 
 extension NamedTypeExtension on NamedType {
   String get qualifiedName {
-    final importPrefix = this.importPrefix;
+    var importPrefix = this.importPrefix;
     if (importPrefix != null) {
       return '${importPrefix.name.lexeme}.${name2.lexeme}';
     } else {
@@ -315,7 +315,7 @@ extension TypeAnnotationExtension on TypeAnnotation {
   /// be already resolved. Every such expression must have the type set,
   /// at least `dynamic`.
   DartType get typeOrThrow {
-    final type = this.type;
+    var type = this.type;
     if (type == null) {
       throw StateError('No type: $this');
     }

pkg/analyzer/lib/src/dart/constant/constant_verifier.dart

@@ -922,7 +922,7 @@ class ConstantVerifier extends RecursiveAstVisitor<void> {
     }
 
     // Prepare for recording data for testing.
-    final exhaustivenessDataForTesting = this.exhaustivenessDataForTesting;
+    var exhaustivenessDataForTesting = this.exhaustivenessDataForTesting;
 
     // Compute and report errors.
     var errors = patternConverter.hasInvalidType
@@ -1064,12 +1064,12 @@ class _ConstLiteralVerifier {
       var value = verifier._evaluateAndReportError(element, errorCode);
       if (value is! DartObjectImpl) return false;
 
-      final listElementType = this.listElementType;
+      var listElementType = this.listElementType;
       if (listElementType != null) {
         return _validateListExpression(listElementType, element, value);
       }
 
-      final setConfig = this.setConfig;
+      var setConfig = this.setConfig;
       if (setConfig != null) {
         return _validateSetExpression(setConfig, element, value);
       }
@@ -1133,7 +1133,7 @@ class _ConstLiteralVerifier {
         return _validateListOrSetSpread(element, value);
       }
 
-      final mapConfig = this.mapConfig;
+      var mapConfig = this.mapConfig;
       if (mapConfig != null) {
         return _validateMapSpread(mapConfig, element, value);
       }
@@ -1218,7 +1218,7 @@ class _ConstLiteralVerifier {
       return false;
     }
 
-    final setConfig = this.setConfig;
+    var setConfig = this.setConfig;
     if (setConfig == null) {
       return true;
     }

pkg/analyzer/lib/src/dart/constant/evaluation.dart

@@ -2519,7 +2519,7 @@ class _InstanceCreationEvaluator {
       return error;
     }
 
-    final definingType = this.definingType;
+    var definingType = this.definingType;
     if (definingType.element case ExtensionTypeElement element) {
       var representation = _fieldMap[element.representation.name];
       if (representation != null) {
@@ -3145,7 +3145,7 @@ class _InstanceCreationEvaluator {
 
 extension on NamedType {
   bool get isTypeLiteralInConstantPattern {
-    final parent = this.parent;
+    var parent = this.parent;
     return parent is TypeLiteral && parent.parent?.parent is ConstantPattern;
   }
 }

pkg/analyzer/lib/src/dart/constant/potentially_constant.dart

@@ -467,7 +467,7 @@ class _ConstantTypeChecker {
 
 extension on NamedType {
   bool get isConstantNamedType {
-    final element = this.element;
+    var element = this.element;
     if (element is InterfaceElement || element is TypeAliasElement) {
       return !isDeferred;
     }