Skip to content

Commit f6cc573

Browse files
committed
fix(exception_handler): fix error messages of wrapped exceptions
Closes angular#4117
1 parent 892d2b9 commit f6cc573

File tree

137 files changed

+338
-348
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+338
-348
lines changed

modules/angular2/src/compiler/template_parser.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@ import {
33
RegExpWrapper,
44
isPresent,
55
StringWrapper,
6-
BaseException,
76
StringJoiner,
87
stringify,
98
assertionsEnabled,
109
isBlank
1110
} from 'angular2/src/core/facade/lang';
12-
11+
import {BaseException} from 'angular2/src/core/facade/exceptions';
1312
import {Parser, AST, ASTWithSource} from 'angular2/src/core/change_detection/change_detection';
1413
import {TemplateBinding} from 'angular2/src/core/change_detection/parser/ast';
1514

modules/angular2/src/core/application_common.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,15 @@ import {
66
Type,
77
isBlank,
88
isPresent,
9-
BaseException,
109
assertionsEnabled,
1110
print,
1211
stringify
1312
} from 'angular2/src/core/facade/lang';
13+
import {
14+
BaseException,
15+
WrappedException,
16+
ExceptionHandler
17+
} from 'angular2/src/core/facade/exceptions';
1418
import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter';
1519
import {DOM} from 'angular2/src/core/dom/dom_adapter';
1620
import {Compiler, CompilerCache} from './compiler/compiler';
@@ -27,7 +31,6 @@ import {
2731
KeyValueDiffers,
2832
defaultKeyValueDiffers
2933
} from 'angular2/src/core/change_detection/change_detection';
30-
import {ExceptionHandler} from 'angular2/src/core/facade/exception_handler';
3134
import {ViewLoader} from 'angular2/src/core/render/dom/compiler/view_loader';
3235
import {StyleUrlResolver} from 'angular2/src/core/render/dom/compiler/style_url_resolver';
3336
import {StyleInliner} from 'angular2/src/core/render/dom/compiler/style_inliner';

modules/angular2/src/core/change_detection/abstract_change_detector.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import {isPresent, isBlank, BaseException, StringWrapper} from 'angular2/src/core/facade/lang';
1+
import {isPresent, isBlank, StringWrapper} from 'angular2/src/core/facade/lang';
2+
import {BaseException} from 'angular2/src/core/facade/exceptions';
23
import {ListWrapper} from 'angular2/src/core/facade/collection';
34
import {ChangeDetectionUtil} from './change_detection_util';
45
import {ChangeDetectorRef} from './change_detector_ref';

modules/angular2/src/core/change_detection/change_detection.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,7 @@ import {
1313
} from './interfaces';
1414
import {Injector, Inject, Injectable, OpaqueToken, Optional, Binding} from 'angular2/src/core/di';
1515
import {StringMap, StringMapWrapper} from 'angular2/src/core/facade/collection';
16-
import {
17-
CONST,
18-
CONST_EXPR,
19-
isPresent,
20-
BaseException,
21-
assertionsEnabled
22-
} from 'angular2/src/core/facade/lang';
23-
16+
import {CONST, CONST_EXPR, isPresent, assertionsEnabled} from 'angular2/src/core/facade/lang';
2417
export * from './parser/ast';
2518

2619
export {Lexer} from './parser/lexer';

modules/angular2/src/core/change_detection/change_detection_jit_generator.ts

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
import {
2-
BaseException,
3-
Type,
4-
isBlank,
5-
isPresent,
6-
StringWrapper
7-
} from 'angular2/src/core/facade/lang';
1+
import {Type, isBlank, isPresent, StringWrapper} from 'angular2/src/core/facade/lang';
2+
import {BaseException} from 'angular2/src/core/facade/exceptions';
83
import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
94

105
import {AbstractChangeDetector} from './abstract_change_detector';
@@ -70,7 +65,7 @@ export class ChangeDetectorJITGenerator {
7065
${this.generateSource()}
7166
return function(dispatcher) {
7267
return new ${this.typeName}(dispatcher);
73-
}
68+
}
7469
`;
7570
return new Function(this.abstractChangeDetectorVarName, this.changeDetectionUtilVarName,
7671
factorySource)(AbstractChangeDetector, ChangeDetectionUtil);

modules/angular2/src/core/change_detection/change_detection_util.ts

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
1-
import {
2-
CONST_EXPR,
3-
isPresent,
4-
isBlank,
5-
BaseException,
6-
Type,
7-
StringWrapper
8-
} from 'angular2/src/core/facade/lang';
1+
import {CONST_EXPR, isPresent, isBlank, Type, StringWrapper} from 'angular2/src/core/facade/lang';
2+
import {BaseException} from 'angular2/src/core/facade/exceptions';
93
import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
104
import {ProtoRecord} from './proto_record';
115
import {ChangeDetectionStrategy, isDefaultChangeDetectionStrategy} from './constants';

modules/angular2/src/core/change_detection/codegen_logic_util.ts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
import {ListWrapper} from 'angular2/src/core/facade/collection';
2-
import {
3-
BaseException,
4-
Json,
5-
StringWrapper,
6-
isPresent,
7-
isBlank
8-
} from 'angular2/src/core/facade/lang';
2+
import {Json, StringWrapper, isPresent, isBlank} from 'angular2/src/core/facade/lang';
93
import {CodegenNameUtil} from './codegen_name_util';
104
import {codify, combineGeneratedStrings, rawString} from './codegen_facade';
115
import {ProtoRecord, RecordType} from './proto_record';
126
import {BindingTarget} from './binding_record';
137
import {DirectiveRecord} from './directive_record';
148
import {ChangeDetectionStrategy} from './constants';
9+
import {BaseException} from 'angular2/src/core/facade/exceptions';
1510

1611
/**
1712
* Class responsible for providing change detection logic for chagne detector classes.

modules/angular2/src/core/change_detection/differs/default_iterable_differ.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import {CONST, BaseException} from 'angular2/src/core/facade/lang';
1+
import {CONST} from 'angular2/src/core/facade/lang';
2+
import {BaseException} from 'angular2/src/core/facade/exceptions';
23
import {
34
isListLikeIterable,
45
iterateListLike,

modules/angular2/src/core/change_detection/differs/default_keyvalue_differ.ts

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
2-
import {
3-
stringify,
4-
looseIdentical,
5-
isJsObject,
6-
CONST,
7-
isBlank,
8-
BaseException
9-
} from 'angular2/src/core/facade/lang';
2+
import {stringify, looseIdentical, isJsObject, CONST, isBlank} from 'angular2/src/core/facade/lang';
3+
import {BaseException} from 'angular2/src/core/facade/exceptions';
104
import {ChangeDetectorRef} from '../change_detector_ref';
115
import {KeyValueDiffer, KeyValueDifferFactory} from '../differs/keyvalue_differs';
126

modules/angular2/src/core/change_detection/differs/iterable_differs.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import {isBlank, isPresent, BaseException, CONST} from 'angular2/src/core/facade/lang';
1+
import {isBlank, isPresent, CONST} from 'angular2/src/core/facade/lang';
2+
import {BaseException} from 'angular2/src/core/facade/exceptions';
23
import {ListWrapper} from 'angular2/src/core/facade/collection';
34
import {ChangeDetectorRef} from '../change_detector_ref';
45
import {Binding, SkipSelfMetadata, OptionalMetadata, Injectable} from 'angular2/src/core/di';

0 commit comments

Comments
 (0)