Roll package:analyzer forward to 8.1.1 (flutter#173867)

Author: bkonyi

dev/bots/custom_rules/no_double_clamp.dart

@@ -65,7 +65,7 @@ class _DoubleClampVisitor extends RecursiveAstVisitor<void> {
 
   @override
   void visitSimpleIdentifier(SimpleIdentifier node) {
-    if (node.name != 'clamp' || node.staticElement is! MethodElement) {
+    if (node.name != 'clamp' || node.element is! MethodElement) {
       return;
     }
     final bool isAllowed = switch (node.parent) {

dev/bots/custom_rules/no_stop_watches.dart

@@ -93,7 +93,7 @@ class _StopwatchVisitor extends RecursiveAstVisitor<void> {
   bool _isInternal(LibraryElement libraryElement) {
     return path.isWithin(
       compilationUnit.session.analysisContext.contextRoot.root.path,
-      libraryElement.source.fullName,
+      libraryElement.firstFragment.source.fullName,
     );
   }
 
@@ -118,7 +118,7 @@ class _StopwatchVisitor extends RecursiveAstVisitor<void> {
 
   @override
   void visitConstructorName(ConstructorName node) {
-    final Element? element = node.staticElement;
+    final Element? element = node.element;
     if (element is! ConstructorElement) {
       assert(false, '$element of $node is not a ConstructorElement.');
       return;
@@ -137,7 +137,7 @@ class _StopwatchVisitor extends RecursiveAstVisitor<void> {
 
   @override
   void visitSimpleIdentifier(SimpleIdentifier node) {
-    final bool isAllowed = switch (node.staticElement) {
+    final bool isAllowed = switch (node.element) {
       ExecutableElement(
         returnType: DartType(element: final ClassElement classElement),
         library: final LibraryElement libraryElement,

dev/bots/custom_rules/protect_public_state_subtypes.dart

@@ -73,7 +73,7 @@ class _StateSubclassVisitor extends SimpleAstVisitor<void> {
 
   @override
   void visitClassDeclaration(ClassDeclaration node) {
-    if (isPublicStateSubtype(node.declaredElement!)) {
+    if (isPublicStateSubtype(node.declaredFragment!.element)) {
       node.visitChildren(this);
     }
   }
@@ -92,7 +92,7 @@ class _StateSubclassVisitor extends SimpleAstVisitor<void> {
       case 'dispose':
       case 'build':
       case 'debugFillProperties':
-        if (!node.declaredElement!.hasProtected) {
+        if (!node.declaredFragment!.element.metadata.hasProtected) {
           unprotectedMethods.add(node);
         }
     }

dev/bots/custom_rules/render_box_intrinsics.dart

@@ -66,7 +66,7 @@ class _RenderBoxSubclassVisitor extends RecursiveAstVisitor<void> {
   // The cached version, call this method instead of _checkIfImplementsRenderBox.
   static bool _implementsRenderBox(InterfaceElement interfaceElement) {
     // Framework naming convention: a RenderObject subclass names have "Render" in its name.
-    if (!interfaceElement.name.contains('Render')) {
+    if (!interfaceElement.name!.contains('Render')) {
       return false;
     }
     return interfaceElement.name == 'RenderBox' ||
@@ -115,7 +115,7 @@ class _RenderBoxSubclassVisitor extends RecursiveAstVisitor<void> {
     if (isCallingSuperImplementation) {
       return;
     }
-    final Element? declaredInClassElement = node.staticElement?.declaration?.enclosingElement3;
+    final Element? declaredInClassElement = node.element?.enclosingElement;
     if (declaredInClassElement is InterfaceElement &&
         _implementsRenderBox(declaredInClassElement)) {
       violationNodes.add((node, correctMethodName));

packages/flutter_tools/lib/src/widget_preview/dependency_graph.dart

@@ -95,7 +95,7 @@ class _PreviewVisitor extends RecursiveAstVisitor<void> {
           PreviewDetails(
             packageName: packageName,
             functionName: _currentFunction!.name.toString(),
-            isBuilder: returnType.name2.isWidgetBuilder,
+            isBuilder: returnType.name.isWidgetBuilder,
             previewAnnotation: preview,
           ),
         );
@@ -117,7 +117,7 @@ class _PreviewVisitor extends RecursiveAstVisitor<void> {
           PreviewDetails(
             packageName: packageName,
             functionName: '${parentClass.name}.${_currentMethod!.name}',
-            isBuilder: returnType.name2.isWidgetBuilder,
+            isBuilder: returnType.name.isWidgetBuilder,
             previewAnnotation: preview,
           ),
         );
@@ -134,7 +134,7 @@ class _PreviewVisitor extends RecursiveAstVisitor<void> {
 
 /// Contains all the information related to a library being watched by [PreviewDetector].
 final class LibraryPreviewNode {
-  LibraryPreviewNode({required LibraryElement2 library, required this.logger})
+  LibraryPreviewNode({required LibraryElement library, required this.logger})
     : path = library.toPreviewPath() {
     final libraryFilePaths = <String>[
       for (final LibraryFragment fragment in library.fragments) fragment.source.fullName,
@@ -190,7 +190,7 @@ final class LibraryPreviewNode {
   /// Finds all previews defined in the [lib] and adds them to [previews].
   void findPreviews({required ResolvedLibraryResult lib}) {
     // Iterate over the compilation unit's AST to find previews.
-    final visitor = _PreviewVisitor(lib: lib.element2);
+    final visitor = _PreviewVisitor(lib: lib.element);
     for (final ResolvedUnitResult libUnit in lib.units) {
       libUnit.unit.visitChildren(visitor);
     }
@@ -212,13 +212,13 @@ final class LibraryPreviewNode {
 
     for (final unit in units) {
       final LibraryFragment fragment = unit.libraryFragment;
-      for (final LibraryImport importedLib in fragment.libraryImports2) {
-        if (importedLib.importedLibrary2 == null) {
+      for (final LibraryImport importedLib in fragment.libraryImports) {
+        if (importedLib.importedLibrary == null) {
           // This is an import for a file that's not analyzed (likely an import of a package from
           // the pub-cache) and isn't necessary to track as part of the dependency graph.
           continue;
         }
-        final LibraryElement2 importedLibrary = importedLib.importedLibrary2!;
+        final LibraryElement importedLibrary = importedLib.importedLibrary!;
         final LibraryPreviewNode result = graph.putIfAbsent(
           importedLibrary.toPreviewPath(),
           () => LibraryPreviewNode(library: importedLibrary, logger: logger),

packages/flutter_tools/lib/src/widget_preview/preview_code_generator.dart

@@ -6,8 +6,6 @@ import 'package:analyzer/dart/constant/value.dart';
 import 'package:analyzer/dart/element/element2.dart' as analyzer;
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/type.dart';
-// ignore: implementation_imports, can be removed when package:analyzer 8.1.0 is released.
-import 'package:analyzer/src/dart/constant/value.dart';
 import 'package:built_collection/built_collection.dart';
 import 'package:code_builder/code_builder.dart' as cb;
 import 'package:dart_style/dart_style.dart';
@@ -254,45 +252,44 @@ class PreviewCodeGenerator {
 
 extension on DartObject {
   cb.Expression toExpression() {
-    final objectImpl = this as DartObjectImpl;
     final DartType type = this.type!;
     return switch (type) {
       DartType(isDartCoreBool: true) => cb.literalBool(toBoolValue()!),
       DartType(isDartCoreDouble: true) => cb.literalNum(toDoubleValue()!),
       DartType(isDartCoreInt: true) => cb.literalNum(toIntValue()!),
       DartType(isDartCoreString: true) => cb.literalString(toStringValue()!),
       DartType(isDartCoreNull: true) => cb.literalNull,
-      InterfaceType(element3: EnumElement2()) => _createEnumInstance(objectImpl),
-      InterfaceType() => _createInstance(type, objectImpl),
-      FunctionType() => _createTearoff(toFunctionValue2()!),
+      InterfaceType(element3: EnumElement()) => _createEnumInstance(this),
+      InterfaceType() => _createInstance(type, this),
+      FunctionType() => _createTearoff(toFunctionValue()!),
       _ => throw UnsupportedError('Unexpected DartObject type: $runtimeType'),
     };
   }
 
-  cb.Expression _createTearoff(ExecutableElement2 element) {
+  cb.Expression _createTearoff(ExecutableElement element) {
     return cb.refer(element.displayName, _elementToLibraryIdentifier(element));
   }
 
-  cb.Expression _createEnumInstance(DartObjectImpl object) {
-    final VariableElement2 variable = object.variable2!;
+  cb.Expression _createEnumInstance(DartObject object) {
+    final VariableElement variable = object.variable!;
     return switch (variable) {
-      FieldElement2(
+      FieldElement(
         isEnumConstant: true,
         displayName: final enumValue,
-        enclosingElement2: EnumElement2(displayName: final enumName),
+        enclosingElement: EnumElement(displayName: final enumName),
       ) =>
         cb.refer('$enumName.$enumValue', _elementToLibraryIdentifier(variable)),
-      PropertyInducingElement2(:final displayName) => cb.refer(
+      PropertyInducingElement(:final displayName) => cb.refer(
         displayName,
         _elementToLibraryIdentifier(variable),
       ),
       _ => throw UnsupportedError('Unexpected enum variable type: ${variable.runtimeType}'),
     };
   }
 
-  cb.Expression _createInstance(InterfaceType dartType, DartObjectImpl object) {
-    final ConstructorInvocation constructorInvocation = object.getInvocation()!;
-    final ConstructorElement2 constructor = constructorInvocation.constructor2;
+  cb.Expression _createInstance(InterfaceType dartType, DartObject object) {
+    final ConstructorInvocation constructorInvocation = object.constructorInvocation!;
+    final ConstructorElement constructor = constructorInvocation.constructor;
     final cb.Expression type = cb.refer(
       dartType.element3.name3!,
       _elementToLibraryIdentifier(dartType.element3),
@@ -317,6 +314,6 @@ extension on DartObject {
     );
   }
 
-  /// Returns the import URI for the [analyzer.LibraryElement2] containing [element].
-  String? _elementToLibraryIdentifier(analyzer.Element2? element) => element?.library2!.identifier;
+  /// Returns the import URI for the [analyzer.LibraryElement] containing [element].
+  String? _elementToLibraryIdentifier(analyzer.Element? element) => element?.library!.identifier;
 }

packages/flutter_tools/lib/src/widget_preview/preview_detector.dart

@@ -191,20 +191,20 @@ class PreviewDetector {
           final unit =
               (await context.currentSession.getResolvedUnit(filePath)) as ResolvedUnitResult;
           lib = await context.currentSession.getResolvedLibrary(
-            unit.libraryElement2.firstFragment.source.fullName,
+            unit.libraryElement.firstFragment.source.fullName,
           );
         }
         if (lib is ResolvedLibraryResult) {
           final ResolvedLibraryResult resolvedLib = lib;
-          final PreviewPath previewPath = lib.element2.toPreviewPath();
+          final PreviewPath previewPath = lib.element.toPreviewPath();
           // This library has already been processed.
           if (updatedPreviews.containsKey(previewPath)) {
             continue;
           }
 
           final LibraryPreviewNode previewsForLibrary = _dependencyGraph.putIfAbsent(
             previewPath,
-            () => LibraryPreviewNode(library: resolvedLib.element2, logger: logger),
+            () => LibraryPreviewNode(library: resolvedLib.element, logger: logger),
           );
 
           previewsForLibrary.updateDependencyGraph(graph: _dependencyGraph, units: lib.units);

packages/flutter_tools/lib/src/widget_preview/utils.dart

@@ -32,22 +32,22 @@ extension AnnotationExtension on Annotation {
   /// Convenience getter to identify `@Preview` annotations
   bool get isPreview =>
       name.name == 'Preview' &&
-      elementAnnotation!.element2?.library2!.uri == widgetPreviewsLibraryUri;
+      elementAnnotation!.element?.library!.uri == widgetPreviewsLibraryUri;
 
   bool get isMultiPreview {
-    final Element2? element = elementAnnotation!.element2;
-    if (element is ConstructorElement2) {
-      final InterfaceType type = element.enclosingElement2.supertype!;
+    final Element? element = elementAnnotation!.element;
+    if (element is ConstructorElement) {
+      final InterfaceType type = element.enclosingElement.supertype!;
       return type.getDisplayString() == 'MultiPreview' &&
-          type.element3.library2.uri == widgetPreviewsLibraryUri;
+          type.element.library.uri == widgetPreviewsLibraryUri;
     }
     return false;
   }
 
   List<DartObject> findMultiPreviewPreviewNodes({required AnalysisContext context}) {
     final DartObject evaluatedAnnotation = elementAnnotation!.computeConstantValue()!;
-    final Element2 element = evaluatedAnnotation.type!.element3!;
-    if (element is ClassElement2) {
+    final Element element = evaluatedAnnotation.type!.element!;
+    if (element is ClassElement) {
       final InterfaceType type = element.supertype!;
       if (type.getDisplayString() != 'MultiPreview') {
         throw StateError('$element is not a MultiPreview!');
@@ -67,7 +67,7 @@ extension StringExtension on String {
   bool get doesContainDartTool => contains('.dart_tool');
 }
 
-extension LibraryElement2Extension on LibraryElement2 {
+extension LibraryElementExtension on LibraryElement {
   /// Convenience method to package path and [uri] into a [PreviewPath]
   PreviewPath toPreviewPath() => (path: firstFragment.source.fullName, uri: uri);
 }

packages/flutter_tools/pubspec.yaml

@@ -10,6 +10,7 @@ dependencies:
   #
   # For detailed instructions, refer to:
   # https://github.com/flutter/flutter/blob/main/docs/infra/Updating-dependencies-in-Flutter.md
+  analyzer: 8.1.1
   archive: 3.6.1
   args: 2.7.0
   dds: 5.0.3
@@ -23,13 +24,13 @@ dependencies:
   file: 7.0.1
   flutter_template_images: 5.0.0
   html: 0.15.6
-  http: 1.4.0
+  http: 1.5.0
   intl: 0.20.2
   meta: 1.17.0
   multicast_dns: 0.3.3
   mustache_template: 2.0.0
   package_config: 2.2.0
-  process: 5.0.4
+  process: 5.0.5
   fake_async: 1.3.3
   stack_trace: 1.12.1
   usage: 4.1.1
@@ -71,20 +72,19 @@ dependencies:
 
   standard_message_codec: 0.0.1+4
 
-  dart_style: 3.1.0
+  dart_style: 3.1.2
 
   # The below dependencies are transitive and are here to pin them to a specific version.
-  _fe_analyzer_shared: 82.0.0
-  analyzer: 7.4.5
+  _fe_analyzer_shared: 88.0.0
   boolean_selector: 2.1.2
   browser_launcher: 1.1.3
   built_collection: 5.1.1
-  built_value: 8.11.0
+  built_value: 8.11.1
   cli_config: 0.2.0
   clock: 1.1.2
   csslib: 1.0.2
   dap: 1.4.0
-  dds_service_extensions: 2.0.2
+  dds_service_extensions: 2.1.0
   devtools_shared: 12.0.0
   dtd: 4.0.0
   extension_discovery: 2.1.0
@@ -126,4 +126,4 @@ dev_dependencies:
 dartdoc:
   # Exclude this package from the hosted API docs.
   nodoc: true
-# PUBSPEC CHECKSUM: 932agm
+# PUBSPEC CHECKSUM: f0tepf

packages/flutter_tools/test/widget_preview_scaffold.shard/widget_preview_scaffold/pubspec.yaml

@@ -14,7 +14,7 @@ dependencies:
   # These will be replaced with proper constraints after the template is hydrated.
   dtd: 2.5.1
   flutter_lints: 6.0.0
-  google_fonts: 6.2.1
+  google_fonts: 6.3.0
   stack_trace: 1.12.1
   url_launcher: 6.3.2
 
@@ -27,7 +27,7 @@ dependencies:
   crypto: 3.0.6
   fake_async: 1.3.3
   file: 7.0.1
-  http: 1.4.0
+  http: 1.5.0
   http_parser: 4.1.2
   json_rpc_2: 3.0.3
   leak_tracker: 11.0.1
@@ -46,7 +46,7 @@ dependencies:
   test_api: 0.7.7
   typed_data: 1.4.0
   unified_analytics: 8.0.1
-  url_launcher_android: 6.3.16
+  url_launcher_android: 6.3.17
   url_launcher_ios: 6.3.3
   url_launcher_linux: 3.2.1
   url_launcher_macos: 3.2.2
@@ -62,4 +62,4 @@ dependencies:
 flutter:
   uses-material-design: true
 
-# PUBSPEC CHECKSUM: patulg
+# PUBSPEC CHECKSUM: b279i4