Use inclusive flag, as originally done, but include almost everything

weswigham · weswigham · commit 26b1ab499c21 · 2016-06-06T13:05:29.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -7664,7 +7664,7 @@ namespace ts {
 
         function getFlowTypeOfReference(reference: Node, declaredType: Type, assumeInitialized: boolean, includeOuterFunctions: boolean) {
             let key: string;
-            if (!reference.flowNode || assumeInitialized && (declaredType.flags & TypeFlags.NotNarrowable)) {
+            if (!reference.flowNode || assumeInitialized && !(declaredType.flags & TypeFlags.Narrowable)) {
                 return declaredType;
             }
             const initialType = assumeInitialized ? declaredType : addNullableKind(declaredType, TypeFlags.Undefined);
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -2219,12 +2219,9 @@ namespace ts {
         UnionOrIntersection = Union | Intersection,
         StructuredType = ObjectType | Union | Intersection,
 
-        // 'NotNarrowable' types are types where narrowing reverts to the original type, rather than actually narrow.
-        // This is never really correct - you can _always_ narrow to an intersection with that type, _but_ we keep
-        // Void as the only non-narrowable type, since it's a non-value type construct (representing a lack of a value)
-        // and, generally speaking, narrowing `void` should fail in some way, as it is nonsensical. (`void` narrowing
-        // to `void & T`, in a structural sense, is just narrowing to T, which we wouldn't allow under normal rules)
-        NotNarrowable = Void,
+        // 'Narrowable' types are types where narrowing actually narrows.
+        // This *should* be every type other than null, undefined, void, and never
+        Narrowable = Any | StructuredType | TypeParameter | StringLike | NumberLike | Boolean | ESSymbol,
         /* @internal */
         RequiresWidening = ContainsWideningType | ContainsObjectLiteral,
         /* @internal */

Original file line number	Diff line number	Diff line change
`@@ -7664,7 +7664,7 @@ namespace ts {`
`7664`	`7664`
`7665`	`7665`	`function getFlowTypeOfReference(reference: Node, declaredType: Type, assumeInitialized: boolean, includeOuterFunctions: boolean) {`
`7666`	`7666`	`let key: string;`
`7667`		`- if (!reference.flowNode \|\| assumeInitialized && (declaredType.flags & TypeFlags.NotNarrowable)) {`
	`7667`	`+ if (!reference.flowNode \|\| assumeInitialized && !(declaredType.flags & TypeFlags.Narrowable)) {`
`7668`	`7668`	`return declaredType;`
`7669`	`7669`	`}`
`7670`	`7670`	`const initialType = assumeInitialized ? declaredType : addNullableKind(declaredType, TypeFlags.Undefined);`