fix(exception_handler): fix error messages of wrapped exceptions

Closes #4117

modules/angular2/src/core/di/binding.ts

@@ -4,11 +4,11 @@ import {
   isPresent,
   CONST,
   CONST_EXPR,
-  BaseException,
   stringify,
   isArray,
   normalizeBool
 } from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import {MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection';
 import {reflector} from 'angular2/src/core/reflection/reflection';
 import {Key} from './key';

modules/angular2/src/core/di/exceptions.ts

@@ -1,5 +1,6 @@
 import {ListWrapper} from 'angular2/src/core/facade/collection';
-import {stringify, BaseException, isBlank} from 'angular2/src/core/facade/lang';
+import {stringify, isBlank} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import {Key} from './key';
 import {Injector} from './injector';
 
@@ -37,9 +38,8 @@ export class AbstractBindingError extends BaseException {
   injectors: Injector[];
   constructResolvingMessage: Function;
 
-  constructor(injector: Injector, key: Key, constructResolvingMessage: Function, originalException?,
-              originalStack?) {
-    super("DI Exception", originalException, originalStack, null);
+  constructor(injector: Injector, key: Key, constructResolvingMessage: Function) {
+    super("DI Exception");
     this.keys = [key];
     this.injectors = [injector];
     this.constructResolvingMessage = constructResolvingMessage;
@@ -53,8 +53,6 @@ export class AbstractBindingError extends BaseException {
   }
 
   get context() { return this.injectors[this.injectors.length - 1].debugContext(); }
-
-  toString(): string { return this.message; }
 }
 
 /**
@@ -100,16 +98,30 @@ export class CyclicDependencyError extends AbstractBindingError {
  * The `InstantiationError` class contains the original error plus the dependency graph which caused
  * this object to be instantiated.
  */
-export class InstantiationError extends AbstractBindingError {
-  causeKey: Key;
-  constructor(injector: Injector, originalException, originalStack, key: Key) {
-    super(injector, key, function(keys: any[]) {
-      var first = stringify(ListWrapper.first(keys).token);
-      return `Error during instantiation of ${first}!${constructResolvingPath(keys)}.`;
-    }, originalException, originalStack);
+export class InstantiationError extends WrappedException {
+  name: string;
+  keys: Key[];
+  injectors: Injector[];
 
-    this.causeKey = key;
+  constructor(injector: Injector, originalException, originalStack, key: Key) {
+    super("DI Exception", originalException, originalStack, null);
+    this.keys = [key];
+    this.injectors = [injector];
   }
+
+  addKey(injector: Injector, key: Key): void {
+    this.injectors.push(injector);
+    this.keys.push(key);
+  }
+
+  get wrapperMessage(): string {
+    var first = stringify(ListWrapper.first(this.keys).token);
+    return `Error during instantiation of ${first}!${constructResolvingPath(this.keys)}.`;
+  }
+
+  get causeKey(): Key { return this.keys[0]; }
+
+  get context() { return this.injectors[this.injectors.length - 1].debugContext(); }
 }
 
 /**

modules/angular2/src/core/di/injector.ts

@@ -647,7 +647,7 @@ export class Injector {
       d18 = length > 18 ? this._getByDependency(binding, deps[18], visibility) : null;
       d19 = length > 19 ? this._getByDependency(binding, deps[19], visibility) : null;
     } catch (e) {
-      if (e instanceof AbstractBindingError) {
+      if (e instanceof AbstractBindingError || e instanceof InstantiationError) {
         e.addKey(this, binding.key);
       }
       throw e;

modules/angular2/src/core/di/key.ts

@@ -1,5 +1,6 @@
 import {MapWrapper} from 'angular2/src/core/facade/collection';
-import {stringify, CONST, Type, isBlank, BaseException} from 'angular2/src/core/facade/lang';
+import {stringify, CONST, Type, isBlank} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import {TypeLiteral} from './type_literal';
 import {resolveForwardRef} from './forward_ref';