maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add test + reshuffle/rename new code

Browse source
This commit is contained in:
Nathan Shively-Sanders 2019-09-06 15:15:19 -07:00
parent 1703ae0f46
commit 330e51f098
6 changed files with 77 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
src/services/codefixes/inferFromUsage.ts
View file

@ -899,59 +899,42 @@ namespace ts.codefix {
if (usage.isNumberOrString) {
types.push(checker.getUnionType([checker.getStringType(), checker.getNumberType()]));
}
if (usage.numberIndex) {
types.push(checker.createArrayType(unifyFromUsage(usage.numberIndex)));
}
if (usage.properties && usage.properties.size
|| usage.calls && usage.calls.length
|| usage.constructs && usage.constructs.length
|| usage.stringIndex) {
types.push(inferStructuralType(usage));
}
types.push(...(usage.candidateTypes || []).map(t => checker.getBaseTypeOfLiteralType(t)));
types.push(...inferNamedTypesFromProperties(usage));
if (usage.numberIndex) {
types.push(checker.createArrayType(unifyFromUsage(usage.numberIndex)));
}
const structural = inferStructuralType(usage);
if (structural) {
types.push(structural);
}
return types;
}
function inferStructuralType(usage: Usage) {
if (usage.properties && usage.properties.size
|| usage.calls && usage.calls.length
|| usage.constructs && usage.constructs.length
|| usage.stringIndex) {
const members = createUnderscoreEscapedMap<Symbol>();
const callSignatures: Signature[] = [];
const constructSignatures: Signature[] = [];
let stringIndexInfo: IndexInfo | undefined;
if (usage.properties) {
usage.properties.forEach((u, name) => {
const symbol = checker.createSymbol(SymbolFlags.Property, name);
symbol.type = unifyFromUsage(u);
members.set(name, symbol);
});
}
if (usage.calls) {
callSignatures.push(getSignatureFromCalls(usage.calls));
}
if (usage.constructs) {
constructSignatures.push(getSignatureFromCalls(usage.constructs));
}
if (usage.stringIndex) {
stringIndexInfo = checker.createIndexInfo(unifyFromUsage(usage.stringIndex), /*isReadonly*/ false);
}
return checker.createAnonymousType(/*symbol*/ undefined!, members, callSignatures, constructSignatures, stringIndexInfo, /*numberIndexInfo*/ undefined); // TODO: GH#18217
const members = createUnderscoreEscapedMap<Symbol>();
if (usage.properties) {
usage.properties.forEach((u, name) => {
const symbol = checker.createSymbol(SymbolFlags.Property, name);
symbol.type = unifyFromUsage(u);
members.set(name, symbol);
});
}
const callSignatures: Signature[] = usage.calls ? [getSignatureFromCalls(usage.calls)] : [];
const constructSignatures: Signature[] = usage.constructs ? [getSignatureFromCalls(usage.constructs)] : [];
const stringIndexInfo = usage.stringIndex && checker.createIndexInfo(unifyFromUsage(usage.stringIndex), /*isReadonly*/ false);
return checker.createAnonymousType(/*symbol*/ undefined!, members, callSignatures, constructSignatures, stringIndexInfo, /*numberIndexInfo*/ undefined); // TODO: GH#18217
}
function inferNamedTypesFromProperties(usage: Usage): Type[] {
if (!usage.properties || !usage.properties.size) return [];
const matches = builtins.filter(t => allPropertiesAreAssignableToUsage(t, usage));
if (0 < matches.length && matches.length < 3) {
return matches.map(m => inferInstantiationFromUsage(m, usage));
const types = builtins.filter(t => allPropertiesAreAssignableToUsage(t, usage));
if (0 < types.length && types.length < 3) {
return types.map(t => inferInstantiationFromUsage(t, usage));
}
return [];
}

9
tests/cases/fourslash/codeFixInferFromUsageAddition.ts Normal file
View file

@ -0,0 +1,9 @@
/// <reference path='fourslash.ts' />
// @noImplicitAny: true
//// function foo([|a, m |]) {
//// return a + m
//// }
verify.rangeAfterCodeFix("a: any, m: any", /*includeWhiteSpace*/ undefined, /*errorCode*/ undefined, /*index*/0);

14
tests/cases/fourslash/codeFixInferFromUsageArray.ts Normal file
View file

@ -0,0 +1,14 @@
/// <reference path='fourslash.ts' />
// @noImplicitAny: true
//// function foo([|p, a, b, c, d, e |]) {
//// var x: string = a.pop()
//// b.reverse()
//// var rr: boolean[] = c.reverse()
//// d.some(t => t > 1); // can't infer from callbacks right now
//// var y = e.concat(12); // can't infer from overloaded functions right now
//// return p.push(12)
//// }
verify.rangeAfterCodeFix("p: number[], a: string[], b: any[], c: boolean[], d: any[], e: number[]", /*includeWhiteSpace*/ undefined, /*errorCode*/ undefined, /*index*/0);

10
tests/cases/fourslash/codeFixInferFromUsageLiteralTypes.ts Normal file
View file

@ -0,0 +1,10 @@
/// <reference path='fourslash.ts' />
// @noImplicitAny: true
//// function foo([|a, m |]) {
//// a = 'hi'
//// m = 1
//// }
verify.rangeAfterCodeFix("a: string, m: number", /*includeWhiteSpace*/ undefined, /*errorCode*/ undefined, /*index*/0);

9
tests/cases/fourslash/codeFixInferFromUsagePromise.ts Normal file
View file

@ -0,0 +1,9 @@
/// <reference path='fourslash.ts' />
// @noImplicitAny: true
//// function foo([|p |]) {
//// return p.then((x: string[]) => x[0])
//// }
verify.rangeAfterCodeFix("p: Promise<string[]>", /*includeWhiteSpace*/ undefined, /*errorCode*/ undefined, /*index*/0);

12
tests/cases/fourslash/codeFixInferFromUsageString.ts Normal file
View file

@ -0,0 +1,12 @@
/// <reference path='fourslash.ts' />
// @noImplicitAny: true
//// function foo([|p, a, b, c, d |]) {
//// var x
//// p.charAt(x)
//// a.charAt(0)
//// b.concat('hi')
//// }
verify.rangeAfterCodeFix("p: string, a: string, b: string | string[]", /*includeWhiteSpace*/ undefined, /*errorCode*/ undefined, /*index*/0);