Bump analyzer to 2.4.0

dart_test.yaml

@@ -0,0 +1,10 @@
+tags:
+  core:
+    test_on: vm
+  creator:
+    test_on: vm
+  html:
+    test_on: browser
+  webdriver:
+    test_on: vm
+    timeout: 2x

lib/builder.dart

@@ -38,6 +38,7 @@ Builder pageloaderBuilder(BuilderOptions options) {
       SharedPartBuilder([const PageObjectGenerator()], 'pageloader');
 
   if (optionsMap.isNotEmpty) {
+    // ignore: unnecessary_null_comparison
     if (log == null) {
       throw StateError('Upgrade `build_runner` to at least 0.8.2.');
     } else {

lib/src/generators/pageobject_generator.dart

@@ -52,7 +52,7 @@ class PageObjectGenerator extends GeneratorForAnnotation<PageObject> {
         library = await resolver
             .libraryFor(await resolver.assetIdForElement(element.library));
         final session = library.session;
-        resolvedLibrary = await session.getResolvedLibraryByElement2(library)
+        resolvedLibrary = await session.getResolvedLibraryByElement(library)
             as ResolvedLibraryResult;
         break;
       } catch (_) {

lib/src/html/html_mouse.dart

@@ -23,7 +23,7 @@ late HtmlMouse _globalMouse;
 SyncFn<dynamic>? _cachedSyncFn;
 
 /// Returns the globally used [HtmlMouse] in Html based tests.
-HtmlMouse globalMouse(SyncFn<dynamic> syncFn) {
+HtmlMouse globalMouse(SyncFn<dynamic>? syncFn) {
   assert(syncFn != null);
   // [SyncFn] may change based on when this function is called.
   // If it does change, we need to create a new [HtmlMouse] since this

lib/src/html/html_page_loader_element.dart

@@ -11,10 +11,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import 'dart:convert';
 import 'dart:html';
 import 'dart:js' as js;
-import 'dart:math';
 import 'dart:svg' show SvgElement;
 
 import 'package:js/js_util.dart' as js_util;
@@ -757,7 +755,7 @@ String? _elementText(List<Node> elements) {
     return _elementText(
         elem.getDistributedNodes().whereType<Element>().toList());
   }
-  if (elem.nodes == null || elem.nodes.isEmpty) {
+  if (elem.nodes.isEmpty) {
     return elem.text;
   }
   return _elementText(elem.nodes);

lib/src/html/html_pointer.dart

@@ -22,7 +22,7 @@ late HtmlPointer _globalPointer;
 SyncFn? _cachedSyncFn;
 
 /// Returns the globally used [HtmlPointer] in Html based tests.
-HtmlPointer globalPointer(SyncFn syncFn) {
+HtmlPointer globalPointer(SyncFn? syncFn) {
   assert(syncFn != null);
   // [SyncFn] may change based on when this function is called.
   // If it does change, we need to create a new [HtmlPointer] since this

lib/src/webdriver/webdriver_page_loader_element.dart

@@ -49,7 +49,7 @@ class WebDriverPageLoaderElement implements PageLoaderElement {
         _cachedElement = null,
         _finder = null,
         _parentElement = null {
-    assert(_driver != null);
+    // assert(_driver != null);
   }
 
   /// Constructs an element from a [WebElement].
@@ -347,7 +347,7 @@ class WebDriverPageLoaderElement implements PageLoaderElement {
     // So we can try again after moving the element into the center of page.
     try {
       _retryWhenStale<void>(() => _single.click());
-    } catch (ElementClickInterceptedException) {
+    } catch (elementClickInterceptedException) {
       await scrollIntoViewCentered();
       _retryWhenStale<void>(() => _single.click());
     }

pubspec.yaml

@@ -17,7 +17,7 @@ environment:
   sdk: '>=2.12.0 <3.0.0'
 
 dependencies:
-  analyzer: ^1.7.1
+  analyzer: <2.5.0
   build: ^2.0.2
   built_value: ^8.0.6
   build_config: ^1.0.0

test/core_method_information_test.dart

@@ -14,6 +14,7 @@
 // limitations under the License.
 
 @TestOn('vm')
+@Tags(['core'])
 
 import 'package:pageloader/src/generators/methods/core_method_information.dart';
 import 'package:test/test.dart';

test/correct_gen_null_safety_test.dart

@@ -12,6 +12,7 @@
 // limitations under the License.
 
 @TestOn('vm')
+@Tags(['core'])
 
 import 'package:test/test.dart';
 

test/correct_gen_test.dart

@@ -14,6 +14,7 @@
 // limitations under the License.
 
 @TestOn('vm')
+@Tags(['core'])
 
 import 'package:test/test.dart';
 

test/data/html_setup.dart

@@ -120,7 +120,7 @@ html.Element setUp() {
       <div id="mixin-div">mixin div</div>
       <custom-events-element></custom-event-element>''';
 
-  final templateHtml = '<button id="inner">some <content></content></button>';
+  // final templateHtml = '<button id="inner">some <content></content></button>';
 
   final results =
       (body as html.Element).querySelectorAll('div[id=testdocument]');