Skip to content

Commit df95de3

Browse files
RyanCavanaughRyanCavanaugh
committed
Merge branch 'master' into referencesDogfood_1
2 parents e1a5036 + 79ad7df commit df95de3

120 files changed

Lines changed: 3081 additions & 1866 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎package-lock.json‎

Lines changed: 368 additions & 415 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎scripts/tslint/rules/booleanTriviaRule.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,11 @@ function walk(ctx: Lint.WalkContext<void>): void {
2828
function shouldIgnoreCalledExpression(expression: ts.Expression): boolean {
2929
if (expression.kind === ts.SyntaxKind.PropertyAccessExpression) {
3030
const methodName = (expression as ts.PropertyAccessExpression).name.text;
31-
if (methodName.indexOf("set") === 0) {
31+
if (methodName.startsWith("set") || methodName.startsWith("assert")) {
3232
return true;
3333
}
3434
switch (methodName) {
3535
case "apply":
36-
case "assert":
37-
case "assertEqual":
3836
case "call":
3937
case "equal":
4038
case "fail":
@@ -46,11 +44,10 @@ function walk(ctx: Lint.WalkContext<void>): void {
4644
}
4745
else if (expression.kind === ts.SyntaxKind.Identifier) {
4846
const functionName = (expression as ts.Identifier).text;
49-
if (functionName.indexOf("set") === 0) {
47+
if (functionName.startsWith("set") || functionName.startsWith("assert")) {
5048
return true;
5149
}
5250
switch (functionName) {
53-
case "assert":
5451
case "contains":
5552
case "createAnonymousType":
5653
case "createImportSpecifier":

‎src/compiler/checker.ts‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4170,14 +4170,17 @@ namespace ts {
41704170
else {
41714171
// Use explicitly specified property name ({ p: xxx } form), or otherwise the implied name ({ p } form)
41724172
const name = declaration.propertyName || <Identifier>declaration.name;
4173-
if (isComputedNonLiteralName(name)) {
4174-
// computed properties with non-literal names are treated as 'any'
4173+
const isLate = isLateBindableName(name);
4174+
const isWellKnown = isComputedPropertyName(name) && isWellKnownSymbolSyntactically(name.expression);
4175+
if (!isLate && !isWellKnown && isComputedNonLiteralName(name)) {
41754176
return anyType;
41764177
}
41774178

41784179
// Use type of the specified property, or otherwise, for a numeric name, the type of the numeric index signature,
41794180
// or otherwise the type of the string index signature.
4180-
const text = getTextOfPropertyName(name);
4181+
const text = isLate ? getLateBoundNameFromType(checkComputedPropertyName(name as ComputedPropertyName) as LiteralType | UniqueESSymbolType) :
4182+
isWellKnown ? getPropertyNameForKnownSymbolName(idText(((name as ComputedPropertyName).expression as PropertyAccessExpression).name)) :
4183+
getTextOfPropertyName(name);
41814184

41824185
// Relax null check on ambient destructuring parameters, since the parameters have no implementation and are just documentation
41834186
if (strictNullChecks && declaration.flags & NodeFlags.Ambient && isParameterDeclaration(declaration)) {
@@ -4363,7 +4366,7 @@ namespace ts {
43634366
for (const declaration of symbol.declarations) {
43644367
let declarationInConstructor = false;
43654368
const expression = declaration.kind === SyntaxKind.BinaryExpression ? <BinaryExpression>declaration :
4366-
declaration.kind === SyntaxKind.PropertyAccessExpression ? <BinaryExpression>getAncestor(declaration, SyntaxKind.BinaryExpression) :
4369+
declaration.kind === SyntaxKind.PropertyAccessExpression ? cast(declaration.parent, isBinaryExpression) :
43674370
undefined;
43684371

43694372
if (!expression) {
@@ -13875,7 +13878,8 @@ namespace ts {
1387513878
const assignmentKind = getAssignmentTargetKind(node);
1387613879

1387713880
if (assignmentKind) {
13878-
if (!(localOrExportSymbol.flags & SymbolFlags.Variable)) {
13881+
if (!(localOrExportSymbol.flags & SymbolFlags.Variable) &&
13882+
!(isInJavaScriptFile(node) && localOrExportSymbol.flags & SymbolFlags.ValueModule)) {
1387913883
error(node, Diagnostics.Cannot_assign_to_0_because_it_is_not_a_variable, symbolToString(symbol));
1388013884
return unknownType;
1388113885
}
@@ -19086,6 +19090,9 @@ namespace ts {
1908619090

1908719091
const links = getNodeLinks(node);
1908819092
const type = getTypeOfSymbol(node.symbol);
19093+
if (isTypeAny(type)) {
19094+
return type;
19095+
}
1908919096

1909019097
// Check if function expression is contextually typed and assign parameter types if so.
1909119098
if (!(links.flags & NodeCheckFlags.ContextChecked)) {
@@ -19848,8 +19855,9 @@ namespace ts {
1984819855
// VarExpr = ValueExpr
1984919856
// requires VarExpr to be classified as a reference
1985019857
// A compound assignment furthermore requires VarExpr to be classified as a reference (section 4.1)
19851-
// and the type of the non - compound operation to be assignable to the type of VarExpr.
19852-
if (checkReferenceExpression(left, Diagnostics.The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access)) {
19858+
// and the type of the non-compound operation to be assignable to the type of VarExpr.
19859+
if (checkReferenceExpression(left, Diagnostics.The_left_hand_side_of_an_assignment_expression_must_be_a_variable_or_a_property_access)
19860+
&& (!isIdentifier(left) || unescapeLeadingUnderscores(left.escapedText) !== "exports")) {
1985319861
// to avoid cascading errors check assignability only if 'isReference' check succeeded and no errors were reported
1985419862
checkTypeAssignableTo(valueType, leftType, left, /*headMessage*/ undefined);
1985519863
}
@@ -21867,6 +21875,10 @@ namespace ts {
2186721875
// and give a better error message when the host function mentions `arguments`
2186821876
// but the tag doesn't have an array type
2186921877
if (decl) {
21878+
const i = getJSDocTags(decl).filter(isJSDocParameterTag).indexOf(node);
21879+
if (i > -1 && i < decl.parameters.length && isBindingPattern(decl.parameters[i].name)) {
21880+
return;
21881+
}
2187021882
if (!containsArgumentsReference(decl)) {
2187121883
error(node.name,
2187221884
Diagnostics.JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name,

‎src/compiler/core.ts‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1265,10 +1265,7 @@ namespace ts {
12651265
});
12661266
}
12671267

1268-
export function assign<T1 extends MapLike<{}>, T2, T3>(t: T1, arg1: T2, arg2: T3): T1 & T2 & T3;
1269-
export function assign<T1 extends MapLike<{}>, T2>(t: T1, arg1: T2): T1 & T2;
1270-
export function assign<T1 extends MapLike<{}>>(t: T1, ...args: any[]): any;
1271-
export function assign<T1 extends MapLike<{}>>(t: T1, ...args: any[]) {
1268+
export function assign<T extends object>(t: T, ...args: T[]) {
12721269
for (const arg of args) {
12731270
for (const p in arg) {
12741271
if (hasProperty(arg, p)) {
@@ -1724,6 +1721,10 @@ namespace ts {
17241721
return compareComparableValues(a, b);
17251722
}
17261723

1724+
export function min<T>(a: T, b: T, compare: Comparer<T>): T {
1725+
return compare(a, b) === Comparison.LessThan ? a : b;
1726+
}
1727+
17271728
/**
17281729
* Compare two strings using a case-insensitive ordinal comparison.
17291730
*
@@ -3119,8 +3120,8 @@ namespace ts {
31193120
return (arg: T) => f(arg) && g(arg);
31203121
}
31213122

3122-
export function or<T>(f: (arg: T) => boolean, g: (arg: T) => boolean) {
3123-
return (arg: T) => f(arg) || g(arg);
3123+
export function or<T>(f: (arg: T) => boolean, g: (arg: T) => boolean): (arg: T) => boolean {
3124+
return arg => f(arg) || g(arg);
31243125
}
31253126

31263127
export function assertTypeIsNever(_: never): void { } // tslint:disable-line no-empty

‎src/compiler/diagnosticMessages.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4161,5 +4161,9 @@
41614161
"Convert all constructor functions to classes": {
41624162
"category": "Message",
41634163
"code": 95045
4164+
},
4165+
"Generate 'get' and 'set' accessors": {
4166+
"category": "Message",
4167+
"code": 95046
41644168
}
41654169
}

‎src/compiler/parser.ts‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7600,7 +7600,7 @@ namespace ts {
76007600
const tripleSlashXMLCommentStartRegEx = /^\/\/\/\s*<(\S+)\s.*?\/>/im;
76017601
const singleLinePragmaRegEx = /^\/\/\/?\s*@(\S+)\s*(.*)\s*$/im;
76027602
function extractPragmas(pragmas: PragmaPsuedoMapEntry[], range: CommentRange, text: string) {
7603-
const tripleSlash = tripleSlashXMLCommentStartRegEx.exec(text);
7603+
const tripleSlash = range.kind === SyntaxKind.SingleLineCommentTrivia && tripleSlashXMLCommentStartRegEx.exec(text);
76047604
if (tripleSlash) {
76057605
const name = tripleSlash[1].toLowerCase() as keyof PragmaPsuedoMap; // Technically unsafe cast, but we do it so the below check to make it safe typechecks
76067606
const pragma = commentPragmas[name] as PragmaDefinition;
@@ -7637,15 +7637,17 @@ namespace ts {
76377637
return;
76387638
}
76397639

7640-
const singleLine = singleLinePragmaRegEx.exec(text);
7640+
const singleLine = range.kind === SyntaxKind.SingleLineCommentTrivia && singleLinePragmaRegEx.exec(text);
76417641
if (singleLine) {
76427642
return addPragmaForMatch(pragmas, range, PragmaKindFlags.SingleLine, singleLine);
76437643
}
76447644

7645-
const multiLinePragmaRegEx = /\s*@(\S+)\s*(.*)\s*$/gim; // Defined inline since it uses the "g" flag, which keeps a persistent index (for iterating)
7646-
let multiLineMatch: RegExpExecArray;
7647-
while (multiLineMatch = multiLinePragmaRegEx.exec(text)) {
7648-
addPragmaForMatch(pragmas, range, PragmaKindFlags.MultiLine, multiLineMatch);
7645+
if (range.kind === SyntaxKind.MultiLineCommentTrivia) {
7646+
const multiLinePragmaRegEx = /\s*@(\S+)\s*(.*)\s*$/gim; // Defined inline since it uses the "g" flag, which keeps a persistent index (for iterating)
7647+
let multiLineMatch: RegExpExecArray;
7648+
while (multiLineMatch = multiLinePragmaRegEx.exec(text)) {
7649+
addPragmaForMatch(pragmas, range, PragmaKindFlags.MultiLine, multiLineMatch);
7650+
}
76497651
}
76507652
}
76517653

‎src/compiler/program.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,6 @@ namespace ts {
573573
const packageIdToSourceFile = createMap<SourceFile>();
574574
// Maps from a SourceFile's `.path` to the name of the package it was imported with.
575575
let sourceFileToPackageName = createMap<string>();
576-
// See `sourceFileIsRedirectedTo`.
577576
let redirectTargetsSet = createMap<true>();
578577

579578
const filesByName = createMap<SourceFile | undefined>();

‎src/compiler/tsc.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace ts {
1818
}
1919

2020
let reportDiagnostic = createDiagnosticReporter(sys);
21-
function udpateReportDiagnostic(options: CompilerOptions) {
21+
function updateReportDiagnostic(options: CompilerOptions) {
2222
if (options.pretty) {
2323
reportDiagnostic = createDiagnosticReporter(sys, /*pretty*/ true);
2424
}
@@ -107,7 +107,7 @@ namespace ts {
107107
const commandLineOptions = commandLine.options;
108108
if (configFileName) {
109109
const configParseResult = parseConfigFileWithSystem(configFileName, commandLineOptions, sys, reportDiagnostic);
110-
udpateReportDiagnostic(configParseResult.options);
110+
updateReportDiagnostic(configParseResult.options);
111111
if (isWatchSet(configParseResult.options)) {
112112
reportWatchModeWithoutSysSupport();
113113
createWatchOfConfigFile(configParseResult, commandLineOptions);
@@ -117,7 +117,7 @@ namespace ts {
117117
}
118118
}
119119
else {
120-
udpateReportDiagnostic(commandLineOptions);
120+
updateReportDiagnostic(commandLineOptions);
121121
if (isWatchSet(commandLineOptions)) {
122122
reportWatchModeWithoutSysSupport();
123123
createWatchOfFilesAndCompilerOptions(commandLine.fileNames, commandLineOptions);

‎src/compiler/types.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2527,7 +2527,7 @@ namespace ts {
25272527
/**
25282528
* If two source files are for the same version of the same package, one will redirect to the other.
25292529
* (See `createRedirectSourceFile` in program.ts.)
2530-
* The redirect will have this set. The other will not have anything set, but see Program#sourceFileIsRedirectedTo.
2530+
* The redirect will have this set. The redirected-to source file will be in `redirectTargetsSet`.
25312531
*/
25322532
/* @internal */ redirectInfo?: RedirectInfo | undefined;
25332533

‎src/compiler/utilities.ts‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4271,7 +4271,7 @@ namespace ts {
42714271
}
42724272
}
42734273

4274-
export function isParameterPropertyDeclaration(node: Node): boolean {
4274+
export function isParameterPropertyDeclaration(node: Node): node is ParameterDeclaration {
42754275
return hasModifier(node, ModifierFlags.ParameterPropertyModifier) && node.parent.kind === SyntaxKind.Constructor && isClassLike(node.parent.parent);
42764276
}
42774277

@@ -4630,11 +4630,21 @@ namespace ts {
46304630
* parameters by name and binding patterns do not have a name.
46314631
*/
46324632
export function getJSDocParameterTags(param: ParameterDeclaration): ReadonlyArray<JSDocParameterTag> {
4633-
if (param.name && isIdentifier(param.name)) {
4634-
const name = param.name.escapedText;
4635-
return getJSDocTags(param.parent).filter((tag): tag is JSDocParameterTag => isJSDocParameterTag(tag) && isIdentifier(tag.name) && tag.name.escapedText === name);
4633+
if (param.name) {
4634+
if (isIdentifier(param.name)) {
4635+
const name = param.name.escapedText;
4636+
return getJSDocTags(param.parent).filter((tag): tag is JSDocParameterTag => isJSDocParameterTag(tag) && isIdentifier(tag.name) && tag.name.escapedText === name);
4637+
}
4638+
else {
4639+
const i = param.parent.parameters.indexOf(param);
4640+
Debug.assert(i > -1, "Parameters should always be in their parents' parameter list");
4641+
const paramTags = getJSDocTags(param.parent).filter(isJSDocParameterTag);
4642+
if (i < paramTags.length) {
4643+
return [paramTags[i]];
4644+
}
4645+
}
46364646
}
4637-
// a binding pattern doesn't have a name, so it's not possible to match it a JSDoc parameter, which is identified by name
4647+
// return empty array for: out-of-order binding patterns and JSDoc function syntax, which has un-named parameters
46384648
return emptyArray;
46394649
}
46404650

0 commit comments

Comments
 (0)