Merge pull request microsoft#8583 from Microsoft/parameter_property_modifier

Andy · Andy · commit cf749307b9c5 · 2016-05-12T14:16:12.000-07:00
Use NodeFlags.ParameterPropertyModifier rather than NodeFlags.AccessibilityModifier to detect parameter properties
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -961,8 +961,8 @@ namespace ts {
                         break;
 
                     case SyntaxKind.Parameter:
-                        // Only consider properties defined as constructor parameters
-                        if (!(node.flags & NodeFlags.AccessibilityModifier)) {
+                        // Only consider parameter properties
+                        if (!(node.flags & NodeFlags.ParameterPropertyModifier)) {
                             break;
                         }
                     // fall through
@@ -2795,7 +2795,7 @@ namespace ts {
             case SyntaxKind.Constructor: return ScriptElementKind.constructorImplementationElement;
             case SyntaxKind.TypeParameter: return ScriptElementKind.typeParameterElement;
             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.ImportSpecifier:
             case SyntaxKind.ImportClause:
diff --git a/tests/cases/fourslash/navigationItemsInConstructorsExactMatch.ts b/tests/cases/fourslash/navigationItemsInConstructorsExactMatch.ts
@@ -2,11 +2,12 @@
 
 ////class Test {
 ////    private search1: number;
-////    constructor(public search2: boolean, search3: string) {
+////    constructor(public search2: boolean, readonly search3: string, search4: string) {
 ////    }
 ////}
 
 // Search for properties defined in the constructor, but not other constructor paramters
 var searchValue = "search";
 verify.navigationItemsListContains("search1", "property", searchValue, "prefix");
 verify.navigationItemsListContains("search2", "property", searchValue, "prefix");
+verify.navigationItemsListContains("search3", "property", searchValue, "prefix");
