Move outputPreferences to globals (#52846)
diff --git a/packages/flutter_tools/lib/runner.dart b/packages/flutter_tools/lib/runner.dart
index 71b6858..536e434 100644
--- a/packages/flutter_tools/lib/runner.dart
+++ b/packages/flutter_tools/lib/runner.dart
@@ -15,7 +15,6 @@
import 'src/base/io.dart';
import 'src/base/logger.dart';
import 'src/base/process.dart';
-import 'src/base/terminal.dart';
import 'src/context_runner.dart';
import 'src/doctor.dart';
import 'src/globals.dart' as globals;
@@ -234,7 +233,7 @@
try {
final BufferLogger logger = BufferLogger(
terminal: globals.terminal,
- outputPreferences: outputPreferences,
+ outputPreferences: globals.outputPreferences,
);
await context.run<bool>(
diff --git a/packages/flutter_tools/lib/src/base/terminal.dart b/packages/flutter_tools/lib/src/base/terminal.dart
index e931cf8..55bc9c7 100644
--- a/packages/flutter_tools/lib/src/base/terminal.dart
+++ b/packages/flutter_tools/lib/src/base/terminal.dart
@@ -9,7 +9,6 @@
import '../convert.dart';
import '../globals.dart' as globals;
-import 'context.dart';
import 'io.dart' as io;
import 'logger.dart';
@@ -33,11 +32,6 @@
return globals.terminal.bolden(globals.terminal.color('✓', TerminalColor.green));
}
-OutputPreferences get outputPreferences {
- return context?.get<OutputPreferences>() ?? _defaultOutputPreferences;
-}
-final OutputPreferences _defaultOutputPreferences = OutputPreferences();
-
/// A class that contains the context settings for command text output to the
/// console.
class OutputPreferences {
diff --git a/packages/flutter_tools/lib/src/base/utils.dart b/packages/flutter_tools/lib/src/base/utils.dart
index a05e211..6b5ad06 100644
--- a/packages/flutter_tools/lib/src/base/utils.dart
+++ b/packages/flutter_tools/lib/src/base/utils.dart
@@ -9,8 +9,8 @@
import 'package:meta/meta.dart';
import '../convert.dart';
+import '../globals.dart' as globals;
import 'file_system.dart';
-import 'terminal.dart';
/// Convert `foo_bar` to `fooBar`.
String camelCase(String str) {
@@ -239,7 +239,7 @@
return '';
}
indent ??= 0;
- columnWidth ??= outputPreferences.wrapColumn;
+ columnWidth ??= globals.outputPreferences.wrapColumn;
columnWidth -= indent;
assert(columnWidth >= 0);
@@ -322,7 +322,7 @@
assert(columnWidth != null);
assert(columnWidth >= 0);
assert(start >= 0);
- shouldWrap ??= outputPreferences.wrapText;
+ shouldWrap ??= globals.outputPreferences.wrapText;
/// Returns true if the code unit at [index] in [text] is a whitespace
/// character.
diff --git a/packages/flutter_tools/lib/src/context_runner.dart b/packages/flutter_tools/lib/src/context_runner.dart
index 54badb5..4611bf7 100644
--- a/packages/flutter_tools/lib/src/context_runner.dart
+++ b/packages/flutter_tools/lib/src/context_runner.dart
@@ -19,7 +19,6 @@
import 'base/os.dart';
import 'base/process.dart';
import 'base/signals.dart';
-import 'base/terminal.dart';
import 'base/time.dart';
import 'base/user_messages.dart';
import 'build_system/build_system.dart';
@@ -147,13 +146,13 @@
? WindowsStdoutLogger(
terminal: globals.terminal,
stdio: globals.stdio,
- outputPreferences: outputPreferences,
+ outputPreferences: globals.outputPreferences,
timeoutConfiguration: timeoutConfiguration,
)
: StdoutLogger(
terminal: globals.terminal,
stdio: globals.stdio,
- outputPreferences: outputPreferences,
+ outputPreferences: globals.outputPreferences,
timeoutConfiguration: timeoutConfiguration,
),
MacOSWorkflow: () => const MacOSWorkflow(),
diff --git a/packages/flutter_tools/lib/src/doctor.dart b/packages/flutter_tools/lib/src/doctor.dart
index 539bb92..5a84f5e 100644
--- a/packages/flutter_tools/lib/src/doctor.dart
+++ b/packages/flutter_tools/lib/src/doctor.dart
@@ -229,8 +229,8 @@
buffer.write(wrapText(
lineBuffer.toString(),
hangingIndent: result.leadingBox.length + 1,
- columnWidth: outputPreferences.wrapColumn,
- shouldWrap: outputPreferences.wrapText,
+ columnWidth: globals.outputPreferences.wrapColumn,
+ shouldWrap: globals.outputPreferences.wrapText,
));
buffer.writeln();
diff --git a/packages/flutter_tools/lib/src/globals.dart b/packages/flutter_tools/lib/src/globals.dart
index 8ab4be0..2c8f3ed 100644
--- a/packages/flutter_tools/lib/src/globals.dart
+++ b/packages/flutter_tools/lib/src/globals.dart
@@ -81,6 +81,9 @@
XCDevice get xcdevice => context.get<XCDevice>();
+final OutputPreferences _defaultOutputPreferences = OutputPreferences();
+OutputPreferences get outputPreferences => context.get<OutputPreferences>() ?? _defaultOutputPreferences;
+
final BotDetector _defaultBotDetector = BotDetector(
httpClientFactory: context.get<HttpClientFactory>() ?? () => HttpClient(),
platform: platform,
diff --git a/packages/flutter_tools/lib/src/resident_runner.dart b/packages/flutter_tools/lib/src/resident_runner.dart
index 0b9f2f6..9ec0d8d 100644
--- a/packages/flutter_tools/lib/src/resident_runner.dart
+++ b/packages/flutter_tools/lib/src/resident_runner.dart
@@ -15,7 +15,6 @@
import 'base/io.dart' as io;
import 'base/logger.dart';
import 'base/signals.dart';
-import 'base/terminal.dart' show outputPreferences;
import 'base/utils.dart';
import 'build_info.dart';
import 'codegen.dart';
@@ -628,7 +627,7 @@
logger: globals.logger,
terminal: globals.terminal,
platform: globals.platform,
- outputPreferences: outputPreferences,
+ outputPreferences: globals.outputPreferences,
) {
if (!artifactDirectory.existsSync()) {
artifactDirectory.createSync(recursive: true);
diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart
index 67ffd2d..c417200 100644
--- a/packages/flutter_tools/lib/src/runner/flutter_command.dart
+++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart
@@ -15,7 +15,6 @@
import '../base/context.dart';
import '../base/io.dart' as io;
import '../base/signals.dart';
-import '../base/terminal.dart';
import '../base/time.dart';
import '../base/user_messages.dart';
import '../base/utils.dart';
@@ -128,7 +127,7 @@
ArgParser get argParser => _argParser;
final ArgParser _argParser = ArgParser(
allowTrailingOptions: false,
- usageLineLength: outputPreferences.wrapText ? outputPreferences.wrapColumn : null,
+ usageLineLength: globals.outputPreferences.wrapText ? globals.outputPreferences.wrapColumn : null,
);
@override
diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
index 970e402..ac37ea0 100644
--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
@@ -139,14 +139,14 @@
ArgParser get argParser => _argParser;
final ArgParser _argParser = ArgParser(
allowTrailingOptions: false,
- usageLineLength: outputPreferences.wrapText ? outputPreferences.wrapColumn : null,
+ usageLineLength: globals.outputPreferences.wrapText ? globals.outputPreferences.wrapColumn : null,
);
@override
String get usageFooter {
return wrapText('Run "flutter help -v" for verbose help output, including less commonly used options.',
- columnWidth: outputPreferences.wrapColumn,
- shouldWrap: outputPreferences.wrapText,
+ columnWidth: globals.outputPreferences.wrapColumn,
+ shouldWrap: globals.outputPreferences.wrapText,
);
}
@@ -154,8 +154,8 @@
String get usage {
final String usageWithoutDescription = super.usage.substring(description.length + 2);
final String prefix = wrapText(description,
- shouldWrap: outputPreferences.wrapText,
- columnWidth: outputPreferences.wrapColumn,
+ shouldWrap: globals.outputPreferences.wrapText,
+ columnWidth: globals.outputPreferences.wrapColumn,
);
return '$prefix\n\n$usageWithoutDescription';
}
diff --git a/packages/flutter_tools/test/general.shard/runner/flutter_command_runner_test.dart b/packages/flutter_tools/test/general.shard/runner/flutter_command_runner_test.dart
index e78fa0f..476f245 100644
--- a/packages/flutter_tools/test/general.shard/runner/flutter_command_runner_test.dart
+++ b/packages/flutter_tools/test/general.shard/runner/flutter_command_runner_test.dart
@@ -291,7 +291,7 @@
@override
Future<FlutterCommandResult> runCommand() {
- preferences = outputPreferences;
+ preferences = globals.outputPreferences;
return Future<FlutterCommandResult>.value(const FlutterCommandResult(ExitStatus.success));
}
diff --git a/packages/flutter_tools/test/general.shard/vmservice_test.dart b/packages/flutter_tools/test/general.shard/vmservice_test.dart
index 646fdf1..3af20ff 100644
--- a/packages/flutter_tools/test/general.shard/vmservice_test.dart
+++ b/packages/flutter_tools/test/general.shard/vmservice_test.dart
@@ -9,6 +9,7 @@
import 'package:flutter_tools/src/base/logger.dart';
import 'package:flutter_tools/src/base/terminal.dart';
import 'package:flutter_tools/src/device.dart';
+import 'package:flutter_tools/src/globals.dart' as globals;
import 'package:flutter_tools/src/version.dart';
import 'package:flutter_tools/src/vmservice.dart';
import 'package:json_rpc_2/json_rpc_2.dart' as rpc;
@@ -291,7 +292,7 @@
});
}, overrides: <Type, Generator>{
Logger: () => StdoutLogger(
- outputPreferences: outputPreferences,
+ outputPreferences: globals.outputPreferences,
terminal: AnsiTerminal(
stdio: mockStdio,
platform: const LocalPlatform(),
@@ -311,7 +312,7 @@
});
}, overrides: <Type, Generator>{
Logger: () => StdoutLogger(
- outputPreferences: outputPreferences,
+ outputPreferences: globals.outputPreferences,
terminal: AnsiTerminal(
stdio: mockStdio,
platform: const LocalPlatform(),
@@ -332,7 +333,7 @@
});
}, overrides: <Type, Generator>{
Logger: () => StdoutLogger(
- outputPreferences: outputPreferences,
+ outputPreferences: globals.outputPreferences,
terminal: AnsiTerminal(
stdio: mockStdio,
platform: const LocalPlatform(),
diff --git a/packages/flutter_tools/test/src/context.dart b/packages/flutter_tools/test/src/context.dart
index 235ea72..ab61de9 100644
--- a/packages/flutter_tools/test/src/context.dart
+++ b/packages/flutter_tools/test/src/context.dart
@@ -120,7 +120,7 @@
OutputPreferences: () => OutputPreferences.test(),
Logger: () => BufferLogger(
terminal: globals.terminal,
- outputPreferences: outputPreferences,
+ outputPreferences: globals.outputPreferences,
),
OperatingSystemUtils: () => FakeOperatingSystemUtils(),
PersistentToolState: () => buildPersistentToolState(globals.fs),
