Respond to PR comments

Andy Hanson · Andy Hanson · commit 89c992a8a1ff · 2016-06-23T12:08:18.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -3202,8 +3202,8 @@ namespace ts {
             return parameter && parameter.symbol;
         }
 
-        function getAnnotatedAccessorThisType(accessor: AccessorDeclaration): Type | undefined {
-            return getThisTypeOfSignature(getSignatureFromDeclaration(accessor));
+        function getThisTypeOfDeclaration(declaration: SignatureDeclaration): Type | undefined {
+            return getThisTypeOfSignature(getSignatureFromDeclaration(declaration));
         }
 
         function getTypeOfAccessors(symbol: Symbol): Type {
@@ -8603,7 +8603,7 @@ namespace ts {
                     return type;
                 }
 
-                const thisType = getThisTypeOfSignature(getSignatureFromDeclaration(container));
+                const thisType = getThisTypeOfDeclaration(container);
                 if (thisType) {
                     return thisType;
                 }
@@ -13500,7 +13500,7 @@ namespace ts {
                         // TypeScript 1.0 spec (April 2014): 4.5
                         // If both accessors include type annotations, the specified types must be identical.
                         checkAccessorDeclarationTypesIdentical(node, otherAccessor, getAnnotatedAccessorType, Diagnostics.get_and_set_accessor_must_have_the_same_type);
-                        checkAccessorDeclarationTypesIdentical(node, otherAccessor, getAnnotatedAccessorThisType, Diagnostics.get_and_set_accessor_must_have_the_same_this_type);
+                        checkAccessorDeclarationTypesIdentical(node, otherAccessor, getThisTypeOfDeclaration, Diagnostics.get_and_set_accessor_must_have_the_same_this_type);
                     }
                 }
                 getTypeOfAccessors(getSymbolOfNode(node));

Original file line number	Diff line number	Diff line change
`@@ -3202,8 +3202,8 @@ namespace ts {`
`3202`	`3202`	`return parameter && parameter.symbol;`
`3203`	`3203`	`}`
`3204`	`3204`
`3205`		`- function getAnnotatedAccessorThisType(accessor: AccessorDeclaration): Type \| undefined {`
`3206`		`- return getThisTypeOfSignature(getSignatureFromDeclaration(accessor));`
	`3205`	`+ function getThisTypeOfDeclaration(declaration: SignatureDeclaration): Type \| undefined {`
	`3206`	`+ return getThisTypeOfSignature(getSignatureFromDeclaration(declaration));`
`3207`	`3207`	`}`
`3208`	`3208`
`3209`	`3209`	`function getTypeOfAccessors(symbol: Symbol): Type {`
`@@ -8603,7 +8603,7 @@ namespace ts {`
`8603`	`8603`	`return type;`
`8604`	`8604`	`}`
`8605`	`8605`
`8606`		`- const thisType = getThisTypeOfSignature(getSignatureFromDeclaration(container));`
	`8606`	`+ const thisType = getThisTypeOfDeclaration(container);`
`8607`	`8607`	`if (thisType) {`
`8608`	`8608`	`return thisType;`
`8609`	`8609`	`}`
`@@ -13500,7 +13500,7 @@ namespace ts {`
`13500`	`13500`	`// TypeScript 1.0 spec (April 2014): 4.5`
`13501`	`13501`	`// If both accessors include type annotations, the specified types must be identical.`
`13502`	`13502`	`checkAccessorDeclarationTypesIdentical(node, otherAccessor, getAnnotatedAccessorType, Diagnostics.get_and_set_accessor_must_have_the_same_type);`
`13503`		`- checkAccessorDeclarationTypesIdentical(node, otherAccessor, getAnnotatedAccessorThisType, Diagnostics.get_and_set_accessor_must_have_the_same_this_type);`
	`13503`	`+ checkAccessorDeclarationTypesIdentical(node, otherAccessor, getThisTypeOfDeclaration, Diagnostics.get_and_set_accessor_must_have_the_same_this_type);`
`13504`	`13504`	`}`
`13505`	`13505`	`}`
`13506`	`13506`	`getTypeOfAccessors(getSymbolOfNode(node));`