fix(exception_handler): fix error messages of wrapped exceptions

angular · Sep 10, 2015 · 6608c99 · 6608c99
1 parent aa5df5f
commit 6608c99
Show file tree

Hide file tree

Showing 137 changed files with 338 additions and 348 deletions.
diff --git a/modules/angular2/src/compiler/template_parser.ts b/modules/angular2/src/compiler/template_parser.ts
@@ -3,13 +3,12 @@ import {
   RegExpWrapper,
   isPresent,
   StringWrapper,
-  BaseException,
   StringJoiner,
   stringify,
   assertionsEnabled,
   isBlank
 } from 'angular2/src/core/facade/lang';
-
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {Parser, AST, ASTWithSource} from 'angular2/src/core/change_detection/change_detection';
 import {TemplateBinding} from 'angular2/src/core/change_detection/parser/ast';
 

diff --git a/modules/angular2/src/core/application_common.ts b/modules/angular2/src/core/application_common.ts
@@ -6,11 +6,15 @@ import {
   Type,
   isBlank,
   isPresent,
-  BaseException,
   assertionsEnabled,
   print,
   stringify
 } from 'angular2/src/core/facade/lang';
+import {
+  BaseException,
+  WrappedException,
+  ExceptionHandler
+} from 'angular2/src/core/facade/exceptions';
 import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter';
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
 import {Compiler, CompilerCache} from './compiler/compiler';
@@ -27,7 +31,6 @@ import {
   KeyValueDiffers,
   defaultKeyValueDiffers
 } from 'angular2/src/core/change_detection/change_detection';
-import {ExceptionHandler} from 'angular2/src/core/facade/exception_handler';
 import {ViewLoader} from 'angular2/src/core/render/dom/compiler/view_loader';
 import {StyleUrlResolver} from 'angular2/src/core/render/dom/compiler/style_url_resolver';
 import {StyleInliner} from 'angular2/src/core/render/dom/compiler/style_inliner';

diff --git a/modules/angular2/src/core/change_detection/abstract_change_detector.ts b/modules/angular2/src/core/change_detection/abstract_change_detector.ts
@@ -1,4 +1,5 @@
-import {isPresent, isBlank, BaseException, StringWrapper} from 'angular2/src/core/facade/lang';
+import {isPresent, isBlank, StringWrapper} from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {ListWrapper} from 'angular2/src/core/facade/collection';
 import {ChangeDetectionUtil} from './change_detection_util';
 import {ChangeDetectorRef} from './change_detector_ref';

diff --git a/modules/angular2/src/core/change_detection/change_detection.ts b/modules/angular2/src/core/change_detection/change_detection.ts
@@ -13,14 +13,7 @@ import {
 } from './interfaces';
 import {Injector, Inject, Injectable, OpaqueToken, Optional, Binding} from 'angular2/src/core/di';
 import {StringMap, StringMapWrapper} from 'angular2/src/core/facade/collection';
-import {
-  CONST,
-  CONST_EXPR,
-  isPresent,
-  BaseException,
-  assertionsEnabled
-} from 'angular2/src/core/facade/lang';
-
+import {CONST, CONST_EXPR, isPresent, assertionsEnabled} from 'angular2/src/core/facade/lang';
 export * from './parser/ast';
 
 export {Lexer} from './parser/lexer';

diff --git a/modules/angular2/src/core/change_detection/change_detection_jit_generator.ts b/modules/angular2/src/core/change_detection/change_detection_jit_generator.ts
@@ -1,10 +1,5 @@
-import {
-  BaseException,
-  Type,
-  isBlank,
-  isPresent,
-  StringWrapper
-} from 'angular2/src/core/facade/lang';
+import {Type, isBlank, isPresent, StringWrapper} from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
 
 import {AbstractChangeDetector} from './abstract_change_detector';
@@ -70,7 +65,7 @@ export class ChangeDetectorJITGenerator {
       ${this.generateSource()}
       return function(dispatcher) {
         return new ${this.typeName}(dispatcher);
-      }      
+      }
     `;
     return new Function(this.abstractChangeDetectorVarName, this.changeDetectionUtilVarName,
                         factorySource)(AbstractChangeDetector, ChangeDetectionUtil);

diff --git a/modules/angular2/src/core/change_detection/change_detection_util.ts b/modules/angular2/src/core/change_detection/change_detection_util.ts
@@ -1,11 +1,5 @@
-import {
-  CONST_EXPR,
-  isPresent,
-  isBlank,
-  BaseException,
-  Type,
-  StringWrapper
-} from 'angular2/src/core/facade/lang';
+import {CONST_EXPR, isPresent, isBlank, Type, StringWrapper} from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
 import {ProtoRecord} from './proto_record';
 import {ChangeDetectionStrategy, isDefaultChangeDetectionStrategy} from './constants';

diff --git a/modules/angular2/src/core/change_detection/codegen_logic_util.ts b/modules/angular2/src/core/change_detection/codegen_logic_util.ts
@@ -1,17 +1,12 @@
 import {ListWrapper} from 'angular2/src/core/facade/collection';
-import {
-  BaseException,
-  Json,
-  StringWrapper,
-  isPresent,
-  isBlank
-} from 'angular2/src/core/facade/lang';
+import {Json, StringWrapper, isPresent, isBlank} from 'angular2/src/core/facade/lang';
 import {CodegenNameUtil} from './codegen_name_util';
 import {codify, combineGeneratedStrings, rawString} from './codegen_facade';
 import {ProtoRecord, RecordType} from './proto_record';
 import {BindingTarget} from './binding_record';
 import {DirectiveRecord} from './directive_record';
 import {ChangeDetectionStrategy} from './constants';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 
 /**
  * Class responsible for providing change detection logic for chagne detector classes.

diff --git a/modules/angular2/src/core/change_detection/differs/default_iterable_differ.ts b/modules/angular2/src/core/change_detection/differs/default_iterable_differ.ts
@@ -1,4 +1,5 @@
-import {CONST, BaseException} from 'angular2/src/core/facade/lang';
+import {CONST} from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {
   isListLikeIterable,
   iterateListLike,

diff --git a/modules/angular2/src/core/change_detection/differs/default_keyvalue_differ.ts b/modules/angular2/src/core/change_detection/differs/default_keyvalue_differ.ts
@@ -1,12 +1,6 @@
 import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
-import {
-  stringify,
-  looseIdentical,
-  isJsObject,
-  CONST,
-  isBlank,
-  BaseException
-} from 'angular2/src/core/facade/lang';
+import {stringify, looseIdentical, isJsObject, CONST, isBlank} from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {ChangeDetectorRef} from '../change_detector_ref';
 import {KeyValueDiffer, KeyValueDifferFactory} from '../differs/keyvalue_differs';
 

diff --git a/modules/angular2/src/core/change_detection/differs/iterable_differs.ts b/modules/angular2/src/core/change_detection/differs/iterable_differs.ts
@@ -1,4 +1,5 @@
-import {isBlank, isPresent, BaseException, CONST} from 'angular2/src/core/facade/lang';
+import {isBlank, isPresent, CONST} from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {ListWrapper} from 'angular2/src/core/facade/collection';
 import {ChangeDetectorRef} from '../change_detector_ref';
 import {Binding, SkipSelfMetadata, OptionalMetadata, Injectable} from 'angular2/src/core/di';

diff --git a/modules/angular2/src/core/change_detection/differs/keyvalue_differs.ts b/modules/angular2/src/core/change_detection/differs/keyvalue_differs.ts
@@ -1,4 +1,5 @@
-import {isBlank, isPresent, BaseException, CONST} from 'angular2/src/core/facade/lang';
+import {isBlank, isPresent, CONST} from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {ListWrapper} from 'angular2/src/core/facade/collection';
 import {ChangeDetectorRef} from '../change_detector_ref';
 import {Binding, SkipSelfMetadata, OptionalMetadata, Injectable} from 'angular2/src/core/di';

diff --git a/modules/angular2/src/core/change_detection/dynamic_change_detector.ts b/modules/angular2/src/core/change_detection/dynamic_change_detector.ts
@@ -1,10 +1,5 @@
-import {
-  isPresent,
-  isBlank,
-  BaseException,
-  FunctionWrapper,
-  StringWrapper
-} from 'angular2/src/core/facade/lang';
+import {isPresent, isBlank, FunctionWrapper, StringWrapper} from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
 
 import {AbstractChangeDetector} from './abstract_change_detector';

diff --git a/modules/angular2/src/core/change_detection/exceptions.ts b/modules/angular2/src/core/change_detection/exceptions.ts
@@ -1,4 +1,4 @@
-import {BaseException} from "angular2/src/core/facade/lang";
+import {BaseException, WrappedException} from "angular2/src/core/facade/exceptions";
 
 /**
  * An error thrown if application changes model breaking the top-down data flow.
@@ -21,7 +21,7 @@ export class ExpressionChangedAfterItHasBeenCheckedException extends BaseExcepti
  *
  * This error wraps the original exception, this is done to attach expression location information.
  */
-export class ChangeDetectionError extends BaseException {
+export class ChangeDetectionError extends WrappedException {
   /**
    * Location of the expression.
    */

diff --git a/modules/angular2/src/core/change_detection/parser/ast.ts b/modules/angular2/src/core/change_detection/parser/ast.ts
@@ -1,4 +1,4 @@
-import {isBlank, isPresent, FunctionWrapper, BaseException} from "angular2/src/core/facade/lang";
+import {isBlank, isPresent, FunctionWrapper} from "angular2/src/core/facade/lang";
 import {Map, ListWrapper, StringMapWrapper} from "angular2/src/core/facade/collection";
 
 export class AST {

diff --git a/modules/angular2/src/core/change_detection/parser/lexer.ts b/modules/angular2/src/core/change_detection/parser/lexer.ts
@@ -1,12 +1,7 @@
 import {Injectable} from 'angular2/src/core/di/decorators';
 import {ListWrapper, SetWrapper} from "angular2/src/core/facade/collection";
-import {
-  NumberWrapper,
-  StringJoiner,
-  StringWrapper,
-  BaseException,
-  isPresent
-} from "angular2/src/core/facade/lang";
+import {NumberWrapper, StringJoiner, StringWrapper, isPresent} from "angular2/src/core/facade/lang";
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 
 export enum TokenType {
   Character,

diff --git a/modules/angular2/src/core/change_detection/parser/locals.ts b/modules/angular2/src/core/change_detection/parser/locals.ts
@@ -1,4 +1,5 @@
-import {isPresent, BaseException} from 'angular2/src/core/facade/lang';
+import {isPresent} from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {ListWrapper, MapWrapper} from 'angular2/src/core/facade/collection';
 
 export class Locals {

diff --git a/modules/angular2/src/core/change_detection/parser/parser.ts b/modules/angular2/src/core/change_detection/parser/parser.ts
@@ -1,5 +1,6 @@
 import {Injectable} from 'angular2/src/core/di/decorators';
-import {isBlank, isPresent, BaseException, StringWrapper} from 'angular2/src/core/facade/lang';
+import {isBlank, isPresent, StringWrapper} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import {ListWrapper} from 'angular2/src/core/facade/collection';
 import {
   Lexer,
@@ -51,8 +52,7 @@ var INTERPOLATION_REGEXP = /\{\{(.*?)\}\}/g;
 
 class ParseException extends BaseException {
   constructor(message: string, input: string, errLocation: string, ctxLocation?: any) {
-    super(`Parser Error: ${message} ${errLocation} [${input}] in ${ctxLocation}`, null, null,
-          ctxLocation);
+    super(`Parser Error: ${message} ${errLocation} [${input}] in ${ctxLocation}`);
   }
 }
 

diff --git a/modules/angular2/src/core/change_detection/pipe_transform.ts b/modules/angular2/src/core/change_detection/pipe_transform.ts
@@ -1,5 +1,3 @@
-import {ABSTRACT, BaseException, CONST, Type} from 'angular2/src/core/facade/lang';
-
 /**
  * To create a Pipe, you must implement this interface.
  *

diff --git a/modules/angular2/src/core/change_detection/pregen_proto_change_detector.ts b/modules/angular2/src/core/change_detection/pregen_proto_change_detector.ts
@@ -1,4 +1,4 @@
-import {BaseException} from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 
 import {ProtoChangeDetector, ChangeDetector} from './interfaces';
 import {coalesce} from './coalesce';

diff --git a/modules/angular2/src/core/change_detection/proto_change_detector.ts b/modules/angular2/src/core/change_detection/proto_change_detector.ts
@@ -1,4 +1,5 @@
-import {BaseException, Type, isBlank, isPresent, isString} from 'angular2/src/core/facade/lang';
+import {Type, isBlank, isPresent, isString} from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
 
 import {

diff --git a/modules/angular2/src/core/compiler/compiler.ts b/modules/angular2/src/core/compiler/compiler.ts
@@ -5,12 +5,12 @@ import {
   isBlank,
   isType,
   isPresent,
-  BaseException,
   normalizeBlank,
   stringify,
   isArray,
   isPromise
 } from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async';
 import {ListWrapper, Map, MapWrapper} from 'angular2/src/core/facade/collection';
 

diff --git a/modules/angular2/src/core/compiler/directive_resolver.ts b/modules/angular2/src/core/compiler/directive_resolver.ts
@@ -1,5 +1,6 @@
 import {resolveForwardRef, Injectable} from 'angular2/src/core/di';
-import {Type, isPresent, BaseException, stringify} from 'angular2/src/core/facade/lang';
+import {Type, isPresent, stringify} from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {ListWrapper, StringMap, StringMapWrapper} from 'angular2/src/core/facade/collection';
 import {
   DirectiveMetadata,

diff --git a/modules/angular2/src/core/compiler/dynamic_component_loader.ts b/modules/angular2/src/core/compiler/dynamic_component_loader.ts
@@ -1,6 +1,6 @@
 import {Key, Injector, ResolvedBinding, Binding, bind, Injectable} from 'angular2/src/core/di';
 import {Compiler} from './compiler';
-import {Type, BaseException, stringify, isPresent} from 'angular2/src/core/facade/lang';
+import {Type, stringify, isPresent} from 'angular2/src/core/facade/lang';
 import {Promise} from 'angular2/src/core/facade/async';
 import {AppViewManager} from 'angular2/src/core/compiler/view_manager';
 import {ElementRef} from './element_ref';

diff --git a/modules/angular2/src/core/compiler/element_binder.ts b/modules/angular2/src/core/compiler/element_binder.ts
@@ -1,4 +1,5 @@
-import {isBlank, isPresent, BaseException} from 'angular2/src/core/facade/lang';
+import {isBlank, isPresent} from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import * as eiModule from './element_injector';
 import {DirectiveBinding} from './element_injector';
 import * as viewModule from './view';

diff --git a/modules/angular2/src/core/compiler/element_injector.ts b/modules/angular2/src/core/compiler/element_injector.ts
@@ -2,11 +2,11 @@ import {
   isPresent,
   isBlank,
   Type,
-  BaseException,
   stringify,
   CONST_EXPR,
   StringWrapper
 } from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async';
 import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
 import {

diff --git a/modules/angular2/src/core/compiler/element_ref.ts b/modules/angular2/src/core/compiler/element_ref.ts
@@ -1,4 +1,4 @@
-import {BaseException, isPresent} from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {ViewRef} from './view_ref';
 import {RenderViewRef, RenderElementRef, Renderer} from 'angular2/src/core/render/api';
 

diff --git a/modules/angular2/src/core/compiler/pipe_resolver.ts b/modules/angular2/src/core/compiler/pipe_resolver.ts
@@ -1,5 +1,6 @@
 import {resolveForwardRef, Injectable} from 'angular2/src/core/di';
-import {Type, isPresent, BaseException, stringify} from 'angular2/src/core/facade/lang';
+import {Type, isPresent, stringify} from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {PipeMetadata} from 'angular2/src/core/metadata';
 import {reflector} from 'angular2/src/core/reflection/reflection';
 

diff --git a/modules/angular2/src/core/compiler/proto_view_factory.ts b/modules/angular2/src/core/compiler/proto_view_factory.ts
@@ -1,13 +1,8 @@
 import {Injectable} from 'angular2/src/core/di';
 
 import {ListWrapper, MapWrapper} from 'angular2/src/core/facade/collection';
-import {
-  StringWrapper,
-  isPresent,
-  isBlank,
-  BaseException,
-  assertionsEnabled
-} from 'angular2/src/core/facade/lang';
+import {StringWrapper, isPresent, isBlank, assertionsEnabled} from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {reflector} from 'angular2/src/core/reflection/reflection';
 
 import {

diff --git a/modules/angular2/src/core/compiler/view.ts b/modules/angular2/src/core/compiler/view.ts
@@ -25,7 +25,8 @@ import {
   DirectiveBinding
 } from './element_injector';
 import {ElementBinder} from './element_binder';
-import {isPresent, isBlank, BaseException} from 'angular2/src/core/facade/lang';
+import {isPresent, isBlank} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import * as renderApi from 'angular2/src/core/render/api';
 import {RenderEventDispatcher} from 'angular2/src/core/render/api';
 import {ViewRef, ProtoViewRef, internalView} from './view_ref';
@@ -318,7 +319,7 @@ class _Context {
 /**
  * Wraps an exception thrown by an event handler.
  */
-class EventEvaluationError extends BaseException {
+class EventEvaluationError extends WrappedException {
   constructor(eventName: string, originalException: any, originalStack: any, context: any) {
     super(`Error during evaluation of "${eventName}"`, originalException, originalStack, context);
   }

diff --git a/modules/angular2/src/core/compiler/view_manager.ts b/modules/angular2/src/core/compiler/view_manager.ts
@@ -1,5 +1,6 @@
 import {Injector, Binding, Injectable, ResolvedBinding} from 'angular2/src/core/di';
-import {isPresent, isBlank, BaseException} from 'angular2/src/core/facade/lang';
+import {isPresent, isBlank} from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import * as viewModule from './view';
 import {ElementRef} from './element_ref';
 import {ProtoViewRef, ViewRef, HostViewRef, internalView, internalProtoView} from './view_ref';

diff --git a/modules/angular2/src/core/compiler/view_manager_utils.ts b/modules/angular2/src/core/compiler/view_manager_utils.ts
@@ -1,7 +1,7 @@
 import {Injector, Binding, Injectable, ResolvedBinding} from 'angular2/src/core/di';
 import {ListWrapper, MapWrapper, Map, StringMapWrapper} from 'angular2/src/core/facade/collection';
 import * as eli from './element_injector';
-import {isPresent, isBlank, BaseException} from 'angular2/src/core/facade/lang';
+import {isPresent, isBlank} from 'angular2/src/core/facade/lang';
 import * as viewModule from './view';
 import {internalView} from './view_ref';
 import * as avmModule from './view_manager';

diff --git a/modules/angular2/src/core/compiler/view_resolver.ts b/modules/angular2/src/core/compiler/view_resolver.ts
@@ -1,7 +1,8 @@
 import {Injectable} from 'angular2/src/core/di';
 import {ViewMetadata} from '../metadata/view';
 
-import {Type, stringify, isBlank, BaseException} from 'angular2/src/core/facade/lang';
+import {Type, stringify, isBlank} from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {Map, MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection';
 
 import {reflector} from 'angular2/src/core/reflection/reflection';

diff --git a/modules/angular2/src/core/debug/debug_element.ts b/modules/angular2/src/core/debug/debug_element.ts
@@ -1,4 +1,4 @@
-import {Type, isPresent, BaseException, isBlank} from 'angular2/src/core/facade/lang';
+import {Type, isPresent, isBlank} from 'angular2/src/core/facade/lang';
 import {ListWrapper, MapWrapper, Predicate} from 'angular2/src/core/facade/collection';
 
 import {DOM} from 'angular2/src/core/dom/dom_adapter';

diff --git a/modules/angular2/src/core/di/binding.ts b/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';