Skip to content

Commit a57b9ad

Browse files
keertiptvolkert
keertip
authored and
tvolkert
committed
Remove upper case constants (flutter#86)
1 parent 0af5602 commit a57b9ad

25 files changed

Lines changed: 282 additions & 277 deletions

‎packages/file/CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
#### 5.0.1
2+
3+
* Remove upper case constants
4+
* Update SDK constraint to 2.0.0-dev.54.0.
5+
16
#### 5.0.0
27

38
* Moved `testing` library into a dedicated `package:file_testing` so that

‎packages/file/lib/src/backends/chroot/chroot_directory.dart‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class _ChrootDirectory extends _ChrootFileSystemEntity<Directory, io.Directory>
1818
}
1919

2020
@override
21-
FileSystemEntityType get expectedType => FileSystemEntityType.DIRECTORY;
21+
FileSystemEntityType get expectedType => FileSystemEntityType.directory;
2222

2323
@override
2424
io.Directory _rawDelegate(String path) => fileSystem.delegate.directory(path);
@@ -33,7 +33,7 @@ class _ChrootDirectory extends _ChrootFileSystemEntity<Directory, io.Directory>
3333
throw common.notADirectory(path);
3434
}
3535
FileSystemEntityType type = await fileSystem.type(newPath);
36-
if (type != FileSystemEntityType.NOT_FOUND) {
36+
if (type != FileSystemEntityType.notFound) {
3737
if (type != expectedType) {
3838
throw common.notADirectory(newPath);
3939
}
@@ -61,7 +61,7 @@ class _ChrootDirectory extends _ChrootFileSystemEntity<Directory, io.Directory>
6161
throw common.notADirectory(path);
6262
}
6363
FileSystemEntityType type = fileSystem.typeSync(newPath);
64-
if (type != FileSystemEntityType.NOT_FOUND) {
64+
if (type != FileSystemEntityType.notFound) {
6565
if (type != expectedType) {
6666
throw common.notADirectory(newPath);
6767
}
@@ -98,11 +98,11 @@ class _ChrootDirectory extends _ChrootFileSystemEntity<Directory, io.Directory>
9898
Future<Directory> create({bool recursive: false}) async {
9999
if (_isLink) {
100100
switch (await fileSystem.type(path)) {
101-
case FileSystemEntityType.NOT_FOUND:
101+
case FileSystemEntityType.notFound:
102102
throw common.noSuchFileOrDirectory(path);
103-
case FileSystemEntityType.FILE:
103+
case FileSystemEntityType.file:
104104
throw common.fileExists(path);
105-
case FileSystemEntityType.DIRECTORY:
105+
case FileSystemEntityType.directory:
106106
// Nothing to do.
107107
return this;
108108
default:
@@ -117,11 +117,11 @@ class _ChrootDirectory extends _ChrootFileSystemEntity<Directory, io.Directory>
117117
void createSync({bool recursive: false}) {
118118
if (_isLink) {
119119
switch (fileSystem.typeSync(path)) {
120-
case FileSystemEntityType.NOT_FOUND:
120+
case FileSystemEntityType.notFound:
121121
throw common.noSuchFileOrDirectory(path);
122-
case FileSystemEntityType.FILE:
122+
case FileSystemEntityType.file:
123123
throw common.fileExists(path);
124-
case FileSystemEntityType.DIRECTORY:
124+
case FileSystemEntityType.directory:
125125
// Nothing to do.
126126
return;
127127
default:

‎packages/file/lib/src/backends/chroot/chroot_file.dart‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class _ChrootFile extends _ChrootFileSystemEntity<File, io.File>
2020
}
2121

2222
@override
23-
FileSystemEntityType get expectedType => FileSystemEntityType.FILE;
23+
FileSystemEntityType get expectedType => FileSystemEntityType.file;
2424

2525
@override
2626
io.File _rawDelegate(String path) => fileSystem.delegate.file(path);
@@ -30,21 +30,21 @@ class _ChrootFile extends _ChrootFileSystemEntity<File, io.File>
3030
_SetupCallback setUp = () async {};
3131

3232
if (await fileSystem.type(newPath, followLinks: false) ==
33-
FileSystemEntityType.LINK) {
33+
FileSystemEntityType.link) {
3434
// The delegate file system will ensure that the link target references
3535
// an actual file before allowing the rename, but we want the link target
3636
// to be resolved with respect to this file system. Thus, we perform that
3737
// validation here instead.
3838
switch (await fileSystem.type(newPath)) {
39-
case FileSystemEntityType.FILE:
40-
case FileSystemEntityType.NOT_FOUND:
39+
case FileSystemEntityType.file:
40+
case FileSystemEntityType.notFound:
4141
// Validation passed; delete the link to keep the delegate file
4242
// system's validation from getting in the way.
4343
setUp = () async {
4444
await fileSystem.link(newPath).delete();
4545
};
4646
break;
47-
case FileSystemEntityType.DIRECTORY:
47+
case FileSystemEntityType.directory:
4848
throw common.isADirectory(newPath);
4949
default:
5050
// Should never happen.
@@ -54,11 +54,11 @@ class _ChrootFile extends _ChrootFileSystemEntity<File, io.File>
5454

5555
if (_isLink) {
5656
switch (await fileSystem.type(path)) {
57-
case FileSystemEntityType.NOT_FOUND:
57+
case FileSystemEntityType.notFound:
5858
throw common.noSuchFileOrDirectory(path);
59-
case FileSystemEntityType.DIRECTORY:
59+
case FileSystemEntityType.directory:
6060
throw common.isADirectory(path);
61-
case FileSystemEntityType.FILE:
61+
case FileSystemEntityType.file:
6262
await setUp();
6363
await fileSystem.delegate
6464
.link(fileSystem._real(path))
@@ -79,21 +79,21 @@ class _ChrootFile extends _ChrootFileSystemEntity<File, io.File>
7979
_SetupCallback setUp = () {};
8080

8181
if (fileSystem.typeSync(newPath, followLinks: false) ==
82-
FileSystemEntityType.LINK) {
82+
FileSystemEntityType.link) {
8383
// The delegate file system will ensure that the link target references
8484
// an actual file before allowing the rename, but we want the link target
8585
// to be resolved with respect to this file system. Thus, we perform that
8686
// validation here instead.
8787
switch (fileSystem.typeSync(newPath)) {
88-
case FileSystemEntityType.FILE:
89-
case FileSystemEntityType.NOT_FOUND:
88+
case FileSystemEntityType.file:
89+
case FileSystemEntityType.notFound:
9090
// Validation passed; delete the link to keep the delegate file
9191
// system's validation from getting in the way.
9292
setUp = () {
9393
fileSystem.link(newPath).deleteSync();
9494
};
9595
break;
96-
case FileSystemEntityType.DIRECTORY:
96+
case FileSystemEntityType.directory:
9797
throw common.isADirectory(newPath);
9898
default:
9999
// Should never happen.
@@ -103,11 +103,11 @@ class _ChrootFile extends _ChrootFileSystemEntity<File, io.File>
103103

104104
if (_isLink) {
105105
switch (fileSystem.typeSync(path)) {
106-
case FileSystemEntityType.NOT_FOUND:
106+
case FileSystemEntityType.notFound:
107107
throw common.noSuchFileOrDirectory(path);
108-
case FileSystemEntityType.DIRECTORY:
108+
case FileSystemEntityType.directory:
109109
throw common.isADirectory(path);
110-
case FileSystemEntityType.FILE:
110+
case FileSystemEntityType.file:
111111
setUp();
112112
fileSystem.delegate
113113
.link(fileSystem._real(path))
@@ -138,17 +138,17 @@ class _ChrootFile extends _ChrootFileSystemEntity<File, io.File>
138138
Future<FileSystemEntityType> type() =>
139139
fileSystem.delegate.type(real(), followLinks: false);
140140

141-
if (await type() == FileSystemEntityType.LINK) {
141+
if (await type() == FileSystemEntityType.link) {
142142
path = fileSystem._resolve(p.basename(path),
143143
from: p.dirname(path), notFound: _NotFoundBehavior.allowAtTail);
144144
switch (await type()) {
145-
case FileSystemEntityType.NOT_FOUND:
145+
case FileSystemEntityType.notFound:
146146
await _rawDelegate(real()).create();
147147
return this;
148-
case FileSystemEntityType.FILE:
148+
case FileSystemEntityType.file:
149149
// Nothing to do.
150150
return this;
151-
case FileSystemEntityType.DIRECTORY:
151+
case FileSystemEntityType.directory:
152152
throw common.isADirectory(path);
153153
default:
154154
throw new AssertionError();
@@ -170,17 +170,17 @@ class _ChrootFile extends _ChrootFileSystemEntity<File, io.File>
170170
FileSystemEntityType type() =>
171171
fileSystem.delegate.typeSync(real(), followLinks: false);
172172

173-
if (type() == FileSystemEntityType.LINK) {
173+
if (type() == FileSystemEntityType.link) {
174174
path = fileSystem._resolve(p.basename(path),
175175
from: p.dirname(path), notFound: _NotFoundBehavior.allowAtTail);
176176
switch (type()) {
177-
case FileSystemEntityType.NOT_FOUND:
177+
case FileSystemEntityType.notFound:
178178
_rawDelegate(real()).createSync();
179179
return;
180-
case FileSystemEntityType.FILE:
180+
case FileSystemEntityType.file:
181181
// Nothing to do.
182182
return;
183-
case FileSystemEntityType.DIRECTORY:
183+
case FileSystemEntityType.directory:
184184
throw common.isADirectory(path);
185185
default:
186186
throw new AssertionError();
@@ -242,12 +242,12 @@ class _ChrootFile extends _ChrootFileSystemEntity<File, io.File>
242242

243243
@override
244244
Future<RandomAccessFile> open({
245-
FileMode mode: FileMode.READ,
245+
FileMode mode: FileMode.read,
246246
}) async =>
247247
getDelegate(followLinks: true).open(mode: mode);
248248

249249
@override
250-
RandomAccessFile openSync({FileMode mode: FileMode.READ}) =>
250+
RandomAccessFile openSync({FileMode mode: FileMode.read}) =>
251251
getDelegate(followLinks: true).openSync(mode: mode);
252252

253253
@override
@@ -256,7 +256,7 @@ class _ChrootFile extends _ChrootFileSystemEntity<File, io.File>
256256

257257
@override
258258
IOSink openWrite({
259-
FileMode mode: FileMode.WRITE,
259+
FileMode mode: FileMode.write,
260260
Encoding encoding: utf8,
261261
}) =>
262262
getDelegate(followLinks: true).openWrite(mode: mode, encoding: encoding);
@@ -288,7 +288,7 @@ class _ChrootFile extends _ChrootFileSystemEntity<File, io.File>
288288
@override
289289
Future<File> writeAsBytes(
290290
List<int> bytes, {
291-
FileMode mode: FileMode.WRITE,
291+
FileMode mode: FileMode.write,
292292
bool flush: false,
293293
}) async =>
294294
wrap(await getDelegate(followLinks: true).writeAsBytes(
@@ -300,7 +300,7 @@ class _ChrootFile extends _ChrootFileSystemEntity<File, io.File>
300300
@override
301301
void writeAsBytesSync(
302302
List<int> bytes, {
303-
FileMode mode: FileMode.WRITE,
303+
FileMode mode: FileMode.write,
304304
bool flush: false,
305305
}) =>
306306
getDelegate(followLinks: true)
@@ -309,7 +309,7 @@ class _ChrootFile extends _ChrootFileSystemEntity<File, io.File>
309309
@override
310310
Future<File> writeAsString(
311311
String contents, {
312-
FileMode mode: FileMode.WRITE,
312+
FileMode mode: FileMode.write,
313313
Encoding encoding: utf8,
314314
bool flush: false,
315315
}) async =>
@@ -323,7 +323,7 @@ class _ChrootFile extends _ChrootFileSystemEntity<File, io.File>
323323
@override
324324
void writeAsStringSync(
325325
String contents, {
326-
FileMode mode: FileMode.WRITE,
326+
FileMode mode: FileMode.write,
327327
Encoding encoding: utf8,
328328
bool flush: false,
329329
}) =>

‎packages/file/lib/src/backends/chroot/chroot_file_system.dart‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@ class ChrootFileSystem extends FileSystem {
111111
value = _resolve(value, notFound: _NotFoundBehavior.throwError);
112112
String realPath = _real(value, resolve: false);
113113
switch (delegate.typeSync(realPath, followLinks: false)) {
114-
case FileSystemEntityType.DIRECTORY:
114+
case FileSystemEntityType.directory:
115115
break;
116-
case FileSystemEntityType.NOT_FOUND:
116+
case FileSystemEntityType.notFound:
117117
throw common.noSuchFileOrDirectory(path);
118118
default:
119119
throw common.notADirectory(path);
@@ -167,7 +167,7 @@ class ChrootFileSystem extends FileSystem {
167167
realPath = _real(path, followLinks: followLinks);
168168
} on FileSystemException {
169169
return new Future<FileSystemEntityType>.value(
170-
FileSystemEntityType.NOT_FOUND);
170+
FileSystemEntityType.notFound);
171171
}
172172
return delegate.type(realPath, followLinks: false);
173173
}
@@ -178,7 +178,7 @@ class ChrootFileSystem extends FileSystem {
178178
try {
179179
realPath = _real(path, followLinks: followLinks);
180180
} on FileSystemException {
181-
return FileSystemEntityType.NOT_FOUND;
181+
return FileSystemEntityType.notFound;
182182
}
183183
return delegate.typeSync(realPath, followLinks: false);
184184
}
@@ -297,16 +297,16 @@ class ChrootFileSystem extends FileSystem {
297297
String realPath = _real(currentPath, resolve: false);
298298

299299
switch (delegate.typeSync(realPath, followLinks: false)) {
300-
case FileSystemEntityType.DIRECTORY:
300+
case FileSystemEntityType.directory:
301301
breadcrumbs.clear();
302302
break;
303-
case FileSystemEntityType.FILE:
303+
case FileSystemEntityType.file:
304304
breadcrumbs.clear();
305305
if (parts.isNotEmpty) {
306306
throw common.notADirectory(currentPath);
307307
}
308308
break;
309-
case FileSystemEntityType.NOT_FOUND:
309+
case FileSystemEntityType.notFound:
310310
String returnEarly() {
311311
ledger.addAll(parts);
312312
return getCurrentPath();
@@ -329,7 +329,7 @@ class ChrootFileSystem extends FileSystem {
329329
throw common.noSuchFileOrDirectory(path);
330330
}
331331
break;
332-
case FileSystemEntityType.LINK:
332+
case FileSystemEntityType.link:
333333
if (parts.isEmpty && !followLinks) {
334334
break;
335335
}
@@ -379,7 +379,7 @@ class _NotFoundFileStat implements FileStat {
379379
DateTime get accessed => null;
380380

381381
@override
382-
FileSystemEntityType get type => FileSystemEntityType.NOT_FOUND;
382+
FileSystemEntityType get type => FileSystemEntityType.notFound;
383383

384384
@override
385385
int get mode => 0;

‎packages/file/lib/src/backends/chroot/chroot_file_system_entity.dart‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ abstract class _ChrootFileSystemEntity<T extends FileSystemEntity,
4848
/// Tells whether this entity's path references a symbolic link.
4949
bool get _isLink =>
5050
fileSystem.typeSync(path, followLinks: false) ==
51-
FileSystemEntityType.LINK;
51+
FileSystemEntityType.link;
5252

5353
@override
5454
Directory wrapDirectory(io.Directory delegate) =>
@@ -109,14 +109,14 @@ abstract class _ChrootFileSystemEntity<T extends FileSystemEntity,
109109
Future<FileSystemEntityType> type(String path) =>
110110
fileSystem.delegate.type(real(path), followLinks: false);
111111

112-
if (await type(path) == FileSystemEntityType.LINK) {
113-
if (expectedType == FileSystemEntityType.LINK) {
112+
if (await type(path) == FileSystemEntityType.link) {
113+
if (expectedType == FileSystemEntityType.link) {
114114
await fileSystem.delegate.link(real(path)).delete();
115115
} else {
116116
String resolvedPath = fileSystem._resolve(p.basename(path),
117117
from: p.dirname(path), notFound: _NotFoundBehavior.allowAtTail);
118118
if (!recursive && await type(resolvedPath) != expectedType) {
119-
throw expectedType == FileSystemEntityType.FILE
119+
throw expectedType == FileSystemEntityType.file
120120
? common.isADirectory(path)
121121
: common.notADirectory(path);
122122
}
@@ -138,14 +138,14 @@ abstract class _ChrootFileSystemEntity<T extends FileSystemEntity,
138138
FileSystemEntityType type(String path) =>
139139
fileSystem.delegate.typeSync(real(path), followLinks: false);
140140

141-
if (type(path) == FileSystemEntityType.LINK) {
142-
if (expectedType == FileSystemEntityType.LINK) {
141+
if (type(path) == FileSystemEntityType.link) {
142+
if (expectedType == FileSystemEntityType.link) {
143143
fileSystem.delegate.link(real(path)).deleteSync();
144144
} else {
145145
String resolvedPath = fileSystem._resolve(p.basename(path),
146146
from: p.dirname(path), notFound: _NotFoundBehavior.allowAtTail);
147147
if (!recursive && type(resolvedPath) != expectedType) {
148-
throw expectedType == FileSystemEntityType.FILE
148+
throw expectedType == FileSystemEntityType.file
149149
? common.isADirectory(path)
150150
: common.notADirectory(path);
151151
}
@@ -158,7 +158,7 @@ abstract class _ChrootFileSystemEntity<T extends FileSystemEntity,
158158

159159
@override
160160
Stream<FileSystemEvent> watch({
161-
int events: FileSystemEvent.ALL,
161+
int events: FileSystemEvent.all,
162162
bool recursive: false,
163163
}) =>
164164
throw new UnsupportedError('watch is not supported on ChrootFileSystem');

‎packages/file/lib/src/backends/chroot/chroot_link.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class _ChrootLink extends _ChrootFileSystemEntity<Link, io.Link>
3434
}
3535

3636
@override
37-
FileSystemEntityType get expectedType => FileSystemEntityType.LINK;
37+
FileSystemEntityType get expectedType => FileSystemEntityType.link;
3838

3939
@override
4040
io.Link _rawDelegate(String path) => fileSystem.delegate.link(path);

0 commit comments

Comments
 (0)