Check SymbolFlags instead

sandersn · sandersn · commit 56f82563aedd · 2018-08-16T08:38:41.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -17739,12 +17739,6 @@ namespace ts {
             }
         }
 
-        // If a symbol is a synthesized symbol with no value declaration, we assume it is a property. Example of this are the synthesized
-        // '.prototype' property as well as synthesized tuple index properties.
-        function getDeclarationKindFromSymbol(s: Symbol) {
-            return s.valueDeclaration ? s.valueDeclaration.kind : SyntaxKind.PropertyDeclaration;
-        }
-
         function getDeclarationNodeFlagsFromSymbol(s: Symbol): NodeFlags {
             return s.valueDeclaration ? getCombinedNodeFlags(s.valueDeclaration) : 0;
         }
@@ -17881,10 +17875,7 @@ namespace ts {
         }
 
         function symbolHasNonMethodDeclaration(symbol: Symbol) {
-            return forEachProperty(symbol, prop => {
-                const propKind = getDeclarationKindFromSymbol(prop);
-                return propKind !== SyntaxKind.MethodDeclaration && propKind !== SyntaxKind.MethodSignature;
-            });
+            return !!forEachProperty(symbol, prop => !(prop.flags & SymbolFlags.Method));
         }
 
         function checkNonNullExpression(

Original file line number	Diff line number	Diff line change
`@@ -17739,12 +17739,6 @@ namespace ts {`
`17739`	`17739`	`}`
`17740`	`17740`	`}`
`17741`	`17741`
`17742`		`- // If a symbol is a synthesized symbol with no value declaration, we assume it is a property. Example of this are the synthesized`
`17743`		`- // '.prototype' property as well as synthesized tuple index properties.`
`17744`		`- function getDeclarationKindFromSymbol(s: Symbol) {`
`17745`		`- return s.valueDeclaration ? s.valueDeclaration.kind : SyntaxKind.PropertyDeclaration;`
`17746`		`- }`
`17747`		`-`
`17748`	`17742`	`function getDeclarationNodeFlagsFromSymbol(s: Symbol): NodeFlags {`
`17749`	`17743`	`return s.valueDeclaration ? getCombinedNodeFlags(s.valueDeclaration) : 0;`
`17750`	`17744`	`}`
`@@ -17881,10 +17875,7 @@ namespace ts {`
`17881`	`17875`	`}`
`17882`	`17876`
`17883`	`17877`	`function symbolHasNonMethodDeclaration(symbol: Symbol) {`
`17884`		`- return forEachProperty(symbol, prop => {`
`17885`		`- const propKind = getDeclarationKindFromSymbol(prop);`
`17886`		`- return propKind !== SyntaxKind.MethodDeclaration && propKind !== SyntaxKind.MethodSignature;`
`17887`		`- });`
	`17878`	`+ return !!forEachProperty(symbol, prop => !(prop.flags & SymbolFlags.Method));`
`17888`	`17879`	`}`
`17889`	`17880`
`17890`	`17881`	`function checkNonNullExpression(`