diff --git a/packages/flutter_tools/bin/fuchsia_builder.dart b/packages/flutter_tools/bin/fuchsia_builder.dart index 5cc088057a..5efe7e6f92 100644 --- a/packages/flutter_tools/bin/fuchsia_builder.dart +++ b/packages/flutter_tools/bin/fuchsia_builder.dart @@ -15,7 +15,6 @@ import '../lib/src/base/io.dart'; import '../lib/src/base/logger.dart'; import '../lib/src/base/os.dart'; import '../lib/src/base/platform.dart'; -import '../lib/src/base/terminal.dart'; import '../lib/src/cache.dart'; import '../lib/src/disabled_usage.dart'; import '../lib/src/flx.dart'; @@ -50,7 +49,6 @@ Future main(List args) async { context.putIfAbsent(Platform, () => const LocalPlatform()); context.putIfAbsent(FileSystem, () => const LocalFileSystem()); context.putIfAbsent(ProcessManager, () => const LocalProcessManager()); - context.putIfAbsent(AnsiTerminal, () => new AnsiTerminal()); context.putIfAbsent(Logger, () => new StdoutLogger()); context.putIfAbsent(Cache, () => new Cache()); context.putIfAbsent(Config, () => new Config()); diff --git a/packages/flutter_tools/bin/fuchsia_tester.dart b/packages/flutter_tools/bin/fuchsia_tester.dart index be84f061b0..3c711668d3 100644 --- a/packages/flutter_tools/bin/fuchsia_tester.dart +++ b/packages/flutter_tools/bin/fuchsia_tester.dart @@ -17,7 +17,6 @@ import '../lib/src/base/io.dart'; import '../lib/src/base/logger.dart'; import '../lib/src/base/os.dart'; import '../lib/src/base/platform.dart'; -import '../lib/src/base/terminal.dart'; import '../lib/src/cache.dart'; import '../lib/src/dart/package_map.dart'; import '../lib/src/disabled_usage.dart'; @@ -46,7 +45,6 @@ Future main(List args) async { context.putIfAbsent(Platform, () => const LocalPlatform()); context.putIfAbsent(FileSystem, () => const LocalFileSystem()); context.putIfAbsent(ProcessManager, () => const LocalProcessManager()); - context.putIfAbsent(AnsiTerminal, () => new AnsiTerminal()); context.putIfAbsent(Logger, () => new StdoutLogger()); context.putIfAbsent(Cache, () => new Cache()); context.putIfAbsent(Config, () => new Config()); diff --git a/packages/flutter_tools/lib/runner.dart b/packages/flutter_tools/lib/runner.dart index eb48b7e094..e2045785b7 100644 --- a/packages/flutter_tools/lib/runner.dart +++ b/packages/flutter_tools/lib/runner.dart @@ -18,7 +18,6 @@ import 'src/base/io.dart'; import 'src/base/logger.dart'; import 'src/base/platform.dart'; import 'src/base/process.dart'; -import 'src/base/terminal.dart'; import 'src/base/utils.dart'; import 'src/cache.dart'; import 'src/crash_reporting.dart'; @@ -68,7 +67,6 @@ Future run( context.putIfAbsent(Platform, () => const LocalPlatform()); context.putIfAbsent(FileSystem, () => const LocalFileSystem()); context.putIfAbsent(ProcessManager, () => const LocalProcessManager()); - context.putIfAbsent(AnsiTerminal, () => new AnsiTerminal()); context.putIfAbsent(Logger, () => platform.isWindows ? new WindowsStdoutLogger() : new StdoutLogger()); context.putIfAbsent(Config, () => new Config()); diff --git a/packages/flutter_tools/lib/src/base/terminal.dart b/packages/flutter_tools/lib/src/base/terminal.dart index a3fb027cff..f777c90da4 100644 --- a/packages/flutter_tools/lib/src/base/terminal.dart +++ b/packages/flutter_tools/lib/src/base/terminal.dart @@ -15,7 +15,7 @@ import 'platform.dart'; final AnsiTerminal _kAnsiTerminal = new AnsiTerminal(); AnsiTerminal get terminal { - return context == null + return (context == null || context[AnsiTerminal] == null) ? _kAnsiTerminal : context[AnsiTerminal]; } diff --git a/packages/flutter_tools/test/src/context.dart b/packages/flutter_tools/test/src/context.dart index 487bbfe27a..3c5fe1be66 100644 --- a/packages/flutter_tools/test/src/context.dart +++ b/packages/flutter_tools/test/src/context.dart @@ -13,7 +13,6 @@ import 'package:flutter_tools/src/base/logger.dart'; import 'package:flutter_tools/src/base/os.dart'; import 'package:flutter_tools/src/base/platform.dart'; import 'package:flutter_tools/src/base/port_scanner.dart'; -import 'package:flutter_tools/src/base/terminal.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/devfs.dart'; import 'package:flutter_tools/src/device.dart'; @@ -42,7 +41,6 @@ typedef void ContextInitializer(AppContext testContext); void _defaultInitializeContext(AppContext testContext) { testContext - ..putIfAbsent(AnsiTerminal, () => new AnsiTerminal()) ..putIfAbsent(DeviceManager, () => new MockDeviceManager()) ..putIfAbsent(DevFSConfig, () => new DevFSConfig()) ..putIfAbsent(Doctor, () => new MockDoctor())