Skip to content

Commit 345fa25

Browse files
authored
Merge pull request #28 from netglade/remove-isBlank-on-nullable-string
Remove isBlank etc. on nullable String
2 parents e09a893 + cfa8de8 commit 345fa25

File tree

9 files changed

+55
-29
lines changed

9 files changed

+55
-29
lines changed

.fvm/fvm_config.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"flutterSdkVersion": "3.19.0",
3+
"flavors": {}
4+
}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ melos_my_project.iml
77
.vscode/*
88
!.vscode/tasks.json
99
!.vscode/settings.json
10+
.fvm/flutter_sdk
1011

1112
.packages
1213
.pub/

.vscode/settings.json

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"dart.flutterSdkPath": ".fvm/flutter_sdk",
3+
"search.exclude": {
4+
"**/.fvm": true,
5+
"**/*.g.dart": true,
6+
},
7+
"files.exclude": {
8+
"**/.git": true,
9+
"**/.DS_Store": true,
10+
".idea/**": true,
11+
".run/**": true,
12+
},
13+
// Remove from file watching
14+
"files.watcherExclude": {
15+
"**/.fvm": true
16+
},
17+
"dart.lineLength": 120,
18+
"editor.rulers": [
19+
120
20+
],
21+
"yaml.schemas": {
22+
"https://json.schemastore.org/dart-build.json": [
23+
"build.yaml"
24+
]
25+
},
26+
"explorer.fileNesting.enabled": true,
27+
"explorer.fileNesting.patterns": {
28+
"*.dart": "${capture}.g.dart,${capture}.freezed.dart,${capture}.auto_mappr.dart"
29+
},
30+
"yaml.schemaStore.enable": false
31+
}

packages/netglade_utils/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
## 2.0.0
2+
- Remove `isBlank`, `isNotBlank` from `String?` extension.
3+
14
## 1.3.0
25
- Add `distinctBy` to iterable extensions.
36

packages/netglade_utils/example/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ environment:
66
sdk: ^3.0.0
77

88
dependencies:
9-
netglade_analysis: ^7.0.0
9+
netglade_analysis: ^8.0.0
1010
netglade_utils:
1111
path: ..

packages/netglade_utils/lib/src/extensions/string_extensions.dart

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,6 @@ extension StringExtensions on String {
3535
}
3636

3737
extension NullableStringExtensions on String? {
38-
/// Returns true when `this` is `String` which is `isBlank`.
39-
/// When the value is `null`, returns `false`.
40-
///
41-
/// * String? is blank when it has a value and contains only whitespaces.
42-
bool get isBlank {
43-
return this?.isBlank ?? false;
44-
}
45-
4638
/// Returns true when `this` is either `null` or `isBlank`.
4739
///
4840
/// * String? is blank when it has a value and contains only whitespaces.
@@ -55,13 +47,6 @@ extension NullableStringExtensions on String? {
5547
return !isNullOrBlank;
5648
}
5749

58-
/// Returns negation of [isBlank].
59-
///
60-
/// * String? is blank when it has a value and contains only whitespaces.
61-
bool get isNotBlank {
62-
return !isBlank;
63-
}
64-
6550
/// Returns true when `this` is either `null` or `isBlank`.
6651
bool get isNullOrEmpty {
6752
return this?.isEmpty ?? true;

packages/netglade_utils/lib/src/testing/mock_extensions.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ import 'package:mocktail/mocktail.dart';
66
import 'package:netglade_utils/src/result/result.dart';
77

88
extension FutureVoidAnswer on When<Future<void>> {
9-
void thenAnswerWithVoid() => thenAnswer((_) async => <void>{});
9+
// ignore: no-empty-block, its ok
10+
void thenAnswerWithVoid() => thenAnswer((_) async {});
1011
}
1112

1213
extension VoidAnswer on When<void> {
13-
void thenAnswerWithVoid() => thenAnswer((_) => <void>{});
14+
// ignore: no-empty-block, its ok
15+
void thenAnswerWithVoid() => thenAnswer((_) {});
1416
}
1517

1618
extension GenericAnswer<T> on When<Future<T>> {

packages/netglade_utils/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: netglade_utils
2-
version: 1.3.0
2+
version: 2.0.0
33
description: Dart utils used internally at netglade.
44
repository: https://github.com/netglade/flutter_core/tree/main/packages/netglade_utils
55
issue_tracker: https://github.com/netglade/flutter_core/issues
@@ -17,5 +17,5 @@ dependencies:
1717
mocktail: ^1.0.0
1818

1919
dev_dependencies:
20-
netglade_analysis: ^7.0.0
20+
netglade_analysis: ^8.0.0
2121
test: ^1.24.6

packages/netglade_utils/test/src/extensions/string_extensions_test.dart

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,22 +43,22 @@ void main() {
4343
group('on String?', () {
4444
test('empty message is isBlank', () {
4545
final String? value = '';
46-
expect(value.isBlank, isTrue);
46+
expect(value?.isBlank, isTrue);
4747
});
4848

4949
test('null message is not isBlank', () {
5050
final String? value = null;
51-
expect(value.isBlank, isFalse);
51+
expect(value?.isBlank, isNull);
5252
});
5353

5454
test('message with whitespaces is isBlank', () {
5555
final String? value = ' ';
56-
expect(value.isBlank, isTrue);
56+
expect(value?.isBlank, isTrue);
5757
});
5858

5959
test('message with non-whitespace characters is not isBlank', () {
6060
final String? value = 'xxx';
61-
expect(value.isBlank, isFalse);
61+
expect(value?.isBlank, isFalse);
6262
});
6363
});
6464
});
@@ -84,22 +84,22 @@ void main() {
8484
group('on String?', () {
8585
test('empty message is not isNotBlank', () {
8686
final String? value = '';
87-
expect(value.isNotBlank, isFalse);
87+
expect(value?.isNotBlank, isFalse);
8888
});
8989

90-
test('message is null is isNotBlank', () {
90+
test('message is null is null', () {
9191
final String? value = null;
92-
expect(value.isNotBlank, isTrue);
92+
expect(value?.isNotBlank, isNull);
9393
});
9494

9595
test('message has whitespaces is not isNotBlank', () {
9696
final String? value = ' ';
97-
expect(value.isNotBlank, isFalse);
97+
expect(value?.isNotBlank, isFalse);
9898
});
9999

100100
test('message has non-whitespace characters is isNotBlank', () {
101101
final String? value = 'xxx';
102-
expect(value.isNotBlank, isTrue);
102+
expect(value?.isNotBlank, isTrue);
103103
});
104104
});
105105
});

0 commit comments

Comments
 (0)