[web] Code cleanup (flutter#27741)

lib/web_ui/analysis_options.yaml

@@ -26,8 +26,6 @@ linter:
     prefer_conditional_assignment: false
     prefer_const_constructors: false
     prefer_const_constructors_in_immutables: false
-    prefer_const_declarations: false
-    prefer_const_literals_to_create_immutables: false
     prefer_foreach: false
     prefer_generic_function_type_aliases: false
     prefer_initializing_formals: false
@@ -37,14 +35,6 @@ linter:
     recursive_getters: false
     slash_for_doc_comments: false
     sort_unnamed_constructors_first: false
-    test_types_in_equals: false
-    throw_in_finally: false
-    type_init_formals: false
-    unnecessary_getters_setters: false
-    use_rethrow_when_possible: false
-    valid_regexps: false
-    use_function_type_syntax_for_parameters: false
-    avoid_single_cascade_in_expression_statements: false
     flutter_style_todos: false
 
     # We have some legitimate use-cases for this (preserve tear-off identity)

lib/web_ui/dev/browser.dart

@@ -97,7 +97,7 @@ abstract class Browser {
   /// which asynchronously returns the browser process. Any errors in
   /// [startBrowser] (even those raised asynchronously after it returns) are
   /// piped to [onExit] and will cause the browser to be killed.
-  Browser(Future<Process> startBrowser()) {
+  Browser(Future<Process> Function() startBrowser) {
     // Don't return a Future here because there's no need for the caller to wait
     // for the process to actually start. They should just wait for the HTTP
     // request instead.

lib/web_ui/dev/build.dart

@@ -15,8 +15,7 @@ import 'watcher.dart';
 
 class BuildCommand extends Command<bool> with ArgUtils<bool> {
   BuildCommand() {
-    argParser
-      ..addFlag(
+    argParser.addFlag(
         'watch',
         defaultsTo: false,
         abbr: 'w',

lib/web_ui/dev/chrome.dart

@@ -112,7 +112,7 @@ class Chrome extends Browser {
     }, remoteDebuggerCompleter.future);
   }
 
-  Chrome._(Future<Process> startBrowser(), this.remoteDebuggerUrl)
+  Chrome._(Future<Process> Function() startBrowser, this.remoteDebuggerUrl)
       : super(startBrowser);
 }
 
@@ -157,8 +157,9 @@ Future<Process> _spawnChromiumProcess(String executable, List<String> args, { St
       })
       .firstWhere((String line) => line.startsWith('DevTools listening'), orElse: () {
         if (hitGlibcBug) {
-          final String message = 'Encountered glibc bug https://sourceware.org/bugzilla/show_bug.cgi?id=19329. '
-            'Will try launching browser again.';
+          const String message = 'Encountered glibc bug '
+              'https://sourceware.org/bugzilla/show_bug.cgi?id=19329. '
+              'Will try launching browser again.';
           print(message);
           return message;
         }

lib/web_ui/dev/chrome_installer.dart

@@ -34,8 +34,7 @@ class ChromeArgParser extends BrowserArgParser {
     _pinnedChromeBuildNumber =
         PlatformBinding.instance.getChromeBuild(browserLock);
 
-    argParser
-      ..addOption(
+    argParser.addOption(
         'chrome-version',
         defaultsTo: pinnedChromeBuildNumber,
         help: 'The Chrome version to use while running tests. If the requested '
@@ -234,8 +233,8 @@ class ChromeInstaller {
             ..createSync(recursive: true)
             ..writeAsBytesSync(data);
         } else {
-          io.Directory(path.join(versionDir.path, filename))
-            ..create(recursive: true);
+          io.Directory(path.join(versionDir.path, filename)).create(
+              recursive: true);
         }
       }
 

lib/web_ui/dev/create_simulator.dart

@@ -14,7 +14,7 @@ class CreateSimulatorCommand extends Command<bool> with ArgUtils<bool> {
   CreateSimulatorCommand() {
     IosSafariArgParser.instance.populateOptions(argParser);
     argParser
-      ..addOption(
+      .addOption(
         'type',
         defaultsTo: _defaultType,
         help: 'Type of the mobile simulator. Currently the only iOS '
@@ -24,7 +24,7 @@ class CreateSimulatorCommand extends Command<bool> with ArgUtils<bool> {
   }
 
   /// Currently the only iOS Simulators are supported.
-  static final String _defaultType = 'iOS';
+  static const String _defaultType = 'iOS';
 
   @override
   String get name => 'create_simulator';

lib/web_ui/dev/edge.dart

@@ -72,5 +72,5 @@ class Edge extends Browser {
     });
   }
 
-  Edge._(Future<Process> startBrowser()) : super(startBrowser);
+  Edge._(Future<Process> Function() startBrowser) : super(startBrowser);
 }

lib/web_ui/dev/edge_installation.dart

@@ -24,8 +24,7 @@ class EdgeArgParser extends BrowserArgParser {
 
   @override
   void populateOptions(ArgParser argParser) {
-    argParser
-      ..addOption(
+    argParser.addOption(
         'edge-version',
         defaultsTo: 'system',
         help: 'The Edge version to use while running tests. The Edge '

lib/web_ui/dev/firefox.dart

@@ -63,7 +63,7 @@ class Firefox extends Browser {
       );
 
       // Using a profile on opening will prevent popups related to profiles.
-      final String _profile = '''
+      const String _profile = '''
 user_pref("browser.shell.checkDefaultBrowser", false);
 user_pref("dom.disable_open_during_load", false);
 user_pref("dom.max_script_run_time", 0);
@@ -111,6 +111,6 @@ user_pref("dom.max_script_run_time", 0);
     }, remoteDebuggerCompleter.future);
   }
 
-  Firefox._(Future<Process> startBrowser(), this.remoteDebuggerUrl)
+  Firefox._(Future<Process> Function() startBrowser, this.remoteDebuggerUrl)
       : super(startBrowser);
 }

lib/web_ui/dev/firefox_installer.dart

@@ -28,8 +28,7 @@ class FirefoxArgParser extends BrowserArgParser {
     final YamlMap browserLock = BrowserLock.instance.configuration;
     final String firefoxVersion = browserLock['firefox']['version'] as String;
 
-    argParser
-      ..addOption(
+    argParser.addOption(
         'firefox-version',
         defaultsTo: firefoxVersion,
         help: 'The Firefox version to use while running tests. If the requested '

lib/web_ui/dev/safari_installation.dart

@@ -22,8 +22,7 @@ class SafariArgParser extends BrowserArgParser {
 
   @override
   void populateOptions(ArgParser argParser) {
-    argParser
-      ..addOption(
+    argParser.addOption(
         'safari-version',
         defaultsTo: 'system',
         help: 'The Safari version to use while running tests. The Safari '

lib/web_ui/dev/safari_ios.dart

@@ -72,7 +72,7 @@ class SafariIos extends Browser {
     });
   }
 
-  SafariIos._(Future<io.Process> startBrowser()) : super(startBrowser);
+  SafariIos._(Future<io.Process> Function() startBrowser) : super(startBrowser);
 }
 
 /// [ScreenshotManager] implementation for Safari.

lib/web_ui/dev/safari_macos.dart

@@ -89,5 +89,5 @@ class SafariMacOs extends Browser {
     });
   }
 
-  SafariMacOs._(Future<Process> startBrowser()) : super(startBrowser);
+  SafariMacOs._(Future<Process> Function() startBrowser) : super(startBrowser);
 }

lib/web_ui/dev/utils.dart

@@ -337,8 +337,7 @@ class GeneralTestsArgumentParser {
   bool verbose = false;
 
   void populateOptions(ArgParser argParser) {
-    argParser
-      ..addFlag(
+    argParser.addFlag(
         'verbose',
         defaultsTo: false,
         help: 'Flag to indicate extra logs should also be printed.',

lib/web_ui/lib/src/engine/canvaskit/initialization.dart

@@ -88,9 +88,9 @@ const String canvasKitBaseUrl = String.fromEnvironment(
   'FLUTTER_WEB_CANVASKIT_URL',
   defaultValue: 'https://unpkg.com/[email protected]/bin/',
 );
-final String canvasKitBuildUrl =
+const String canvasKitBuildUrl =
     canvasKitBaseUrl + (kProfileMode ? 'profiling/' : '');
-final String canvasKitJavaScriptBindingsUrl =
+const String canvasKitJavaScriptBindingsUrl =
     canvasKitBuildUrl + 'canvaskit.js';
 String canvasKitWasmModuleUrl(String file) => _currentCanvasKitBase! + file;
 

lib/web_ui/lib/src/engine/canvaskit/surface.dart

@@ -219,7 +219,7 @@ class Surface {
     final int surfaceHeight = _currentSurfaceSize!.height.ceil();
     final double offset =
         (_pixelHeight - surfaceHeight) / window.devicePixelRatio;
-    htmlCanvas!.style..transform = 'translate(0, -${offset}px)';
+    htmlCanvas!.style.transform = 'translate(0, -${offset}px)';
   }
 
   void _contextRestoredListener(html.Event event) {

lib/web_ui/lib/src/engine/frame_reference.dart

@@ -67,7 +67,7 @@ class CrossFrameCache<T> {
 
   void _addToCache(String key, _CrossFrameCacheItem<T> item) {
     _cache ??= <String, List<_CrossFrameCacheItem<T>>>{};
-    (_cache![key] ??= <_CrossFrameCacheItem<T>>[])..add(item);
+    (_cache![key] ??= <_CrossFrameCacheItem<T>>[]).add(item);
   }
 
   /// Given a key, consumes an item that has been cached in a prior frame.

lib/web_ui/lib/src/engine/html/path/conic.dart

@@ -216,13 +216,13 @@ class Conic {
     // Map conic to 3D.
     final double tx0 = p0x;
     final double ty0 = p0y;
-    final double tz0 = 1;
+    const double tz0 = 1;
     final double tx1 = p1x * fW;
     final double ty1 = p1y * fW;
     final double tz1 = fW;
     final double tx2 = p2x;
     final double ty2 = p2y;
-    final double tz2 = 1;
+    const double tz2 = 1;
     // Now interpolate each dimension.
     final double dx0 = tx0 + (tx1 - tx0) * t;
     final double dx2 = tx1 + (tx2 - tx1) * t;
@@ -335,7 +335,7 @@ class Conic {
 
   static double evalDenominator(double w, double t) {
     final double B = 2 * (w - 1);
-    final double C = 1;
+    const double C = 1;
     final double A = -B;
     return polyEval(A, B, C, t);
   }

lib/web_ui/lib/src/engine/html/path/cubic.dart

@@ -163,7 +163,7 @@ double? chopMonoAtY(Float32List _buffer, int bufferStartPos, double y) {
   }
 
   // Bisection / linear convergance.
-  final double tolerance = 1.0 / 65536;
+  const double tolerance = 1.0 / 65536;
   do {
     final double tMid = (tPos + tNeg) / 2.0;
     final double y01 = ycrv0 + (ycrv1 - ycrv0) * tMid;

lib/web_ui/lib/src/engine/html/path/path.dart

@@ -902,7 +902,7 @@ class SurfacePath implements ui.Path {
     assert(direction != SPathDirection.kUnknown);
     final bool isOval = _hasOnlyMoveTos();
 
-    final double weight = SPath.scalarRoot2Over2;
+    const double weight = SPath.scalarRoot2Over2;
     final double left = oval.left;
     final double right = oval.right;
     final double centerX = (left + right) / 2.0;
@@ -1018,7 +1018,7 @@ class SurfacePath implements ui.Path {
       // degenerate(oval) => line points are collapsing.
       _addOval(bounds, direction, startIndex ~/ 2);
     } else {
-      final double weight = SPath.scalarRoot2Over2;
+      const double weight = SPath.scalarRoot2Over2;
       final double left = bounds.left;
       final double right = bounds.right;
       final double top = bounds.top;

lib/web_ui/lib/src/engine/html/path/path_ref.dart

@@ -309,7 +309,7 @@ class PathRef {
     if (other.runtimeType != runtimeType) {
       return false;
     }
-    return equals(other as PathRef);
+    return other is PathRef && equals(other);
   }
 
   @override
@@ -876,7 +876,7 @@ class PathRef {
       for (int i = 0; i < len; i += 2) {
         final double pointX = fPoints[i];
         final double pointY = fPoints[i + 1];
-        final double tolerance = 0.0001;
+        const double tolerance = 0.0001;
         final bool pointIsFinite = pointX.isFinite && pointY.isFinite;
         if (pointIsFinite &&
             (pointX + tolerance < boundsLeft ||

lib/web_ui/lib/src/engine/html/path/path_utils.dart

@@ -314,7 +314,7 @@ class Convexicator {
         math.max(curVecX, math.max(curVecY, math.max(lastX, lastY))),
         -smallest);
     if (SPath.nearlyEqual(largest, largest + cross)) {
-      final double nearlyZeroSquared =
+      const double nearlyZeroSquared =
           SPath.scalarNearlyZero * SPath.scalarNearlyZero;
       if (SPath.nearlyEqual(lengthSquared(lastX, lastY), nearlyZeroSquared) ||
           SPath.nearlyEqual(lengthSquared(curVecX, curVecY), nearlyZeroSquared)) {

lib/web_ui/lib/src/engine/html/shader_mask.dart

@@ -76,7 +76,7 @@ class PersistedShaderMask extends PersistedContainerSurface
   html.Element createElement() {
     final html.Element element = defaultCreateElement('flt-shader-mask');
     final html.Element container = html.Element.tag('flt-mask-interior');
-    container.style..position = 'absolute';
+    container.style.position = 'absolute';
     _childContainer = container;
     element.append(_childContainer!);
     return element;

lib/web_ui/lib/src/engine/html/surface.dart

@@ -524,11 +524,7 @@ abstract class PersistedSurface implements ui.EngineLayer {
   /// transforms as well as this layer's transform (if any).
   ///
   /// The value is update by [recomputeTransformAndClip].
-  Matrix4? get transform => _transform;
-  set transform(Matrix4? value) {
-    _transform = value;
-  }
-  Matrix4? _transform;
+  Matrix4? transform;
 
   /// The intersection at this surface level.
   ///
@@ -555,7 +551,7 @@ abstract class PersistedSurface implements ui.EngineLayer {
   ///
   /// This method is called by the [preroll] method.
   void recomputeTransformAndClip() {
-    _transform = parent!._transform;
+    transform = parent!.transform;
     localClipBounds = null;
     projectedClip = null;
   }
@@ -661,7 +657,7 @@ abstract class PersistedContainerSurface extends PersistedSurface {
 
   @override
   void recomputeTransformAndClip() {
-    _transform = parent!._transform;
+    transform = parent!.transform;
     localClipBounds = null;
     projectedClip = null;
   }

lib/web_ui/lib/src/engine/platform_dispatcher.dart

@@ -1012,7 +1012,7 @@ bool _handleWebTestEnd2EndMessage(MethodCodec codec, ByteData? data) {
 }
 
 /// Invokes [callback] inside the given [zone].
-void invoke(void callback()?, Zone? zone) {
+void invoke(void Function()? callback, Zone? zone) {
   if (callback == null) {
     return;
   }
@@ -1027,7 +1027,7 @@ void invoke(void callback()?, Zone? zone) {
 }
 
 /// Invokes [callback] inside the given [zone] passing it [arg].
-void invoke1<A>(void callback(A a)?, Zone? zone, A arg) {
+void invoke1<A>(void Function(A a)? callback, Zone? zone, A arg) {
   if (callback == null) {
     return;
   }

lib/web_ui/lib/src/engine/text/measurement.dart

@@ -646,7 +646,7 @@ class CanvasTextMeasurementService extends TextMeasurementService {
       maxIntrinsicWidth: maxIntrinsicCalculator.value,
       width: constraints.width,
       lines: linesCalculator.lines,
-      placeholderBoxes: <ui.TextBox>[],
+      placeholderBoxes: const <ui.TextBox>[],
       textAlign: paragraph.textAlign,
       textDirection: paragraph.textDirection,
     );

lib/web_ui/test/canvas_test.dart

@@ -38,7 +38,7 @@ void testMain() {
     }
 
     testCanvas('draws laid out paragraph', (EngineCanvas canvas) {
-      final ui.Rect screenRect = const ui.Rect.fromLTWH(0, 0, 100, 100);
+      const ui.Rect screenRect = ui.Rect.fromLTWH(0, 0, 100, 100);
       final RecordingCanvas recordingCanvas = RecordingCanvas(screenRect);
       final ui.ParagraphBuilder builder =
           ui.ParagraphBuilder(ui.ParagraphStyle());
@@ -63,7 +63,7 @@ void testMain() {
 
     testCanvas('ignores paragraphs that were not laid out',
         (EngineCanvas canvas) {
-      final ui.Rect screenRect = const ui.Rect.fromLTWH(0, 0, 100, 100);
+      const ui.Rect screenRect = ui.Rect.fromLTWH(0, 0, 100, 100);
       final RecordingCanvas recordingCanvas = RecordingCanvas(screenRect);
       final ui.ParagraphBuilder builder =
           ui.ParagraphBuilder(ui.ParagraphStyle());