Fix tests

lib/src/codegen/js_codegen.dart

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library js_codegen;
 
 import 'dart:collection' show HashSet, HashMap, SplayTreeSet;
 
 import 'package:analyzer/analyzer.dart' hide ConstantEvaluator;
+import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/src/generated/ast.dart' hide ConstantEvaluator;
 import 'package:analyzer/src/generated/constant.dart';
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/engine.dart' show AnalysisContext;
 import 'package:analyzer/src/generated/resolver.dart' show TypeProvider;
-import 'package:analyzer/src/generated/scanner.dart'
+import 'package:analyzer/src/dart/ast/token.dart'
     show StringToken, Token, TokenType;
 import 'package:analyzer/src/generated/type_system.dart'
     show StrongTypeSystemImpl;
 import 'package:analyzer/src/task/dart.dart' show PublicNamespaceBuilder;
 
 import 'ast_builder.dart' show AstBuilder;
 import 'reify_coercions.dart' show CoercionReifier, Tuple2;
 
 // TODO(jmesserly): import from its own package
 import '../js/js_ast.dart' as JS;
@@ skipping 1295 matching lines @@
       t is ParameterizedType && t.typeArguments.any(_hasUnsoundTypeParameter);
 
   JS.Expression _defaultParamValue(FormalParameter param) {
     if (param is DefaultFormalParameter && param.defaultValue != null) {
       return _visit(param.defaultValue);
     } else {
       return new JS.LiteralNull();
     }
   }
 
-  JS.Fun _emitNativeFunctionBody(
-      List<JS.Parameter> params, List<JS.Expression> paramRefs,
-      MethodDeclaration node) {
+  JS.Fun _emitNativeFunctionBody(List<JS.Parameter> params,
+      List<JS.Expression> paramRefs, MethodDeclaration node) {
     if (node.isStatic) {
       // TODO(vsm): Do we need to handle this case?
       return null;
     }
 
     String name = node.name.name;
     var annotation = findAnnotation(node.element, isJsName);
     if (annotation != null) {
       name = getConstantField(annotation, 'name', types.stringType)
           ?.toStringValue();
@@ skipping 214 matching lines @@
       // arrow functions yet (e.g. `({a} = {}) => 1`) but happily accepts them
       // with regular functions (e.g. `function({a} = {}) { return 1 }`).
       // Note that Firefox accepts both syntaxes just fine.
       // TODO(ochafik): Simplify this code when Chrome Canary catches up.
       var canUseArrowFun = !node.parameters.parameters.any(_isNamedParam);
 
       JS.Node jsBody;
       var body = node.body;
       if (body.isGenerator || body.isAsynchronous) {
         var paramRefs = _emitParameterReferences(node.parameters);
-        jsBody = _emitGeneratorFunctionBody(
-            params, paramRefs, body, returnType);
+        jsBody =
+            _emitGeneratorFunctionBody(params, paramRefs, body, returnType);
       } else if (body is ExpressionFunctionBody) {
         jsBody = _visit(body.expression);
       } else {
         jsBody = _visit(body);
       }
       if (jsBody is JS.Expression && !canUseArrowFun) {
         jsBody = js.statement("{ return #; }", [jsBody]);
       }
       var clos = canUseArrowFun
           ? new JS.ArrowFun(params, jsBody,
               typeParams: typeParams, returnType: returnType)
           : new JS.Fun(params, jsBody,
               typeParams: typeParams, returnType: returnType);
       if (!inStmt) {
         var type = getStaticType(node);
         return _emitFunctionTagged(clos, type,
             topLevel: _executesAtTopLevel(node));
       }
       return clos;
     }
   }
 
-  JS.Fun _emitFunctionBody(List<JS.Parameter> params,
-      List<JS.Expression> paramRefs, FunctionBody body,
-      List<JS.Identifier> typeParams, JS.TypeRef returnType) {
+  JS.Fun _emitFunctionBody(
+      List<JS.Parameter> params,
+      List<JS.Expression> paramRefs,
+      FunctionBody body,
+      List<JS.Identifier> typeParams,
+      JS.TypeRef returnType) {
     // sync*, async, async*
     if (body.isAsynchronous || body.isGenerator) {
       // TODO(ochafik): Refine params: we don't need default values in the
       // nested function, so we'd need to generate a custom, simpler params
       // list here.
       return new JS.Fun(
           params,
           js.statement('{ return #; }', [
             _emitGeneratorFunctionBody(params, paramRefs, body, returnType)
           ]),
           returnType: returnType);
     }
     // normal function (sync)
     return new JS.Fun(params, _visit(body),
         typeParams: typeParams, returnType: returnType);
   }
 
-  JS.Expression _emitGeneratorFunctionBody(
-      List<JS.Parameter> params, List<JS.Expression> paramRefs,
-      FunctionBody body, JS.TypeRef returnType) {
+  JS.Expression _emitGeneratorFunctionBody(List<JS.Parameter> params,
+      List<JS.Expression> paramRefs, FunctionBody body, JS.TypeRef returnType) {
     var kind = body.isSynchronous ? 'sync' : 'async';
     if (body.isGenerator) kind += 'Star';
 
     // Transforms `sync*` `async` and `async*` function bodies
     // using ES6 generators.
     //
     // `sync*` wraps a generator in a Dart Iterable<T>:
     //
     // function name(<args>) {
     //   return dart.syncStar(function*(<args>) {
@@ skipping 548 matching lines @@
   bool _isNamedParam(FormalParameter param) =>
       param.kind == ParameterKind.NAMED;
 
   @override
   List<JS.Parameter> visitFormalParameterList(FormalParameterList node) =>
       _emitFormalParameterList(node);
 
   // TODO(ochafik): Decouple Parameter from Identifier.
   List<JS.Expression> _emitParameterReferences(FormalParameterList node) =>
       node == null
-      ? <JS.Expression>[]
-      : _emitFormalParameterList(node, allowDestructuring: false)
-          .map((JS.Parameter p) {
-            if (p is JS.RestParameter) return new JS.Spread(p.parameter);
-            return p as JS.Identifier;
-          })
-          .toList();
+          ? <JS.Expression>[]
+          : _emitFormalParameterList(node, allowDestructuring: false)
+              .map((JS.Parameter p) {
+              if (p is JS.RestParameter) return new JS.Spread(p.parameter);
+              return p as JS.Identifier;
+            }).toList();
 
   List<JS.Parameter> _emitFormalParameterList(FormalParameterList node,
       {bool allowDestructuring: true}) {
     var result = <JS.Parameter>[];
 
     var namedVars = <JS.DestructuredVariable>[];
     var destructure = allowDestructuring && options.destructureNamedParams;
     var hasNamedArgsConflictingWithObjectProperties = false;
     var needsOpts = false;
 
@@ skipping 14 matching lines @@
           }
           namedVars.add(new JS.DestructuredVariable(
               name: name,
               structure: structure,
               defaultValue: _defaultParamValue(param)));
         } else {
           needsOpts = true;
         }
       } else {
         var jsParam = _visit(param);
-        result.add(
-            param is DefaultFormalParameter && destructure
-                ? new JS.DestructuredVariable(
-                    name: jsParam, defaultValue: _defaultParamValue(param))
-                : jsParam);
+        result.add(param is DefaultFormalParameter && destructure
+            ? new JS.DestructuredVariable(
+                name: jsParam, defaultValue: _defaultParamValue(param))
+            : jsParam);
       }
     }
 
     if (needsOpts) {
       result.add(_namedArgTemp);
     } else if (namedVars.isNotEmpty) {
       // Note: `var {valueOf} = {}` extracts `Object.prototype.valueOf`, so
       // in case there are conflicting names we create an object without
       // any prototype.
       var defaultOpts = hasNamedArgsConflictingWithObjectProperties
@@ skipping 1540 matching lines @@
 
 /// A special kind of element created by the compiler, signifying a temporary
 /// variable. These objects use instance equality, and should be shared
 /// everywhere in the tree where they are treated as the same variable.
 class TemporaryVariableElement extends LocalVariableElementImpl {
   TemporaryVariableElement.forNode(Identifier name) : super.forNode(name);
 
   int get hashCode => identityHashCode(this);
   bool operator ==(Object other) => identical(this, other);
 }