cargdev/angular
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(ivy): dedup render3 NodeInjector (#27541)

Browse Source 
We had two `NodeInjector` classes: one in `view_compatibility` and one in `di`. We replaced the one in `di` with the one from `view_compatibility` and reconciled their differences.
PR Close #27541
This commit is contained in:
Olivier Combe
2018-12-07 10:56:51 +01:00
committed by Alex Rickabaugh
parent 44dd764d6d
commit 9e7a8f6e89
4 changed files with 13 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/core/src/render3/di.ts
View File

@ -287,10 +287,12 @@ export function injectAttributeImpl(tNode: TNode, attrNameToInject: string): str
* Look for the injector providing the token by walking up the node injector tree and then
* the module injector tree.
*
* @param nodeInjector Node injector where the search should start
* @param tNode The Node where the search for the injector should start
* @param lView The `LView` that contains the `tNode`
* @param token The token to look for
* @param flags Injection flags
* @returns the value from the injector or `null` when not found
* @param notFoundValue The value to return when the injection flags is `InjectFlags.Optional`
* @returns the value from the injector, `null` when not found, or `notFoundValue` if provided
*/
export function getOrCreateInjectable<T>(
tNode: TElementNode | TContainerNode | TElementContainerNode, lView: LView,
@ -558,22 +560,11 @@ export function injectInjector() {
}
export class NodeInjector implements Injector {
private _injectorIndex: number;
constructor(
private _tNode: TElementNode|TContainerNode|TElementContainerNode, private _lView: LView) {
this._injectorIndex = getOrCreateNodeInjectorForNode(_tNode, _lView);
}
private _tNode: TElementNode|TContainerNode|TElementContainerNode, private _lView: LView) {}
get(token: any): any {
const previousTNode = getPreviousOrParentTNode();
const previousLView = getLView();
setTNodeAndViewData(this._tNode, this._lView);
try {
return getOrCreateInjectable(this._tNode, this._lView, token);
} finally {
setTNodeAndViewData(previousTNode, previousLView);
}
get(token: any, notFoundValue?: any): any {
return getOrCreateInjectable(this._tNode, this._lView, token, undefined, notFoundValue);
}
}