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>
This commit is contained in:
+3
-12
@@ -36,29 +36,20 @@ void main() {
|
||||
test('on macOS, includes the well-known extras', () {
|
||||
if (!Platform.isMacOS) return;
|
||||
// Homebrew is the canonical one; at least one of these should appear.
|
||||
expect(
|
||||
expandedPath,
|
||||
anyOf(contains('/opt/homebrew/bin'), contains('/usr/local/bin')),
|
||||
);
|
||||
expect(expandedPath, anyOf(contains('/opt/homebrew/bin'), contains('/usr/local/bin')));
|
||||
});
|
||||
});
|
||||
|
||||
group('mergePtyEnv', () {
|
||||
test('clide defaults override the process env where they overlap', () {
|
||||
final merged = mergePtyEnv(processEnv: {
|
||||
'TERM': 'dumb',
|
||||
'CUSTOM': 'preserved',
|
||||
});
|
||||
final merged = mergePtyEnv(processEnv: {'TERM': 'dumb', 'CUSTOM': 'preserved'});
|
||||
expect(merged['TERM'], 'xterm-256color'); // clide default wins
|
||||
expect(merged['COLORTERM'], 'truecolor');
|
||||
expect(merged['CUSTOM'], 'preserved'); // process env retained
|
||||
});
|
||||
|
||||
test('overrides win over both process env and clide defaults', () {
|
||||
final merged = mergePtyEnv(
|
||||
processEnv: {'TERM': 'dumb'},
|
||||
overrides: {'TERM': 'screen-256color'},
|
||||
);
|
||||
final merged = mergePtyEnv(processEnv: {'TERM': 'dumb'}, overrides: {'TERM': 'screen-256color'});
|
||||
expect(merged['TERM'], 'screen-256color');
|
||||
});
|
||||
|
||||
|
||||
+10
-40
@@ -33,10 +33,7 @@ void main() {
|
||||
columns: 80,
|
||||
rows: 24,
|
||||
workingDirectory: '/',
|
||||
environment: {
|
||||
...Platform.environment,
|
||||
'TERM': 'xterm-256color',
|
||||
},
|
||||
environment: {...Platform.environment, 'TERM': 'xterm-256color'},
|
||||
);
|
||||
addTearDown(s.close);
|
||||
|
||||
@@ -51,10 +48,7 @@ void main() {
|
||||
columns: 80,
|
||||
rows: 24,
|
||||
workingDirectory: '/',
|
||||
environment: {
|
||||
...Platform.environment,
|
||||
'TERM': 'xterm-256color',
|
||||
},
|
||||
environment: {...Platform.environment, 'TERM': 'xterm-256color'},
|
||||
);
|
||||
addTearDown(s.close);
|
||||
|
||||
@@ -68,10 +62,7 @@ void main() {
|
||||
});
|
||||
addTearDown(sub.cancel);
|
||||
|
||||
await firstByte.future.timeout(
|
||||
ioTimeout,
|
||||
onTimeout: () => fail('shell never produced its first byte within ${ioTimeout.inSeconds}s'),
|
||||
);
|
||||
await firstByte.future.timeout(ioTimeout, onTimeout: () => fail('shell never produced its first byte within ${ioTimeout.inSeconds}s'));
|
||||
|
||||
s.write(utf8.encode('echo write-test-ok\n'));
|
||||
|
||||
@@ -86,20 +77,14 @@ void main() {
|
||||
columns: 80,
|
||||
rows: 24,
|
||||
workingDirectory: '/',
|
||||
environment: {
|
||||
...Platform.environment,
|
||||
'TERM': 'xterm-256color',
|
||||
},
|
||||
environment: {...Platform.environment, 'TERM': 'xterm-256color'},
|
||||
);
|
||||
|
||||
final done = Completer<void>();
|
||||
s.output.listen((_) {}, onDone: () => done.complete());
|
||||
|
||||
await s.close();
|
||||
await done.future.timeout(
|
||||
ioTimeout,
|
||||
onTimeout: () => fail('output stream did not close within ${ioTimeout.inSeconds}s after s.close()'),
|
||||
);
|
||||
await done.future.timeout(ioTimeout, onTimeout: () => fail('output stream did not close within ${ioTimeout.inSeconds}s after s.close()'));
|
||||
expect(s.isClosed, isTrue);
|
||||
});
|
||||
|
||||
@@ -111,10 +96,7 @@ void main() {
|
||||
columns: 80,
|
||||
rows: 24,
|
||||
workingDirectory: '/',
|
||||
environment: {
|
||||
...Platform.environment,
|
||||
'TERM': 'xterm-256color',
|
||||
},
|
||||
environment: {...Platform.environment, 'TERM': 'xterm-256color'},
|
||||
);
|
||||
addTearDown(s.close);
|
||||
|
||||
@@ -133,10 +115,7 @@ void main() {
|
||||
columns: 80,
|
||||
rows: 24,
|
||||
workingDirectory: '/tmp/clide-no-such-dir-${DateTime.now().microsecondsSinceEpoch}',
|
||||
environment: {
|
||||
...Platform.environment,
|
||||
'TERM': 'xterm-256color',
|
||||
},
|
||||
environment: {...Platform.environment, 'TERM': 'xterm-256color'},
|
||||
),
|
||||
throwsA(isA<PtyException>().having((e) => e.errno, 'errno', 2)),
|
||||
);
|
||||
@@ -153,10 +132,7 @@ void main() {
|
||||
columns: 80,
|
||||
rows: 24,
|
||||
workingDirectory: '/',
|
||||
environment: {
|
||||
...Platform.environment,
|
||||
'TERM': 'xterm-256color',
|
||||
},
|
||||
environment: {...Platform.environment, 'TERM': 'xterm-256color'},
|
||||
),
|
||||
throwsA(isA<PtyException>().having((e) => e.errno, 'errno', 2)),
|
||||
);
|
||||
@@ -172,10 +148,7 @@ void main() {
|
||||
columns: 80,
|
||||
rows: 24,
|
||||
workingDirectory: '/',
|
||||
environment: {
|
||||
...Platform.environment,
|
||||
'TERM': 'xterm-256color',
|
||||
},
|
||||
environment: {...Platform.environment, 'TERM': 'xterm-256color'},
|
||||
);
|
||||
addTearDown(s.close);
|
||||
expect(s.pid, greaterThan(0));
|
||||
@@ -188,10 +161,7 @@ void main() {
|
||||
columns: 80,
|
||||
rows: 24,
|
||||
workingDirectory: '/',
|
||||
environment: {
|
||||
...Platform.environment,
|
||||
'TERM': 'xterm-256color',
|
||||
},
|
||||
environment: {...Platform.environment, 'TERM': 'xterm-256color'},
|
||||
);
|
||||
addTearDown(s.close);
|
||||
s.resize(cols: 120, rows: 30);
|
||||
|
||||
Reference in New Issue
Block a user