chore: adopt Dart 3.9 toolchain — honest floor + tall-style reformat (T-353)

Raise the declared minimums in pubspec.yaml to what our deps already require: Flutter >=3.35.0 / Dart >=3.9.0 (was 3.19.0 / 3.5.0). alchemist 0.12 needs Flutter 3.32; Dart 3.9 first ships in Flutter 3.35, so 3.35 is the binding floor. Pin the exact build toolchain in .fvmrc (Flutter 3.44.1). Moving to the Dart 3.9 language level switches `dart format` to the new "tall" style and enables two new lints. This commit is the resulting mechanical churn, isolated from any behaviour change: - whole-tree `dart format` reformat (tall style) - `dart fix` for unnecessary_underscores + use_null_aware_elements No runtime behaviour change; `make test` green. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-11 12:11:53 +02:00
parent bcea5f15b7
commit 6d0ebab721
444 changed files with 7587 additions and 12849 deletions
@@ -25,12 +25,7 @@ String _buildExpandedPath() {
  final base = Platform.environment['PATH'] ?? '';
  if (!Platform.isMacOS) return base;
  final home = Platform.environment['HOME'] ?? '';
-  final extras = <String>[
-    if (home.isNotEmpty) '$home/.local/bin',
-    '/opt/homebrew/bin',
-    '/opt/homebrew/sbin',
-    '/usr/local/bin',
-  ];
+  final extras = <String>[if (home.isNotEmpty) '$home/.local/bin', '/opt/homebrew/bin', '/opt/homebrew/sbin', '/usr/local/bin'];
  final existing = base.split(':').toSet();
  final missing = extras.where((p) => !existing.contains(p));
  if (missing.isEmpty) return base;
@@ -53,13 +48,6 @@ const Map<String, String> clidePtyEnvDefaults = {

 /// Merge [base] onto the process environment; clide defaults override
 /// user env where they overlap. Explicit [overrides] win over both.
-Map<String, String> mergePtyEnv({
-  required Map<String, String> processEnv,
-  Map<String, String>? overrides,
-}) {
-  return {
-    ...processEnv,
-    ...clidePtyEnvDefaults,
-    if (overrides != null) ...overrides,
-  };
+Map<String, String> mergePtyEnv({required Map<String, String> processEnv, Map<String, String>? overrides}) {
+  return {...processEnv, ...clidePtyEnvDefaults, ...?overrides};
 }
@@ -64,82 +64,28 @@ const int sigwinch = 28;
 // Typedefs
 // ---------------------------------------------------------------------------

-typedef _SocketpairC = ffi.Int32 Function(
-  ffi.Int32 domain,
-  ffi.Int32 type,
-  ffi.Int32 protocol,
-  ffi.Pointer<ffi.Int32> sv,
-);
-typedef _SocketpairD = int Function(
-  int domain,
-  int type,
-  int protocol,
-  ffi.Pointer<ffi.Int32> sv,
-);
+typedef _SocketpairC = ffi.Int32 Function(ffi.Int32 domain, ffi.Int32 type, ffi.Int32 protocol, ffi.Pointer<ffi.Int32> sv);
+typedef _SocketpairD = int Function(int domain, int type, int protocol, ffi.Pointer<ffi.Int32> sv);

-typedef _RecvmsgC = ffi.IntPtr Function(
-  ffi.Int32 sockfd,
-  ffi.Pointer<Msghdr> msg,
-  ffi.Int32 flags,
-);
-typedef _RecvmsgD = int Function(
-  int sockfd,
-  ffi.Pointer<Msghdr> msg,
-  int flags,
-);
+typedef _RecvmsgC = ffi.IntPtr Function(ffi.Int32 sockfd, ffi.Pointer<Msghdr> msg, ffi.Int32 flags);
+typedef _RecvmsgD = int Function(int sockfd, ffi.Pointer<Msghdr> msg, int flags);

-typedef _RecvmsgDarwinC = ffi.IntPtr Function(
-  ffi.Int32 sockfd,
-  ffi.Pointer<MsghdrDarwin> msg,
-  ffi.Int32 flags,
-);
-typedef _RecvmsgDarwinD = int Function(
-  int sockfd,
-  ffi.Pointer<MsghdrDarwin> msg,
-  int flags,
-);
+typedef _RecvmsgDarwinC = ffi.IntPtr Function(ffi.Int32 sockfd, ffi.Pointer<MsghdrDarwin> msg, ffi.Int32 flags);
+typedef _RecvmsgDarwinD = int Function(int sockfd, ffi.Pointer<MsghdrDarwin> msg, int flags);

-typedef _ReadC = ffi.IntPtr Function(
-  ffi.Int32 fd,
-  ffi.Pointer<ffi.Uint8> buf,
-  ffi.IntPtr count,
-);
-typedef _ReadD = int Function(
-  int fd,
-  ffi.Pointer<ffi.Uint8> buf,
-  int count,
-);
+typedef _ReadC = ffi.IntPtr Function(ffi.Int32 fd, ffi.Pointer<ffi.Uint8> buf, ffi.IntPtr count);
+typedef _ReadD = int Function(int fd, ffi.Pointer<ffi.Uint8> buf, int count);

-typedef _WriteC = ffi.IntPtr Function(
-  ffi.Int32 fd,
-  ffi.Pointer<ffi.Uint8> buf,
-  ffi.IntPtr count,
-);
-typedef _WriteD = int Function(
-  int fd,
-  ffi.Pointer<ffi.Uint8> buf,
-  int count,
-);
+typedef _WriteC = ffi.IntPtr Function(ffi.Int32 fd, ffi.Pointer<ffi.Uint8> buf, ffi.IntPtr count);
+typedef _WriteD = int Function(int fd, ffi.Pointer<ffi.Uint8> buf, int count);

 typedef _CloseC = ffi.Int32 Function(ffi.Int32 fd);
 typedef _CloseD = int Function(int fd);

-typedef _IoctlPtrC = ffi.Int32 Function(
-  ffi.Int32 fd,
-  ffi.UnsignedLong request,
-  ffi.Pointer<Winsize> argp,
-);
-typedef _IoctlPtrD = int Function(
-  int fd,
-  int request,
-  ffi.Pointer<Winsize> argp,
-);
+typedef _IoctlPtrC = ffi.Int32 Function(ffi.Int32 fd, ffi.UnsignedLong request, ffi.Pointer<Winsize> argp);
+typedef _IoctlPtrD = int Function(int fd, int request, ffi.Pointer<Winsize> argp);

-typedef _FcntlIntC = ffi.Int32 Function(
-  ffi.Int32 fd,
-  ffi.Int32 cmd,
-  ffi.Int32 arg,
-);
+typedef _FcntlIntC = ffi.Int32 Function(ffi.Int32 fd, ffi.Int32 cmd, ffi.Int32 arg);
 typedef _FcntlIntD = int Function(int fd, int cmd, int arg);

 typedef _ErrnoLocationC = ffi.Pointer<ffi.Int32> Function();
@@ -257,16 +203,12 @@ final _FcntlIntD fcntlInt = _libc.lookupFunction<_FcntlIntC, _FcntlIntD>('fcntl'
 /// uses `__error`.
 int get errno {
  try {
-    final fn = _libc.lookupFunction<_ErrnoLocationC, _ErrnoLocationD>(
-      '__errno_location',
-    );
+    final fn = _libc.lookupFunction<_ErrnoLocationC, _ErrnoLocationD>('__errno_location');
    return fn().value;
  } on ArgumentError {
    // Fall through to macOS-style.
  }
-  final fn = _libc.lookupFunction<_ErrnoLocationC, _ErrnoLocationD>(
-    '__error',
-  );
+  final fn = _libc.lookupFunction<_ErrnoLocationC, _ErrnoLocationD>('__error');
  return fn().value;
 }

@@ -65,38 +65,62 @@ final _ptsname = _dl.lookupFunction<ffi.Pointer<Utf8> Function(ffi.Int32), ffi.P
 // larger than any documented platform layout) and pass it as Pointer<Void>.
 // init() writes the real layout into our memory; destroy() releases any
 // internal nested allocations.
-final _posixSpawn = _dl.lookupFunction<
-    ffi.Int32 Function(ffi.Pointer<ffi.Int32>, ffi.Pointer<Utf8>, ffi.Pointer<ffi.Void>, ffi.Pointer<ffi.Void>, ffi.Pointer<ffi.Pointer<Utf8>>,
-        ffi.Pointer<ffi.Pointer<Utf8>>),
-    int Function(ffi.Pointer<ffi.Int32>, ffi.Pointer<Utf8>, ffi.Pointer<ffi.Void>, ffi.Pointer<ffi.Void>, ffi.Pointer<ffi.Pointer<Utf8>>,
-        ffi.Pointer<ffi.Pointer<Utf8>>)>('posix_spawn');
+final _posixSpawn = _dl
+    .lookupFunction<
+      ffi.Int32 Function(
+        ffi.Pointer<ffi.Int32>,
+        ffi.Pointer<Utf8>,
+        ffi.Pointer<ffi.Void>,
+        ffi.Pointer<ffi.Void>,
+        ffi.Pointer<ffi.Pointer<Utf8>>,
+        ffi.Pointer<ffi.Pointer<Utf8>>,
+      ),
+      int Function(
+        ffi.Pointer<ffi.Int32>,
+        ffi.Pointer<Utf8>,
+        ffi.Pointer<ffi.Void>,
+        ffi.Pointer<ffi.Void>,
+        ffi.Pointer<ffi.Pointer<Utf8>>,
+        ffi.Pointer<ffi.Pointer<Utf8>>,
+      )
+    >('posix_spawn');

 final _spawnattrInit = _dl.lookupFunction<ffi.Int32 Function(ffi.Pointer<ffi.Void>), int Function(ffi.Pointer<ffi.Void>)>('posix_spawnattr_init');
 final _spawnattrDestroy = _dl.lookupFunction<ffi.Int32 Function(ffi.Pointer<ffi.Void>), int Function(ffi.Pointer<ffi.Void>)>('posix_spawnattr_destroy');
-final _spawnattrSetflags =
-    _dl.lookupFunction<ffi.Int32 Function(ffi.Pointer<ffi.Void>, ffi.Int16), int Function(ffi.Pointer<ffi.Void>, int)>('posix_spawnattr_setflags');
+final _spawnattrSetflags = _dl.lookupFunction<ffi.Int32 Function(ffi.Pointer<ffi.Void>, ffi.Int16), int Function(ffi.Pointer<ffi.Void>, int)>(
+  'posix_spawnattr_setflags',
+);

 final _faInit = _dl.lookupFunction<ffi.Int32 Function(ffi.Pointer<ffi.Void>), int Function(ffi.Pointer<ffi.Void>)>('posix_spawn_file_actions_init');
 final _faDestroy = _dl.lookupFunction<ffi.Int32 Function(ffi.Pointer<ffi.Void>), int Function(ffi.Pointer<ffi.Void>)>('posix_spawn_file_actions_destroy');
-final _faAddopen = _dl.lookupFunction<ffi.Int32 Function(ffi.Pointer<ffi.Void>, ffi.Int32, ffi.Pointer<Utf8>, ffi.Int32, ffi.Uint32),
-    int Function(ffi.Pointer<ffi.Void>, int, ffi.Pointer<Utf8>, int, int)>('posix_spawn_file_actions_addopen');
+final _faAddopen = _dl
+    .lookupFunction<
+      ffi.Int32 Function(ffi.Pointer<ffi.Void>, ffi.Int32, ffi.Pointer<Utf8>, ffi.Int32, ffi.Uint32),
+      int Function(ffi.Pointer<ffi.Void>, int, ffi.Pointer<Utf8>, int, int)
+    >('posix_spawn_file_actions_addopen');
 final _faAdddup2 = _dl.lookupFunction<ffi.Int32 Function(ffi.Pointer<ffi.Void>, ffi.Int32, ffi.Int32), int Function(ffi.Pointer<ffi.Void>, int, int)>(
-    'posix_spawn_file_actions_adddup2');
-final _faAddclose =
-    _dl.lookupFunction<ffi.Int32 Function(ffi.Pointer<ffi.Void>, ffi.Int32), int Function(ffi.Pointer<ffi.Void>, int)>('posix_spawn_file_actions_addclose');
+  'posix_spawn_file_actions_adddup2',
+);
+final _faAddclose = _dl.lookupFunction<ffi.Int32 Function(ffi.Pointer<ffi.Void>, ffi.Int32), int Function(ffi.Pointer<ffi.Void>, int)>(
+  'posix_spawn_file_actions_addclose',
+);
 // glibc 2.29+ / macOS 10.15+. Both ship the `_np` suffix.
 final _faAddchdir = _dl.lookupFunction<ffi.Int32 Function(ffi.Pointer<ffi.Void>, ffi.Pointer<Utf8>), int Function(ffi.Pointer<ffi.Void>, ffi.Pointer<Utf8>)>(
-    'posix_spawn_file_actions_addchdir_np');
+  'posix_spawn_file_actions_addchdir_np',
+);

 // libc primitives shared with the reader isolate / lifecycle.
-final _nativeWrite =
-    _dl.lookupFunction<ffi.IntPtr Function(ffi.Int32, ffi.Pointer<ffi.Void>, ffi.IntPtr), int Function(int, ffi.Pointer<ffi.Void>, int)>('write');
+final _nativeWrite = _dl.lookupFunction<ffi.IntPtr Function(ffi.Int32, ffi.Pointer<ffi.Void>, ffi.IntPtr), int Function(int, ffi.Pointer<ffi.Void>, int)>(
+  'write',
+);
 final _nativeClose = _dl.lookupFunction<ffi.Int32 Function(ffi.Int32), int Function(int)>('close');
-final _ioctl =
-    _dl.lookupFunction<ffi.Int32 Function(ffi.Int32, ffi.UnsignedLong, ffi.Pointer<_Winsize>), int Function(int, int, ffi.Pointer<_Winsize>)>('ioctl');
+final _ioctl = _dl.lookupFunction<ffi.Int32 Function(ffi.Int32, ffi.UnsignedLong, ffi.Pointer<_Winsize>), int Function(int, int, ffi.Pointer<_Winsize>)>(
+  'ioctl',
+);
 final _nativeKill = _dl.lookupFunction<ffi.Int32 Function(ffi.Int32, ffi.Int32), int Function(int, int)>('kill');
-final _waitpid =
-    _dl.lookupFunction<ffi.Int32 Function(ffi.Int32, ffi.Pointer<ffi.Int32>, ffi.Int32), int Function(int, ffi.Pointer<ffi.Int32>, int)>('waitpid');
+final _waitpid = _dl.lookupFunction<ffi.Int32 Function(ffi.Int32, ffi.Pointer<ffi.Int32>, ffi.Int32), int Function(int, ffi.Pointer<ffi.Int32>, int)>(
+  'waitpid',
+);

 // Constants — all duplicated from <fcntl.h>, <sys/ioctl.h>, <spawn.h>.
 final int _kTiocsWinsz = Platform.isMacOS ? 0x80087467 : 0x5414;
@@ -378,11 +402,7 @@ class NativePty {
      }
      var written = 0;
      while (written < bytes.length) {
-        final n = _nativeWrite(
-          _fd,
-          (buf + written).cast(),
-          bytes.length - written,
-        );
+        final n = _nativeWrite(_fd, (buf + written).cast(), bytes.length - written);
        if (n < 0) {
          final err = libc.errno;
          if (err == PosixErrno.eintr) continue;
@@ -451,10 +471,7 @@ class NativePty {
    // Wait for the isolate to send `null` (EOF) — confirms it has
    // exited its poll loop and won't touch the fd again.
    if (_readerExited != null) {
-      await _readerExited!.future.timeout(
-        const Duration(milliseconds: 500),
-        onTimeout: () {},
-      );
+      await _readerExited!.future.timeout(const Duration(milliseconds: 500), onTimeout: () {});
    }

    _nativeClose(_fd);