maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Switch to isNodeDescendantOf

Browse source
This commit is contained in:
Nathan Shively-Sanders 2015-10-31 12:42:04 -07:00
parent 6aecd43d9a
commit 201266b97f
3 changed files with 10 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/compiler/checker.ts
View file

@ -4420,26 +4420,13 @@ namespace ts {
let container = getThisContainer(node, /*includeArrowFunctions*/ false); let container = getThisContainer(node, /*includeArrowFunctions*/ false);
let parent = container && container.parent; let parent = container && container.parent;
if (parent && (isClassLike(parent) || parent.kind === SyntaxKind.InterfaceDeclaration)) { if (parent && (isClassLike(parent) || parent.kind === SyntaxKind.InterfaceDeclaration)) {
if (!(container.flags & NodeFlags.Static) && !isConstructorParameter(node, container)) { if (!(container.flags & NodeFlags.Static) &&
(container.kind !== SyntaxKind.Constructor || isNodeDescendentOf(node, (<ConstructorDeclaration>container).body))) {
return getDeclaredTypeOfClassOrInterface(getSymbolOfNode(parent)).thisType; return getDeclaredTypeOfClassOrInterface(getSymbolOfNode(parent)).thisType;
} }
} }
error(node, Diagnostics.A_this_type_is_available_only_in_a_non_static_member_of_a_class_or_interface); error(node, Diagnostics.A_this_type_is_available_only_in_a_non_static_member_of_a_class_or_interface);
return unknownType; return unknownType;
function isConstructorParameter(node: Node, container: Node) {
if (container.kind === SyntaxKind.Constructor) {
let ctor = (<ConstructorDeclaration>container);
while (node && node !== ctor) {
if (node === ctor.body) {
return false;
}
node = node.parent;
}
return true;
}
}
} }
function getTypeFromThisTypeNode(node: TypeNode): Type { function getTypeFromThisTypeNode(node: TypeNode): Type {

8
src/compiler/emitter.ts
View file

@ -359,14 +359,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
sourceMaps: sourceMapDataList sourceMaps: sourceMapDataList
}; };
function isNodeDescendentOf(node: Node, ancestor: Node): boolean {
while (node) {
if (node === ancestor) return true;
node = node.parent;
}
return false;
}
function isUniqueLocalName(name: string, container: Node): boolean { function isUniqueLocalName(name: string, container: Node): boolean {
for (let node = container; isNodeDescendentOf(node, container); node = node.nextContainer) { for (let node = container; isNodeDescendentOf(node, container); node = node.nextContainer) {
if (node.locals && hasProperty(node.locals, name)) { if (node.locals && hasProperty(node.locals, name)) {

8
src/compiler/utilities.ts
View file

@ -1167,6 +1167,14 @@ namespace ts {
return !!node && (node.kind === SyntaxKind.ArrayBindingPattern || node.kind === SyntaxKind.ObjectBindingPattern); return !!node && (node.kind === SyntaxKind.ArrayBindingPattern || node.kind === SyntaxKind.ObjectBindingPattern);
} }
export function isNodeDescendentOf(node: Node, ancestor: Node): boolean {
while (node) {
if (node === ancestor) return true;
node = node.parent;
}
return false;
}
export function isInAmbientContext(node: Node): boolean { export function isInAmbientContext(node: Node): boolean {
while (node) { while (node) {
if (node.flags & (NodeFlags.Ambient | NodeFlags.DeclarationFile)) { if (node.flags & (NodeFlags.Ambient | NodeFlags.DeclarationFile)) {