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

Commit 32fe994

Browse files
author
John Messerly
committed
remove another old analyzer workaround
[email protected] Review URL: https://codereview.chromium.org/1089693002
1 parent 877a8bf commit 32fe994

File tree

4 files changed

+9
-13
lines changed

4 files changed

+9
-13
lines changed

lib/runtime/dart/async.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -920,7 +920,7 @@ var async;
920920
onData(handleData) {
921921
if (handleData == null)
922922
handleData = dart.as(_nullDataHandler, dart.functionType(dart.void, [T]));
923-
this[_onData] = dart.as(this[_zone].registerUnaryCallback(handleData), _DataHandler);
923+
this[_onData] = dart.as(this[_zone].registerUnaryCallback(handleData), _DataHandler$(T));
924924
}
925925
onError(handleError) {
926926
if (handleError == null)
@@ -4303,7 +4303,7 @@ var async;
43034303
if (handleDone == null)
43044304
handleDone = _StreamHandlerTransformer[_defaultHandleDone];
43054305
return new (_HandlerEventSink$(S, T))(handleData, handleError, handleDone, outputSink);
4306-
}, _SinkMapper));
4306+
}, _SinkMapper$(S, T)));
43074307
}
43084308
bind(stream) {
43094309
return super.bind(stream);

lib/runtime/dart/collection.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2828,7 +2828,7 @@ var collection;
28282828
compare = null;
28292829
if (isValidKey === void 0)
28302830
isValidKey = null;
2831-
this[_comparator] = dart.as(compare == null ? core.Comparable.compare : compare, core.Comparator);
2831+
this[_comparator] = dart.as(compare == null ? core.Comparable.compare : compare, core.Comparator$(K));
28322832
this[_validKey] = dart.as(isValidKey != null ? isValidKey : v => dart.is(v, K), _Predicate);
28332833
super._SplayTree();
28342834
}

lib/runtime/dart/core.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1141,7 +1141,7 @@ var core;
11411141
_GeneratorIterable(end, generator) {
11421142
this[_end] = end;
11431143
this[_start] = 0;
1144-
this[_generator] = dart.as(generator != null ? generator : _GeneratorIterable[_id], _Generator);
1144+
this[_generator] = dart.as(generator != null ? generator : _GeneratorIterable[_id], _Generator$(E));
11451145
super.IterableBase();
11461146
}
11471147
slice(start, end, generator) {

lib/src/codegen/js_codegen.dart

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1102,14 +1102,10 @@ class JSCodegenVisitor extends GeneralizingAstVisitor with ConversionVisitor {
11021102

11031103
var typeArgs = null;
11041104
if (type is ParameterizedType) {
1105-
// TODO(jmesserly): this is a workaround for an analyzer bug, see:
1106-
// https://github.com/dart-lang/dev_compiler/commit/a212d59ad046085a626dd8d16881cdb8e8b9c3fa
1107-
if (type is! FunctionType || element is FunctionTypeAlias) {
1108-
var args = type.typeArguments;
1109-
if (args.any((a) => a != types.dynamicType)) {
1110-
name = '$name\$';
1111-
typeArgs = args.map(_emitTypeName);
1112-
}
1105+
var args = type.typeArguments;
1106+
if (args.any((a) => a != types.dynamicType)) {
1107+
name = '$name\$';
1108+
typeArgs = args.map(_emitTypeName);
11131109
}
11141110
}
11151111

@@ -1277,7 +1273,7 @@ class JSCodegenVisitor extends GeneralizingAstVisitor with ConversionVisitor {
12771273
var named = <JS.Property>[];
12781274
for (var arg in node.arguments) {
12791275
if (arg is NamedExpression) {
1280-
named.add(visitNamedExpression(arg));
1276+
named.add(_visit(arg));
12811277
} else {
12821278
args.add(_visit(arg));
12831279
}

0 commit comments

Comments
 (0)