Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #2967. Update/ignore invalid_null_aware_operator warnings #2970

Merged
merged 2 commits into from
Nov 6, 2024
Merged

Fixes #2967. Update/ignore invalid_null_aware_operator warnings #2970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3ecce9
Fixes #2967. Update/ignore invalid_null_aware_operator warnings
sgrekhov Nov 5, 2024
0f5be40
Fix warning names
sgrekhov Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion LanguageFeatures/Control-flow-collections/Null-aware-elements/syntax_A05_t02.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ main() {
// 6: ?6
f(null) ?? 6: ? f(null) ?? 6, // ignore: invalid_null_aware_operator
// null: ?7
f(null) ?? null: ? f(null) ?? 7,
f(null) ?? null: ? f(null) ?? 7, // ignore: invalid_null_aware_operator

// ?8: ?null
?f(8) ?? null: ?f(null) ?? null,
Expand Down
62 changes: 20 additions & 42 deletions LanguageFeatures/Control-flow-collections/Null-aware-elements/syntax_equality_A01_t01.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@

// SharedOptions=--enable-experiment=null-aware-elements

// TODO(sgrekhov): replace unspecified by the actual lint name

import '../../../Utils/expect.dart';

class A {
Expand All @@ -39,12 +37,8 @@ class C extends A {

void test(int? expected) {
var list = [
?super == expected,
// ^
// [analyzer] unspecified
?super != expected
// ^
// [analyzer] unspecified
?super == expected, // ignore: invalid_null_aware_operator
?super != expected // ignore: invalid_null_aware_operator
];
if (expected != null) {
Expect.listEquals([true, false], list);
Expand All @@ -53,28 +47,16 @@ class C extends A {
}

var set = {
?super == expected,
// ^
// [analyzer] unspecified
?super != expected
// ^
// [analyzer] unspecified
?super == expected, // ignore: invalid_null_aware_operator
?super != expected // ignore: invalid_null_aware_operator
};
Expect.setEquals({false, true}, set);

var map1 = {
?super == expected: 1,
// ^
// [analyzer] unspecified
?super != expected: 2,
// ^
// [analyzer] unspecified
3: ?super == expected,
// ^
// [analyzer] unspecified
4: ?super != expected,
// ^
// [analyzer] unspecified
?super == expected: 1, // ignore: invalid_null_aware_operator
?super != expected: 2, // ignore: invalid_null_aware_operator
3: ?super == expected, // ignore: invalid_null_aware_operator
4: ?super != expected, // ignore: invalid_null_aware_operator
};
if (expected != null) {
Expect.mapEquals({true: 1, false: 2, 3: true, 4: false}, map1);
Expand All @@ -83,12 +65,8 @@ class C extends A {
}

var map2 = {
?super == expected: ?super == expected,
// ^
// [analyzer] unspecified
?super != expected: ?super != expected
// ^
// [analyzer] unspecified
?super == expected: ?super == expected, // ignore: invalid_null_aware_operator
?super != expected: ?super != expected // ignore: invalid_null_aware_operator
};
Expect.mapEquals({true: true, false: false}, map2);
}
Expand All @@ -99,28 +77,28 @@ main() {
int? e2 = 1 > 2 ? 1 : null; // null

var list = [
?e1 == e2,
?e2 != e1
?e1 == e2, // ignore: invalid_null_aware_operator
?e2 != e1 // ignore: invalid_null_aware_operator
];
Expect.listEquals([false, true], list);

var set = {
?e1 == e2,
?e2 != e1
?e1 == e2, // ignore: invalid_null_aware_operator
?e2 != e1 // ignore: invalid_null_aware_operator
};
Expect.setEquals({false, true}, set);

var map1 = {
?e1 == e2: 1,
?e2 != e1: 2,
3: ?e1 == e2,
4: ?e2 != e1,
?e1 == e2: 1, // ignore: invalid_null_aware_operator
?e2 != e1: 2, // ignore: invalid_null_aware_operator
3: ?e1 == e2, // ignore: invalid_null_aware_operator
4: ?e2 != e1, // ignore: invalid_null_aware_operator
};
Expect.mapEquals({false: 1, true: 2, 3: false, 4: true}, map1);

var map2 = {
?e1 == e2: ?e1 == e2,
?e2 != e1: ?e2 != e1
?e1 == e2: ?e1 == e2, // ignore: invalid_null_aware_operator
?e2 != e1: ?e2 != e1 // ignore: invalid_null_aware_operator
};
Expect.mapEquals({false: false, true: true}, map2);

Expand Down
40 changes: 25 additions & 15 deletions LanguageFeatures/Control-flow-collections/Null-aware-elements/warnings_A01_t04.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@

// SharedOptions=--enable-experiment=null-aware-elements

// TODO(sgrekhov): replace unspecified by the actual lint name

import '../../../Utils/expect.dart';

int? f(int? v) => v;
Expand All @@ -23,55 +21,67 @@ main() {
var list = <int>[
? f(1) ?? 2,
// ^
// [analyzer] unspecified
// [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
? f(null) ?? 2,
// ^
// [analyzer] unspecified
// [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
? 2 > 1 ? 3 : 4
// ^
// [analyzer] unspecified
// [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
];
Expect.listEquals([1, 2, 3], list);

var set = <int>{
? f(1) ?? 2,
// ^
// [analyzer] unspecified
// [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
? f(null) ?? 2,
// ^
// [analyzer] unspecified
// [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
? 2 > 1 ? 3 : 4
// ^
// [analyzer] unspecified
// [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
};
Expect.setEquals({1, 2, 3}, set);

var map = <int, int>{
? f(1) ?? 2: 1,
// ^
// [analyzer] unspecified
// [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
? f(null) ?? 2: 2,
// ^
// [analyzer] unspecified
// [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
? 2 > 1 ? 3 : 4: 3,
// ^
// [analyzer] unspecified
// [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
4: ? f(1) ?? 2,
// ^
// [analyzer] unspecified
// [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
5: ? f(null) ?? 2,
// ^
// [analyzer] unspecified
// [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
6: ? 2 > 1 ? 3 : 4
// ^
// [analyzer] unspecified
// ^
// [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
};
Expect.mapEquals({
? f(1) ?? 2: 1,
// ^
// [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
? f(null) ?? 2: 2,
// ^
// [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
? 2 > 1 ? 3 : 4: 3,
// ^
// [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
4: ? f(1) ?? 2,
// ^
// [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
5: ? f(null) ?? 2,
// ^
// [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
6: ? 2 > 1 ? 3 : 4
// ^
// [analyzer] STATIC_WARNING.INVALID_NULL_AWARE_OPERATOR
}, map);
}