Move fix around

Author: jakebailey

internal/checker/checker.go

@@ -21188,9 +21188,6 @@ func (c *Checker) getDefaultTypeArgumentType(isInJavaScriptFile bool) *Type {
 // this gets the instantiated default type of its target. If the type parameter has no default type or
 // the default is circular, `undefined` is returned.
 func (c *Checker) getDefaultFromTypeParameter(t *Type) *Type {
-	if t.flags&TypeFlagsTypeParameter == 0 {
-		return nil
-	}
 	defaultType := c.getResolvedTypeParameterDefault(t)
 	if defaultType != c.noConstraintType && defaultType != c.circularConstraintType {
 		return defaultType

internal/checker/inference.go

@@ -1292,11 +1292,14 @@ func (c *Checker) getInferredType(n *InferenceContext, index int) *Type {
 				// succeeds, meaning there is no error for not having inference candidates. An
 				// inference error only occurs when there are *conflicting* candidates, i.e.
 				// candidates with no common supertype.
-				defaultType := c.getDefaultFromTypeParameter(inference.typeParameter)
-				if defaultType != nil {
-					// Instantiate the default type. Any forward reference to a type
-					// parameter should be instantiated to the empty object type.
-					inferredType = c.instantiateType(defaultType, mergeTypeMappers(c.newBackreferenceMapper(n, index), n.nonFixingMapper))
+
+				if inference.typeParameter.flags&TypeFlagsTypeParameter != 0 {
+					defaultType := c.getDefaultFromTypeParameter(inference.typeParameter)
+					if defaultType != nil {
+						// Instantiate the default type. Any forward reference to a type
+						// parameter should be instantiated to the empty object type.
+						inferredType = c.instantiateType(defaultType, mergeTypeMappers(c.newBackreferenceMapper(n, index), n.nonFixingMapper))
+					}
 				}
 			}
 		} else {