Migrate remaining APIs

Author: simolus3

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

@@ -13,7 +13,7 @@ class DriftAnalysisError {
   factory DriftAnalysisError.forDartElement(
       dart.Element2 element, String message) {
     return DriftAnalysisError(
-      spanForElement(element),
+      spanForElement2(element),
       message,
     );
   }
@@ -52,7 +52,7 @@ class DriftAnalysisError {
 
   static FileSpan dartAstSpan(
       dart.Element2 element, dart.SyntacticEntity entity) {
-    final span = spanForElement(element) as FileSpan;
+    final span = spanForElement2(element) as FileSpan;
     return span.file.span(entity.offset, entity.end);
   }
 }

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

@@ -2,7 +2,6 @@ import 'package:analyzer/dart/ast/ast.dart' as dart;
 import 'package:analyzer/dart/constant/value.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/type.dart';
-import 'package:analyzer/dart/element/visitor.dart';
 import 'package:analyzer/dart/element/visitor2.dart';
 import 'package:drift/drift.dart' show TableIndex;
 import 'package:source_gen/source_gen.dart';
@@ -186,9 +185,8 @@ class _FindDartElements extends RecursiveElementVisitor2<void> {
   static TypeChecker _checker(InterfaceType type) {
     // Workaround for https://github.com/dart-lang/build/issues/3796, the
     // analysis sessions for _knownTypes and this type might be different.
-    final definition = type.element.librarySource;
-    return TypeChecker.fromUrl(
-        definition.uri.replace(fragment: type.element.name));
+    final uri = type.element3.library2.uri;
+    return TypeChecker.fromUrl(uri.replace(fragment: type.element3.name3));
   }
 
   Future<void> find() async {
@@ -202,16 +200,16 @@ class _FindDartElements extends RecursiveElementVisitor2<void> {
     // weird errors for the Table class itself. In weird cases where we iterate
     // over generated code (standalone tool), don't report existing
     // implementations as tables.
-    return _isTable.isAssignableFrom(element) &&
-        !_isTable.isExactly(element) &&
-        !_isTableInfo.isAssignableFrom(element) &&
+    return _isTable.isAssignableFrom2(element) &&
+        !_isTable.isExactly2(element) &&
+        !_isTableInfo.isAssignableFrom2(element) &&
         // Temporary workaround until https://github.com/dart-lang/source_gen/pull/628
         // gets merged.
         !element.mixins.any((e) => e.nameIfInterfaceType == 'TableInfo');
   }
 
   bool _isDslView(ClassElement2 element) {
-    return _isView.isAssignableFrom(element) && !_isView.isExactly(element);
+    return _isView.isAssignableFrom2(element) && !_isView.isExactly2(element);
   }
 
   @override
@@ -247,8 +245,8 @@ class _FindDartElements extends RecursiveElementVisitor2<void> {
     } else {
       // Check if this class declares a database or a database accessor.
 
-      final firstDb = _isDatabase.firstAnnotationOf(element);
-      final firstDao = _isDao.firstAnnotationOf(element);
+      final firstDb = _isDatabase.firstAnnotationOf2(element);
+      final firstDao = _isDao.firstAnnotationOf2(element);
       final id = _discoverStep._id(element.name3!);
 
       if (firstDb != null) {

drift_dev/lib/src/analysis/resolver/drift/element_resolver.dart

@@ -112,11 +112,11 @@ abstract class DriftElementResolver<T extends DiscoveredElement>
       return null;
     } else if (element is InterfaceElement2) {
       final library = element.library2;
-      return library.typeSystem.instantiateInterfaceToBounds(
+      return library.typeSystem.instantiateInterfaceToBounds2(
           element: element, nullabilitySuffix: NullabilitySuffix.none);
     } else if (element is TypeAliasElement2) {
       final library = element.library2;
-      return library.typeSystem.instantiateTypeAliasToBounds(
+      return library.typeSystem.instantiateTypeAliasToBounds2(
           element: element, nullabilitySuffix: NullabilitySuffix.none);
     } else {
       reportError(DriftAnalysisError.inDriftFile(

drift_dev/lib/src/analysis/resolver/shared/dart_types.dart

@@ -59,7 +59,7 @@ ExistingRowClass? validateExistingClass(
     ctor = instantiation.lookUpConstructor2(constructor, desiredClass.library2);
   } else {
     ctor = desiredClass.getNamedConstructor2(constructor);
-    instantiation = library.typeSystem.instantiateInterfaceToBounds(
+    instantiation = library.typeSystem.instantiateInterfaceToBounds2(
         element: desiredClass, nullabilitySuffix: NullabilitySuffix.none);
   }
 

drift_dev/lib/src/backends/build/backend.dart

@@ -1,7 +1,6 @@
 import 'dart:convert';
 
 import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:build/build.dart' as build;
 import 'package:build/build.dart';
@@ -35,7 +34,7 @@ class DriftBuildBackend extends DriftBackend {
 
   @override
   Future<Uri> uriOfDart(Element2 element) async {
-    final id = await _buildStep.resolver.assetIdForElement(element);
+    final id = await _buildStep.resolver.assetIdForElement2(element);
     return id.uri;
   }
 
@@ -46,7 +45,7 @@ class DriftBuildBackend extends DriftBackend {
   Future<LibraryElement2> readDart(Uri uri) async {
     if (uri.scheme == 'dart') {
       final name = 'dart.${uri.path}';
-      final library = await _buildStep.resolver.findLibraryByName(name);
+      final library = await _buildStep.resolver.findLibraryByName2(name);
 
       if (library == null) {
         throw NotALibraryException(uri);
@@ -56,15 +55,18 @@ class DriftBuildBackend extends DriftBackend {
     }
 
     try {
-      return await _buildStep.resolver.libraryFor(AssetId.resolve(uri));
+      return await _buildStep.resolver.libraryFor2(AssetId.resolve(uri));
     } on NonLibraryAssetException {
       throw NotALibraryException(uri);
     }
   }
 
   @override
   Future<AstNode?> loadElementDeclaration(Element2 element) {
-    return _buildStep.resolver.astNodeFor(element, resolve: true);
+    return _buildStep.resolver.astNodeFor2(
+      element.firstFragment,
+      resolve: true,
+    );
   }
 
   @override
@@ -93,10 +95,13 @@ class DriftBuildBackend extends DriftBackend {
       throw CannotReadExpressionException('No field for $dartExpression');
     }
 
-    final library = await _buildStep.resolver.libraryFor(tempDart);
-    final field = library.units.first.topLevelVariables
-        .firstWhere((element) => element.name == getter);
-    final fieldAst = await _buildStep.resolver.astNodeFor(field, resolve: true);
+    final library = await _buildStep.resolver.libraryFor2(tempDart);
+    final field = library.firstFragment.topLevelVariables2
+        .firstWhere((element) => element.name2 == getter);
+    final fieldAst = await _buildStep.resolver.astNodeFor2(
+      field,
+      resolve: true,
+    );
 
     final initializer = (fieldAst as VariableDeclaration).initializer;
     if (initializer == null) {
@@ -107,25 +112,25 @@ class DriftBuildBackend extends DriftBackend {
   }
 
   @override
-  Future<Element?> resolveTopLevelElement(
+  Future<Element2?> resolveTopLevelElement(
       Uri context, String reference, Iterable<Uri> imports) async {
     final original = AssetId.resolve(context);
     final tempDart = original.changeExtension('.expr.temp.dart');
 
     if (await _buildStep.canRead(tempDart)) {
-      final library = await _buildStep.resolver.libraryFor(tempDart);
-      return library.definingCompilationUnit.scope.lookup(reference).getter;
+      final library = await _buildStep.resolver.libraryFor2(tempDart);
+      return library.firstFragment.scope.lookup(reference).getter2;
     } else {
       // If there's no temporary file whose imports we can use, then that means
       // that there aren't any Dart imports in [context] at all. So we just need
       // to look it up in `dart:core`.
       // For that, resolve a library we know exists and likely has been resolved
       // already.
       final libraryWeKnowExists = await _buildStep.resolver
-          .libraryFor(AssetId.resolve(KnownDriftTypes.uri));
-      final dartCore = libraryWeKnowExists.typeProvider.objectElement.library;
+          .libraryFor2(AssetId.resolve(KnownDriftTypes.uri));
+      final dartCore = libraryWeKnowExists.typeProvider.objectElement2.library2;
 
-      return dartCore.exportNamespace.get(reference);
+      return dartCore.exportNamespace.get2(reference);
     }
   }
 }
@@ -192,7 +197,7 @@ class BuildCacheReader implements AnalysisResultCacheReader {
   Future<LibraryElement2?> readTypeHelperFor(Uri uri) async {
     final assetId = AssetId.resolve(uri).addExtension('.types.temp.dart');
     if (await _buildStep.canRead(assetId)) {
-      return _buildStep.resolver.libraryFor(assetId, allowSyntaxErrors: true);
+      return _buildStep.resolver.libraryFor2(assetId, allowSyntaxErrors: true);
     }
 
     return null;

drift_dev/lib/src/backends/build/drift_builder.dart

@@ -278,7 +278,7 @@ class _DriftBuildRun {
   /// minimal version constraints.
   Future<void> _checkForLanguageVersions() async {
     if (mode.isPartFile) {
-      final library = await buildStep.inputLibrary;
+      final library = await buildStep.inputLibrary2;
       overriddenLanguageVersion = library.languageVersion.override;
 
       final effectiveVersion =
@@ -467,7 +467,7 @@ class _DriftBuildRun {
   Future<void> _createWriter() async {
     if (mode.isMonolithic) {
       final generationOptions = GenerationOptions(
-        imports: ImportManagerForPartFiles(await buildStep.inputLibrary),
+        imports: ImportManagerForPartFiles(await buildStep.inputLibrary2),
       );
       writer = Writer(options, generationOptions: generationOptions);
     } else {