Elements. Avoid a few casts to LibraryElementImpl.

Change-Id: Iae09862d3d9fd14900b6ffe9fda4f542aad877a4
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/406721
Commit-Queue: Konstantin Shcheglov <[email protected]>
Reviewed-by: Phil Quitslund <[email protected]>

Author: scheglov

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

@@ -495,7 +495,9 @@ class ResolvedUnitResultImpl extends FileResultImpl
   }
 
   @override
-  LibraryElement2 get libraryElement2 => libraryFragment.element;
+  LibraryElementImpl get libraryElement2 {
+    return libraryFragment.element as LibraryElementImpl;
+  }
 
   @override
   LibraryFragment get libraryFragment => unit.declaredFragment!;

pkg/analyzer/test/src/dart/constant/evaluation_test.dart

@@ -4900,7 +4900,7 @@ class ConstantVisitorTestSupport extends PubPackageResolutionTest {
         declaredVariables: DeclaredVariables.fromMap(declaredVariables),
         configuration: ConstantEvaluationConfiguration(),
       ),
-      this.result.libraryElement2 as LibraryElementImpl,
+      this.result.libraryElement2,
       errorReporter,
       lexicalEnvironment: lexicalEnvironment,
     );

pkg/analyzer/test/src/dart/micro/file_resolution.dart

@@ -10,6 +10,7 @@ import 'package:analyzer/src/dart/analysis/byte_store.dart';
 import 'package:analyzer/src/dart/analysis/file_state.dart';
 import 'package:analyzer/src/dart/analysis/library_context.dart';
 import 'package:analyzer/src/dart/analysis/performance_logger.dart';
+import 'package:analyzer/src/dart/analysis/results.dart';
 import 'package:analyzer/src/dart/analysis/unlinked_unit_store.dart';
 import 'package:analyzer/src/dart/micro/resolve_file.dart';
 import 'package:analyzer/src/dart/sdk/sdk.dart';
@@ -122,14 +123,14 @@ class FileResolutionTest with ResourceProviderMixin, ResolutionTest {
   }
 
   @override
-  Future<ResolvedUnitResult> resolveFile(
+  Future<ResolvedUnitResultImpl> resolveFile(
     File file, {
     OperationPerformanceImpl? performance,
   }) async {
     result = await fileResolver.resolve(
       path: file.path,
       performance: performance,
-    );
+    ) as ResolvedUnitResultImpl;
     return result;
   }
 

pkg/analyzer/test/src/dart/resolution/resolution.dart

@@ -14,6 +14,7 @@ import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/dart/element/type_provider.dart';
 import 'package:analyzer/error/error.dart';
 import 'package:analyzer/file_system/file_system.dart';
+import 'package:analyzer/src/dart/analysis/results.dart';
 import 'package:analyzer/src/dart/constant/value.dart';
 import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/dart/element/inheritance_manager3.dart';
@@ -47,7 +48,7 @@ mixin ResolutionTest implements ResourceProviderMixin {
   final ResolvedNodeTextConfiguration nodeTextConfiguration =
       ResolvedNodeTextConfiguration();
 
-  late ResolvedUnitResult result;
+  late ResolvedUnitResultImpl result;
   late FindNode findNode;
   late FindElement findElement;
   late FindElement2 findElement2;
@@ -69,7 +70,7 @@ mixin ResolutionTest implements ResourceProviderMixin {
   ClassElement2 get futureElement => typeProvider.futureElement2;
 
   InheritanceManager3 get inheritanceManager {
-    var library = result.libraryElement2 as LibraryElementImpl;
+    var library = result.libraryElement2;
     return library.session.inheritanceManager;
   }
 
@@ -101,7 +102,7 @@ mixin ResolutionTest implements ResourceProviderMixin {
 
   TypeProvider get typeProvider => result.typeProvider;
 
-  TypeSystemImpl get typeSystem => result.typeSystem as TypeSystemImpl;
+  TypeSystemImpl get typeSystem => result.typeSystem;
 
   void addTestFile(String content) {
     newFile(testFile.path, content);
@@ -447,7 +448,7 @@ mixin ResolutionTest implements ResourceProviderMixin {
   ExpectedContextMessage message(File file, int offset, int length) =>
       ExpectedContextMessage(file, offset, length);
 
-  Future<ResolvedUnitResult> resolveFile(File file);
+  Future<ResolvedUnitResultImpl> resolveFile(File file);
 
   /// Resolve [file] into [result].
   Future<void> resolveFile2(File file) async {

pkg/analyzer/test/src/lint/linter/linter_context_impl_test.dart

@@ -5,7 +5,6 @@
 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/dart/element/type_system.dart';
 import 'package:analyzer/src/lint/constants.dart';
 import 'package:analyzer/src/lint/linter.dart';
 import 'package:analyzer/src/string_source.dart';
@@ -52,7 +51,7 @@ abstract class AbstractLinterContextTest extends PubPackageResolutionTest {
       [contextUnit],
       contextUnit,
       result.typeProvider,
-      result.typeSystem as TypeSystemImpl,
+      result.typeSystem,
       InheritanceManager3(),
       // TODO(pq): Use a test package or consider passing in `null`.
       workspacePackage,

pkg/analyzer/test/src/summary/elements/library_fragment_test.dart

@@ -611,15 +611,11 @@ var foo = 0;
 var foo = 1.2;
 ''');
 
-    await assertNoErrorsInCode(r'''
-// ignore:unused_import
+    var library = await buildLibrary(r'''
 import 'a.dart' as prefix;
-
-// ignore:unused_import
 import 'b.dart' as prefix;
 ''');
 
-    var library = result.libraryElement2 as LibraryElementImpl;
     _assertScopeLookups(library, [
       Uri.parse('package:test/test.dart'),
     ], [
@@ -642,15 +638,11 @@ package:test/test.dart
 var pi = 4;
 ''');
 
-    await assertNoErrorsInCode(r'''
-// ignore:unused_import
+    var library = await buildLibrary(r'''
 import 'a.dart' as prefix;
-
-// ignore:unused_import
 import 'dart:math' as prefix;
 ''');
 
-    var library = result.libraryElement2 as LibraryElementImpl;
     _assertScopeLookups(library, [
       Uri.parse('package:test/test.dart'),
     ], [
@@ -669,15 +661,11 @@ package:test/test.dart
 var pi = 4;
 ''');
 
-    await assertNoErrorsInCode(r'''
-// ignore:unused_import
+    var library = await buildLibrary(r'''
 import 'dart:math' as prefix;
-
-// ignore:unused_import
 import 'a.dart' as prefix;
 ''');
 
-    var library = result.libraryElement2 as LibraryElementImpl;
     _assertScopeLookups(library, [
       Uri.parse('package:test/test.dart'),
     ], [
@@ -700,15 +688,11 @@ var foo = 0;
 export 'a.dart';
 ''');
 
-    await assertNoErrorsInCode(r'''
-// ignore:unused_import
+    var library = await buildLibrary(r'''
 import 'a.dart' as prefix;
-
-// ignore:unused_import
 import 'b.dart' as prefix;
 ''');
 
-    var library = result.libraryElement2 as LibraryElementImpl;
     _assertScopeLookups(library, [
       Uri.parse('package:test/test.dart'),
     ], [
@@ -731,15 +715,11 @@ var foo = 0;
 var bar = 0;
 ''');
 
-    await assertNoErrorsInCode(r'''
-// ignore:unused_import
+    var library = await buildLibrary(r'''
 import 'a.dart' as prefix;
-
-// ignore:unused_import
 import 'b.dart' as prefix2;
 ''');
 
-    var library = result.libraryElement2 as LibraryElementImpl;
     _assertScopeLookups(library, [
       Uri.parse('package:test/test.dart'),
     ], [
@@ -767,12 +747,10 @@ package:test/test.dart
   }
 
   test_scope_hasPrefix_lookup_notFound() async {
-    await assertNoErrorsInCode(r'''
-// ignore:unused_import
+    var library = await buildLibrary(r'''
 import 'dart:math' as math;
 ''');
 
-    var library = result.libraryElement2 as LibraryElementImpl;
     _assertScopeLookups(library, [
       Uri.parse('package:test/test.dart'),
     ], [
@@ -786,12 +764,10 @@ package:test/test.dart
   }
 
   test_scope_hasPrefix_lookup_respectsCombinator_hide() async {
-    await assertNoErrorsInCode(r'''
-// ignore:unused_import
+    var library = await buildLibrary(r'''
 import 'dart:math' as math hide sin;
 ''');
 
-    var library = result.libraryElement2 as LibraryElementImpl;
     _assertScopeLookups(library, [
       Uri.parse('package:test/test.dart'),
     ], [
@@ -809,12 +785,10 @@ package:test/test.dart
   }
 
   test_scope_hasPrefix_lookup_respectsCombinator_show() async {
-    await assertNoErrorsInCode(r'''
-// ignore:unused_import
+    var library = await buildLibrary(r'''
 import 'dart:math' as math show sin;
 ''');
 
-    var library = result.libraryElement2 as LibraryElementImpl;
     _assertScopeLookups(library, [
       Uri.parse('package:test/test.dart'),
     ], [