Skip to content

Commit 937ae0d

Browse files
committed
[flutter_tools] Remove unnecessary DelegatingLogger.delegate and _EnvironmentToolContext
Reverts exposing DelegatingLogger.delegate in logger.dart and removes the synthetic _EnvironmentToolContext adapter in build_system/targets/native_assets.dart by passing explicit dependencies to FlutterNativeAssetsBuildRunnerImpl.
1 parent daf9289 commit 937ae0d

11 files changed

Lines changed: 136 additions & 323 deletions

File tree

‎packages/flutter_tools/lib/src/base/logger.dart‎

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -248,49 +248,48 @@ abstract class Logger {
248248
class DelegatingLogger implements Logger {
249249
@visibleForTesting
250250
@protected
251-
DelegatingLogger(this.delegate);
251+
DelegatingLogger(this._delegate);
252252

253-
/// The wrapped [Logger] to which this logger delegates.
254-
final Logger delegate;
253+
final Logger _delegate;
255254

256255
@override
257-
bool get quiet => delegate.quiet;
256+
bool get quiet => _delegate.quiet;
258257

259258
@override
260-
set quiet(bool value) => delegate.quiet = value;
259+
set quiet(bool value) => _delegate.quiet = value;
261260

262261
@override
263-
bool get hasTerminal => delegate.hasTerminal;
262+
bool get hasTerminal => _delegate.hasTerminal;
264263

265264
@override
266-
Terminal get terminal => delegate.terminal;
265+
Terminal get terminal => _delegate.terminal;
267266

268267
@override
269-
OutputPreferences get _outputPreferences => delegate._outputPreferences;
268+
OutputPreferences get _outputPreferences => _delegate._outputPreferences;
270269

271270
@override
272-
bool get isVerbose => delegate.isVerbose;
271+
bool get isVerbose => _delegate.isVerbose;
273272

274273
@override
275-
bool get isMachine => delegate.isMachine;
274+
bool get isMachine => _delegate.isMachine;
276275

277276
@override
278-
bool get hadErrorOutput => delegate.hadErrorOutput;
277+
bool get hadErrorOutput => _delegate.hadErrorOutput;
279278

280279
@override
281-
set hadErrorOutput(bool value) => delegate.hadErrorOutput = value;
280+
set hadErrorOutput(bool value) => _delegate.hadErrorOutput = value;
282281

283282
@override
284-
bool get hadWarningOutput => delegate.hadWarningOutput;
283+
bool get hadWarningOutput => _delegate.hadWarningOutput;
285284

286285
@override
287-
set hadWarningOutput(bool value) => delegate.hadWarningOutput = value;
286+
set hadWarningOutput(bool value) => _delegate.hadWarningOutput = value;
288287

289288
@override
290-
bool get fatalWarnings => delegate.fatalWarnings;
289+
bool get fatalWarnings => _delegate.fatalWarnings;
291290

292291
@override
293-
set fatalWarnings(bool value) => delegate.fatalWarnings = value;
292+
set fatalWarnings(bool value) => _delegate.fatalWarnings = value;
294293

295294
@override
296295
void printError(
@@ -302,7 +301,7 @@ class DelegatingLogger implements Logger {
302301
int? hangingIndent,
303302
bool? wrap,
304303
}) {
305-
delegate.printError(
304+
_delegate.printError(
306305
message,
307306
stackTrace: stackTrace,
308307
emphasis: emphasis,
@@ -323,7 +322,7 @@ class DelegatingLogger implements Logger {
323322
bool? wrap,
324323
bool fatal = true,
325324
}) {
326-
delegate.printWarning(
325+
_delegate.printWarning(
327326
message,
328327
emphasis: emphasis,
329328
color: color,
@@ -344,7 +343,7 @@ class DelegatingLogger implements Logger {
344343
int? hangingIndent,
345344
bool? wrap,
346345
}) {
347-
delegate.printStatus(
346+
_delegate.printStatus(
348347
message,
349348
emphasis: emphasis,
350349
color: color,
@@ -357,17 +356,17 @@ class DelegatingLogger implements Logger {
357356

358357
@override
359358
void printBox(String message, {String? title}) {
360-
delegate.printBox(message, title: title);
359+
_delegate.printBox(message, title: title);
361360
}
362361

363362
@override
364363
void printTrace(String message) {
365-
delegate.printTrace(message);
364+
_delegate.printTrace(message);
366365
}
367366

368367
@override
369368
void sendEvent(String name, [Map<String, dynamic>? args]) {
370-
delegate.sendEvent(name, args);
369+
_delegate.sendEvent(name, args);
371370
}
372371

373372
@override
@@ -376,7 +375,7 @@ class DelegatingLogger implements Logger {
376375
String? progressId,
377376
int progressIndicatorPadding = kDefaultStatusPadding,
378377
}) {
379-
return delegate.startProgress(
378+
return _delegate.startProgress(
380379
message,
381380
progressId: progressId,
382381
progressIndicatorPadding: progressIndicatorPadding,
@@ -390,7 +389,7 @@ class DelegatingLogger implements Logger {
390389
SlowWarningCallback? slowWarningCallback,
391390
TerminalColor? warningColor,
392391
}) {
393-
return delegate.startSpinner(
392+
return _delegate.startSpinner(
394393
onFinish: onFinish,
395394
timeout: timeout,
396395
slowWarningCallback: slowWarningCallback,
@@ -399,13 +398,13 @@ class DelegatingLogger implements Logger {
399398
}
400399

401400
@override
402-
bool get supportsColor => delegate.supportsColor;
401+
bool get supportsColor => _delegate.supportsColor;
403402

404403
@override
405-
void clear() => delegate.clear();
404+
void clear() => _delegate.clear();
406405

407406
@override
408-
void checkForFatalLogs() => delegate.checkForFatalLogs();
407+
void checkForFatalLogs() => _delegate.checkForFatalLogs();
409408
}
410409

411410
/// If [logger] is a [DelegatingLogger], walks the delegate chain and returns
@@ -418,7 +417,7 @@ T asLogger<T extends Logger>(Logger logger) {
418417
if (logger is T) {
419418
return logger;
420419
} else if (logger is DelegatingLogger) {
421-
logger = logger.delegate;
420+
logger = logger._delegate;
422421
} else {
423422
throw StateError('$original has no ancestor delegate of type $T');
424423
}

‎packages/flutter_tools/lib/src/build_system/targets/darwin.dart‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -234,18 +234,11 @@ void _printXcodeLog(
234234
}
235235

236236
// Must be printed to stderr to be streamed to the Flutter tool in xcode_backend.dart.
237-
// Unwrap DelegatingLogger (e.g. VerboseLogger) so Xcode log prefixes start at column 0.
238237
// Save and restore hadErrorOutput so Xcode warnings and notes do not trip --fatal-warnings.
239-
var unwrappedLogger = logger;
240-
while (unwrappedLogger is DelegatingLogger) {
241-
unwrappedLogger = unwrappedLogger.delegate;
242-
}
243-
final bool previousLoggerHadErrorOutput = logger.hadErrorOutput;
244-
final bool previousUnwrappedHadErrorOutput = unwrappedLogger.hadErrorOutput;
245-
unwrappedLogger.printError('$linePath${logType.name}: $message', wrap: false);
238+
final bool hadErrorOutput = logger.hadErrorOutput;
239+
logger.printError('$linePath${logType.name}: $message', wrap: false);
246240
if (logType != XcodeLogType.error) {
247-
logger.hadErrorOutput = previousLoggerHadErrorOutput;
248-
unwrappedLogger.hadErrorOutput = previousUnwrappedHadErrorOutput;
241+
logger.hadErrorOutput = hadErrorOutput;
249242
}
250243
}
251244

‎packages/flutter_tools/lib/src/build_system/targets/native_assets.dart‎

Lines changed: 4 additions & 156 deletions
Original file line numberDiff line numberDiff line change
@@ -14,38 +14,15 @@ library;
1414

1515
import 'package:meta/meta.dart';
1616
import 'package:package_config/package_config_types.dart';
17-
import 'package:process/process.dart';
1817

19-
import '../../artifacts.dart';
20-
import '../../base/bot_detector.dart';
2118
import '../../base/common.dart';
22-
import '../../base/config.dart';
2319
import '../../base/file_system.dart';
24-
import '../../base/io.dart';
25-
import '../../base/logger.dart';
26-
import '../../base/os.dart';
27-
import '../../base/platform.dart';
28-
import '../../base/process.dart';
29-
import '../../base/signals.dart';
30-
import '../../base/terminal.dart';
31-
import '../../base/time.dart';
32-
import '../../base/user_messages.dart';
3320
import '../../build_info.dart';
34-
import '../../context/tool_context.dart';
3521
import '../../convert.dart';
36-
import '../../custom_devices/custom_devices_config.dart';
3722
import '../../dart/package_map.dart';
3823
import '../../features.dart';
39-
import '../../flutter_cache.dart';
40-
import '../../git.dart';
4124
import '../../isolated/native_assets/dart_hook_result.dart';
4225
import '../../isolated/native_assets/native_assets.dart';
43-
import '../../native_assets.dart';
44-
import '../../persistent_tool_state.dart';
45-
import '../../pre_run_validator.dart';
46-
import '../../project.dart';
47-
import '../../runner/local_engine.dart';
48-
import '../../version.dart';
4926
import '../build_system.dart';
5027
import '../depfile.dart';
5128
import '../exceptions.dart' show MissingDefineException;
@@ -440,145 +417,16 @@ Future<FlutterNativeAssetsBuildRunner> createFlutterNativeAssetsBuildRunner(
440417
return FlutterNativeAssetsBuildRunnerImpl(
441418
environment.packageConfigPath,
442419
packageConfig,
420+
fileSystem,
421+
environment.logger,
422+
environment.platform,
423+
environment.processManager,
443424
runPackageName,
444425
pubspecPath,
445426
includeDevDependencies: includeDevDependencies,
446-
toolContext: _EnvironmentToolContext(environment),
447427
);
448428
}
449429

450-
class _EnvironmentToolContext implements ToolContext {
451-
_EnvironmentToolContext(this._environment);
452-
453-
final Environment _environment;
454-
455-
@override
456-
Artifacts get artifacts => _environment.artifacts;
457-
458-
@override
459-
late final botDetector = BotDetector(platform: platform);
460-
461-
@override
462-
late final cache = FlutterCache(
463-
fileSystem: fs,
464-
logger: logger,
465-
platform: platform,
466-
osUtils: os,
467-
projectFactory: projectFactory,
468-
stdio: stdio,
469-
);
470-
471-
@override
472-
late final config = Config(
473-
Config.kFlutterSettings,
474-
fileSystem: fs,
475-
logger: logger,
476-
platform: platform,
477-
);
478-
479-
@override
480-
late final customDevicesConfig = CustomDevicesConfig(
481-
fileSystem: fs,
482-
logger: logger,
483-
platform: platform,
484-
);
485-
486-
@override
487-
late final fileSystemUtils = FileSystemUtils(fileSystem: fs, platform: platform);
488-
489-
@override
490-
late final flutterVersion = FlutterVersion(
491-
flutterRoot: _environment.flutterRootDir.path,
492-
fs: fs,
493-
git: git,
494-
platform: platform,
495-
);
496-
497-
@override
498-
FileSystem get fs => _environment.fileSystem;
499-
500-
@override
501-
late final git = Git(currentPlatform: platform, runProcessWith: processUtils);
502-
503-
@override
504-
late final localEngineLocator = LocalEngineLocator(
505-
userMessages: userMessages,
506-
logger: logger,
507-
platform: platform,
508-
fileSystem: fs,
509-
flutterRoot: _environment.flutterRootDir.path,
510-
);
511-
512-
@override
513-
Logger get logger => _environment.logger;
514-
515-
@override
516-
TestCompilerNativeAssetsBuilder? get nativeAssetsBuilder => null;
517-
518-
@override
519-
late final os = OperatingSystemUtils(
520-
fileSystem: fs,
521-
logger: logger,
522-
platform: platform,
523-
processManager: processManager,
524-
);
525-
526-
@override
527-
late final outputPreferences = OutputPreferences(
528-
wrapText: stdio.hasTerminal,
529-
showColor: platform.stdoutSupportsAnsi,
530-
stdio: stdio,
531-
);
532-
533-
@override
534-
late final persistentToolState = PersistentToolState(
535-
fileSystem: fs,
536-
logger: logger,
537-
platform: platform,
538-
);
539-
540-
@override
541-
Platform get platform => _environment.platform;
542-
543-
@override
544-
PreRunValidator get preRunValidator => const NoOpPreRunValidator();
545-
546-
@override
547-
late final processInfo = ProcessInfo(fs);
548-
549-
@override
550-
ProcessManager get processManager => _environment.processManager;
551-
552-
@override
553-
late final processUtils = ProcessUtils(processManager: processManager, logger: logger);
554-
555-
@override
556-
late final projectFactory = FlutterProjectFactory(fileSystem: fs, logger: logger);
557-
558-
@override
559-
late final shutdownHooks = ShutdownHooks();
560-
561-
@override
562-
Signals get signals => LocalSignals.instance;
563-
564-
@override
565-
late final stdio = Stdio();
566-
567-
@override
568-
SystemClock get systemClock => const SystemClock();
569-
570-
@override
571-
late final terminal = AnsiTerminal(
572-
stdio: stdio,
573-
platform: platform,
574-
now: DateTime.now(),
575-
shutdownHooks: shutdownHooks,
576-
);
577-
578-
@override
579-
late final userMessages = UserMessages();
580-
}
581-
582430
bool _isTestTarget(Environment environment) {
583431
final String? targetFile = environment.defines[kTargetFile];
584432
if (targetFile == null) {

‎packages/flutter_tools/lib/src/isolated/native_assets/android/native_assets.dart‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import '../../../android/gradle_utils.dart';
99
import '../../../base/common.dart';
1010
import '../../../base/file_system.dart';
1111
import '../../../build_info.dart';
12-
import '../../../context/tool_context.dart';
12+
import '../../../context_runner.dart';
1313
import '../native_assets.dart';
1414
import '../native_assets_manifest.dart';
1515

@@ -92,8 +92,10 @@ Map<FlutterCodeAsset, FlutterCodeAssetTargetLocation> assetTargetLocationsAndroi
9292
///
9393
/// Typically the Flutter Gradle Plugin will install an NDK. This method will
9494
/// return the newest NDK if multiple NDKs are found on the system.
95-
Future<CCompilerConfig?> cCompilerConfigAndroid({required ToolContext toolContext}) async {
96-
final AndroidSdk? androidSdk = AndroidSdk.locateAndroidSdk(toolContext: toolContext);
95+
Future<CCompilerConfig?> cCompilerConfigAndroid() async {
96+
final AndroidSdk? androidSdk = AndroidSdk.locateAndroidSdk(
97+
toolContext: const GlobalToolContext(),
98+
);
9799
if (androidSdk == null) {
98100
throwToolExit('Android SDK could not be found.');
99101
}

0 commit comments

Comments
 (0)