Stop using generic comment syntax in observatory.
In most cases the correct fix is to simply drop the generic comment
syntax (e.g. replace "List/*<Map>*/" with "List"). We can't use the
more precise type because the runtime type is actually more general
(e.g. when processing an object that came from the JSON parser, all
lists have runtime type List<dynamic>, even if their elements happen
to be uniform). But we can introduce more precise types when handling
substructures.
Exception: all JSON-derived maps have type Map<String, dynamic> (since
JSON maps always have string keys), so we can use a more precise type
when dealing with JSON maps.
Change-Id: I48c9dbdda97c11530978212146f74db7b43f5197
Reviewed-on: https://dart-review.googlesource.com/58320
Reviewed-by: Ryan Macnak <rmacnak@google.com>
Commit-Queue: Paul Berry <paulberry@google.com>
diff --git a/runtime/observatory/lib/src/service/object.dart b/runtime/observatory/lib/src/service/object.dart
index dfe58d8..ace655c 100644
--- a/runtime/observatory/lib/src/service/object.dart
+++ b/runtime/observatory/lib/src/service/object.dart
@@ -2053,8 +2053,9 @@
}
/// A [ServiceObject] which implements [Map].
-class ServiceMap extends ServiceObject implements Map, M.UnknownObjectRef {
- final Map _map = {};
+class ServiceMap extends ServiceObject
+ implements Map<String, dynamic>, M.UnknownObjectRef {
+ final Map<String, dynamic> _map = {};
static String objectIdRingPrefix = 'objects/';
bool get immutable => false;
@@ -2092,7 +2093,7 @@
operator []=(k, v) => _map[k] = v;
bool get isEmpty => _map.isEmpty;
bool get isNotEmpty => _map.isNotEmpty;
- Iterable get keys => _map.keys;
+ Iterable<String> get keys => _map.keys;
Iterable get values => _map.values;
int get length => _map.length;
@@ -3617,7 +3618,7 @@
library = map['library'];
}
- void _parseTokenPosTable(List/*<List<int>>*/ table) {
+ void _parseTokenPosTable(List table) {
if (table == null) {
return;
}
@@ -3627,14 +3628,14 @@
lastTokenPos = null;
var lineSet = new Set();
- for (var line in table) {
+ for (List line in table) {
// Each entry begins with a line number...
- var lineNumber = line[0];
+ int lineNumber = line[0];
lineSet.add(lineNumber);
for (var pos = 1; pos < line.length; pos += 2) {
// ...and is followed by (token offset, col number) pairs.
- var tokenOffset = line[pos];
- var colNumber = line[pos + 1];
+ int tokenOffset = line[pos];
+ int colNumber = line[pos + 1];
if (firstTokenPos == null) {
// Mark first token position.
firstTokenPos = tokenOffset;
@@ -4427,7 +4428,7 @@
}
}
- void _processDescriptors(List/*<Map>*/ descriptors) {
+ void _processDescriptors(List descriptors) {
for (Map descriptor in descriptors) {
var pcOffset = int.parse(descriptor['pcOffset'], radix: 16);
var address = startAddress + pcOffset;
@@ -4587,7 +4588,7 @@
String toString() => "ServiceMetric($_id)";
}
-Future<Null> printFrames(List/*<Frame>*/ frames) async {
+Future<Null> printFrames(List frames) async {
for (int i = 0; i < frames.length; i++) {
final Frame frame = frames[i];
String frameText = await frame.toUserString();
diff --git a/runtime/observatory/tests/service/bad_reload_test.dart b/runtime/observatory/tests/service/bad_reload_test.dart
index 23927e9..660e683 100644
--- a/runtime/observatory/tests/service/bad_reload_test.dart
+++ b/runtime/observatory/tests/service/bad_reload_test.dart
@@ -66,9 +66,9 @@
);
// Observe that it failed.
expect(response['success'], isFalse);
- List/*<Map<String, dynamic>>*/ notices = response['details']['notices'];
+ List notices = response['details']['notices'];
expect(notices.length, equals(1));
- Map/*<String, dynamic>*/ reasonForCancelling = notices[0];
+ Map<String, dynamic> reasonForCancelling = notices[0];
expect(reasonForCancelling['type'], equals('ReasonForCancelling'));
expect(reasonForCancelling['message'], contains('library_isnt_here_man'));
diff --git a/runtime/observatory/tests/service/service_test_common.dart b/runtime/observatory/tests/service/service_test_common.dart
index 71eea66..bf3dca8 100644
--- a/runtime/observatory/tests/service/service_test_common.dart
+++ b/runtime/observatory/tests/service/service_test_common.dart
@@ -116,7 +116,8 @@
(event.breakpoint == syntheticBreakpoint);
if (isAdd) {
syntheticBreakpoint = event.breakpoint;
- } else if (isResume) {} else if (isPaused) {
+ } else if (isResume) {
+ } else if (isPaused) {
pausedAtSyntheticBreakpoint.complete(isolate);
syntheticBreakpoint = null;
cancelSubscription();
@@ -269,7 +270,7 @@
ServiceMap stack = await isolate.getStack();
expect(stack.type, equals('Stack'));
- List/*<Frame>*/ frames = stack['frames'];
+ List frames = stack['frames'];
expect(frames.length, greaterThanOrEqualTo(1));
Frame top = frames[0];
@@ -297,10 +298,10 @@
ServiceMap stack = await isolate.getStack();
expect(stack.type, equals('Stack'));
- List/*<Frame>*/ frames = stack['frames'];
+ List frames = stack['frames'];
expect(frames.length, greaterThanOrEqualTo(1));
- Frame topFrame = stack['frames'][0];
+ Frame topFrame = frames[0];
ServiceFunction function = await topFrame.function.load();
String name = function.name;
if (includeOwner) {
@@ -315,7 +316,7 @@
sb.write("Expected to be in function $functionName but "
"actually in function $name");
sb.write("\nFull stack trace:\n");
- for (Frame f in stack['frames']) {
+ for (Frame f in frames) {
await f.function.load();
await (f.function.dartOwner as ServiceObject).load();
String name = f.function.name;
@@ -444,7 +445,7 @@
// We are paused: Resume after recording.
ServiceMap stack = await isolate.getStack();
expect(stack.type, equals('Stack'));
- List/*<Frame>*/ frames = stack['frames'];
+ List frames = stack['frames'];
expect(frames.length, greaterThanOrEqualTo(2));
Frame frame = frames[0];
String brokeAt = await frame.location.toUserString();
