diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 269c55145ecdf..5b481ef47211f 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -3951,7 +3951,12 @@ namespace ts { writePunctuation(writer, SyntaxKind.CloseBracketToken); writePunctuation(writer, SyntaxKind.ColonToken); writeSpace(writer); - buildTypeDisplay(info.type, writer, enclosingDeclaration, globalFlags, symbolStack); + if (info.type) { + buildTypeDisplay(info.type, writer, enclosingDeclaration, globalFlags, symbolStack); + } + else { + writeKeyword(writer, SyntaxKind.AnyKeyword); + } writePunctuation(writer, SyntaxKind.SemicolonToken); writer.writeLine(); } diff --git a/src/services/codefixes/inferFromUsage.ts b/src/services/codefixes/inferFromUsage.ts index 9782619d41dd2..e5177991b3479 100644 --- a/src/services/codefixes/inferFromUsage.ts +++ b/src/services/codefixes/inferFromUsage.ts @@ -70,7 +70,6 @@ namespace ts.codefix { return undefined; } - const containingFunction = getContainingFunction(token); switch (errorCode) { // Variable and Property declarations case Diagnostics.Member_0_implicitly_has_an_1_type.code: @@ -81,6 +80,13 @@ namespace ts.codefix { const symbol = program.getTypeChecker().getSymbolAtLocation(token); return symbol && symbol.valueDeclaration && getCodeActionForVariableDeclaration(symbol.valueDeclaration, sourceFile, program, cancellationToken); } + } + + const containingFunction = getContainingFunction(token); + if (containingFunction === undefined) { + return undefined; + } + switch (errorCode) { // Parameter declarations case Diagnostics.Parameter_0_implicitly_has_an_1_type.code: @@ -148,6 +154,11 @@ namespace ts.codefix { containingFunction.parameters.map(p => isIdentifier(p.name) ? inferTypeForVariableFromUsage(p.name, sourceFile, program, cancellationToken) : undefined); if (!types) return undefined; + // We didn't actually find a set of type inference positions matching each parameter position + if (containingFunction.parameters.length !== types.length) { + return undefined; + } + const textChanges = arrayFrom(mapDefinedIterator(zipToIterator(containingFunction.parameters, types), ([parameter, type]) => type && !parameter.type && !parameter.initializer ? makeChange(containingFunction, parameter.end, type, program) : undefined)); return textChanges.length ? { declaration: parameterDeclaration, textChanges } : undefined; @@ -191,8 +202,9 @@ namespace ts.codefix { sourceFile, token.getStart(sourceFile)); - Debug.assert(!!references, "Found no references!"); - Debug.assert(references.length === 1, "Found more references than expected"); + if (!references || references.length !== 1) { + return []; + } return references[0].references.map(r => getTokenAtPosition(program.getSourceFile(r.fileName), r.textSpan.start, /*includeJsDocComment*/ false)); } @@ -281,6 +293,10 @@ namespace ts.codefix { } export function inferTypeForParametersFromReferences(references: Identifier[], declaration: FunctionLikeDeclaration, checker: TypeChecker, cancellationToken: CancellationToken): (Type | undefined)[] | undefined { + if (references.length === 0) { + return undefined; + } + if (declaration.parameters) { const usageContext: UsageContext = {}; for (const reference of references) { diff --git a/src/services/symbolDisplay.ts b/src/services/symbolDisplay.ts index fe04342b8f7ff..caf38306bec1b 100644 --- a/src/services/symbolDisplay.ts +++ b/src/services/symbolDisplay.ts @@ -496,7 +496,7 @@ namespace ts.SymbolDisplay { addNewLineIfDisplayPartsExist(); if (symbolKind) { pushTypePart(symbolKind); - if (!some(symbol.declarations, d => isArrowFunction(d) || (isFunctionExpression(d) || isClassExpression(d)) && !d.name)) { + if (symbol && !some(symbol.declarations, d => isArrowFunction(d) || (isFunctionExpression(d) || isClassExpression(d)) && !d.name)) { displayParts.push(spacePart()); addFullSymbolName(symbol); } diff --git a/tests/cases/fourslash/incompleteFunctionCallCodefix.ts b/tests/cases/fourslash/incompleteFunctionCallCodefix.ts new file mode 100644 index 0000000000000..007eaa20f7ff9 --- /dev/null +++ b/tests/cases/fourslash/incompleteFunctionCallCodefix.ts @@ -0,0 +1,9 @@ +/// + +// @noImplicitAny: true +//// function f(/*1*/x) { +//// } +//// f( + +verify.not.codeFixAvailable([]); + diff --git a/tests/cases/fourslash/incompleteFunctionCallCodefix2.ts b/tests/cases/fourslash/incompleteFunctionCallCodefix2.ts new file mode 100644 index 0000000000000..c1bc731541f62 --- /dev/null +++ b/tests/cases/fourslash/incompleteFunctionCallCodefix2.ts @@ -0,0 +1,7 @@ +/// + +// @noImplicitAny: true +//// function f(new C(100, 3, undefined) + +verify.not.codeFixAvailable([]); + diff --git a/tests/cases/fourslash/incompleteFunctionCallCodefix3.ts b/tests/cases/fourslash/incompleteFunctionCallCodefix3.ts new file mode 100644 index 0000000000000..3c0261e48a70f --- /dev/null +++ b/tests/cases/fourslash/incompleteFunctionCallCodefix3.ts @@ -0,0 +1,7 @@ +/// + +// @noImplicitAny: true +//// function ...q) {}} f(10); + +verify.not.codeFixAvailable([]); + diff --git a/tests/cases/fourslash/typeToStringCrashInCodeFix.ts b/tests/cases/fourslash/typeToStringCrashInCodeFix.ts new file mode 100644 index 0000000000000..05cf00cb4cec9 --- /dev/null +++ b/tests/cases/fourslash/typeToStringCrashInCodeFix.ts @@ -0,0 +1,6 @@ +/// + +// @noImplicitAny: true +//// function f(y, z = { p: y[ + +verify.getAndApplyCodeFix();