Fix broken tests

Yui T · Yui T · commit 7e71686b1a96 · 2015-12-14T10:14:35.000-08:00
diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
@@ -1444,7 +1444,7 @@ namespace ts {
 
             // If this is a property-parameter, then also declare the property symbol into the
             // containing class.
-            if (isPropertyParameterDeclaration(node)) {
+            if (isParameterPropertyDeclaration(node)) {
                 const classDeclaration = <ClassLikeDeclaration>node.parent.parent;
                 declareSymbol(classDeclaration.symbol.members, classDeclaration.symbol, node, SymbolFlags.Property, SymbolFlags.PropertyExcludes);
             }
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -67,7 +67,7 @@ namespace ts {
             // The language service will always care about the narrowed type of a symbol, because that is
             // the type the language says the symbol should have.
             getTypeOfSymbolAtLocation: getNarrowedTypeOfSymbol,
-            getSymbolOfParameterPropertyDeclaration,
+            getSymbolsOfParameterPropertyDeclaration,
             getDeclaredTypeOfSymbol,
             getPropertiesOfType,
             getPropertyOfType,
@@ -435,7 +435,7 @@ namespace ts {
          * @param parameterName a name of the parameter to get the symbols for.
          * @return a tuple of two symbols 
          */
-        function getSymbolOfParameterPropertyDeclaration(parameter: ParameterDeclaration, parameterName: string): [Symbol, Symbol] {
+        function getSymbolsOfParameterPropertyDeclaration(parameter: ParameterDeclaration, parameterName: string): [Symbol, Symbol] {
             const constructoDeclaration = parameter.parent;
             const classDeclaration = parameter.parent.parent;
 
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -1723,7 +1723,7 @@ namespace ts {
 
         getSymbolsInScope(location: Node, meaning: SymbolFlags): Symbol[];
         getSymbolAtLocation(node: Node): Symbol;
-        getSymbolOfParameterPropertyDeclaration(parameter: ParameterDeclaration, parameterName: string): Symbol[];
+        getSymbolsOfParameterPropertyDeclaration(parameter: ParameterDeclaration, parameterName: string): Symbol[];
         getShorthandAssignmentValueSymbol(location: Node): Symbol;
         getTypeAtLocation(node: Node): Type;
         typeToString(type: Type, enclosingDeclaration?: Node, flags?: TypeFormatFlags): string;
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -2742,9 +2742,7 @@ namespace ts {
         }
     }
 
-    export function isPropertyParameterDeclaration(node: ParameterDeclaration): boolean {
-        // If this is a property-parameter, then also declare the property symbol into the
-        // containing class.
+    export function isParameterPropertyDeclaration(node: ParameterDeclaration): boolean {
         return node.flags & NodeFlags.AccessibilityModifier && node.parent.kind === SyntaxKind.Constructor && isClassLike(node.parent.parent);
     }
 }
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -5972,8 +5972,8 @@ namespace ts {
                 // Parameter Declaration symbol is only visible within function scope, so the symbol is stored in contructor.locals.
                 // Property Declaration symbol is a member of the class, so the symbol is stored in its class Declaration.symbol.members
                 if (symbol.valueDeclaration && symbol.valueDeclaration.kind === SyntaxKind.Parameter &&
-                    isPropertyParameterDeclaration(<ParameterDeclaration>symbol.valueDeclaration)) {
-                    result = result.concat(typeChecker.getSymbolOfParameterPropertyDeclaration(<ParameterDeclaration>symbol.valueDeclaration, symbol.name));
+                    isParameterPropertyDeclaration(<ParameterDeclaration>symbol.valueDeclaration)) {
+                    result = result.concat(typeChecker.getSymbolsOfParameterPropertyDeclaration(<ParameterDeclaration>symbol.valueDeclaration, symbol.name));
                 }
 
                 // If this is a union property, add all the symbols from all its source symbols in all unioned types.
diff --git a/tests/cases/fourslash/documentHighlightAtParameterPropertyDeclaration2.ts b/tests/cases/fourslash/documentHighlightAtParameterPropertyDeclaration2.ts
@@ -20,5 +20,5 @@
 let markers = test.markers()
 for (let marker of markers) {
     goTo.position(marker.position);
-    verify.documentHighlightsAtPositionCount(3, ["file1.ts"]);
+    verify.documentHighlightsAtPositionCount(2, ["file1.ts"]);
 }

Original file line number	Diff line number	Diff line change
`@@ -1444,7 +1444,7 @@ namespace ts {`
`1444`	`1444`
`1445`	`1445`	`// If this is a property-parameter, then also declare the property symbol into the`
`1446`	`1446`	`// containing class.`
`1447`		`- if (isPropertyParameterDeclaration(node)) {`
	`1447`	`+ if (isParameterPropertyDeclaration(node)) {`
`1448`	`1448`	`const classDeclaration = <ClassLikeDeclaration>node.parent.parent;`
`1449`	`1449`	`declareSymbol(classDeclaration.symbol.members, classDeclaration.symbol, node, SymbolFlags.Property, SymbolFlags.PropertyExcludes);`
`1450`	`1450`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2742,9 +2742,7 @@ namespace ts {`
`2742`	`2742`	`}`
`2743`	`2743`	`}`
`2744`	`2744`
`2745`		`- export function isPropertyParameterDeclaration(node: ParameterDeclaration): boolean {`
`2746`		`- // If this is a property-parameter, then also declare the property symbol into the`
`2747`		`- // containing class.`
	`2745`	`+ export function isParameterPropertyDeclaration(node: ParameterDeclaration): boolean {`
`2748`	`2746`	`return node.flags & NodeFlags.AccessibilityModifier && node.parent.kind === SyntaxKind.Constructor && isClassLike(node.parent.parent);`
`2749`	`2747`	`}`
`2750`	`2748`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,5 @@`
`20`	`20`	`let markers = test.markers()`
`21`	`21`	`for (let marker of markers) {`
`22`	`22`	`goTo.position(marker.position);`
`23`		`- verify.documentHighlightsAtPositionCount(3, ["file1.ts"]);`
	`23`	`+ verify.documentHighlightsAtPositionCount(2, ["file1.ts"]);`
`24`	`24`	`}`