Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Catch modifiers in sourcefiles.

Browse Source
This commit is contained in:
Daniel Rosenwasser
2014-11-20 12:29:47 -08:00
parent f283f8055f
commit be3c544e9d
1 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/services.ts
+23 -18
View File
@@ -3838,27 +3838,32 @@ module ts {
var modifierFlag: NodeFlags = getFlagFromModifier(modifier);
var nodes: Node[];
if (container.kind === SyntaxKind.ModuleBlock) {
nodes = (<Block>container).statements;
}
else if (container.kind === SyntaxKind.ClassDeclaration) {
nodes = (<ClassDeclaration>container).members;
switch (container.kind) {
case SyntaxKind.ModuleBlock:
case SyntaxKind.SourceFile:
nodes = (<Block>container).statements;
break;
case SyntaxKind.ClassDeclaration:
nodes = (<ClassDeclaration>container).members;
// If we're an accessibility modifier, we should search the constructor's parameter list
// as well (i.e. don't look for 'static' parameters).
if (modifierFlag & NodeFlags.AccessibilityModifier) {
var constructor = forEach((<ClassDeclaration>container).members, member => {
return member.kind === SyntaxKind.Constructor && <ConstructorDeclaration>member;
});
// If we're an accessibility modifier, we should search the constructor's parameter list
// as well (i.e. don't look for 'static' parameters).
if (modifierFlag & NodeFlags.AccessibilityModifier) {
var constructor = forEach((<ClassDeclaration>container).members, member => {
return member.kind === SyntaxKind.Constructor && <ConstructorDeclaration>member;
});
if (constructor) {
nodes = nodes.concat(constructor.parameters);
if (constructor) {
nodes = nodes.concat(constructor.parameters);
}
}
}
}
else if (container.kind === SyntaxKind.Constructor) {
nodes = (<Node[]>(<ConstructorDeclaration>container).parameters).concat(
(<ClassDeclaration>container.parent).members);
break;
case SyntaxKind.Constructor:
nodes = (<Node[]>(<ConstructorDeclaration>container).parameters).concat(
(<ClassDeclaration>container.parent).members);
break;
default:
Debug.fail("Invalid container kind.")
}
forEach(nodes, node => {