Unverified Commit 46c99809 authored by Jenn Magder's avatar Jenn Magder Committed by GitHub

Migrate flutter_tools file_system to null safety (#78896)

parent 2415eca4
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// @dart = 2.8
import 'package:file/file.dart'; import 'package:file/file.dart';
import 'package:file/local.dart' as local_fs; import 'package:file/local.dart' as local_fs;
import 'package:meta/meta.dart'; import 'package:meta/meta.dart';
...@@ -31,8 +29,8 @@ class FileNotFoundException implements IOException { ...@@ -31,8 +29,8 @@ class FileNotFoundException implements IOException {
/// Various convenience file system methods. /// Various convenience file system methods.
class FileSystemUtils { class FileSystemUtils {
FileSystemUtils({ FileSystemUtils({
@required FileSystem fileSystem, required FileSystem fileSystem,
@required Platform platform, required Platform platform,
}) : _fileSystem = fileSystem, }) : _fileSystem = fileSystem,
_platform = platform; _platform = platform;
...@@ -86,8 +84,8 @@ class FileSystemUtils { ...@@ -86,8 +84,8 @@ class FileSystemUtils {
/// ///
/// Returns false, if [entity] exists, but [referenceFile] does not. /// Returns false, if [entity] exists, but [referenceFile] does not.
bool isOlderThanReference({ bool isOlderThanReference({
@required FileSystemEntity entity, required FileSystemEntity entity,
@required File referenceFile, required File referenceFile,
}) { }) {
if (!entity.existsSync()) { if (!entity.existsSync()) {
return true; return true;
...@@ -97,8 +95,8 @@ class FileSystemUtils { ...@@ -97,8 +95,8 @@ class FileSystemUtils {
} }
/// Return the absolute path of the user's home directory. /// Return the absolute path of the user's home directory.
String get homeDirPath { String? get homeDirPath {
String path = _platform.isWindows String? path = _platform.isWindows
? _platform.environment['USERPROFILE'] ? _platform.environment['USERPROFILE']
: _platform.environment['HOME']; : _platform.environment['HOME'];
if (path != null) { if (path != null) {
...@@ -123,8 +121,8 @@ String getDisplayPath(String fullPath, FileSystem fileSystem) { ...@@ -123,8 +121,8 @@ String getDisplayPath(String fullPath, FileSystem fileSystem) {
void copyDirectory( void copyDirectory(
Directory srcDir, Directory srcDir,
Directory destDir, { Directory destDir, {
bool Function(File srcFile, File destFile) shouldCopyFile, bool Function(File srcFile, File destFile)? shouldCopyFile,
void Function(File srcFile, File destFile) onFileCopied, void Function(File srcFile, File destFile)? onFileCopied,
}) { }) {
if (!srcDir.existsSync()) { if (!srcDir.existsSync()) {
throw Exception('Source directory "${srcDir.path}" does not exist, nothing to copy'); throw Exception('Source directory "${srcDir.path}" does not exist, nothing to copy');
...@@ -167,13 +165,13 @@ class LocalFileSystem extends local_fs.LocalFileSystem { ...@@ -167,13 +165,13 @@ class LocalFileSystem extends local_fs.LocalFileSystem {
@visibleForTesting @visibleForTesting
LocalFileSystem.test({ LocalFileSystem.test({
@required Signals signals, required Signals signals,
List<ProcessSignal> fatalSignals = Signals.defaultExitSignals, List<ProcessSignal> fatalSignals = Signals.defaultExitSignals,
}) : this(signals, fatalSignals, null); }) : this(signals, fatalSignals, null);
Directory _systemTemp; Directory? _systemTemp;
final Map<ProcessSignal, Object> _signalTokens = <ProcessSignal, Object>{}; final Map<ProcessSignal, Object> _signalTokens = <ProcessSignal, Object>{};
final ShutdownHooks _shutdownHooks; final ShutdownHooks? _shutdownHooks;
Future<void> dispose() async { Future<void> dispose() async {
_tryToDeleteTemp(); _tryToDeleteTemp();
...@@ -189,7 +187,7 @@ class LocalFileSystem extends local_fs.LocalFileSystem { ...@@ -189,7 +187,7 @@ class LocalFileSystem extends local_fs.LocalFileSystem {
void _tryToDeleteTemp() { void _tryToDeleteTemp() {
try { try {
if (_systemTemp?.existsSync() ?? false) { if (_systemTemp?.existsSync() ?? false) {
_systemTemp.deleteSync(recursive: true); _systemTemp?.deleteSync(recursive: true);
} }
} on FileSystemException { } on FileSystemException {
// ignore. // ignore.
...@@ -225,6 +223,6 @@ class LocalFileSystem extends local_fs.LocalFileSystem { ...@@ -225,6 +223,6 @@ class LocalFileSystem extends local_fs.LocalFileSystem {
_tryToDeleteTemp, _tryToDeleteTemp,
); );
} }
return _systemTemp; return _systemTemp!;
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment