Migrate to element2

Author: simolus3

drift_dev/analysis_options.yaml

@@ -5,3 +5,7 @@ analyzer:
     strict-casts: true
   exclude:
     - "**/*.g.dart"
+
+linter:
+  rules:
+    analyzer_use_new_elements: true

drift_dev/lib/src/analysis/backend.dart

@@ -1,5 +1,5 @@
 import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:logging/logging.dart';
 
 /// The backend used by drift's analysis implementation to read files and access
@@ -15,8 +15,8 @@ abstract class DriftBackend {
   /// Reads a file as string.
   Future<String> readAsString(Uri uri);
 
-  Future<Uri> uriOfDart(Element element) async {
-    return element.source!.uri;
+  Future<Uri> uriOfDart(Element2 element) async {
+    return element.library2!.uri;
   }
 
   bool get canReadDart;
@@ -26,15 +26,15 @@ abstract class DriftBackend {
   /// This should also be able to resolve SDK libraries.
   /// If no Dart library can be found under that uri, throws a
   /// [NotALibraryException].
-  Future<LibraryElement> readDart(Uri uri);
+  Future<LibraryElement2> readDart(Uri uri);
 
   /// Loads the resolved AST node defining the given [element].
   ///
   /// Depending on how the analyzer is accessed, this may throw an exception if
   /// the resolved AST is not available.
   /// When the [element] does not have a syntactic representation in the AST,
   /// null is returned.
-  Future<AstNode?> loadElementDeclaration(Element element);
+  Future<AstNode?> loadElementDeclaration(Element2 element);
 
   /// Resolves a Dart expression from a string.
   ///
@@ -48,7 +48,7 @@ abstract class DriftBackend {
       Uri context, String dartExpression, Iterable<String> imports);
 
   /// Resolves the Dart element named [reference] in the [imports] of [context].
-  Future<Element?> resolveTopLevelElement(
+  Future<Element2?> resolveTopLevelElement(
       Uri context, String reference, Iterable<Uri> imports);
 }
 

drift_dev/lib/src/analysis/driver/cache.dart

@@ -1,4 +1,4 @@
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 
 import '../results/element.dart';
 import 'state.dart';
@@ -11,7 +11,7 @@ class DriftAnalysisCache {
   final Map<Uri, FileState> knownFiles = {};
   final Map<DriftElementId, DriftElementKind> discoveredElements = {};
 
-  final Map<Uri, LibraryElement?> typeHelperLibraries = {};
+  final Map<Uri, LibraryElement2?> typeHelperLibraries = {};
 
   FileState stateForUri(Uri uri) {
     return knownFiles[uri] ?? notifyFileChanged(uri);

drift_dev/lib/src/analysis/driver/driver.dart

@@ -1,6 +1,6 @@
 import 'dart:convert';
 
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:sqlparser/sqlparser.dart';
 
 import '../backend.dart';
@@ -377,7 +377,7 @@ abstract class AnalysisResultCacheReader {
 
   Future<CachedDiscoveryResults?> readDiscovery(Uri uri);
 
-  Future<LibraryElement?> readTypeHelperFor(Uri uri);
+  Future<LibraryElement2?> readTypeHelperFor(Uri uri);
 
   Future<String?> readElementCacheFor(Uri uri);
 }

drift_dev/lib/src/analysis/driver/error.dart

@@ -1,5 +1,5 @@
 import 'package:analyzer/dart/ast/syntactic_entity.dart' as dart;
-import 'package:analyzer/dart/element/element.dart' as dart;
+import 'package:analyzer/dart/element/element2.dart' as dart;
 import 'package:source_gen/source_gen.dart';
 import 'package:source_span/source_span.dart';
 import 'package:sqlparser/sqlparser.dart' as sql;
@@ -11,15 +11,15 @@ class DriftAnalysisError {
   DriftAnalysisError(this.span, this.message);
 
   factory DriftAnalysisError.forDartElement(
-      dart.Element element, String message) {
+      dart.Element2 element, String message) {
     return DriftAnalysisError(
       spanForElement(element),
       message,
     );
   }
 
   factory DriftAnalysisError.inDartAst(
-      dart.Element element, dart.SyntacticEntity entity, String message) {
+      dart.Element2 element, dart.SyntacticEntity entity, String message) {
     return DriftAnalysisError(dartAstSpan(element, entity), message);
   }
 
@@ -51,7 +51,7 @@ class DriftAnalysisError {
   }
 
   static FileSpan dartAstSpan(
-      dart.Element element, dart.SyntacticEntity entity) {
+      dart.Element2 element, dart.SyntacticEntity entity) {
     final span = spanForElement(element) as FileSpan;
     return span.file.span(entity.offset, entity.end);
   }

drift_dev/lib/src/analysis/driver/state.dart

@@ -1,4 +1,4 @@
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:meta/meta.dart';
 import 'package:path/path.dart' show url;
 import 'package:sqlparser/sqlparser.dart' hide AnalysisError;
@@ -168,7 +168,7 @@ class DriftFileImport {
 }
 
 class DiscoveredDartLibrary extends DiscoveredFileState {
-  final LibraryElement library;
+  final LibraryElement2 library;
 
   @override
   final List<DriftImport> importDependencies;

drift_dev/lib/src/analysis/resolver/dart/accessor.dart

@@ -58,7 +58,7 @@ class DartAccessorResolver
       }
 
       final table = await resolveDartReferenceOrReportError<DriftTable>(
-          dartType.element,
+          dartType.element3,
           (msg) => DriftAnalysisError.forDartElement(element, msg));
       if (table != null) {
         tables.add(table);
@@ -81,7 +81,7 @@ class DartAccessorResolver
       }
 
       final view = await resolveDartReferenceOrReportError<DriftView>(
-          dartType.element,
+          dartType.element3,
           (msg) => DriftAnalysisError.forDartElement(element, msg));
       if (view != null) {
         views.add(view);
@@ -139,7 +139,7 @@ class DartAccessorResolver
         }
 
         final dao = await resolveDartReferenceOrReportError<DatabaseAccessor>(
-            type.element,
+            type.element3,
             (msg) => DriftAnalysisError.forDartElement(element, msg));
         if (dao != null) accessors.add(dao);
       }
@@ -158,12 +158,12 @@ class DartAccessorResolver
       );
     } else {
       final dbType = element.allSupertypes
-          .firstWhereOrNull((i) => i.element.name == 'DatabaseAccessor');
+          .firstWhereOrNull((i) => i.element3.name3 == 'DatabaseAccessor');
 
       // inherits from DatabaseAccessor<T>, we want to know which T
 
       final dbImpl = dbType?.typeArguments.single ??
-          element.library.typeProvider.dynamicType;
+          element.library2.typeProvider.dynamicType;
       if (dbImpl is DynamicType) {
         reportError(DriftAnalysisError.forDartElement(
           element,
@@ -186,15 +186,16 @@ class DartAccessorResolver
   }
 
   Future<int?> _readSchemaVersion() async {
-    final element =
-        discovered.dartElement.thisType.getGetter('schemaVersion')?.variable2;
+    final element = discovered.dartElement.thisType
+        .lookUpGetter3('schemaVersion', discovered.dartElement.library2)
+        ?.variable3;
     if (element == null) return null;
 
     try {
       if (element.isSynthetic) {
         // Getter, read from `=>` body if possible.
         final expr = returnExpressionOfMethod(await resolver.driver.backend
-            .loadElementDeclaration(element.getter!) as MethodDeclaration);
+            .loadElementDeclaration(element.getter2!) as MethodDeclaration);
         if (expr is IntegerLiteral) {
           return expr.value;
         }
@@ -213,15 +214,15 @@ class DartAccessorResolver
   }
 
   bool _hasConstructorWithDatabaseConnection() {
-    final constructor = discovered.dartElement.unnamedConstructor;
+    final constructor = discovered.dartElement.unnamedConstructor2;
     if (constructor == null) {
       return false;
     }
-    if (constructor.parameters.length != 1) {
+    if (constructor.formalParameters.length != 1) {
       return false;
     }
 
-    final [param] = constructor.parameters;
+    final [param] = constructor.formalParameters;
     if (param.isNamed) {
       return false;
     }

drift_dev/lib/src/analysis/resolver/dart/column.dart

@@ -1,5 +1,5 @@
 import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:collection/collection.dart';
 import 'package:drift/drift.dart' show DriftSqlType;
@@ -97,12 +97,12 @@ class ColumnParser {
   /// migrations), there might not be a `creationTime` in scope for the check
   /// constraint. So, we annotate these references in [AnnotatedDartCode] and
   /// use that information when generating code to transform the code.
-  final Map<Element, String> _columnsInSameTable;
+  final Map<Element2, String> _columnsInSameTable;
 
   ColumnParser(this._resolver, this._columnsInSameTable);
 
   Future<PendingColumnInformation?> parse(
-      ColumnDeclaration columnDeclaration, Element element) async {
+      ColumnDeclaration columnDeclaration, Element2 element) async {
     final expr = columnDeclaration.expression;
 
     if (expr is! FunctionExpressionInvocation) {
@@ -174,8 +174,8 @@ class ColumnParser {
             break;
           }
 
-          final staticElement = first.staticElement;
-          if (staticElement is! ClassElement) {
+          final staticElement = first.element;
+          if (staticElement is! ClassElement2) {
             _resolver.reportError(DriftAnalysisError.inDartAst(
               element,
               first,
@@ -384,7 +384,7 @@ class ColumnParser {
       final expression = remainingExpr.argumentList.arguments.single;
 
       final custom = readCustomType(
-        element.library!,
+        element.library2!,
         expression,
         helper,
         (message) => _resolver.reportError(
@@ -404,7 +404,7 @@ class ColumnParser {
     AppliedTypeConverter? converter;
     if (mappedAs != null) {
       converter = readTypeConverter(
-        element.library!,
+        element.library2!,
         mappedAs,
         columnType,
         nullable,
@@ -498,7 +498,7 @@ class ColumnParser {
         sqlType: columnType,
         nullable: nullable,
         nameInSql: sqlName,
-        nameInDart: element.name!,
+        nameInDart: element.name3!,
         declaration: DriftDeclaration.dartElement(element),
         typeConverter: converter,
         clientDefaultCode: clientDefaultExpression,
@@ -528,31 +528,31 @@ class ColumnParser {
     }[name]!;
   }
 
-  String? _readJsonKey(Element getter) {
-    final annotations = getter.metadata;
+  String? _readJsonKey(Element2 getter) {
+    final annotations = getter.metadataIfAnnotatable;
     final object = annotations.firstWhereOrNull((e) {
       final value = e.computeConstantValue();
       final valueType = value?.type;
 
       return valueType is InterfaceType &&
           isFromDrift(valueType) &&
-          valueType.element.name == 'JsonKey';
+          valueType.element3.name3 == 'JsonKey';
     });
 
     if (object == null) return null;
 
     return object.computeConstantValue()!.getField('key')!.toStringValue();
   }
 
-  String? _readReferenceName(Element getter) {
-    final annotations = getter.metadata;
+  String? _readReferenceName(Element2 getter) {
+    final annotations = getter.metadataIfAnnotatable;
     final object = annotations.firstWhereOrNull((e) {
       final value = e.computeConstantValue();
       final valueType = value?.type;
 
       return valueType is InterfaceType &&
           isFromDrift(valueType) &&
-          valueType.element.name == 'ReferenceName';
+          valueType.element3.name3 == 'ReferenceName';
     });
 
     if (object == null) return null;