Skip to content

Commit 05204c7

Browse files
DanielRosenwasserDanielRosenwasser
committed
Merge branch 'master' into release-3.6
2 parents 365362c + dc38ace commit 05204c7

12 files changed

+193
-20
lines changed

‎src/compiler/checker.ts

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20573,10 +20573,15 @@ namespace ts {
2057320573
}
2057420574
propType = getConstraintForLocation(getTypeOfSymbol(prop), node);
2057520575
}
20576+
return getFlowTypeOfAccessExpression(node, prop, propType, right);
20577+
}
20578+
20579+
function getFlowTypeOfAccessExpression(node: ElementAccessExpression | PropertyAccessExpression | QualifiedName, prop: Symbol | undefined, propType: Type, errorNode: Node) {
2057620580
// Only compute control flow type if this is a property access expression that isn't an
2057720581
// assignment target, and the referenced property was declared as a variable, property,
2057820582
// accessor, or optional method.
20579-
if (node.kind !== SyntaxKind.PropertyAccessExpression ||
20583+
const assignmentKind = getAssignmentTargetKind(node);
20584+
if (node.kind !== SyntaxKind.ElementAccessExpression && node.kind !== SyntaxKind.PropertyAccessExpression ||
2058020585
assignmentKind === AssignmentKind.Definite ||
2058120586
prop && !(prop.flags & (SymbolFlags.Variable | SymbolFlags.Property | SymbolFlags.Accessor)) && !(prop.flags & SymbolFlags.Method && propType.flags & TypeFlags.Union)) {
2058220587
return propType;
@@ -20586,7 +20591,7 @@ namespace ts {
2058620591
// and if we are in a constructor of the same class as the property declaration, assume that
2058720592
// the property is uninitialized at the top of the control flow.
2058820593
let assumeUninitialized = false;
20589-
if (strictNullChecks && strictPropertyInitialization && left.kind === SyntaxKind.ThisKeyword) {
20594+
if (strictNullChecks && strictPropertyInitialization && node.expression.kind === SyntaxKind.ThisKeyword) {
2059020595
const declaration = prop && prop.valueDeclaration;
2059120596
if (declaration && isInstancePropertyWithoutInitializer(declaration)) {
2059220597
const flowContainer = getControlFlowContainer(node);
@@ -20603,7 +20608,7 @@ namespace ts {
2060320608
}
2060420609
const flowType = getFlowTypeOfReference(node, propType, assumeUninitialized ? getOptionalType(propType) : propType);
2060520610
if (assumeUninitialized && !(getFalsyFlags(propType) & TypeFlags.Undefined) && getFalsyFlags(flowType) & TypeFlags.Undefined) {
20606-
error(right, Diagnostics.Property_0_is_used_before_being_assigned, symbolToString(prop!)); // TODO: GH#18217
20611+
error(errorNode, Diagnostics.Property_0_is_used_before_being_assigned, symbolToString(prop!)); // TODO: GH#18217
2060720612
// Return the declared type to reduce follow-on errors
2060820613
return propType;
2060920614
}
@@ -20960,7 +20965,7 @@ namespace ts {
2096020965
AccessFlags.Writing | (isGenericObjectType(objectType) && !isThisTypeParameter(objectType) ? AccessFlags.NoIndexSignatures : 0) :
2096120966
AccessFlags.None;
2096220967
const indexedAccessType = getIndexedAccessTypeOrUndefined(objectType, effectiveIndexType, node, accessFlags) || errorType;
20963-
return checkIndexedAccessIndexType(indexedAccessType, node);
20968+
return checkIndexedAccessIndexType(getFlowTypeOfAccessExpression(node, indexedAccessType.symbol, indexedAccessType, indexExpression), node);
2096420969
}
2096520970

2096620971
function checkThatExpressionIsProperSymbolReference(expression: Expression, expressionType: Type, reportError: boolean): boolean {

‎src/harness/fourslash.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -865,7 +865,7 @@ namespace FourSlash {
865865
ts.zipWith(actual, expected, (completion, expectedCompletion, index) => {
866866
const name = typeof expectedCompletion === "string" ? expectedCompletion : expectedCompletion.name;
867867
if (completion.name !== name) {
868-
this.raiseError(`${marker ? JSON.stringify(marker) : "" } Expected completion at index ${index} to be ${name}, got ${completion.name}`);
868+
this.raiseError(`${marker ? JSON.stringify(marker) : ""} Expected completion at index ${index} to be ${name}, got ${completion.name}`);
869869
}
870870
this.verifyCompletionEntry(completion, expectedCompletion);
871871
});
@@ -3759,7 +3759,7 @@ namespace FourSlashInterface {
37593759
}
37603760

37613761
export class Plugins {
3762-
constructor (private state: FourSlash.TestState) {
3762+
constructor(private state: FourSlash.TestState) {
37633763
}
37643764

37653765
public configurePlugin(pluginName: string, configuration: any): void {
@@ -4582,7 +4582,7 @@ namespace FourSlashInterface {
45824582
export const keywords: ReadonlyArray<ExpectedCompletionEntryObject> = keywordsWithUndefined.filter(k => k.name !== "undefined");
45834583

45844584
export const typeKeywords: ReadonlyArray<ExpectedCompletionEntryObject> =
4585-
["false", "null", "true", "void", "any", "boolean", "keyof", "never", "number", "object", "string", "symbol", "undefined", "unique", "unknown", "bigint"].map(keywordEntry);
4585+
["false", "null", "true", "void", "any", "boolean", "keyof", "never", "readonly", "number", "object", "string", "symbol", "undefined", "unique", "unknown", "bigint"].map(keywordEntry);
45864586

45874587
const globalTypeDecls: ReadonlyArray<ExpectedCompletionEntryObject> = [
45884588
interfaceEntry("Symbol"),
@@ -4698,6 +4698,9 @@ namespace FourSlashInterface {
46984698
];
46994699
}
47004700

4701+
export const typeAssertionKeywords: ReadonlyArray<ExpectedCompletionEntry> =
4702+
globalTypesPlus([keywordEntry("const")]);
4703+
47014704
function getInJsKeywords(keywords: ReadonlyArray<ExpectedCompletionEntryObject>): ReadonlyArray<ExpectedCompletionEntryObject> {
47024705
return keywords.filter(keyword => {
47034706
switch (keyword.name) {

‎src/harness/virtualFileSystemWithWatch.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ interface Array<T> {}`
3030
return combinePaths(getDirectoryPath(libFile.path), "tsc.js");
3131
}
3232

33-
interface TestServerHostCreationParameters {
33+
export interface TestServerHostCreationParameters {
3434
useCaseSensitiveFileNames?: boolean;
3535
executingFilePath?: string;
3636
currentDirectory?: string;

‎src/services/completions.ts

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ namespace ts.Completions {
3838
InterfaceElementKeywords, // Keywords inside interface body
3939
ConstructorParameterKeywords, // Keywords at constructor parameter
4040
FunctionLikeBodyKeywords, // Keywords at function like body
41+
TypeAssertionKeywords,
4142
TypeKeywords,
4243
Last = TypeKeywords
4344
}
@@ -441,7 +442,7 @@ namespace ts.Completions {
441442
(symbol.escapedName === InternalSymbolName.ExportEquals))
442443
// Name of "export default foo;" is "foo". Name of "export default 0" is the filename converted to camelCase.
443444
? firstDefined(symbol.declarations, d => isExportAssignment(d) && isIdentifier(d.expression) ? d.expression.text : undefined)
444-
|| codefix.moduleSymbolToValidIdentifier(origin.moduleSymbol, target)
445+
|| codefix.moduleSymbolToValidIdentifier(origin.moduleSymbol, target)
445446
: symbol.name;
446447
}
447448

@@ -632,9 +633,9 @@ namespace ts.Completions {
632633
// At `,`, treat this as the next argument after the comma.
633634
? checker.getContextualTypeForArgumentAtIndex(argInfo.invocation, argInfo.argumentIndex + (previousToken.kind === SyntaxKind.CommaToken ? 1 : 0))
634635
: isEqualityOperatorKind(previousToken.kind) && isBinaryExpression(parent) && isEqualityOperatorKind(parent.operatorToken.kind)
635-
// completion at `x ===/**/` should be for the right side
636-
? checker.getTypeAtLocation(parent.left)
637-
: checker.getContextualType(previousToken as Expression);
636+
// completion at `x ===/**/` should be for the right side
637+
? checker.getTypeAtLocation(parent.left)
638+
: checker.getContextualType(previousToken as Expression);
638639
}
639640
}
640641

@@ -1182,7 +1183,11 @@ namespace ts.Completions {
11821183
function filterGlobalCompletion(symbols: Symbol[]): void {
11831184
const isTypeOnly = isTypeOnlyCompletion();
11841185
const allowTypes = isTypeOnly || !isContextTokenValueLocation(contextToken) && isPossiblyTypeArgumentPosition(contextToken, sourceFile, typeChecker);
1185-
if (isTypeOnly) keywordFilters = KeywordCompletionFilters.TypeKeywords;
1186+
if (isTypeOnly) {
1187+
keywordFilters = isTypeAssertion()
1188+
? KeywordCompletionFilters.TypeAssertionKeywords
1189+
: KeywordCompletionFilters.TypeKeywords;
1190+
}
11861191

11871192
filterMutate(symbols, symbol => {
11881193
if (!isSourceFile(location)) {
@@ -1212,6 +1217,10 @@ namespace ts.Completions {
12121217
});
12131218
}
12141219

1220+
function isTypeAssertion(): boolean {
1221+
return isAssertionExpression(contextToken.parent);
1222+
}
1223+
12151224
function isTypeOnlyCompletion(): boolean {
12161225
return insideJsDocTagTypeExpression || !isContextTokenValueLocation(contextToken) && (isPartOfTypeNode(location) || isContextTokenTypeLocation(contextToken));
12171226
}
@@ -1240,7 +1249,8 @@ namespace ts.Completions {
12401249
return parentKind === SyntaxKind.AsExpression;
12411250

12421251
case SyntaxKind.LessThanToken:
1243-
return parentKind === SyntaxKind.TypeReference;
1252+
return parentKind === SyntaxKind.TypeReference ||
1253+
parentKind === SyntaxKind.TypeAssertionExpression;
12441254

12451255
case SyntaxKind.ExtendsKeyword:
12461256
return parentKind === SyntaxKind.TypeParameter;
@@ -1516,7 +1526,7 @@ namespace ts.Completions {
15161526
// 3. at the end of a regular expression (due to trailing flags like '/foo/g').
15171527
return (isRegularExpressionLiteral(contextToken) || isStringTextContainingNode(contextToken)) && (
15181528
rangeContainsPositionExclusive(createTextRangeFromSpan(createTextSpanFromNode(contextToken)), position) ||
1519-
position === contextToken.end && (!!contextToken.isUnterminated || isRegularExpressionLiteral(contextToken)));
1529+
position === contextToken.end && (!!contextToken.isUnterminated || isRegularExpressionLiteral(contextToken)));
15201530
}
15211531

15221532
/**
@@ -2026,8 +2036,8 @@ namespace ts.Completions {
20262036

20272037
return baseSymbols.filter(propertySymbol =>
20282038
!existingMemberNames.has(propertySymbol.escapedName) &&
2029-
!!propertySymbol.declarations &&
2030-
!(getDeclarationModifierFlagsFromSymbol(propertySymbol) & ModifierFlags.Private));
2039+
!!propertySymbol.declarations &&
2040+
!(getDeclarationModifierFlagsFromSymbol(propertySymbol) & ModifierFlags.Private));
20312041
}
20322042

20332043
/**
@@ -2139,6 +2149,8 @@ namespace ts.Completions {
21392149
return isParameterPropertyModifier(kind);
21402150
case KeywordCompletionFilters.FunctionLikeBodyKeywords:
21412151
return isFunctionLikeBodyKeyword(kind);
2152+
case KeywordCompletionFilters.TypeAssertionKeywords:
2153+
return isTypeKeyword(kind) || kind === SyntaxKind.ConstKeyword;
21422154
case KeywordCompletionFilters.TypeKeywords:
21432155
return isTypeKeyword(kind);
21442156
default:

‎src/services/utilities.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,6 +1224,7 @@ namespace ts {
12241224
SyntaxKind.NullKeyword,
12251225
SyntaxKind.NumberKeyword,
12261226
SyntaxKind.ObjectKeyword,
1227+
SyntaxKind.ReadonlyKeyword,
12271228
SyntaxKind.StringKeyword,
12281229
SyntaxKind.SymbolKeyword,
12291230
SyntaxKind.TrueKeyword,
@@ -1734,8 +1735,8 @@ namespace ts {
17341735

17351736
function getSynthesizedDeepCloneWorker<T extends Node>(node: T, renameMap?: Map<Identifier>, checker?: TypeChecker, callback?: (originalNode: Node, clone: Node) => any): T {
17361737
const visited = (renameMap || checker || callback) ?
1737-
visitEachChild(node, wrapper, nullTransformationContext) :
1738-
visitEachChild(node, getSynthesizedDeepClone, nullTransformationContext);
1738+
visitEachChild(node, wrapper, nullTransformationContext) :
1739+
visitEachChild(node, getSynthesizedDeepClone, nullTransformationContext);
17391740

17401741
if (visited === node) {
17411742
// This only happens for leaf nodes - internal nodes always see their children change.

‎tests/baselines/reference/controlFlowElementAccess2.js

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
//// [controlFlowElementAccess2.ts]
2+
declare const config: {
3+
[key: string]: boolean | { prop: string };
4+
};
5+
6+
if (typeof config['works'] !== 'boolean') {
7+
config.works.prop = 'test'; // ok
8+
config['works'].prop = 'test'; // error, config['works']: boolean | { 'prop': string }
9+
}
10+
if (typeof config.works !== 'boolean') {
11+
config['works'].prop = 'test'; // error, config['works']: boolean | { 'prop': string }
12+
config.works.prop = 'test'; // ok
13+
}
14+
15+
16+
//// [controlFlowElementAccess2.js]
17+
"use strict";
18+
if (typeof config['works'] !== 'boolean') {
19+
config.works.prop = 'test'; // ok
20+
config['works'].prop = 'test'; // error, config['works']: boolean | { 'prop': string }
21+
}
22+
if (typeof config.works !== 'boolean') {
23+
config['works'].prop = 'test'; // error, config['works']: boolean | { 'prop': string }
24+
config.works.prop = 'test'; // ok
25+
}

‎tests/baselines/reference/controlFlowElementAccess2.symbols

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
=== tests/cases/conformance/controlFlow/controlFlowElementAccess2.ts ===
2+
declare const config: {
3+
>config : Symbol(config, Decl(controlFlowElementAccess2.ts, 0, 13))
4+
5+
[key: string]: boolean | { prop: string };
6+
>key : Symbol(key, Decl(controlFlowElementAccess2.ts, 1, 5))
7+
>prop : Symbol(prop, Decl(controlFlowElementAccess2.ts, 1, 30))
8+
9+
};
10+
11+
if (typeof config['works'] !== 'boolean') {
12+
>config : Symbol(config, Decl(controlFlowElementAccess2.ts, 0, 13))
13+
14+
config.works.prop = 'test'; // ok
15+
>config.works.prop : Symbol(prop, Decl(controlFlowElementAccess2.ts, 1, 30))
16+
>config : Symbol(config, Decl(controlFlowElementAccess2.ts, 0, 13))
17+
>prop : Symbol(prop, Decl(controlFlowElementAccess2.ts, 1, 30))
18+
19+
config['works'].prop = 'test'; // error, config['works']: boolean | { 'prop': string }
20+
>config['works'].prop : Symbol(prop, Decl(controlFlowElementAccess2.ts, 1, 30))
21+
>config : Symbol(config, Decl(controlFlowElementAccess2.ts, 0, 13))
22+
>prop : Symbol(prop, Decl(controlFlowElementAccess2.ts, 1, 30))
23+
}
24+
if (typeof config.works !== 'boolean') {
25+
>config : Symbol(config, Decl(controlFlowElementAccess2.ts, 0, 13))
26+
27+
config['works'].prop = 'test'; // error, config['works']: boolean | { 'prop': string }
28+
>config['works'].prop : Symbol(prop, Decl(controlFlowElementAccess2.ts, 1, 30))
29+
>config : Symbol(config, Decl(controlFlowElementAccess2.ts, 0, 13))
30+
>prop : Symbol(prop, Decl(controlFlowElementAccess2.ts, 1, 30))
31+
32+
config.works.prop = 'test'; // ok
33+
>config.works.prop : Symbol(prop, Decl(controlFlowElementAccess2.ts, 1, 30))
34+
>config : Symbol(config, Decl(controlFlowElementAccess2.ts, 0, 13))
35+
>prop : Symbol(prop, Decl(controlFlowElementAccess2.ts, 1, 30))
36+
}
37+

‎tests/baselines/reference/controlFlowElementAccess2.types

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
=== tests/cases/conformance/controlFlow/controlFlowElementAccess2.ts ===
2+
declare const config: {
3+
>config : { [key: string]: boolean | { prop: string; }; }
4+
5+
[key: string]: boolean | { prop: string };
6+
>key : string
7+
>prop : string
8+
9+
};
10+
11+
if (typeof config['works'] !== 'boolean') {
12+
>typeof config['works'] !== 'boolean' : boolean
13+
>typeof config['works'] : "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function"
14+
>config['works'] : boolean | { prop: string; }
15+
>config : { [key: string]: boolean | { prop: string; }; }
16+
>'works' : "works"
17+
>'boolean' : "boolean"
18+
19+
config.works.prop = 'test'; // ok
20+
>config.works.prop = 'test' : "test"
21+
>config.works.prop : string
22+
>config.works : { prop: string; }
23+
>config : { [key: string]: boolean | { prop: string; }; }
24+
>works : { prop: string; }
25+
>prop : string
26+
>'test' : "test"
27+
28+
config['works'].prop = 'test'; // error, config['works']: boolean | { 'prop': string }
29+
>config['works'].prop = 'test' : "test"
30+
>config['works'].prop : string
31+
>config['works'] : { prop: string; }
32+
>config : { [key: string]: boolean | { prop: string; }; }
33+
>'works' : "works"
34+
>prop : string
35+
>'test' : "test"
36+
}
37+
if (typeof config.works !== 'boolean') {
38+
>typeof config.works !== 'boolean' : boolean
39+
>typeof config.works : "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function"
40+
>config.works : boolean | { prop: string; }
41+
>config : { [key: string]: boolean | { prop: string; }; }
42+
>works : boolean | { prop: string; }
43+
>'boolean' : "boolean"
44+
45+
config['works'].prop = 'test'; // error, config['works']: boolean | { 'prop': string }
46+
>config['works'].prop = 'test' : "test"
47+
>config['works'].prop : string
48+
>config['works'] : { prop: string; }
49+
>config : { [key: string]: boolean | { prop: string; }; }
50+
>'works' : "works"
51+
>prop : string
52+
>'test' : "test"
53+
54+
config.works.prop = 'test'; // ok
55+
>config.works.prop = 'test' : "test"
56+
>config.works.prop : string
57+
>config.works : { prop: string; }
58+
>config : { [key: string]: boolean | { prop: string; }; }
59+
>works : { prop: string; }
60+
>prop : string
61+
>'test' : "test"
62+
}
63+

‎tests/cases/conformance/controlFlow/controlFlowElementAccess2.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// @strict: true
2+
declare const config: {
3+
[key: string]: boolean | { prop: string };
4+
};
5+
6+
if (typeof config['works'] !== 'boolean') {
7+
config.works.prop = 'test'; // ok
8+
config['works'].prop = 'test'; // error, config['works']: boolean | { 'prop': string }
9+
}
10+
if (typeof config.works !== 'boolean') {
11+
config['works'].prop = 'test'; // error, config['works']: boolean | { 'prop': string }
12+
config.works.prop = 'test'; // ok
13+
}

‎tests/cases/fourslash/completionsTypeAssertionKeywords.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
/// <reference path='fourslash.ts'/>
2+
3+
////const a = {
4+
//// b: 42 as /*0*/
5+
////};
6+
////
7+
////1 as /*1*/
8+
////
9+
////const b = 42 as /*2*/
10+
////
11+
////var c = </*3*/>42
12+
13+
verify.completions({ marker: test.markers(), exact: completion.typeAssertionKeywords });

‎tests/cases/fourslash/documentHighlightsInvalidModifierLocations.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
////function f([|readonly|] p) {}
77

88
for (const r of test.ranges()) {
9-
verify.documentHighlightsOf(r, [r]);
9+
verify.documentHighlightsOf(r, test.ranges());
1010
}

‎tests/cases/fourslash/fourslash.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -696,6 +696,7 @@ declare namespace completion {
696696
export const typeKeywords: ReadonlyArray<Entry>;
697697
export const globalTypes: ReadonlyArray<Entry>;
698698
export function globalTypesPlus(plus: ReadonlyArray<FourSlashInterface.ExpectedCompletionEntry>): ReadonlyArray<Entry>;
699+
export const typeAssertionKeywords: ReadonlyArray<Entry>;
699700
export const classElementKeywords: ReadonlyArray<Entry>;
700701
export const classElementInJsKeywords: ReadonlyArray<Entry>;
701702
export const constructorParameterKeywords: ReadonlyArray<Entry>;

0 commit comments

Comments
 (0)