@@ -150,18 +150,28 @@ void testAll({
150150 } catch (_) {}
151151 });
152152
153- Future <void > onBreakPoint (script, bpId, body) =>
154- onBp (stream, isolateId, script, bpId, body);
155-
156- Future <Response > evaluateInFrame (frame, expr, {scope}) async =>
157- await context.service.evaluateInFrame (
158- isolateId,
159- frame,
160- expr,
161- scope: scope,
162- );
153+ Future <void > onBreakPoint (
154+ ScriptRef script,
155+ String bpId,
156+ Future <void > Function (Event event) body,
157+ ) => onBp (stream, isolateId, script, bpId, body);
158+
159+ Future <Response > evaluateInFrame (
160+ int frame,
161+ String expr, {
162+ Map <String , String >? scope,
163+ }) async => await context.service.evaluateInFrame (
164+ isolateId,
165+ frame,
166+ expr,
167+ scope: scope,
168+ );
163169
164- Future <InstanceRef > getInstanceRef (frame, expr, {scope}) async {
170+ Future <InstanceRef > getInstanceRef (
171+ int frame,
172+ String expr, {
173+ Map <String , String >? scope,
174+ }) async {
165175 final result = await evaluateInFrame (frame, expr, scope: scope);
166176 expect (result, isA <InstanceRef >());
167177 return result as InstanceRef ;
@@ -654,11 +664,22 @@ void testAll({
654664
655665 tearDown (() async {});
656666
657- Future <Response > evaluate (targetId, expr, {scope}) async => await context
658- .service
659- .evaluate (isolateId, targetId, expr, scope: scope);
667+ Future <Response > evaluate (
668+ String targetId,
669+ String expr, {
670+ Map <String , String >? scope,
671+ }) async => await context.service.evaluate (
672+ isolateId,
673+ targetId,
674+ expr,
675+ scope: scope,
676+ );
660677
661- Future <InstanceRef > getInstanceRef (targetId, expr, {scope}) async {
678+ Future <InstanceRef > getInstanceRef (
679+ String targetId,
680+ String expr, {
681+ Map <String , String >? scope,
682+ }) async {
662683 final result = await evaluate (targetId, expr, scope: scope);
663684 expect (result, isA <InstanceRef >());
664685 return result as InstanceRef ;
@@ -676,7 +697,7 @@ void testAll({
676697 final libraryId = getRootLibraryId ();
677698
678699 final type = await getInstanceRef (libraryId, '(0,1).runtimeType' );
679- final result = await getInstanceRef (type.id, 'hashCode' );
700+ final result = await getInstanceRef (type.id! , 'hashCode' );
680701
681702 expect (result, matchInstanceRefKind ('Double' ));
682703 },
@@ -687,7 +708,7 @@ void testAll({
687708 final libraryId = getRootLibraryId ();
688709
689710 final type = await getInstanceRef (libraryId, 'Object()' );
690- final result = await getInstanceRef (type.id, 'hashCode' );
711+ final result = await getInstanceRef (type.id! , 'hashCode' );
691712
692713 expect (result, matchInstanceRefKind ('Double' ));
693714 });
@@ -895,7 +916,7 @@ Future<String> _setBreakpointInInjectedClient(WipDebugger debugger) async {
895916 'columnNumber' : 0 ,
896917 },
897918 );
898- return result.json['result' ]['breakpointId' ];
919+ return result.json['result' ]['breakpointId' ] as String ;
899920}
900921
901922Matcher matchInstanceRefKind (String kind) =>
0 commit comments