Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit f606357

Browse files
author
Dart CI
committed
Version 2.14.0-91.0.dev
Merge commit '9108f927ab92c6d679f551d1fb4a4d889c3b8546' into 'dev'
2 parents 86c7493 + 9108f92 commit f606357

File tree

10 files changed

+121
-121
lines changed

10 files changed

+121
-121
lines changed

‎pkg/meta/lib/meta.dart‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,10 @@ const _OptionalTypeArgs optionalTypeArgs = _OptionalTypeArgs();
209209
/// field) `m` in a class `C`. If the annotation is on a field it applies to the
210210
/// getter, and setter if appropriate, that are induced by the field. Indicates
211211
/// that `m` should only be invoked from instance methods of `C` or classes that
212-
/// extend, implement or mix in `C`, either directly or indirectly. Additionally
213-
/// indicates that `m` should only be invoked on `this`, whether explicitly or
214-
/// implicitly.
212+
/// extend, implement or mix in `C`, either directly or indirectly or from within
213+
/// the same library that `m` is declared in. Additionally indicates that `m`
214+
/// should only be invoked on `this` (when outside of the library that it is
215+
/// declared in), whether explicitly or implicitly.
215216
///
216217
/// Tools, such as the analyzer, can provide feedback if
217218
///

‎pkg/test_runner/lib/src/multitest.dart‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@ import "path.dart";
7575
import "test_file.dart";
7676
import "utils.dart";
7777

78-
/// Until legacy multitests are ported we need to support both /// and //#
79-
final multitestMarker = RegExp(r"//[/#]");
78+
final multitestMarker = "//#";
8079

8180
final _multitestOutcomes = {
8281
'ok',

‎pkg/test_runner/tool/convert_multitest.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ Future<void> convertFile(String testFilePath, bool writeToFile, bool verbose,
159159
var suiteDirectory = Path.raw(Uri.base.path);
160160
var content = await testFile.readAsString();
161161
var test = TestFile.parse(suiteDirectory, testFilePath, content);
162-
if (!multitestMarker.hasMatch(content)) {
162+
if (!content.contains(multitestMarker)) {
163163
print("Test ${test.path.toNativePath()} is not a multi-test.");
164164
exitCode = 1;
165165
return;

‎runtime/observatory/tests/service/evaluate_activation_test.dart‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -84,28 +84,28 @@ Future testMethod(Isolate isolate) async {
8484
print("Event $event");
8585
if (event.kind == ServiceEvent.kPauseBreakpoint) {
8686
dynamic frameNumber = 1, r;
87-
r = await isolate.evalFrame(frameNumber, '123'); /// instance: ok
88-
expect(r.valueAsString, equals('123')); /// instance: continued
89-
r = await isolate.evalFrame(frameNumber, 'this'); /// scope: ok
90-
expect(r.clazz.name, equals('C')); /// scope: continued
91-
r = await isolate.evalFrame(frameNumber, 'instVar'); /// instance: continued
92-
expect(r.valueAsString, equals('1')); /// instance: continued
93-
r = await isolate.evalFrame(frameNumber, 'classVar'); /// instance: continued
94-
expect(r.valueAsString, equals('2')); /// instance: continued
95-
r = await isolate.evalFrame(frameNumber, 'methodParam'); /// scope: continued
96-
expect(r.valueAsString, equals('3')); /// scope: continued
97-
r = await isolate.evalFrame(frameNumber, 'methodTemp'); /// scope: continued
98-
expect(r.valueAsString, equals('4')); /// scope: continued
99-
r = await isolate.evalFrame(frameNumber, 'outerParam'); /// scope: continued
100-
expect(r.valueAsString, equals('5')); /// scope: continued
101-
r = await isolate.evalFrame(frameNumber, 'outerTemp'); /// scope: continued
102-
expect(r.valueAsString, equals('6')); /// scope: continued
103-
r = await isolate.evalFrame(frameNumber, 'innerParam'); /// instance: continued
104-
expect(r.valueAsString, equals('7')); /// instance: continued
105-
r = await isolate.evalFrame(frameNumber, 'innerTemp'); /// instance: continued
106-
expect(r.valueAsString, equals('8')); /// instance: continued
107-
r = await isolate.evalFrame(frameNumber, 'math.sqrt'); /// instance: continued
108-
expect(r.isClosure, isTrue); /// instance: continued
87+
r = await isolate.evalFrame(frameNumber, '123'); //# instance: ok
88+
expect(r.valueAsString, equals('123')); //# instance: continued
89+
r = await isolate.evalFrame(frameNumber, 'this'); //# scope: ok
90+
expect(r.clazz.name, equals('C')); //# scope: continued
91+
r = await isolate.evalFrame(frameNumber, 'instVar'); //# instance: continued
92+
expect(r.valueAsString, equals('1')); //# instance: continued
93+
r = await isolate.evalFrame(frameNumber, 'classVar'); //# instance: continued
94+
expect(r.valueAsString, equals('2')); //# instance: continued
95+
r = await isolate.evalFrame(frameNumber, 'methodParam'); //# scope: continued
96+
expect(r.valueAsString, equals('3')); //# scope: continued
97+
r = await isolate.evalFrame(frameNumber, 'methodTemp'); //# scope: continued
98+
expect(r.valueAsString, equals('4')); //# scope: continued
99+
r = await isolate.evalFrame(frameNumber, 'outerParam'); //# scope: continued
100+
expect(r.valueAsString, equals('5')); //# scope: continued
101+
r = await isolate.evalFrame(frameNumber, 'outerTemp'); //# scope: continued
102+
expect(r.valueAsString, equals('6')); //# scope: continued
103+
r = await isolate.evalFrame(frameNumber, 'innerParam'); //# instance: continued
104+
expect(r.valueAsString, equals('7')); //# instance: continued
105+
r = await isolate.evalFrame(frameNumber, 'innerTemp'); //# instance: continued
106+
expect(r.valueAsString, equals('8')); //# instance: continued
107+
r = await isolate.evalFrame(frameNumber, 'math.sqrt'); //# instance: continued
108+
expect(r.isClosure, isTrue); //# instance: continued
109109

110110
hitBreakpoint = true;
111111
sub.cancel(); // Do not handle events for the other tests.
@@ -142,13 +142,13 @@ Future testMethod2(Isolate isolate) async {
142142
r = await isolate.evalFrame(frameNumber, 'classVar');
143143
expect(r.valueAsString, equals('2'));
144144
r = await isolate.evalFrame(frameNumber, 'methodParam');
145-
expect(r.valueAsString, equals('3')); /// scope: continued
145+
expect(r.valueAsString, equals('3')); //# scope: continued
146146
r = await isolate.evalFrame(frameNumber, 'methodTemp');
147-
expect(r.valueAsString, equals('4')); /// scope: continued
147+
expect(r.valueAsString, equals('4')); //# scope: continued
148148
r = await isolate.evalFrame(frameNumber, 'outerParam');
149-
expect(r.valueAsString, equals('5')); /// scope: continued
149+
expect(r.valueAsString, equals('5')); //# scope: continued
150150
r = await isolate.evalFrame(frameNumber, 'outerTemp');
151-
expect(r.valueAsString, equals('6')); /// scope: continued
151+
expect(r.valueAsString, equals('6')); //# scope: continued
152152
r = await isolate.evalFrame(frameNumber, 'innerParam');
153153
expect(r.valueAsString, equals('7'));
154154
r = await isolate.evalFrame(frameNumber, 'innerTemp');
@@ -224,28 +224,28 @@ Future testMethod4(Isolate isolate) async {
224224
print("Event $event");
225225
if (event.kind == ServiceEvent.kPauseBreakpoint) {
226226
dynamic frameNumber = 1, r;
227-
r = await isolate.evalFrame(frameNumber, '123'); /// instance: continued
228-
expect(r.valueAsString, equals('123')); /// instance: continued
229-
r = await isolate.evalFrame(frameNumber, 'this'); /// scope: continued
230-
expect(r.clazz.name, equals('C')); /// scope: continued
231-
r = await isolate.evalFrame(frameNumber, 'instVar'); /// instance: continued
232-
expect(r.valueAsString, equals('1')); /// instance: continued
233-
r = await isolate.evalFrame(frameNumber, 'classVar'); /// instance: continued
234-
expect(r.valueAsString, equals('2')); /// instance: continued
235-
r = await isolate.evalFrame(frameNumber, 'methodParam'); /// scope: continued
236-
expect(r.valueAsString, equals('3')); /// scope: continued
237-
r = await isolate.evalFrame(frameNumber, 'methodTemp'); /// scope: continued
238-
expect(r.valueAsString, equals('4')); /// scope: continued
239-
r = await isolate.evalFrame(frameNumber, 'outerParam'); /// scope: continued
240-
expect(r.valueAsString, equals('5')); /// scope: continued
241-
r = await isolate.evalFrame(frameNumber, 'outerTemp'); /// scope: continued
242-
expect(r.valueAsString, equals('6')); /// scope: continued
243-
r = await isolate.evalFrame(frameNumber, 'innerParam'); /// instance: continued
244-
expect(r.valueAsString, equals('7')); /// instance: continued
245-
r = await isolate.evalFrame(frameNumber, 'innerTemp'); /// instance: continued
246-
expect(r.valueAsString, equals('8')); /// instance: continued
247-
r = await isolate.evalFrame(frameNumber, 'math.sqrt'); /// instance: continued
248-
expect(r.isClosure, isTrue); /// instance: continued
227+
r = await isolate.evalFrame(frameNumber, '123'); //# instance: continued
228+
expect(r.valueAsString, equals('123')); //# instance: continued
229+
r = await isolate.evalFrame(frameNumber, 'this'); //# scope: continued
230+
expect(r.clazz.name, equals('C')); //# scope: continued
231+
r = await isolate.evalFrame(frameNumber, 'instVar'); //# instance: continued
232+
expect(r.valueAsString, equals('1')); //# instance: continued
233+
r = await isolate.evalFrame(frameNumber, 'classVar'); //# instance: continued
234+
expect(r.valueAsString, equals('2')); //# instance: continued
235+
r = await isolate.evalFrame(frameNumber, 'methodParam'); //# scope: continued
236+
expect(r.valueAsString, equals('3')); //# scope: continued
237+
r = await isolate.evalFrame(frameNumber, 'methodTemp'); //# scope: continued
238+
expect(r.valueAsString, equals('4')); //# scope: continued
239+
r = await isolate.evalFrame(frameNumber, 'outerParam'); //# scope: continued
240+
expect(r.valueAsString, equals('5')); //# scope: continued
241+
r = await isolate.evalFrame(frameNumber, 'outerTemp'); //# scope: continued
242+
expect(r.valueAsString, equals('6')); //# scope: continued
243+
r = await isolate.evalFrame(frameNumber, 'innerParam'); //# instance: continued
244+
expect(r.valueAsString, equals('7')); //# instance: continued
245+
r = await isolate.evalFrame(frameNumber, 'innerTemp'); //# instance: continued
246+
expect(r.valueAsString, equals('8')); //# instance: continued
247+
r = await isolate.evalFrame(frameNumber, 'math.sqrt'); //# instance: continued
248+
expect(r.isClosure, isTrue); //# instance: continued
249249

250250
hitBreakpoint = true;
251251
sub.cancel(); // Do not handle events for the other tests.

‎runtime/observatory_2/tests/service_2/evaluate_activation_test.dart‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -84,28 +84,28 @@ Future testMethod(Isolate isolate) async {
8484
print("Event $event");
8585
if (event.kind == ServiceEvent.kPauseBreakpoint) {
8686
var frameNumber = 1, r;
87-
r = await isolate.evalFrame(frameNumber, '123'); /// instance: ok
88-
expect(r.valueAsString, equals('123')); /// instance: continued
89-
r = await isolate.evalFrame(frameNumber, 'this'); /// scope: ok
90-
expect(r.clazz.name, equals('C')); /// scope: continued
91-
r = await isolate.evalFrame(frameNumber, 'instVar'); /// instance: continued
92-
expect(r.valueAsString, equals('1')); /// instance: continued
93-
r = await isolate.evalFrame(frameNumber, 'classVar'); /// instance: continued
94-
expect(r.valueAsString, equals('2')); /// instance: continued
95-
r = await isolate.evalFrame(frameNumber, 'methodParam'); /// scope: continued
96-
expect(r.valueAsString, equals('3')); /// scope: continued
97-
r = await isolate.evalFrame(frameNumber, 'methodTemp'); /// scope: continued
98-
expect(r.valueAsString, equals('4')); /// scope: continued
99-
r = await isolate.evalFrame(frameNumber, 'outerParam'); /// scope: continued
100-
expect(r.valueAsString, equals('5')); /// scope: continued
101-
r = await isolate.evalFrame(frameNumber, 'outerTemp'); /// scope: continued
102-
expect(r.valueAsString, equals('6')); /// scope: continued
103-
r = await isolate.evalFrame(frameNumber, 'innerParam'); /// instance: continued
104-
expect(r.valueAsString, equals('7')); /// instance: continued
105-
r = await isolate.evalFrame(frameNumber, 'innerTemp'); /// instance: continued
106-
expect(r.valueAsString, equals('8')); /// instance: continued
107-
r = await isolate.evalFrame(frameNumber, 'math.sqrt'); /// instance: continued
108-
expect(r.isClosure, isTrue); /// instance: continued
87+
r = await isolate.evalFrame(frameNumber, '123'); //# instance: ok
88+
expect(r.valueAsString, equals('123')); //# instance: continued
89+
r = await isolate.evalFrame(frameNumber, 'this'); //# scope: ok
90+
expect(r.clazz.name, equals('C')); //# scope: continued
91+
r = await isolate.evalFrame(frameNumber, 'instVar'); //# instance: continued
92+
expect(r.valueAsString, equals('1')); //# instance: continued
93+
r = await isolate.evalFrame(frameNumber, 'classVar'); //# instance: continued
94+
expect(r.valueAsString, equals('2')); //# instance: continued
95+
r = await isolate.evalFrame(frameNumber, 'methodParam'); //# scope: continued
96+
expect(r.valueAsString, equals('3')); //# scope: continued
97+
r = await isolate.evalFrame(frameNumber, 'methodTemp'); //# scope: continued
98+
expect(r.valueAsString, equals('4')); //# scope: continued
99+
r = await isolate.evalFrame(frameNumber, 'outerParam'); //# scope: continued
100+
expect(r.valueAsString, equals('5')); //# scope: continued
101+
r = await isolate.evalFrame(frameNumber, 'outerTemp'); //# scope: continued
102+
expect(r.valueAsString, equals('6')); //# scope: continued
103+
r = await isolate.evalFrame(frameNumber, 'innerParam'); //# instance: continued
104+
expect(r.valueAsString, equals('7')); //# instance: continued
105+
r = await isolate.evalFrame(frameNumber, 'innerTemp'); //# instance: continued
106+
expect(r.valueAsString, equals('8')); //# instance: continued
107+
r = await isolate.evalFrame(frameNumber, 'math.sqrt'); //# instance: continued
108+
expect(r.isClosure, isTrue); //# instance: continued
109109

110110
hitBreakpoint = true;
111111
sub.cancel(); // Do not handle events for the other tests.
@@ -142,13 +142,13 @@ Future testMethod2(Isolate isolate) async {
142142
r = await isolate.evalFrame(frameNumber, 'classVar');
143143
expect(r.valueAsString, equals('2'));
144144
r = await isolate.evalFrame(frameNumber, 'methodParam');
145-
expect(r.valueAsString, equals('3')); /// scope: continued
145+
expect(r.valueAsString, equals('3')); //# scope: continued
146146
r = await isolate.evalFrame(frameNumber, 'methodTemp');
147-
expect(r.valueAsString, equals('4')); /// scope: continued
147+
expect(r.valueAsString, equals('4')); //# scope: continued
148148
r = await isolate.evalFrame(frameNumber, 'outerParam');
149-
expect(r.valueAsString, equals('5')); /// scope: continued
149+
expect(r.valueAsString, equals('5')); //# scope: continued
150150
r = await isolate.evalFrame(frameNumber, 'outerTemp');
151-
expect(r.valueAsString, equals('6')); /// scope: continued
151+
expect(r.valueAsString, equals('6')); //# scope: continued
152152
r = await isolate.evalFrame(frameNumber, 'innerParam');
153153
expect(r.valueAsString, equals('7'));
154154
r = await isolate.evalFrame(frameNumber, 'innerTemp');
@@ -224,28 +224,28 @@ Future testMethod4(Isolate isolate) async {
224224
print("Event $event");
225225
if (event.kind == ServiceEvent.kPauseBreakpoint) {
226226
var frameNumber = 1, r;
227-
r = await isolate.evalFrame(frameNumber, '123'); /// instance: continued
228-
expect(r.valueAsString, equals('123')); /// instance: continued
229-
r = await isolate.evalFrame(frameNumber, 'this'); /// scope: continued
230-
expect(r.clazz.name, equals('C')); /// scope: continued
231-
r = await isolate.evalFrame(frameNumber, 'instVar'); /// instance: continued
232-
expect(r.valueAsString, equals('1')); /// instance: continued
233-
r = await isolate.evalFrame(frameNumber, 'classVar'); /// instance: continued
234-
expect(r.valueAsString, equals('2')); /// instance: continued
235-
r = await isolate.evalFrame(frameNumber, 'methodParam'); /// scope: continued
236-
expect(r.valueAsString, equals('3')); /// scope: continued
237-
r = await isolate.evalFrame(frameNumber, 'methodTemp'); /// scope: continued
238-
expect(r.valueAsString, equals('4')); /// scope: continued
239-
r = await isolate.evalFrame(frameNumber, 'outerParam'); /// scope: continued
240-
expect(r.valueAsString, equals('5')); /// scope: continued
241-
r = await isolate.evalFrame(frameNumber, 'outerTemp'); /// scope: continued
242-
expect(r.valueAsString, equals('6')); /// scope: continued
243-
r = await isolate.evalFrame(frameNumber, 'innerParam'); /// instance: continued
244-
expect(r.valueAsString, equals('7')); /// instance: continued
245-
r = await isolate.evalFrame(frameNumber, 'innerTemp'); /// instance: continued
246-
expect(r.valueAsString, equals('8')); /// instance: continued
247-
r = await isolate.evalFrame(frameNumber, 'math.sqrt'); /// instance: continued
248-
expect(r.isClosure, isTrue); /// instance: continued
227+
r = await isolate.evalFrame(frameNumber, '123'); //# instance: continued
228+
expect(r.valueAsString, equals('123')); //# instance: continued
229+
r = await isolate.evalFrame(frameNumber, 'this'); //# scope: continued
230+
expect(r.clazz.name, equals('C')); //# scope: continued
231+
r = await isolate.evalFrame(frameNumber, 'instVar'); //# instance: continued
232+
expect(r.valueAsString, equals('1')); //# instance: continued
233+
r = await isolate.evalFrame(frameNumber, 'classVar'); //# instance: continued
234+
expect(r.valueAsString, equals('2')); //# instance: continued
235+
r = await isolate.evalFrame(frameNumber, 'methodParam'); //# scope: continued
236+
expect(r.valueAsString, equals('3')); //# scope: continued
237+
r = await isolate.evalFrame(frameNumber, 'methodTemp'); //# scope: continued
238+
expect(r.valueAsString, equals('4')); //# scope: continued
239+
r = await isolate.evalFrame(frameNumber, 'outerParam'); //# scope: continued
240+
expect(r.valueAsString, equals('5')); //# scope: continued
241+
r = await isolate.evalFrame(frameNumber, 'outerTemp'); //# scope: continued
242+
expect(r.valueAsString, equals('6')); //# scope: continued
243+
r = await isolate.evalFrame(frameNumber, 'innerParam'); //# instance: continued
244+
expect(r.valueAsString, equals('7')); //# instance: continued
245+
r = await isolate.evalFrame(frameNumber, 'innerTemp'); //# instance: continued
246+
expect(r.valueAsString, equals('8')); //# instance: continued
247+
r = await isolate.evalFrame(frameNumber, 'math.sqrt'); //# instance: continued
248+
expect(r.isClosure, isTrue); //# instance: continued
249249

250250
hitBreakpoint = true;
251251
sub.cancel(); // Do not handle events for the other tests.

‎runtime/tests/vm/dart/data_uri_import_test.dart‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
// BSD-style license that can be found in the LICENSE file.
44

55
// foo() => 42;
6-
import 'data:application/dart;charset=utf-8,foo%28%29%20%3D%3E%2042%3B'; /// percentencoded: ok
7-
import 'data:text/plain;charset=utf-8,foo%28%29%20%3D%3E%2042%3B'; /// wrongmime: ok
8-
import 'data:;charset=utf-8,foo%28%29%20%3D%3E%2042%3B'; /// nomime: ok
9-
import 'data:application/dart;charset=utf-16,foo%28%29%20%3D%3E%2042%3B'; /// utf16: ok
10-
import 'data:application/dart,foo%28%29%20%3D%3E%2042%3B'; /// nocharset: ok
11-
import 'data:application/dart;charset=utf-8,foo?%9g'; /// badencodeddate: compile-time error
12-
import 'data:application/dart;charset=utf-8;base64,Zm9vKCkgPT4gNDI7'; /// base64: ok
6+
import 'data:application/dart;charset=utf-8,foo%28%29%20%3D%3E%2042%3B'; //# percentencoded: ok
7+
import 'data:text/plain;charset=utf-8,foo%28%29%20%3D%3E%2042%3B'; //# wrongmime: ok
8+
import 'data:;charset=utf-8,foo%28%29%20%3D%3E%2042%3B'; //# nomime: ok
9+
import 'data:application/dart;charset=utf-16,foo%28%29%20%3D%3E%2042%3B'; //# utf16: ok
10+
import 'data:application/dart,foo%28%29%20%3D%3E%2042%3B'; //# nocharset: ok
11+
import 'data:application/dart;charset=utf-8,foo?%9g'; //# badencodeddate: compile-time error
12+
import 'data:application/dart;charset=utf-8;base64,Zm9vKCkgPT4gNDI7'; //# base64: ok
1313

1414
import "package:expect/expect.dart";
1515

‎runtime/tests/vm/dart/redirection_type_shuffling_test.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import "package:expect/expect.dart";
77

88
class G<A extends int, B extends String> {
99
G();
10-
factory G.swap() = G<B,A>; /// 00: compile-time error
10+
factory G.swap() = G<B,A>; //# 00: compile-time error
1111
factory G.retain() = G<A,B>;
1212
}
1313

@@ -16,5 +16,5 @@ main() {
1616

1717
Expect.isTrue(cm.newInstance(#retain, []).reflectee is G<int,String>);
1818

19-
Expect.isTrue(cm.newInstance(#swap, []).reflectee is G<String,int>); /// 00: dynamic type error
19+
Expect.isTrue(cm.newInstance(#swap, []).reflectee is G<String,int>); //# 00: dynamic type error
2020
}

0 commit comments

Comments
 (0)