Set package:watcher language version to 3.8, reformat (#2301)

Author: davidmorgan

.github/workflows/watcher.yaml

@@ -54,7 +54,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        sdk: [3.4, dev]
+        sdk: [3.8, dev]
     steps:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8
       - uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c

pkgs/watcher/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.2.2-wip
+
+- Require Dart SDK `^3.8.0`.
+
 ## 1.2.1
 
 - Bug fix: versions before 1.2.0 would allow and ignore a trailing path

pkgs/watcher/lib/src/async_queue.dart

@@ -33,9 +33,10 @@ class AsyncQueue<T> {
   /// Used to avoid top-leveling asynchronous errors.
   final void Function(Object, StackTrace) _errorHandler;
 
-  AsyncQueue(this._processor,
-      {required void Function(Object, StackTrace) onError})
-      : _errorHandler = onError;
+  AsyncQueue(
+    this._processor, {
+    required void Function(Object, StackTrace) onError,
+  }) : _errorHandler = onError;
 
   /// Enqueues [item] to be processed and starts asynchronously processing it
   /// if a process isn't already running.

pkgs/watcher/lib/src/custom_watcher_factory.dart

@@ -8,12 +8,15 @@ import '../watcher.dart';
 class _CustomWatcherFactory {
   final String id;
   final DirectoryWatcher? Function(String path, {Duration? pollingDelay})
-      createDirectoryWatcher;
+  createDirectoryWatcher;
   final FileWatcher? Function(String path, {Duration? pollingDelay})
-      createFileWatcher;
+  createFileWatcher;
 
   _CustomWatcherFactory(
-      this.id, this.createDirectoryWatcher, this.createFileWatcher);
+    this.id,
+    this.createDirectoryWatcher,
+    this.createFileWatcher,
+  );
 }
 
 /// Registers a custom watcher.
@@ -32,35 +35,44 @@ class _CustomWatcherFactory {
 void registerCustomWatcher(
   String id,
   DirectoryWatcher? Function(String path, {Duration? pollingDelay})?
-      createDirectoryWatcher,
+  createDirectoryWatcher,
   FileWatcher? Function(String path, {Duration? pollingDelay})?
-      createFileWatcher,
+  createFileWatcher,
 ) {
   if (_customWatcherFactories.containsKey(id)) {
-    throw ArgumentError('A custom watcher with id `$id` '
-        'has already been registered');
+    throw ArgumentError(
+      'A custom watcher with id `$id` '
+      'has already been registered',
+    );
   }
   _customWatcherFactories[id] = _CustomWatcherFactory(
-      id,
-      createDirectoryWatcher ?? (_, {pollingDelay}) => null,
-      createFileWatcher ?? (_, {pollingDelay}) => null);
+    id,
+    createDirectoryWatcher ?? (_, {pollingDelay}) => null,
+    createFileWatcher ?? (_, {pollingDelay}) => null,
+  );
 }
 
 /// Tries to create a custom [DirectoryWatcher] and returns it.
 ///
 /// Returns `null` if no custom watcher was applicable and throws a [StateError]
 /// if more than one was.
-DirectoryWatcher? createCustomDirectoryWatcher(String path,
-    {Duration? pollingDelay}) {
+DirectoryWatcher? createCustomDirectoryWatcher(
+  String path, {
+  Duration? pollingDelay,
+}) {
   DirectoryWatcher? customWatcher;
   String? customFactoryId;
   for (var watcherFactory in _customWatcherFactories.values) {
     if (customWatcher != null) {
-      throw StateError('Two `CustomWatcherFactory`s applicable: '
-          '`$customFactoryId` and `${watcherFactory.id}` for `$path`');
+      throw StateError(
+        'Two `CustomWatcherFactory`s applicable: '
+        '`$customFactoryId` and `${watcherFactory.id}` for `$path`',
+      );
     }
-    customWatcher =
-        watcherFactory.createDirectoryWatcher(path, pollingDelay: pollingDelay);
+    customWatcher = watcherFactory.createDirectoryWatcher(
+      path,
+      pollingDelay: pollingDelay,
+    );
     customFactoryId = watcherFactory.id;
   }
   return customWatcher;
@@ -75,11 +87,15 @@ FileWatcher? createCustomFileWatcher(String path, {Duration? pollingDelay}) {
   String? customFactoryId;
   for (var watcherFactory in _customWatcherFactories.values) {
     if (customWatcher != null) {
-      throw StateError('Two `CustomWatcherFactory`s applicable: '
-          '`$customFactoryId` and `${watcherFactory.id}` for `$path`');
+      throw StateError(
+        'Two `CustomWatcherFactory`s applicable: '
+        '`$customFactoryId` and `${watcherFactory.id}` for `$path`',
+      );
     }
-    customWatcher =
-        watcherFactory.createFileWatcher(path, pollingDelay: pollingDelay);
+    customWatcher = watcherFactory.createFileWatcher(
+      path,
+      pollingDelay: pollingDelay,
+    );
     customFactoryId = watcherFactory.id;
   }
   return customWatcher;

pkgs/watcher/lib/src/directory_watcher.dart

@@ -42,8 +42,11 @@ abstract class DirectoryWatcher implements Watcher {
   ///
   /// On Windows, pass [runInIsolateOnWindows] `false` to not run the watcher
   /// in a separate isolate to reduce buffer exhaustion failures.
-  factory DirectoryWatcher(String directory,
-      {Duration? pollingDelay, bool runInIsolateOnWindows = true}) {
+  factory DirectoryWatcher(
+    String directory, {
+    Duration? pollingDelay,
+    bool runInIsolateOnWindows = true,
+  }) {
     if (FileSystemEntity.isWatchSupported) {
       var customWatcher = createCustomDirectoryWatcher(
         directory,
@@ -55,8 +58,10 @@ abstract class DirectoryWatcher implements Watcher {
         return RecursiveDirectoryWatcher(directory, runInIsolate: false);
       }
       if (Platform.isWindows) {
-        return RecursiveDirectoryWatcher(directory,
-            runInIsolate: runInIsolateOnWindows);
+        return RecursiveDirectoryWatcher(
+          directory,
+          runInIsolate: runInIsolateOnWindows,
+        );
       }
     }
     return PollingDirectoryWatcher(directory, pollingDelay: pollingDelay);

pkgs/watcher/lib/src/directory_watcher/linux/linux_directory_watcher.dart

@@ -17,7 +17,7 @@ class LinuxDirectoryWatcher extends ResubscribableWatcher
   String get directory => path;
 
   LinuxDirectoryWatcher(String directory)
-      : super(directory, _LinuxDirectoryWatcher.new);
+    : super(directory, _LinuxDirectoryWatcher.new);
 }
 
 /// Linux directory watcher that watches using [WatchTreeRoot].
@@ -43,9 +43,10 @@ class _LinuxDirectoryWatcher
 
   _LinuxDirectoryWatcher(this.path) {
     _watchTree = WatchTreeRoot(
-        watchedDirectory: path,
-        eventsController: _eventsController,
-        readyCompleter: _readyCompleter);
+      watchedDirectory: path,
+      eventsController: _eventsController,
+      readyCompleter: _readyCompleter,
+    );
   }
 
   @override

pkgs/watcher/lib/src/directory_watcher/linux/native_watch.dart

@@ -82,10 +82,10 @@ class NativeWatch {
     required void Function() watchedDirectoryWasDeleted,
     required void Function(List<Event>) onEvents,
     required void Function(Object, StackTrace) onError,
-  })  : _onError = onError,
-        _onEvents = onEvents,
-        _watchedDirectoryWasDeleted = watchedDirectoryWasDeleted,
-        _restartWatching = restartWatching {
+  }) : _onError = onError,
+       _onEvents = onEvents,
+       _watchedDirectoryWasDeleted = watchedDirectoryWasDeleted,
+       _restartWatching = restartWatching {
     logForTesting?.call('NativeWatch(),$watchedDirectory');
     _subscription = watchedDirectory
         .watch()

pkgs/watcher/lib/src/directory_watcher/linux/watch_tree.dart

@@ -47,9 +47,9 @@ class WatchTree {
     required void Function(WatchEvent) emitEvent,
     required void Function(Object, StackTrace) onError,
     required void Function() watchedDirectoryWasDeleted,
-  })  : _emitEvent = emitEvent,
-        _onError = onError,
-        _watchedDirectoryWasDeleted = watchedDirectoryWasDeleted {
+  }) : _emitEvent = emitEvent,
+       _onError = onError,
+       _watchedDirectoryWasDeleted = watchedDirectoryWasDeleted {
     logForTesting?.call('WatchTree(),$watchedDirectory');
     _watch(starting: starting, recovering: false);
   }
@@ -74,20 +74,22 @@ class WatchTree {
   /// for files that have disappeared, and "modify" for files that are still
   /// present.
   void _watch({required bool starting, required bool recovering}) {
-    logForTesting
-        ?.call('WatchTree,$watchedDirectory,_watch,$starting,$recovering');
+    logForTesting?.call(
+      'WatchTree,$watchedDirectory,_watch,$starting,$recovering',
+    );
     _nativeWatch?.close();
     _nativeWatch = NativeWatch(
-        watchedDirectory: watchedDirectory,
-        restartWatching: () {
-          _watch(starting: false, recovering: true);
-        },
-        watchedDirectoryWasDeleted: () {
-          _emitDeleteTree();
-          _watchedDirectoryWasDeleted();
-        },
-        onError: _onError,
-        onEvents: _onEvents);
+      watchedDirectory: watchedDirectory,
+      restartWatching: () {
+        _watch(starting: false, recovering: true);
+      },
+      watchedDirectoryWasDeleted: () {
+        _emitDeleteTree();
+        _watchedDirectoryWasDeleted();
+      },
+      onError: _onError,
+      onEvents: _onEvents,
+    );
 
     final listedFiles = <RelativePath>{};
     final listedDirectories = <RelativePath>{};
@@ -103,8 +105,10 @@ class WatchTree {
       // Nothing found, use empty sets so everything is handled as deleted.
     }
 
-    logForTesting?.call('Watch,$watchedDirectory,list,'
-        'files=$listedFiles,directories=$listedDirectories');
+    logForTesting?.call(
+      'Watch,$watchedDirectory,list,'
+      'files=$listedFiles,directories=$listedDirectories',
+    );
     if (recovering) {
       // Emit deletes for missing files.
       for (final file in _files.toList()) {
@@ -210,12 +214,14 @@ class WatchTree {
       final eventTypesSet = eventTypes.toSet();
 
       // Path needs polling if it had both a delete and a create.
-      final needsPolling = eventTypesSet.contains(EventType.delete) &&
+      final needsPolling =
+          eventTypesSet.contains(EventType.delete) &&
           (eventTypesSet.contains(EventType.createFile) ||
               eventTypesSet.contains(EventType.createDirectory));
       if (needsPolling) {
-        logForTesting
-            ?.call('Watch,$watchedDirectory,onEvents,$eventPath,ambiguous');
+        logForTesting?.call(
+          'Watch,$watchedDirectory,onEvents,$eventPath,ambiguous',
+        );
         pathsToPoll.add(eventPath);
         continue;
       }
@@ -291,21 +297,22 @@ class WatchTree {
     logForTesting?.call('Watch,$watchedDirectory,createDirectory,$directory');
     _directories.remove(directory)?._emitDeleteTree();
     _directories[directory] = WatchTree(
-        emitEvent: _emitEvent,
-        onError: (Object e, StackTrace s) {
-          // Ignore exceptions from subdirectories except "out of watchers"
-          // which is an unrecoverable error.
-          if (e is FileSystemException &&
-              e.message.contains('Failed to watch path') &&
-              e.osError?.errorCode == 28) {
-            _onError(e, s);
-          }
-        },
-        watchedDirectoryWasDeleted: () {
-          _emitDeleteDirectory(directory);
-        },
-        watchedDirectory: watchedDirectory.append(directory),
-        starting: starting);
+      emitEvent: _emitEvent,
+      onError: (Object e, StackTrace s) {
+        // Ignore exceptions from subdirectories except "out of watchers"
+        // which is an unrecoverable error.
+        if (e is FileSystemException &&
+            e.message.contains('Failed to watch path') &&
+            e.osError?.errorCode == 28) {
+          _onError(e, s);
+        }
+      },
+      watchedDirectoryWasDeleted: () {
+        _emitDeleteDirectory(directory);
+      },
+      watchedDirectory: watchedDirectory.append(directory),
+      starting: starting,
+    );
   }
 
   /// Adds [file] to known [_files].

pkgs/watcher/lib/src/directory_watcher/linux/watch_tree_root.dart

@@ -17,20 +17,21 @@ class WatchTreeRoot {
 
   late final WatchTree watch;
 
-  WatchTreeRoot(
-      {required String watchedDirectory,
-      required Completer<void> readyCompleter,
-      required StreamController<WatchEvent> eventsController})
-      : _readyCompleter = readyCompleter,
-        _eventsController = eventsController,
-        watchedDirectory = AbsolutePath(watchedDirectory) {
+  WatchTreeRoot({
+    required String watchedDirectory,
+    required Completer<void> readyCompleter,
+    required StreamController<WatchEvent> eventsController,
+  }) : _readyCompleter = readyCompleter,
+       _eventsController = eventsController,
+       watchedDirectory = AbsolutePath(watchedDirectory) {
     logForTesting?.call('WatchTree(),$watchedDirectory');
     watch = WatchTree(
-        watchedDirectory: this.watchedDirectory,
-        starting: true,
-        emitEvent: _emit,
-        onError: _emitError,
-        watchedDirectoryWasDeleted: _watchedDirectoryWasDeleted);
+      watchedDirectory: this.watchedDirectory,
+      starting: true,
+      emitEvent: _emit,
+      onError: _emitError,
+      watchedDirectoryWasDeleted: _watchedDirectoryWasDeleted,
+    );
     _ready();
   }
 
@@ -44,8 +45,9 @@ class WatchTreeRoot {
 
   /// Handler for when [watchedDirectory] is deleted.
   void _watchedDirectoryWasDeleted() {
-    logForTesting
-        ?.call('WatchTree,$watchedDirectory,_watchedDirectoryWasDeleted');
+    logForTesting?.call(
+      'WatchTree,$watchedDirectory,_watchedDirectoryWasDeleted',
+    );
     _ready();
     _eventsController.close();
   }