Version 2.11.0-189.0.dev
Merge commit '4db0411cbd98c21666aa288eb14bcd9b440cc44c' into 'dev'
diff --git a/pkg/dev_compiler/lib/src/kernel/compiler.dart b/pkg/dev_compiler/lib/src/kernel/compiler.dart
index 7e7566e..31522ce 100644
--- a/pkg/dev_compiler/lib/src/kernel/compiler.dart
+++ b/pkg/dev_compiler/lib/src/kernel/compiler.dart
@@ -5079,7 +5079,7 @@
assert(result is js_ast.Expression ||
result is js_ast.Statement && node.parent is ExpressionStatement);
- return result;
+ return result.withSourceInformation(_nodeStart(node));
}
bool _isWebLibrary(Uri importUri) =>
diff --git a/pkg/vm_service/test/http_enable_timeline_logging_service_test.dart b/pkg/vm_service/test/http_enable_timeline_logging_service_test.dart
index b236cc4..10157d5 100644
--- a/pkg/vm_service/test/http_enable_timeline_logging_service_test.dart
+++ b/pkg/vm_service/test/http_enable_timeline_logging_service_test.dart
@@ -4,9 +4,10 @@
import 'dart:async';
-import 'package:vm_service/vm_service.dart';
-import 'package:vm_service/src/dart_io_extensions.dart';
import 'package:test/test.dart';
+import 'package:vm_service/src/dart_io_extensions.dart';
+import 'package:vm_service/vm_service.dart';
+
import 'common/service_test_common.dart';
import 'common/test_helper.dart';
@@ -16,6 +17,7 @@
'ext.dart.io.getHttpEnableTimelineLogging';
const String kHttpEnableTimelineLogging =
'ext.dart.io.httpEnableTimelineLogging';
+
Future<void> setup() async {}
Future<void> waitForStreamEvent(
@@ -34,6 +36,7 @@
await service.streamListen(EventStreams.kExtension);
if (useSetter) {
+ // ignore: deprecated_member_use_from_same_package
await service.setHttpEnableTimelineLogging(isolateId, state);
} else {
await service.httpEnableTimelineLogging(isolateId, state);
@@ -55,14 +58,17 @@
},
(VmService service, IsolateRef isolateRef) async {
final isolateId = isolateRef.id;
+ // ignore: deprecated_member_use_from_same_package
dynamic response = await service.getHttpEnableTimelineLogging(isolateId);
expect(response.enabled, false);
await waitForStreamEvent(service, isolateRef, true);
+ // ignore: deprecated_member_use_from_same_package
response = await service.getHttpEnableTimelineLogging(isolateId);
expect(response.enabled, true);
await waitForStreamEvent(service, isolateRef, false);
+ // ignore: deprecated_member_use_from_same_package
response = await service.getHttpEnableTimelineLogging(isolateId);
expect(response.enabled, false);
},
diff --git a/tools/VERSION b/tools/VERSION
index 7693e3e..b629cdf0 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
MAJOR 2
MINOR 11
PATCH 0
-PRERELEASE 188
+PRERELEASE 189
PRERELEASE_PATCH 0
\ No newline at end of file
