Unnecessary new (#20138) * enable lint unnecessary_new * fix tests * fix tests * fix tests
diff --git a/packages/flutter_tools/lib/src/commands/analyze.dart b/packages/flutter_tools/lib/src/commands/analyze.dart index c79ba29..1da4c74 100644 --- a/packages/flutter_tools/lib/src/commands/analyze.dart +++ b/packages/flutter_tools/lib/src/commands/analyze.dart
@@ -82,13 +82,13 @@ @override Future<Null> runCommand() { if (argResults['watch']) { - return new AnalyzeContinuously( + return AnalyzeContinuously( argResults, runner.getRepoRoots(), runner.getRepoPackages(), ).analyze(); } else { - return new AnalyzeOnce( + return AnalyzeOnce( argResults, runner.getRepoRoots(), runner.getRepoPackages(),
diff --git a/packages/flutter_tools/lib/src/commands/analyze_base.dart b/packages/flutter_tools/lib/src/commands/analyze_base.dart index 5e07adc..04547d2 100644 --- a/packages/flutter_tools/lib/src/commands/analyze_base.dart +++ b/packages/flutter_tools/lib/src/commands/analyze_base.dart
@@ -123,7 +123,7 @@ Map<String, PackageDependency> packages = <String, PackageDependency>{}; PackageDependency getPackageDependency(String packageName) { - return packages.putIfAbsent(packageName, () => new PackageDependency()); + return packages.putIfAbsent(packageName, () => PackageDependency()); } /// Read the .packages file in [directory] and add referenced packages to [dependencies]. @@ -135,7 +135,7 @@ final Iterable<String> lines = dotPackages .readAsStringSync() .split('\n') - .where((String line) => !line.startsWith(new RegExp(r'^ *#'))); + .where((String line) => !line.startsWith(RegExp(r'^ *#'))); for (String line in lines) { final int colon = line.indexOf(':'); if (colon > 0) { @@ -177,7 +177,7 @@ // prepare a union of all the .packages files if (dependencies.hasConflicts) { - final StringBuffer message = new StringBuffer(); + final StringBuffer message = StringBuffer(); message.writeln(dependencies.generateConflictReport()); message.writeln('Make sure you have run "pub upgrade" in all the directories mentioned above.'); if (dependencies.hasConflictsAffectingFlutterRepo) { @@ -205,7 +205,7 @@ String generateConflictReport() { assert(hasConflicts); - final StringBuffer result = new StringBuffer(); + final StringBuffer result = StringBuffer(); for (String package in packages.keys.where((String package) => packages[package].hasConflict)) { result.writeln('Package "$package" has conflicts:'); packages[package].describeConflict(result);
diff --git a/packages/flutter_tools/lib/src/commands/analyze_continuously.dart b/packages/flutter_tools/lib/src/commands/analyze_continuously.dart index 3309753..c326608 100644 --- a/packages/flutter_tools/lib/src/commands/analyze_continuously.dart +++ b/packages/flutter_tools/lib/src/commands/analyze_continuously.dart
@@ -26,7 +26,7 @@ String analysisTarget; bool firstAnalysis = true; - Set<String> analyzedPaths = new Set<String>(); + Set<String> analyzedPaths = Set<String>(); Map<String, List<AnalysisError>> analysisErrors = <String, List<AnalysisError>>{}; Stopwatch analysisTimer; int lastErrorCount = 0; @@ -37,7 +37,7 @@ List<String> directories; if (argResults['flutter-repo']) { - final PackageDependencyTracker dependencies = new PackageDependencyTracker(); + final PackageDependencyTracker dependencies = PackageDependencyTracker(); dependencies.checkForConflictingDependencies(repoPackages, dependencies); directories = repoRoots; @@ -54,7 +54,7 @@ final String sdkPath = argResults['dart-sdk'] ?? sdk.dartSdkPath; - final AnalysisServer server = new AnalysisServer(sdkPath, directories); + final AnalysisServer server = AnalysisServer(sdkPath, directories); server.onAnalyzing.listen((bool isAnalyzing) => _handleAnalysisStatus(server, isAnalyzing)); server.onErrors.listen(_handleAnalysisErrors); @@ -76,7 +76,7 @@ printStatus('\n'); analysisStatus = logger.startProgress('Analyzing $analysisTarget...'); analyzedPaths.clear(); - analysisTimer = new Stopwatch()..start(); + analysisTimer = Stopwatch()..start(); } else { analysisStatus?.stop(); analysisTimer.stop();
diff --git a/packages/flutter_tools/lib/src/commands/analyze_once.dart b/packages/flutter_tools/lib/src/commands/analyze_once.dart index 84d02a3..ae14c97 100644 --- a/packages/flutter_tools/lib/src/commands/analyze_once.dart +++ b/packages/flutter_tools/lib/src/commands/analyze_once.dart
@@ -38,7 +38,7 @@ (workingDirectory ?? fs.currentDirectory).path; // find directories from argResults.rest - final Set<String> directories = new Set<String>.from(argResults.rest + final Set<String> directories = Set<String>.from(argResults.rest .map<String>((String path) => fs.path.canonicalize(path))); if (directories.isNotEmpty) { for (String directory in directories) { @@ -54,7 +54,7 @@ if (argResults['flutter-repo']) { // check for conflicting dependencies - final PackageDependencyTracker dependencies = new PackageDependencyTracker(); + final PackageDependencyTracker dependencies = PackageDependencyTracker(); dependencies.checkForConflictingDependencies(repoPackages, dependencies); directories.addAll(repoRoots); if (argResults.wasParsed('current-package') && argResults['current-package']) @@ -68,12 +68,12 @@ throwToolExit('Nothing to analyze.', exitCode: 0); // analyze all - final Completer<Null> analysisCompleter = new Completer<Null>(); + final Completer<Null> analysisCompleter = Completer<Null>(); final List<AnalysisError> errors = <AnalysisError>[]; final String sdkPath = argResults['dart-sdk'] ?? sdk.dartSdkPath; - final AnalysisServer server = new AnalysisServer( + final AnalysisServer server = AnalysisServer( sdkPath, directories.toList(), ); @@ -101,7 +101,7 @@ Cache.releaseLockEarly(); // collect results - final Stopwatch timer = new Stopwatch()..start(); + final Stopwatch timer = Stopwatch()..start(); final String message = directories.length > 1 ? '${directories.length} ${directories.length == 1 ? 'directory' : 'directories'}' : fs.path.basename(directories.first);
diff --git a/packages/flutter_tools/lib/src/commands/attach.dart b/packages/flutter_tools/lib/src/commands/attach.dart index 09ad900..bcd8b24 100644 --- a/packages/flutter_tools/lib/src/commands/attach.dart +++ b/packages/flutter_tools/lib/src/commands/attach.dart
@@ -53,7 +53,7 @@ help: 'Handle machine structured JSON command input and provide output\n' 'and progress in machine friendly format.', ); - hotRunnerFactory ??= new HotRunnerFactory(); + hotRunnerFactory ??= HotRunnerFactory(); } HotRunnerFactory hotRunnerFactory; @@ -93,15 +93,15 @@ final int devicePort = observatoryPort; final Daemon daemon = argResults['machine'] - ? new Daemon(stdinCommandStream, stdoutCommandResponse, - notifyingLogger: new NotifyingLogger(), logToStdout: true) + ? Daemon(stdinCommandStream, stdoutCommandResponse, + notifyingLogger: NotifyingLogger(), logToStdout: true) : null; Uri observatoryUri; if (devicePort == null) { ProtocolDiscovery observatoryDiscovery; try { - observatoryDiscovery = new ProtocolDiscovery.observatory( + observatoryDiscovery = ProtocolDiscovery.observatory( device.getLogReader(), portForwarder: device.portForwarder, ); @@ -116,7 +116,7 @@ observatoryUri = Uri.parse('http://$ipv4Loopback:$localPort/'); } try { - final FlutterDevice flutterDevice = new FlutterDevice( + final FlutterDevice flutterDevice = FlutterDevice( device, trackWidgetCreation: false, dillOutputPath: argResults['output-dill'], @@ -127,7 +127,7 @@ final HotRunner hotRunner = hotRunnerFactory.build( <FlutterDevice>[flutterDevice], target: targetFile, - debuggingOptions: new DebuggingOptions.enabled(getBuildInfo()), + debuggingOptions: DebuggingOptions.enabled(getBuildInfo()), packagesFilePath: globalResults['packages'], usesTerminalUI: daemon == null, projectRootPath: argResults['project-root'], @@ -170,7 +170,7 @@ String dillOutputPath, bool stayResident = true, bool ipv6 = false, - }) => new HotRunner( + }) => HotRunner( devices, target: target, debuggingOptions: debuggingOptions,
diff --git a/packages/flutter_tools/lib/src/commands/build.dart b/packages/flutter_tools/lib/src/commands/build.dart index 5bf3990..eb5ab8e 100644 --- a/packages/flutter_tools/lib/src/commands/build.dart +++ b/packages/flutter_tools/lib/src/commands/build.dart
@@ -18,11 +18,11 @@ class BuildCommand extends FlutterCommand { BuildCommand({bool verboseHelp = false}) { - addSubcommand(new BuildApkCommand(verboseHelp: verboseHelp)); - addSubcommand(new BuildAotCommand()); - addSubcommand(new BuildIOSCommand()); - addSubcommand(new BuildFlxCommand()); - addSubcommand(new BuildBundleCommand(verboseHelp: verboseHelp)); + addSubcommand(BuildApkCommand(verboseHelp: verboseHelp)); + addSubcommand(BuildAotCommand()); + addSubcommand(BuildIOSCommand()); + addSubcommand(BuildFlxCommand()); + addSubcommand(BuildBundleCommand(verboseHelp: verboseHelp)); } @override
diff --git a/packages/flutter_tools/lib/src/commands/build_aot.dart b/packages/flutter_tools/lib/src/commands/build_aot.dart index 4f379a5..fb07c23 100644 --- a/packages/flutter_tools/lib/src/commands/build_aot.dart +++ b/packages/flutter_tools/lib/src/commands/build_aot.dart
@@ -77,7 +77,7 @@ final String outputPath = argResults['output-dir'] ?? getAotBuildDirectory(); try { String mainPath = findMainDartFile(targetFile); - final AOTSnapshotter snapshotter = new AOTSnapshotter(); + final AOTSnapshotter snapshotter = AOTSnapshotter(); // Compile to kernel. mainPath = await snapshotter.compileKernel(
diff --git a/packages/flutter_tools/lib/src/commands/channel.dart b/packages/flutter_tools/lib/src/commands/channel.dart index 6d14145..499fee1 100644 --- a/packages/flutter_tools/lib/src/commands/channel.dart +++ b/packages/flutter_tools/lib/src/commands/channel.dart
@@ -39,7 +39,7 @@ case 1: return _switchChannel(argResults.rest[0]); default: - throw new ToolExit('Too many arguments.\n$usage'); + throw ToolExit('Too many arguments.\n$usage'); } } @@ -47,7 +47,7 @@ // Beware: currentBranch could contain PII. See getBranchName(). final String currentChannel = FlutterVersion.instance.channel; final String currentBranch = FlutterVersion.instance.getBranchName(); - final Set<String> seenChannels = new Set<String>(); + final Set<String> seenChannels = Set<String>(); showAll = showAll || currentChannel != currentBranch;
diff --git a/packages/flutter_tools/lib/src/commands/create.dart b/packages/flutter_tools/lib/src/commands/create.dart index 4f9f440..a34ec89 100644 --- a/packages/flutter_tools/lib/src/commands/create.dart +++ b/packages/flutter_tools/lib/src/commands/create.dart
@@ -360,7 +360,7 @@ } int _renderTemplate(String templateName, Directory directory, Map<String, dynamic> context) { - final Template template = new Template.fromName(templateName); + final Template template = Template.fromName(templateName); return template.render(directory, context, overwriteExisting: false); } @@ -392,13 +392,13 @@ String _createUTIIdentifier(String organization, String name) { // Create a UTI (https://en.wikipedia.org/wiki/Uniform_Type_Identifier) from a base name - final RegExp disallowed = new RegExp(r'[^a-zA-Z0-9\-\.\u0080-\uffff]+'); + final RegExp disallowed = RegExp(r'[^a-zA-Z0-9\-\.\u0080-\uffff]+'); name = camelCase(name).replaceAll(disallowed, ''); name = name.isEmpty ? 'untitled' : name; return '$organization.$name'; } -final Set<String> _packageDependencies = new Set<String>.from(<String>[ +final Set<String> _packageDependencies = Set<String>.from(<String>[ 'analyzer', 'args', 'async', @@ -431,7 +431,7 @@ /// we should disallow the project name. String _validateProjectName(String projectName) { if (!linter_utils.isValidPackageName(projectName)) { - final String packageNameDetails = new package_names.PubPackageNames().details; + final String packageNameDetails = package_names.PubPackageNames().details; return '"$projectName" is not a valid Dart package name.\n\n$packageNameDetails'; } if (_packageDependencies.contains(projectName)) {
diff --git a/packages/flutter_tools/lib/src/commands/daemon.dart b/packages/flutter_tools/lib/src/commands/daemon.dart index 5bb22bb..614f30a 100644 --- a/packages/flutter_tools/lib/src/commands/daemon.dart +++ b/packages/flutter_tools/lib/src/commands/daemon.dart
@@ -52,13 +52,13 @@ Future<Null> runCommand() { printStatus('Starting device daemon...'); - final NotifyingLogger notifyingLogger = new NotifyingLogger(); + final NotifyingLogger notifyingLogger = NotifyingLogger(); Cache.releaseLockEarly(); return context.run<Null>( body: () async { - final Daemon daemon = new Daemon( + final Daemon daemon = Daemon( stdinCommandStream, stdoutCommandResponse, daemonCommand: this, notifyingLogger: notifyingLogger); @@ -86,10 +86,10 @@ this.logToStdout = false, }) { // Set up domains. - _registerDomain(daemonDomain = new DaemonDomain(this)); - _registerDomain(appDomain = new AppDomain(this)); - _registerDomain(deviceDomain = new DeviceDomain(this)); - _registerDomain(emulatorDomain = new EmulatorDomain(this)); + _registerDomain(daemonDomain = DaemonDomain(this)); + _registerDomain(appDomain = AppDomain(this)); + _registerDomain(deviceDomain = DeviceDomain(this)); + _registerDomain(emulatorDomain = EmulatorDomain(this)); // Start listening. _commandSubscription = commandStream.listen( @@ -112,7 +112,7 @@ final NotifyingLogger notifyingLogger; final bool logToStdout; - final Completer<int> _onExitCompleter = new Completer<int>(); + final Completer<int> _onExitCompleter = Completer<int>(); final Map<String, Domain> _domainMap = <String, Domain>{}; void _registerDomain(Domain domain) { @@ -184,7 +184,7 @@ String toString() => name; void handleCommand(String command, dynamic id, Map<String, dynamic> args) { - new Future<dynamic>.sync(() { + Future<dynamic>.sync(() { if (_handlers.containsKey(command)) return _handlers[command](args); throw 'command not understood: $name.$command'; @@ -289,12 +289,12 @@ StreamSubscription<LogMessage> _subscription; Future<String> version(Map<String, dynamic> args) { - return new Future<String>.value(protocolVersion); + return Future<String>.value(protocolVersion); } Future<Null> shutdown(Map<String, dynamic> args) { Timer.run(daemon.shutdown); - return new Future<Null>.value(); + return Future<Null>.value(); } @override @@ -319,7 +319,7 @@ registerHandler('detach', detach); } - static final Uuid _uuidGenerator = new Uuid(); + static final Uuid _uuidGenerator = Uuid(); static String _getNewAppId() => _uuidGenerator.generateV4(); @@ -343,7 +343,7 @@ final Directory cwd = fs.currentDirectory; fs.currentDirectory = fs.directory(projectDirectory); - final FlutterDevice flutterDevice = new FlutterDevice( + final FlutterDevice flutterDevice = FlutterDevice( device, trackWidgetCreation: trackWidgetCreation, dillOutputPath: dillOutputPath, @@ -352,7 +352,7 @@ ResidentRunner runner; if (enableHotReload) { - runner = new HotRunner( + runner = HotRunner( <FlutterDevice>[flutterDevice], target: target, debuggingOptions: options, @@ -365,7 +365,7 @@ hostIsIde: true, ); } else { - runner = new ColdRunner( + runner = ColdRunner( <FlutterDevice>[flutterDevice], target: target, debuggingOptions: options, @@ -395,7 +395,7 @@ String projectDirectory, bool enableHotReload, Directory cwd) async { - final AppInstance app = new AppInstance(_getNewAppId(), + final AppInstance app = AppInstance(_getNewAppId(), runner: runner, logToStdout: daemon.logToStdout); _apps.add(app); _sendAppEvent(app, 'start', <String, dynamic>{ @@ -407,7 +407,7 @@ Completer<DebugConnectionInfo> connectionInfoCompleter; if (runner.debuggingOptions.debuggingEnabled) { - connectionInfoCompleter = new Completer<DebugConnectionInfo>(); + connectionInfoCompleter = Completer<DebugConnectionInfo>(); // We don't want to wait for this future to complete and callbacks won't fail. // As it just writes to stdout. connectionInfoCompleter.future.then<Null>((DebugConnectionInfo info) { // ignore: unawaited_futures @@ -420,7 +420,7 @@ _sendAppEvent(app, 'debugPort', params); }); } - final Completer<void> appStartedCompleter = new Completer<void>(); + final Completer<void> appStartedCompleter = Completer<void>(); // We don't want to wait for this future to complete and callbacks won't fail. // As it just writes to stdout. appStartedCompleter.future.timeout(const Duration(minutes: 1), onTimeout: () { // ignore: unawaited_futures @@ -565,10 +565,10 @@ registerHandler('forward', forward); registerHandler('unforward', unforward); - addDeviceDiscoverer(new AndroidDevices()); - addDeviceDiscoverer(new IOSDevices()); - addDeviceDiscoverer(new IOSSimulators()); - addDeviceDiscoverer(new FlutterTesterDevices()); + addDeviceDiscoverer(AndroidDevices()); + addDeviceDiscoverer(IOSDevices()); + addDeviceDiscoverer(IOSSimulators()); + addDeviceDiscoverer(FlutterTesterDevices()); } void addDeviceDiscoverer(PollingDeviceDiscovery discoverer) { @@ -596,7 +596,7 @@ discoverer.onRemoved.listen(_onDeviceEvent('device.removed')); } - Future<Null> _serializeDeviceEvents = new Future<Null>.value(); + Future<Null> _serializeDeviceEvents = Future<Null>.value(); _DeviceEventHandler _onDeviceEvent(String eventName) { return (Device device) { @@ -620,14 +620,14 @@ Future<Null> enable(Map<String, dynamic> args) { for (PollingDeviceDiscovery discoverer in _discoverers) discoverer.startPolling(); - return new Future<Null>.value(); + return Future<Null>.value(); } /// Disable device events. Future<Null> disable(Map<String, dynamic> args) { for (PollingDeviceDiscovery discoverer in _discoverers) discoverer.stopPolling(); - return new Future<Null>.value(); + return Future<Null>.value(); } /// Forward a host port to a device port. @@ -655,7 +655,7 @@ if (device == null) throw "device '$deviceId' not found"; - return device.portForwarder.unforward(new ForwardedPort(hostPort, devicePort)); + return device.portForwarder.unforward(ForwardedPort(hostPort, devicePort)); } @override @@ -739,13 +739,13 @@ } class NotifyingLogger extends Logger { - final StreamController<LogMessage> _messageController = new StreamController<LogMessage>.broadcast(); + final StreamController<LogMessage> _messageController = StreamController<LogMessage>.broadcast(); Stream<LogMessage> get onMessage => _messageController.stream; @override void printError(String message, { StackTrace stackTrace, bool emphasis = false }) { - _messageController.add(new LogMessage('error', message, stackTrace)); + _messageController.add(LogMessage('error', message, stackTrace)); } @override @@ -753,7 +753,7 @@ String message, { bool emphasis = false, bool newline = true, String ansiAlternative, int indent } ) { - _messageController.add(new LogMessage('status', message)); + _messageController.add(LogMessage('status', message)); } @override @@ -769,7 +769,7 @@ int progressIndicatorPadding = kDefaultStatusPadding, }) { printStatus(message); - return new Status(); + return Status(); } void dispose() { @@ -799,7 +799,7 @@ } Future<T> _runInZone<T>(AppDomain domain, dynamic method()) { - _logger ??= new _AppRunLogger(domain, this, parent: logToStdout ? logger : null); + _logger ??= _AppRunLogger(domain, this, parent: logToStdout ? logger : null); return context.run<T>( body: method, @@ -812,7 +812,7 @@ /// This domain responds to methods like [getEmulators] and [launch]. class EmulatorDomain extends Domain { - EmulatorManager emulators = new EmulatorManager(); + EmulatorManager emulators = EmulatorManager(); EmulatorDomain(Daemon daemon) : super(daemon, 'emulator') { registerHandler('getEmulators', getEmulators); @@ -924,7 +924,7 @@ 'message': message, }); - _status = new Status(onFinish: () { + _status = Status(onFinish: () { _status = null; _sendProgressEvent(<String, dynamic>{ 'id': id.toString(),
diff --git a/packages/flutter_tools/lib/src/commands/doctor.dart b/packages/flutter_tools/lib/src/commands/doctor.dart index 0dd0b80..4010476 100644 --- a/packages/flutter_tools/lib/src/commands/doctor.dart +++ b/packages/flutter_tools/lib/src/commands/doctor.dart
@@ -27,6 +27,6 @@ @override Future<FlutterCommandResult> runCommand() async { final bool success = await doctor.diagnose(androidLicenses: argResults['android-licenses'], verbose: verbose); - return new FlutterCommandResult(success ? ExitStatus.success : ExitStatus.warning); + return FlutterCommandResult(success ? ExitStatus.success : ExitStatus.warning); } }
diff --git a/packages/flutter_tools/lib/src/commands/drive.dart b/packages/flutter_tools/lib/src/commands/drive.dart index 0d7b529..61f8d11 100644 --- a/packages/flutter_tools/lib/src/commands/drive.dart +++ b/packages/flutter_tools/lib/src/commands/drive.dart
@@ -254,7 +254,7 @@ package, mainPath: mainPath, route: command.route, - debuggingOptions: new DebuggingOptions.enabled( + debuggingOptions: DebuggingOptions.enabled( command.getBuildInfo(), startPaused: true, observatoryPort: command.observatoryPort,
diff --git a/packages/flutter_tools/lib/src/commands/fuchsia_reload.dart b/packages/flutter_tools/lib/src/commands/fuchsia_reload.dart index 317960e..10ed98a 100644 --- a/packages/flutter_tools/lib/src/commands/fuchsia_reload.dart +++ b/packages/flutter_tools/lib/src/commands/fuchsia_reload.dart
@@ -128,16 +128,16 @@ final List<Uri> observatoryUris = fullAddresses.map( (String a) => Uri.parse('http://$a') ).toList(); - final FuchsiaDevice device = new FuchsiaDevice( + final FuchsiaDevice device = FuchsiaDevice( fullAddresses[0], name: _address); - final FlutterDevice flutterDevice = new FlutterDevice( + final FlutterDevice flutterDevice = FlutterDevice( device, trackWidgetCreation: false, ); flutterDevice.observatoryUris = observatoryUris; - final HotRunner hotRunner = new HotRunner( + final HotRunner hotRunner = HotRunner( <FlutterDevice>[flutterDevice], - debuggingOptions: new DebuggingOptions.enabled(getBuildInfo()), + debuggingOptions: DebuggingOptions.enabled(getBuildInfo()), target: _target, projectRootPath: _fuchsiaProjectPath, packagesFilePath: _dotPackagesPath @@ -150,7 +150,7 @@ } // A cache of VMService connections. - final HashMap<int, VMService> _vmServiceCache = new HashMap<int, VMService>(); + final HashMap<int, VMService> _vmServiceCache = HashMap<int, VMService>(); Future<VMService> _getVMService(int port) async { if (!_vmServiceCache.containsKey(port)) { @@ -217,7 +217,7 @@ final String external = getSizeAsMB(totalExternal); final String tabs = '\t' * tabDepth; final String extraTabs = '\t' * (tabDepth + 1); - final StringBuffer stringBuffer = new StringBuffer( + final StringBuffer stringBuffer = StringBuffer( '$tabs$_bold$embedder at $addr$_reset\n' '${extraTabs}RSS: $maxRSS\n' '${extraTabs}Native allocations: $heapSize\n' @@ -372,7 +372,7 @@ Future<List<int>> _getServicePorts() async { final FuchsiaDeviceCommandRunner runner = - new FuchsiaDeviceCommandRunner(_address, _buildDir); + FuchsiaDeviceCommandRunner(_address, _buildDir); final List<String> lsOutput = await runner.run('ls /tmp/dart.services'); final List<int> ports = <int>[]; if (lsOutput != null) { @@ -427,7 +427,7 @@ if (localPort == 0) { printStatus( '_PortForwarder failed to find a local port for $address:$remotePort'); - return new _PortForwarder._(null, 0, 0, null, null); + return _PortForwarder._(null, 0, 0, null, null); } const String dummyRemoteCommand = 'date'; final List<String> command = <String>[ @@ -444,7 +444,7 @@ printTrace("'${command.join(' ')}' exited with exit code $c"); }); printTrace('Set up forwarding from $localPort to $address:$remotePort'); - return new _PortForwarder._(address, remotePort, localPort, process, sshConfig); + return _PortForwarder._(address, remotePort, localPort, process, sshConfig); } Future<Null> stop() async {
diff --git a/packages/flutter_tools/lib/src/commands/ide_config.dart b/packages/flutter_tools/lib/src/commands/ide_config.dart index 1123cbd..415555c 100644 --- a/packages/flutter_tools/lib/src/commands/ide_config.dart +++ b/packages/flutter_tools/lib/src/commands/ide_config.dart
@@ -121,7 +121,7 @@ return; } - final Set<String> manifest = new Set<String>(); + final Set<String> manifest = Set<String>(); final List<FileSystemEntity> flutterFiles = _flutterRoot.listSync(recursive: true); for (FileSystemEntity entity in flutterFiles) { final String relativePath = fs.path.relative(entity.path, from: _flutterRoot.absolute.path); @@ -139,7 +139,7 @@ } // Skip files we aren't interested in. - final RegExp _trackedIdeaFileRegExp = new RegExp( + final RegExp _trackedIdeaFileRegExp = RegExp( r'(\.name|modules.xml|vcs.xml)$', ); final bool isATrackedIdeaFile = _hasDirectoryInPath(srcFile, '.idea') && @@ -253,7 +253,7 @@ } int _renderTemplate(String templateName, String dirPath, Map<String, dynamic> context) { - final Template template = new Template(_templateDirectory, _templateDirectory); + final Template template = Template(_templateDirectory, _templateDirectory); return template.render( fs.directory(dirPath), context,
diff --git a/packages/flutter_tools/lib/src/commands/logs.dart b/packages/flutter_tools/lib/src/commands/logs.dart index a16b23f..56212ad 100644 --- a/packages/flutter_tools/lib/src/commands/logs.dart +++ b/packages/flutter_tools/lib/src/commands/logs.dart
@@ -47,7 +47,7 @@ printStatus('Showing $logReader logs:'); - final Completer<int> exitCompleter = new Completer<int>(); + final Completer<int> exitCompleter = Completer<int>(); // Start reading. final StreamSubscription<String> subscription = logReader.logLines.listen(
diff --git a/packages/flutter_tools/lib/src/commands/materialize.dart b/packages/flutter_tools/lib/src/commands/materialize.dart index 0c0f27d..c785ea4 100644 --- a/packages/flutter_tools/lib/src/commands/materialize.dart +++ b/packages/flutter_tools/lib/src/commands/materialize.dart
@@ -10,8 +10,8 @@ class MaterializeCommand extends FlutterCommand { MaterializeCommand() { - addSubcommand(new MaterializeAndroidCommand()); - addSubcommand(new MaterializeIosCommand()); + addSubcommand(MaterializeAndroidCommand()); + addSubcommand(MaterializeIosCommand()); } @override @@ -45,7 +45,7 @@ await super.validateCommand(); _project = await FlutterProject.current(); if (!_project.isModule) - throw new ToolExit("Only projects created using 'flutter create -t module' can be materialized."); + throw ToolExit("Only projects created using 'flutter create -t module' can be materialized."); } }
diff --git a/packages/flutter_tools/lib/src/commands/packages.dart b/packages/flutter_tools/lib/src/commands/packages.dart index b78e25b..e010a35 100644 --- a/packages/flutter_tools/lib/src/commands/packages.dart +++ b/packages/flutter_tools/lib/src/commands/packages.dart
@@ -12,10 +12,10 @@ class PackagesCommand extends FlutterCommand { PackagesCommand() { - addSubcommand(new PackagesGetCommand('get', false)); - addSubcommand(new PackagesGetCommand('upgrade', true)); - addSubcommand(new PackagesTestCommand()); - addSubcommand(new PackagesPassthroughCommand()); + addSubcommand(PackagesGetCommand('get', false)); + addSubcommand(PackagesGetCommand('upgrade', true)); + addSubcommand(PackagesTestCommand()); + addSubcommand(PackagesPassthroughCommand()); } @override
diff --git a/packages/flutter_tools/lib/src/commands/run.dart b/packages/flutter_tools/lib/src/commands/run.dart index 9f6891e..3443010 100644 --- a/packages/flutter_tools/lib/src/commands/run.dart +++ b/packages/flutter_tools/lib/src/commands/run.dart
@@ -244,9 +244,9 @@ DebuggingOptions _createDebuggingOptions() { final BuildInfo buildInfo = getBuildInfo(); if (buildInfo.isRelease) { - return new DebuggingOptions.disabled(buildInfo); + return DebuggingOptions.disabled(buildInfo); } else { - return new DebuggingOptions.enabled( + return DebuggingOptions.enabled( buildInfo, startPaused: argResults['start-paused'], useTestFonts: argResults['use-test-fonts'], @@ -269,8 +269,8 @@ if (argResults['machine']) { if (devices.length > 1) throwToolExit('--machine does not support -d all.'); - final Daemon daemon = new Daemon(stdinCommandStream, stdoutCommandResponse, - notifyingLogger: new NotifyingLogger(), logToStdout: true); + final Daemon daemon = Daemon(stdinCommandStream, stdoutCommandResponse, + notifyingLogger: NotifyingLogger(), logToStdout: true); AppInstance app; try { final String applicationBinaryPath = argResults['use-application-binary']; @@ -293,7 +293,7 @@ final int result = await app.runner.waitForAppToFinish(); if (result != 0) throwToolExit(null, exitCode: result); - return new FlutterCommandResult( + return FlutterCommandResult( ExitStatus.success, timingLabelParts: <String>['daemon'], endTimeOverride: appStartedTime, @@ -337,7 +337,7 @@ } final List<FlutterDevice> flutterDevices = devices.map((Device device) { - return new FlutterDevice( + return FlutterDevice( device, trackWidgetCreation: argResults['track-widget-creation'], dillOutputPath: argResults['output-dill'], @@ -349,7 +349,7 @@ ResidentRunner runner; final String applicationBinaryPath = argResults['use-application-binary']; if (hotMode) { - runner = new HotRunner( + runner = HotRunner( flutterDevices, target: targetFile, debuggingOptions: _createDebuggingOptions(), @@ -364,7 +364,7 @@ ipv6: ipv6, ); } else { - runner = new ColdRunner( + runner = ColdRunner( flutterDevices, target: targetFile, debuggingOptions: _createDebuggingOptions(), @@ -382,7 +382,7 @@ // need to know about analytics. // // Do not add more operations to the future. - final Completer<void> appStartedTimeRecorder = new Completer<void>.sync(); + final Completer<void> appStartedTimeRecorder = Completer<void>.sync(); // This callback can't throw. appStartedTimeRecorder.future.then( // ignore: unawaited_futures (_) { appStartedTime = clock.now(); } @@ -395,7 +395,7 @@ ); if (result != 0) throwToolExit(null, exitCode: result); - return new FlutterCommandResult( + return FlutterCommandResult( ExitStatus.success, timingLabelParts: <String>[ hotMode ? 'hot' : 'cold',
diff --git a/packages/flutter_tools/lib/src/commands/screenshot.dart b/packages/flutter_tools/lib/src/commands/screenshot.dart index c4233d7..be39b24 100644 --- a/packages/flutter_tools/lib/src/commands/screenshot.dart +++ b/packages/flutter_tools/lib/src/commands/screenshot.dart
@@ -122,7 +122,7 @@ } Future<Map<String, dynamic>> _invokeVmServiceRpc(String method) async { - final Uri observatoryUri = new Uri(scheme: 'http', host: '127.0.0.1', + final Uri observatoryUri = Uri(scheme: 'http', host: '127.0.0.1', port: int.parse(argResults[_kObservatoryPort])); final VMService vmService = await VMService.connect(observatoryUri); return await vmService.vm.invokeRpcRaw(method);
diff --git a/packages/flutter_tools/lib/src/commands/test.dart b/packages/flutter_tools/lib/src/commands/test.dart index 170f7e8..4fc19e9 100644 --- a/packages/flutter_tools/lib/src/commands/test.dart +++ b/packages/flutter_tools/lib/src/commands/test.dart
@@ -140,7 +140,7 @@ CoverageCollector collector; if (argResults['coverage'] || argResults['merge-coverage']) { - collector = new CoverageCollector(); + collector = CoverageCollector(); } final bool machine = argResults['machine']; @@ -152,7 +152,7 @@ if (collector != null) { watcher = collector; } else if (machine) { - watcher = new EventPrinter(); + watcher = EventPrinter(); } Cache.releaseLockEarly();
diff --git a/packages/flutter_tools/lib/src/commands/trace.dart b/packages/flutter_tools/lib/src/commands/trace.dart index 3999a5b..0b5d44e 100644 --- a/packages/flutter_tools/lib/src/commands/trace.dart +++ b/packages/flutter_tools/lib/src/commands/trace.dart
@@ -64,7 +64,7 @@ Duration duration; if (argResults.wasParsed('duration')) { try { - duration = new Duration(seconds: int.parse(argResults['duration'])); + duration = Duration(seconds: int.parse(argResults['duration'])); } on FormatException { throwToolExit('Invalid duration passed to --duration; it should be a positive number of seconds.'); } @@ -88,7 +88,7 @@ if (start) await tracing.startTracing(); - await new Future<Null>.delayed(duration); + await Future<Null>.delayed(duration); if (stop) await _stopTracing(tracing); }
diff --git a/packages/flutter_tools/lib/src/commands/update_packages.dart b/packages/flutter_tools/lib/src/commands/update_packages.dart index 6f19cc2..c6e988a 100644 --- a/packages/flutter_tools/lib/src/commands/update_packages.dart +++ b/packages/flutter_tools/lib/src/commands/update_packages.dart
@@ -112,7 +112,7 @@ // package that is in the goldens repository. We need to make sure that the goldens // repository is cloned locally before we verify or update pubspecs. printStatus('Cloning goldens repository...'); - final GoldensClient goldensClient = new GoldensClient(); + final GoldensClient goldensClient = GoldensClient(); await goldensClient.prepare(); if (isVerifyOnly) { @@ -121,7 +121,7 @@ for (Directory directory in packages) { PubspecYaml pubspec; try { - pubspec = new PubspecYaml(directory); + pubspec = PubspecYaml(directory); } on String catch (message) { throwToolExit(message); } @@ -176,12 +176,12 @@ // First, collect up the explicit dependencies: final List<PubspecYaml> pubspecs = <PubspecYaml>[]; final Map<String, PubspecDependency> dependencies = <String, PubspecDependency>{}; - final Set<String> specialDependencies = new Set<String>(); + final Set<String> specialDependencies = Set<String>(); for (Directory directory in packages) { // these are all the directories with pubspec.yamls we care about printTrace('Reading pubspec.yaml from: ${directory.path}'); PubspecYaml pubspec; try { - pubspec = new PubspecYaml(directory); // this parses the pubspec.yaml + pubspec = PubspecYaml(directory); // this parses the pubspec.yaml } on String catch (message) { throwToolExit(message); } @@ -222,7 +222,7 @@ // going to create a fake package and then run "pub upgrade" on it. The // pub tool will attempt to bring these dependencies up to the most recent // possible versions while honoring all their constraints. - final PubDependencyTree tree = new PubDependencyTree(); // object to collect results + final PubDependencyTree tree = PubDependencyTree(); // object to collect results final Directory tempDir = fs.systemTempDirectory.createTempSync('flutter_update_packages.'); try { final File fakePackage = _pubspecFor(tempDir); @@ -255,7 +255,7 @@ for (PubspecDependency dependency in pubspec.dependencies) { if (dependency.kind == DependencyKind.normal) { tree._versions[package] = version; - tree._dependencyTree[package] ??= new Set<String>(); + tree._dependencyTree[package] ??= Set<String>(); tree._dependencyTree[package].add(dependency.name); } } @@ -290,7 +290,7 @@ // the regular code path. } - final Stopwatch timer = new Stopwatch()..start(); + final Stopwatch timer = Stopwatch()..start(); int count = 0; for (Directory dir in packages) { @@ -314,11 +314,11 @@ if (!tree.contains(to)) throwToolExit('Package $to not found in the dependency tree.'); - final Queue<_DependencyLink> traversalQueue = new Queue<_DependencyLink>(); - final Set<String> visited = new Set<String>(); + final Queue<_DependencyLink> traversalQueue = Queue<_DependencyLink>(); + final Set<String> visited = Set<String>(); final List<_DependencyLink> paths = <_DependencyLink>[]; - traversalQueue.addFirst(new _DependencyLink(from: null, to: from)); + traversalQueue.addFirst(_DependencyLink(from: null, to: from)); while (traversalQueue.isNotEmpty) { final _DependencyLink link = traversalQueue.removeLast(); if (link.to == to) @@ -327,13 +327,13 @@ visited.add(link.from.to); for (String dependency in tree._dependencyTree[link.to]) { if (!visited.contains(dependency)) { - traversalQueue.addFirst(new _DependencyLink(from: link, to: dependency)); + traversalQueue.addFirst(_DependencyLink(from: link, to: dependency)); } } } for (_DependencyLink path in paths) { - final StringBuffer buf = new StringBuffer(); + final StringBuffer buf = StringBuffer(); while (path != null) { buf.write('${path.to}'); path = path.from; @@ -490,7 +490,7 @@ } else { // This line isn't a section header, and we're not in a section we care about. // We just stick the line into the output unmodified. - result.add(new PubspecLine(line)); + result.add(PubspecLine(line)); } } else { // We're in a section we care about. Try to parse out the dependency: @@ -531,7 +531,7 @@ // We're in a section we care about but got a line we didn't // recognize. Maybe it's a comment or a blank line or something. // Just pass it through. - result.add(new PubspecLine(line)); + result.add(PubspecLine(line)); } } } else { @@ -555,15 +555,15 @@ // Remove the PubspecDependency entry we had for it and replace it // with a PubspecLine entry, and add such an entry for this line. result.removeLast(); - result.add(new PubspecLine(lastDependency.line)); - result.add(new PubspecLine(line)); + result.add(PubspecLine(lastDependency.line)); + result.add(PubspecLine(line)); } // We're done with this special dependency, so reset back to null so // we'll go in the top section next time instead. lastDependency = null; } } - return new PubspecYaml._(file, packageName, packageVersion, result, checksum ?? new PubspecChecksum(null, '')); + return PubspecYaml._(file, packageName, packageVersion, result, checksum ?? PubspecChecksum(null, '')); } /// This returns all the explicit dependencies that this pubspec.yaml lists under dependencies. @@ -594,8 +594,8 @@ void apply(PubDependencyTree versions, Set<String> specialDependencies) { assert(versions != null); final List<String> output = <String>[]; // the string data to output to the file, line by line - final Set<String> directDependencies = new Set<String>(); // packages this pubspec directly depends on (i.e. not transitive) - final Set<String> devDependencies = new Set<String>(); + final Set<String> directDependencies = Set<String>(); // packages this pubspec directly depends on (i.e. not transitive) + final Set<String> devDependencies = Set<String>(); Section section = Section.other; // the section we're currently handling // the line number where we're going to insert the transitive dependencies. @@ -693,19 +693,19 @@ final List<String> transitiveDevDependencyOutput = <String>[]; // Which dependencies we need to handle for the transitive and dev dependency sections. - final Set<String> transitiveDependencies = new Set<String>(); - final Set<String> transitiveDevDependencies = new Set<String>(); + final Set<String> transitiveDependencies = Set<String>(); + final Set<String> transitiveDevDependencies = Set<String>(); // Merge the lists of dependencies we've seen in this file from dependencies, dev dependencies, // and the dependencies we know this file mentions that are already pinned // (and which didn't get special processing above). - final Set<String> implied = new Set<String>.from(directDependencies) + final Set<String> implied = Set<String>.from(directDependencies) ..addAll(specialDependencies) ..addAll(devDependencies); // Create a new set to hold the list of packages we've already processed, so // that we don't redundantly process them multiple times. - final Set<String> done = new Set<String>(); + final Set<String> done = Set<String>(); for (String package in directDependencies) transitiveDependencies.addAll(versions.getTransitiveDependenciesFor(package, seen: done, exclude: implied)); for (String package in devDependencies) @@ -722,7 +722,7 @@ transitiveDevDependencyOutput.add(' $package: ${versions.versionFor(package)} $kTransitiveMagicString'); // Build a sorted list of all dependencies for the checksum. - final Set<String> checksumDependencies = new Set<String>() + final Set<String> checksumDependencies = Set<String>() ..addAll(directDependencies) ..addAll(devDependencies) ..addAll(transitiveDependenciesAsList) @@ -755,7 +755,7 @@ // Output the result to the pubspec.yaml file, skipping leading and // duplicate blank lines and removing trailing spaces. - final StringBuffer contents = new StringBuffer(); + final StringBuffer contents = StringBuffer(); bool hadBlankLine = true; for (String line in output) { line = line.trimRight(); @@ -799,8 +799,8 @@ static PubspecChecksum parse(String line) { final List<String> tokens = line.split(kDependencyChecksum); if (tokens.length != 2) - return new PubspecChecksum(null, line); - return new PubspecChecksum(tokens.last.trim(), line); + return PubspecChecksum(null, line); + return PubspecChecksum(tokens.last.trim(), line); } } @@ -852,16 +852,16 @@ final String value = parts.last.trim(); switch (sectionName) { case 'dependencies': - return new PubspecHeader(line, Section.dependencies); + return PubspecHeader(line, Section.dependencies); case 'dev_dependencies': - return new PubspecHeader(line, Section.devDependencies); + return PubspecHeader(line, Section.devDependencies); case 'dependency_overrides': - return new PubspecHeader(line, Section.dependencyOverrides); + return PubspecHeader(line, Section.dependencyOverrides); case 'name': case 'version': - return new PubspecHeader(line, Section.header, name: sectionName, value: value); + return PubspecHeader(line, Section.header, name: sectionName, value: value); default: - return new PubspecHeader(line, Section.other); + return PubspecHeader(line, Section.other); } } @@ -930,7 +930,7 @@ if (colonIndex != -1) { version = line.substring(colonIndex + 1, hashIndex != -1 ? hashIndex : line.length).trim(); } - return new PubspecDependency(line, package, suffix, isTransitive: isTransitive, version: version, kind: stripped.isEmpty ? DependencyKind.unknown : DependencyKind.normal, sourcePath: filename); + return PubspecDependency(line, package, suffix, isTransitive: isTransitive, version: version, kind: stripped.isEmpty ? DependencyKind.unknown : DependencyKind.normal, sourcePath: filename); } final String name; // the package name @@ -1066,8 +1066,8 @@ /// Generates the source of a fake pubspec.yaml file given a list of /// dependencies. String _generateFakePubspec(Iterable<PubspecDependency> dependencies) { - final StringBuffer result = new StringBuffer(); - final StringBuffer overrides = new StringBuffer(); + final StringBuffer result = StringBuffer(); + final StringBuffer overrides = StringBuffer(); result.writeln('name: flutter_update_packages'); result.writeln('dependencies:'); overrides.writeln('dependency_overrides:'); @@ -1145,7 +1145,7 @@ dependencies = const <String>[]; } _versions[package] = version; - _dependencyTree[package] = new Set<String>.from(dependencies); + _dependencyTree[package] = Set<String>.from(dependencies); } } return null;
diff --git a/packages/flutter_tools/lib/src/commands/upgrade.dart b/packages/flutter_tools/lib/src/commands/upgrade.dart index d6a1e82..eefa606 100644 --- a/packages/flutter_tools/lib/src/commands/upgrade.dart +++ b/packages/flutter_tools/lib/src/commands/upgrade.dart
@@ -88,12 +88,12 @@ } // dev/benchmarks/complex_layout/lib/main.dart | 24 +- - static final RegExp _gitDiffRegex = new RegExp(r' (\S+)\s+\|\s+\d+ [+-]+'); + static final RegExp _gitDiffRegex = RegExp(r' (\S+)\s+\|\s+\d+ [+-]+'); // rename {packages/flutter/doc => dev/docs}/styles.html (92%) // delete mode 100644 doc/index.html // create mode 100644 examples/flutter_gallery/lib/gallery/demo.dart - static final RegExp _gitChangedRegex = new RegExp(r' (rename|delete mode|create mode) .+'); + static final RegExp _gitChangedRegex = RegExp(r' (rename|delete mode|create mode) .+'); @visibleForTesting static bool matchesGitLine(String line) {