Skip to content

Fixes #2915. Fix errors and typos in some null-aware elements tests #2917

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

Merged
merged 1 commit into from
Oct 3, 2024
Merged

Fixes #2915. Fix errors and typos in some null-aware elements tests #2917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions LanguageFeatures/Control-flow-collections/Null-aware-elements/constants_A01_t01.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ main() {
?e1: ?e2,
?null: e2,
?nil: e2,
1: ?e1
2: ?e1
};
Expect.mapEquals({e1: 1, 1: e1}, map);
Expect.mapEquals({e1: 1, 2: e1}, map);
}
11 changes: 6 additions & 5 deletions LanguageFeatures/Control-flow-collections/Null-aware-elements/constants_A01_t02.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
main() {
const e1 = 1;
const e2 = 2;
const e3 = 3;

const {
?e1,
Expand Down Expand Up @@ -42,23 +43,23 @@ main() {
// ^
// [analyzer] unspecified
// [cfe] unspecified
?1: 2,
?12: 2,
// ^
// [analyzer] unspecified
// [cfe] unspecified
e1: ?1,
e2: ?1,
// ^
// [analyzer] unspecified
// [cfe] unspecified
1: ?e1,
13: ?e1,
// ^
// [analyzer] unspecified
// [cfe] unspecified
?e1: ?e2,
?e3: ?e2,
// ^
// [analyzer] unspecified
// [cfe] unspecified
?1: ?2
?14: ?2
// ^
// [analyzer] unspecified
// [cfe] unspecified
Expand Down
30 changes: 15 additions & 15 deletions LanguageFeatures/Control-flow-collections/Null-aware-elements/disambiguating_A01_t02.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,40 +32,40 @@ main() {
}

var c1 = {
// ^
// [analyzer] unspecified
// [cfe] unspecified
?v,
"mapEntry": 1
};
var c2 = {
// ^
// ^
// [analyzer] unspecified
// [cfe] unspecified
};
var c2 = {
?v,
"nullAwareMapEntry": ?v
};
var c3 = {
// ^
// ^
// [analyzer] unspecified
// [cfe] unspecified
};
var c3 = {
?v,
?key: "nullAwareMapEntry"
};
var c4 = {
// ^
// ^
// [analyzer] unspecified
// [cfe] unspecified
};
var c4 = {
?v,
?key: ?v
// ^
// [analyzer] unspecified
// [cfe] unspecified
};

Map m = {};
var c5 = {
// ^
// [analyzer] unspecified
// [cfe] unspecified
?v,
...m
// ^
// [analyzer] unspecified
// [cfe] unspecified
};
}
24 changes: 12 additions & 12 deletions LanguageFeatures/Control-flow-collections/Null-aware-elements/disambiguating_A02_t02.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,45 +31,45 @@ main() {
key = "key";
}
var c1 = {
// ^
?key: "nullAwareMapEntry",
// ^
// [analyzer] unspecified
// [cfe] unspecified
?key: "nullAwareMapEntry",
"expressionElement"
};
var c2 = {
// ^
"nullAwareMapEntry": ?v,
// ^
// [analyzer] unspecified
// [cfe] unspecified
"nullAwareMapEntry": ?v,
"expressionElement"
};
var c3 = {
// ^
?key: ?v,
// ^
// [analyzer] unspecified
// [cfe] unspecified
?key: ?v,
"expressionElement"
};
var c4 = {
// ^
?key: "nullAwareMapEntry",
// ^
// [analyzer] unspecified
// [cfe] unspecified
?key: "nullAwareMapEntry",
?v
};
var c5 = {
// ^
"nullAwareMapEntry": ?v,
// ^
// [analyzer] unspecified
// [cfe] unspecified
"nullAwareMapEntry": ?v,
?v
};
var c6 = {
// ^
?key: ?v,
// ^
// [analyzer] unspecified
// [cfe] unspecified
?key: ?v,
?v
};

Expand Down
4 changes: 2 additions & 2 deletions LanguageFeatures/Control-flow-collections/Null-aware-elements/runtime_A02_t02.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ main() {
var map1 = {
f(1): ?f(2),
?f(3): ?f(null),
?(f4): ?null
?f(4): ?null
};
Expect.mapEquals({1: 2}, map1);
Expect.equals("f(1);f(2);f(3);f(null);f(4);", _log);
Expand All @@ -40,7 +40,7 @@ main() {
... {
f(1): ?f(2),
?f(3): ?f(null),
?(f4): ?null
?f(4): ?null
},
?f(5): ?f(6)
};
Expand Down
2 changes: 1 addition & 1 deletion LanguageFeatures/Control-flow-collections/Null-aware-elements/syntax_A01_t01.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ main() {
};

String? key = 2 > 1 ? "key" : null;
List<Map<String, int>? m = 2 > 1 ? ? [{"k": 0}] : null;
List<Map<String, int>>? m = 2 > 1 ? [{"k": 0}] : null;
<String, int>{
?...m,
// ^
Expand Down
Loading