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

Merge pull request #8583 from Microsoft/parameter_property_modifier

Browse source 
Use NodeFlags.ParameterPropertyModifier rather than NodeFlags.AccessibilityModifier to detect parameter properties
This commit is contained in:
Andy 2016-05-12 14:16:12 -07:00
parent 977a7ec1ba b1cd3de89c
commit cf749307b9
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/services/services.ts
View file

@ -961,8 +961,8 @@ namespace ts {
break; break;
case SyntaxKind.Parameter: case SyntaxKind.Parameter:
// Only consider properties defined as constructor parameters // Only consider parameter properties
if (!(node.flags & NodeFlags.AccessibilityModifier)) { if (!(node.flags & NodeFlags.ParameterPropertyModifier)) {
break; break;
} }
// fall through // fall through
@ -2795,7 +2795,7 @@ namespace ts {
case SyntaxKind.Constructor: return ScriptElementKind.constructorImplementationElement; case SyntaxKind.Constructor: return ScriptElementKind.constructorImplementationElement;
case SyntaxKind.TypeParameter: return ScriptElementKind.typeParameterElement; case SyntaxKind.TypeParameter: return ScriptElementKind.typeParameterElement;
case SyntaxKind.EnumMember: return ScriptElementKind.variableElement; case SyntaxKind.EnumMember: return ScriptElementKind.variableElement;
case SyntaxKind.Parameter: return (node.flags & NodeFlags.AccessibilityModifier) ? ScriptElementKind.memberVariableElement : ScriptElementKind.parameterElement; case SyntaxKind.Parameter: return (node.flags & NodeFlags.ParameterPropertyModifier) ? ScriptElementKind.memberVariableElement : ScriptElementKind.parameterElement;
case SyntaxKind.ImportEqualsDeclaration: case SyntaxKind.ImportEqualsDeclaration:
case SyntaxKind.ImportSpecifier: case SyntaxKind.ImportSpecifier:
case SyntaxKind.ImportClause: case SyntaxKind.ImportClause:

3
tests/cases/fourslash/navigationItemsInConstructorsExactMatch.ts
View file

@ -2,7 +2,7 @@
////class Test { ////class Test {
//// private search1: number; //// private search1: number;
//// constructor(public search2: boolean, search3: string) { //// constructor(public search2: boolean, readonly search3: string, search4: string) {
//// } //// }
////} ////}
@ -10,3 +10,4 @@
var searchValue = "search"; var searchValue = "search";
verify.navigationItemsListContains("search1", "property", searchValue, "prefix"); verify.navigationItemsListContains("search1", "property", searchValue, "prefix");
verify.navigationItemsListContains("search2", "property", searchValue, "prefix"); verify.navigationItemsListContains("search2", "property", searchValue, "prefix");
verify.navigationItemsListContains("search3", "property", searchValue, "prefix");