Fix merge issue

ahejlsberg · ahejlsberg · commit ad1c9b91e5d2 · 2016-09-06T18:26:09.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -3094,7 +3094,7 @@ namespace ts {
             // Use the type of the initializer expression if one is present
             if (declaration.initializer) {
                 const exprType = checkExpressionCached(declaration.initializer);
-                const type = getCombinedNodeFlags(declaration) & (NodeFlags.Const | NodeFlags.Readonly) ? exprType : getBaseTypeOfLiteralType(exprType);
+                const type = getCombinedModifierFlags(declaration) & (ModifierFlags.Const | ModifierFlags.Readonly) ? exprType : getBaseTypeOfLiteralType(exprType);
                 return addOptionality(type, /*optional*/ declaration.questionToken && includeOptionality);
             }
 

Original file line number	Diff line number	Diff line change
`@@ -3094,7 +3094,7 @@ namespace ts {`
`3094`	`3094`	`// Use the type of the initializer expression if one is present`
`3095`	`3095`	`if (declaration.initializer) {`
`3096`	`3096`	`const exprType = checkExpressionCached(declaration.initializer);`
`3097`		`- const type = getCombinedNodeFlags(declaration) & (NodeFlags.Const \| NodeFlags.Readonly) ? exprType : getBaseTypeOfLiteralType(exprType);`
	`3097`	`+ const type = getCombinedModifierFlags(declaration) & (ModifierFlags.Const \| ModifierFlags.Readonly) ? exprType : getBaseTypeOfLiteralType(exprType);`
`3098`	`3098`	`return addOptionality(type, /optional/ declaration.questionToken && includeOptionality);`
`3099`	`3099`	`}`
`3100`	`3100`