[flutter_tools] remove globals from compile and devices (#67485)
Remove global variables from compile.dart and devices.dart (except for dds which needs more changes).
#47161
diff --git a/packages/flutter_tools/lib/src/base/terminal.dart b/packages/flutter_tools/lib/src/base/terminal.dart
index 6bf4b20..969bca7 100644
--- a/packages/flutter_tools/lib/src/base/terminal.dart
+++ b/packages/flutter_tools/lib/src/base/terminal.dart
@@ -96,6 +96,14 @@
bool get usesTerminalUi;
set usesTerminalUi(bool value);
+ /// Whether there is a terminal attached to stdin.
+ ///
+ /// If true, this usually indicates that a user is using the CLI as
+ /// opposed to using an IDE. This can be used to determine
+ /// whether it is appropriate to show a terminal prompt,
+ /// or whether an automatic selection should be made instead.
+ bool get stdinHasTerminal;
+
String bolden(String message);
String color(String message, TerminalColor color);
@@ -251,6 +259,9 @@
}
}
+ @override
+ bool get stdinHasTerminal => _stdio.stdinHasTerminal;
+
Stream<String> _broadcastStdInString;
@override
@@ -339,4 +350,7 @@
@override
bool get supportsEmoji => false;
+
+ @override
+ bool get stdinHasTerminal => false;
}
diff --git a/packages/flutter_tools/lib/src/commands/devices.dart b/packages/flutter_tools/lib/src/commands/devices.dart
index a5a5060..59829b3 100644
--- a/packages/flutter_tools/lib/src/commands/devices.dart
+++ b/packages/flutter_tools/lib/src/commands/devices.dart
@@ -80,7 +80,7 @@
globals.printStatus(status.toString());
} else {
globals.printStatus('${devices.length} connected ${pluralize('device', devices.length)}:\n');
- await Device.printDevices(devices);
+ await Device.printDevices(devices, globals.logger);
}
await _printDiagnostics();
}
diff --git a/packages/flutter_tools/lib/src/commands/drive.dart b/packages/flutter_tools/lib/src/commands/drive.dart
index 7fa8e81..ebc9b77 100644
--- a/packages/flutter_tools/lib/src/commands/drive.dart
+++ b/packages/flutter_tools/lib/src/commands/drive.dart
@@ -427,7 +427,7 @@
}
if (devices.length > 1) {
globals.printStatus("Found ${devices.length} devices with name or id matching '${deviceManager.specifiedDeviceId}':");
- await Device.printDevices(devices);
+ await Device.printDevices(devices, globals.logger);
return null;
}
return devices.first;
@@ -438,7 +438,7 @@
return null;
} else if (devices.length > 1) {
globals.printStatus('Found multiple connected devices:');
- await Device.printDevices(devices);
+ await Device.printDevices(devices, globals.logger);
}
globals.printStatus('Using device ${devices.first.name}.');
return devices.first;
diff --git a/packages/flutter_tools/lib/src/compile.dart b/packages/flutter_tools/lib/src/compile.dart
index 138fb0e..770286b 100644
--- a/packages/flutter_tools/lib/src/compile.dart
+++ b/packages/flutter_tools/lib/src/compile.dart
@@ -17,7 +17,6 @@
import 'base/platform.dart';
import 'build_info.dart';
import 'convert.dart';
-import 'globals.dart' as globals;
/// The target model describes the set of core libraries that are available within
/// the SDK.
@@ -416,8 +415,6 @@
List<String> dartDefines,
String librariesSpec,
@required Platform platform,
- // Deprecated
- List<String> experimentalFlags,
}) = DefaultResidentCompiler;
// TODO(jonahwilliams): find a better way to configure additional file system
@@ -517,12 +514,10 @@
this.platformDill,
List<String> dartDefines,
this.librariesSpec,
- // Deprecated
- List<String> experimentalFlags, // ignore: avoid_unused_constructor_parameters
}) : assert(sdkRoot != null),
- _logger = logger ?? globals.logger,
- _processManager = processManager ?? globals.processManager,
- _artifacts = artifacts ?? globals.artifacts,
+ _logger = logger,
+ _processManager = processManager,
+ _artifacts = artifacts,
_stdoutHandler = StdoutHandler(logger: logger),
_platform = platform,
dartDefines = dartDefines ?? const <String>[],
diff --git a/packages/flutter_tools/lib/src/context_runner.dart b/packages/flutter_tools/lib/src/context_runner.dart
index 50d3dbe..8d8fa83 100644
--- a/packages/flutter_tools/lib/src/context_runner.dart
+++ b/packages/flutter_tools/lib/src/context_runner.dart
@@ -152,6 +152,7 @@
featureFlags: featureFlags,
),
operatingSystemUtils: globals.os,
+ terminal: globals.terminal,
),
Doctor: () => Doctor(logger: globals.logger),
DoctorValidatorsProvider: () => DoctorValidatorsProvider.defaultInstance,
diff --git a/packages/flutter_tools/lib/src/device.dart b/packages/flutter_tools/lib/src/device.dart
index 92d4ebf..71a71c4 100644
--- a/packages/flutter_tools/lib/src/device.dart
+++ b/packages/flutter_tools/lib/src/device.dart
@@ -23,14 +23,15 @@
import 'base/logger.dart';
import 'base/os.dart';
import 'base/platform.dart';
-import 'base/user_messages.dart';
+import 'base/terminal.dart';
+import 'base/user_messages.dart' hide userMessages;
import 'base/utils.dart';
import 'build_info.dart';
import 'features.dart';
import 'fuchsia/fuchsia_device.dart';
import 'fuchsia/fuchsia_sdk.dart';
import 'fuchsia/fuchsia_workflow.dart';
-import 'globals.dart' as globals;
+import 'globals.dart' as globals show logger;
import 'ios/devices.dart';
import 'ios/ios_workflow.dart';
import 'ios/simulators.dart';
@@ -81,6 +82,17 @@
/// A disovery mechanism for flutter-supported development devices.
abstract class DeviceManager {
+ DeviceManager({
+ @required Logger logger,
+ @required Terminal terminal,
+ @required UserMessages userMessages,
+ }) : _logger = logger,
+ _terminal = terminal,
+ _userMessages = userMessages;
+
+ final Logger _logger;
+ final Terminal _terminal;
+ final UserMessages _userMessages;
/// Constructing DeviceManagers is cheap; they only do expensive work if some
/// of their methods are called.
@@ -139,7 +151,7 @@
return null;
}, onError: (dynamic error, StackTrace stackTrace) {
// Return matches from other discoverers even if one fails.
- globals.printTrace('Ignored error discovering $deviceId: $error');
+ _logger.printTrace('Ignored error discovering $deviceId: $error');
})
];
@@ -275,11 +287,11 @@
// has two active Android devices running, then we request the user to
// choose one. If the user has two nonEphemeral devices running, we also
// request input to choose one.
- if (devices.length > 1 && globals.stdio.stdinHasTerminal) {
- globals.printStatus(globals.userMessages.flutterMultipleDevicesFound);
- await Device.printDevices(devices);
+ if (devices.length > 1 && _terminal.stdinHasTerminal) {
+ _logger.printStatus(_userMessages.flutterMultipleDevicesFound);
+ await Device.printDevices(devices, _logger);
final Device chosenDevice = await _chooseOneOfAvailableDevices(devices);
- globals.deviceManager.specifiedDeviceId = chosenDevice.id;
+ specifiedDeviceId = chosenDevice.id;
devices = <Device>[chosenDevice];
}
}
@@ -298,18 +310,19 @@
void _displayDeviceOptions(List<Device> devices) {
int count = 0;
for (final Device device in devices) {
- globals.printStatus(userMessages.flutterChooseDevice(count, device.name, device.id));
+ _logger.printStatus(_userMessages.flutterChooseDevice(count, device.name, device.id));
count++;
}
}
Future<String> _readUserInput(int deviceCount) async {
- globals.terminal.usesTerminalUi = true;
- final String result = await globals.terminal.promptForCharInput(
- <String>[ for (int i = 0; i < deviceCount; i++) '$i', 'q', 'Q'],
- displayAcceptedCharacters: false,
- logger: globals.logger,
- prompt: userMessages.flutterChooseOne);
+ _terminal.usesTerminalUi = true;
+ final String result = await _terminal.promptForCharInput(
+ <String>[ for (int i = 0; i < deviceCount; i++) '$i', 'q', 'Q'],
+ displayAcceptedCharacters: false,
+ logger: _logger,
+ prompt: _userMessages.flutterChooseOne,
+ );
return result;
}
@@ -345,6 +358,7 @@
@required UserMessages userMessages,
@required OperatingSystemUtils operatingSystemUtils,
@required WindowsWorkflow windowsWorkflow,
+ @required Terminal terminal,
}) : deviceDiscoverers = <DeviceDiscovery>[
AndroidDevices(
logger: logger,
@@ -408,7 +422,11 @@
processManager: processManager,
logger: logger,
),
- ];
+ ], super(
+ logger: logger,
+ terminal: terminal,
+ userMessages: userMessages,
+ );
@override
final List<DeviceDiscovery> deviceDiscoverers;
@@ -465,7 +483,7 @@
final List<Device> devices = await pollingGetDevices(timeout: pollingTimeout);
deviceNotifier.updateWithNewList(devices);
} on TimeoutException {
- globals.printTrace('Device poll timed out. Will retry.');
+ // Do nothing on a timeout.
}
// Subsequent timeouts after initial population should wait longer.
_timer = _initTimer(_pollingTimeout);
@@ -736,8 +754,8 @@
}
}
- static Future<void> printDevices(List<Device> devices) async {
- await descriptions(devices).forEach(globals.printStatus);
+ static Future<void> printDevices(List<Device> devices, Logger logger) async {
+ await descriptions(devices).forEach(logger.printStatus);
}
static List<String> devicesPlatformTypes(List<Device> devices) {
diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart
index 7003262..0c0d61a 100644
--- a/packages/flutter_tools/lib/src/runner/flutter_command.dart
+++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart
@@ -1063,7 +1063,7 @@
devices = await deviceManager.getAllConnectedDevices();
}
globals.printStatus('');
- await Device.printDevices(devices);
+ await Device.printDevices(devices, globals.logger);
return null;
}
return devices;
@@ -1087,7 +1087,7 @@
globals.printStatus(userMessages.flutterSpecifyDevice);
deviceList = await globals.deviceManager.getAllConnectedDevices();
globals.printStatus('');
- await Device.printDevices(deviceList);
+ await Device.printDevices(deviceList, globals.logger);
return null;
}
return deviceList.single;
