Skip to content

Commit 6a83254

Browse files
rbucktonrbuckton
committed
Small tweaks, lint fixes, and baseline updates
1 parent af6bb55 commit 6a83254

12 files changed

+2363
-226
lines changed

‎src/compiler/checker.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -27467,6 +27467,9 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
2746727467
}
2746827468
const right = expr.right;
2746927469
const rightType = getTypeOfExpression(right);
27470+
if (!isTypeDerivedFrom(rightType, globalObjectType)) {
27471+
return type;
27472+
}
2747027473
const instanceType = mapType(rightType, t => getInstanceType(t, left, type, right));
2747127474
// Don't narrow from `any` if the target type is exactly `Object` or `Function`, and narrow
2747227475
// in the false branch only if the target is a non-empty object type.
@@ -27486,7 +27489,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
2748627489
const syntheticCall = createSyntheticHasInstanceMethodCall(left, leftType, right, constructorType, hasInstanceMethodType);
2748727490
const signature = getEffectsSignature(syntheticCall);
2748827491
const predicate = signature && getTypePredicateOfSignature(signature);
27489-
if (predicate && predicate.kind == TypePredicateKind.Identifier && predicate.parameterIndex == 0) {
27492+
if (predicate && predicate.kind === TypePredicateKind.Identifier && predicate.parameterIndex === 0) {
2749027493
return predicate.type;
2749127494
}
2749227495
if (!isTypeDerivedFrom(constructorType, globalFunctionType)) {

‎tests/baselines/reference/api/tsserverlibrary.d.ts

+1
Original file line numberDiff line numberDiff line change
@@ -5144,6 +5144,7 @@ declare namespace ts {
51445144
readonly isSpread: boolean;
51455145
readonly type: Type;
51465146
readonly tupleNameSource?: ParameterDeclaration | NamedTupleMember;
5147+
readonly thisArgument?: LeftHandSideExpression;
51475148
}
51485149
type ExponentiationOperator = SyntaxKind.AsteriskAsteriskToken;
51495150
type MultiplicativeOperator = SyntaxKind.AsteriskToken | SyntaxKind.SlashToken | SyntaxKind.PercentToken;

‎tests/baselines/reference/api/typescript.d.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1091,6 +1091,7 @@ declare namespace ts {
10911091
readonly isSpread: boolean;
10921092
readonly type: Type;
10931093
readonly tupleNameSource?: ParameterDeclaration | NamedTupleMember;
1094+
readonly thisArgument?: LeftHandSideExpression;
10941095
}
10951096
type ExponentiationOperator = SyntaxKind.AsteriskAsteriskToken;
10961097
type MultiplicativeOperator = SyntaxKind.AsteriskToken | SyntaxKind.SlashToken | SyntaxKind.PercentToken;

‎tests/baselines/reference/instanceofOperatorWithRHSHasSymbolHasInstance.js

+59-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
//// [instanceofOperatorWithRHSHasSymbolHasInstance.ts]
44
interface Point { x: number, y: number }
55
interface Point3D { x: number, y: number, z: number }
6+
interface Point3D2 extends Point { z: number }
67
interface Line { start: Point, end: Point }
78

89
declare var rhs0: { [Symbol.hasInstance](value: unknown): boolean; };
@@ -25,6 +26,7 @@ declare var lhs0: any;
2526
declare var lhs1: object;
2627
declare var lhs2: Point | Point3D | Line;
2728
declare var lhs3: Point3D | Line;
29+
declare var lhs4: Point | Point3D2 | Line;
2830

2931
lhs0 instanceof rhs0 && lhs0;
3032
lhs0 instanceof rhs1 && lhs0;
@@ -75,7 +77,45 @@ lhs3 instanceof Rhs10 && lhs3;
7577
lhs3 instanceof Rhs11 && lhs3;
7678
lhs3 instanceof Rhs12 && lhs3;
7779
lhs3 instanceof Rhs13 && lhs3;
78-
80+
81+
lhs4 instanceof rhs0 && lhs4;
82+
lhs4 instanceof rhs1 && lhs4;
83+
lhs4 instanceof rhs2 && lhs4;
84+
lhs4 instanceof rhs3 && lhs4;
85+
lhs4 instanceof rhs4 && lhs4;
86+
lhs4 instanceof rhs5 && lhs4;
87+
lhs4 instanceof Rhs7 && lhs4;
88+
lhs4 instanceof Rhs8 && lhs4;
89+
lhs4 instanceof Rhs9 && lhs4;
90+
lhs4 instanceof Rhs10 && lhs4;
91+
lhs4 instanceof Rhs11 && lhs4;
92+
lhs4 instanceof Rhs12 && lhs4;
93+
94+
declare class A {
95+
#x: number;
96+
97+
// approximation of `getInstanceType` behavior, with one caveat: the checker versions unions the return types of
98+
// all construct signatures, but we have no way of extracting individual construct signatures from a type.
99+
static [Symbol.hasInstance]<T>(this: T, value: unknown): value is (
100+
T extends globalThis.Function ?
101+
T extends { readonly prototype: infer U } ?
102+
boolean extends (U extends never ? true : false) ? // <- tests whether 'U' is 'any'
103+
T extends (abstract new (...args: any) => infer V) ? V : {} :
104+
U :
105+
never :
106+
never
107+
);
108+
}
109+
110+
declare class B extends A { #y: number; }
111+
112+
declare const obj: unknown;
113+
if (obj instanceof A) {
114+
obj; // A
115+
}
116+
if (obj instanceof B) {
117+
obj; // B
118+
}
79119

80120
//// [instanceofOperatorWithRHSHasSymbolHasInstance.js]
81121
lhs0 instanceof rhs0 && lhs0;
@@ -124,3 +164,21 @@ lhs3 instanceof Rhs10 && lhs3;
124164
lhs3 instanceof Rhs11 && lhs3;
125165
lhs3 instanceof Rhs12 && lhs3;
126166
lhs3 instanceof Rhs13 && lhs3;
167+
lhs4 instanceof rhs0 && lhs4;
168+
lhs4 instanceof rhs1 && lhs4;
169+
lhs4 instanceof rhs2 && lhs4;
170+
lhs4 instanceof rhs3 && lhs4;
171+
lhs4 instanceof rhs4 && lhs4;
172+
lhs4 instanceof rhs5 && lhs4;
173+
lhs4 instanceof Rhs7 && lhs4;
174+
lhs4 instanceof Rhs8 && lhs4;
175+
lhs4 instanceof Rhs9 && lhs4;
176+
lhs4 instanceof Rhs10 && lhs4;
177+
lhs4 instanceof Rhs11 && lhs4;
178+
lhs4 instanceof Rhs12 && lhs4;
179+
if (obj instanceof A) {
180+
obj; // A
181+
}
182+
if (obj instanceof B) {
183+
obj; // B
184+
}

0 commit comments

Comments
 (0)