Skip to content

Create returnOnlySignature only when inferences will possibly be made #35173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 25, 2019
Merged

Create returnOnlySignature only when inferences will possibly be made #35173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a93ed9
Create returnOnlySignature only when inferences will possibly be made
ahejlsberg Nov 18, 2019
c859936
Add regression test
ahejlsberg Nov 25, 2019
6f35afb
Accept new baselines
ahejlsberg Nov 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26051,15 +26051,19 @@ namespace ts {
if (checkMode && checkMode & CheckMode.SkipContextSensitive && isContextSensitive(node)) {
// Skip parameters, return signature with return type that retains noncontextual parts so inferences can still be drawn in an early stage
if (!getEffectiveReturnTypeNode(node) && hasContextSensitiveReturnExpression(node)) {
const links = getNodeLinks(node);
if (links.contextFreeType) {
return links.contextFreeType;
}
const returnType = getReturnTypeFromBody(node, checkMode);
const returnOnlySignature = createSignature(undefined, undefined, undefined, emptyArray, returnType, /*resolvedTypePredicate*/ undefined, 0, SignatureFlags.None);
const returnOnlyType = createAnonymousType(node.symbol, emptySymbols, [returnOnlySignature], emptyArray, undefined, undefined);
returnOnlyType.objectFlags |= ObjectFlags.NonInferrableType;
return links.contextFreeType = returnOnlyType;
// Return plain anyFunctionType if there is no possibility we'll make inferences from the return type
const contextualSignature = getContextualSignature(node);
if (contextualSignature && couldContainTypeVariables(getReturnTypeOfSignature(contextualSignature))) {
const links = getNodeLinks(node);
if (links.contextFreeType) {
return links.contextFreeType;
}
const returnType = getReturnTypeFromBody(node, checkMode);
const returnOnlySignature = createSignature(undefined, undefined, undefined, emptyArray, returnType, /*resolvedTypePredicate*/ undefined, 0, SignatureFlags.None);
const returnOnlyType = createAnonymousType(node.symbol, emptySymbols, [returnOnlySignature], emptyArray, undefined, undefined);
returnOnlyType.objectFlags |= ObjectFlags.NonInferrableType;
return links.contextFreeType = returnOnlyType;
}
}
return anyFunctionType;
}
Expand Down
87 changes: 87 additions & 0 deletions tests/baselines/reference/contextSensitiveReturnTypeInference.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
//// [contextSensitiveReturnTypeInference.ts]
// Repro from #34849

interface IData {
bar: boolean
}

declare function test<TDependencies>(
getter: (deps: TDependencies, data: IData) => any,
deps: TDependencies,
): any

const DEPS = {
foo: 1
}

test(
(deps, data) => ({
fn1: function() { return deps.foo },
fn2: data.bar
}),
DEPS
);

test(
(deps: typeof DEPS, data) => ({
fn1: function() { return deps.foo },
fn2: data.bar
}),
DEPS
);

test(
(deps, data) => ({
fn1: () => deps.foo,
fn2: data.bar
}),
DEPS
);

test(
(deps, data) => {
return {
fn1() { return deps.foo },
fn2: data.bar
}
},
DEPS
);

test(
(deps) => ({
fn1() { return deps.foo },
fn2: 1
}),
DEPS
);


//// [contextSensitiveReturnTypeInference.js]
"use strict";
// Repro from #34849
var DEPS = {
foo: 1
};
test(function (deps, data) { return ({
fn1: function () { return deps.foo; },
fn2: data.bar
}); }, DEPS);
test(function (deps, data) { return ({
fn1: function () { return deps.foo; },
fn2: data.bar
}); }, DEPS);
test(function (deps, data) { return ({
fn1: function () { return deps.foo; },
fn2: data.bar
}); }, DEPS);
test(function (deps, data) {
return {
fn1: function () { return deps.foo; },
fn2: data.bar
};
}, DEPS);
test(function (deps) { return ({
fn1: function () { return deps.foo; },
fn2: 1
}); }, DEPS);
157 changes: 157 additions & 0 deletions tests/baselines/reference/contextSensitiveReturnTypeInference.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
=== tests/cases/compiler/contextSensitiveReturnTypeInference.ts ===
// Repro from #34849

interface IData {
>IData : Symbol(IData, Decl(contextSensitiveReturnTypeInference.ts, 0, 0))

bar: boolean
>bar : Symbol(IData.bar, Decl(contextSensitiveReturnTypeInference.ts, 2, 17))
}

declare function test<TDependencies>(
>test : Symbol(test, Decl(contextSensitiveReturnTypeInference.ts, 4, 1))
>TDependencies : Symbol(TDependencies, Decl(contextSensitiveReturnTypeInference.ts, 6, 22))

getter: (deps: TDependencies, data: IData) => any,
>getter : Symbol(getter, Decl(contextSensitiveReturnTypeInference.ts, 6, 37))
>deps : Symbol(deps, Decl(contextSensitiveReturnTypeInference.ts, 7, 11))
>TDependencies : Symbol(TDependencies, Decl(contextSensitiveReturnTypeInference.ts, 6, 22))
>data : Symbol(data, Decl(contextSensitiveReturnTypeInference.ts, 7, 31))
>IData : Symbol(IData, Decl(contextSensitiveReturnTypeInference.ts, 0, 0))

deps: TDependencies,
>deps : Symbol(deps, Decl(contextSensitiveReturnTypeInference.ts, 7, 52))
>TDependencies : Symbol(TDependencies, Decl(contextSensitiveReturnTypeInference.ts, 6, 22))

): any

const DEPS = {
>DEPS : Symbol(DEPS, Decl(contextSensitiveReturnTypeInference.ts, 11, 5))

foo: 1
>foo : Symbol(foo, Decl(contextSensitiveReturnTypeInference.ts, 11, 14))
}

test(
>test : Symbol(test, Decl(contextSensitiveReturnTypeInference.ts, 4, 1))

(deps, data) => ({
>deps : Symbol(deps, Decl(contextSensitiveReturnTypeInference.ts, 16, 3))
>data : Symbol(data, Decl(contextSensitiveReturnTypeInference.ts, 16, 8))

fn1: function() { return deps.foo },
>fn1 : Symbol(fn1, Decl(contextSensitiveReturnTypeInference.ts, 16, 20))
>deps.foo : Symbol(foo, Decl(contextSensitiveReturnTypeInference.ts, 11, 14))
>deps : Symbol(deps, Decl(contextSensitiveReturnTypeInference.ts, 16, 3))
>foo : Symbol(foo, Decl(contextSensitiveReturnTypeInference.ts, 11, 14))

fn2: data.bar
>fn2 : Symbol(fn2, Decl(contextSensitiveReturnTypeInference.ts, 17, 40))
>data.bar : Symbol(IData.bar, Decl(contextSensitiveReturnTypeInference.ts, 2, 17))
>data : Symbol(data, Decl(contextSensitiveReturnTypeInference.ts, 16, 8))
>bar : Symbol(IData.bar, Decl(contextSensitiveReturnTypeInference.ts, 2, 17))

}),
DEPS
>DEPS : Symbol(DEPS, Decl(contextSensitiveReturnTypeInference.ts, 11, 5))

);

test(
>test : Symbol(test, Decl(contextSensitiveReturnTypeInference.ts, 4, 1))

(deps: typeof DEPS, data) => ({
>deps : Symbol(deps, Decl(contextSensitiveReturnTypeInference.ts, 24, 3))
>DEPS : Symbol(DEPS, Decl(contextSensitiveReturnTypeInference.ts, 11, 5))
>data : Symbol(data, Decl(contextSensitiveReturnTypeInference.ts, 24, 21))

fn1: function() { return deps.foo },
>fn1 : Symbol(fn1, Decl(contextSensitiveReturnTypeInference.ts, 24, 33))
>deps.foo : Symbol(foo, Decl(contextSensitiveReturnTypeInference.ts, 11, 14))
>deps : Symbol(deps, Decl(contextSensitiveReturnTypeInference.ts, 24, 3))
>foo : Symbol(foo, Decl(contextSensitiveReturnTypeInference.ts, 11, 14))

fn2: data.bar
>fn2 : Symbol(fn2, Decl(contextSensitiveReturnTypeInference.ts, 25, 40))
>data.bar : Symbol(IData.bar, Decl(contextSensitiveReturnTypeInference.ts, 2, 17))
>data : Symbol(data, Decl(contextSensitiveReturnTypeInference.ts, 24, 21))
>bar : Symbol(IData.bar, Decl(contextSensitiveReturnTypeInference.ts, 2, 17))

}),
DEPS
>DEPS : Symbol(DEPS, Decl(contextSensitiveReturnTypeInference.ts, 11, 5))

);

test(
>test : Symbol(test, Decl(contextSensitiveReturnTypeInference.ts, 4, 1))

(deps, data) => ({
>deps : Symbol(deps, Decl(contextSensitiveReturnTypeInference.ts, 32, 3))
>data : Symbol(data, Decl(contextSensitiveReturnTypeInference.ts, 32, 8))

fn1: () => deps.foo,
>fn1 : Symbol(fn1, Decl(contextSensitiveReturnTypeInference.ts, 32, 20))
>deps.foo : Symbol(foo, Decl(contextSensitiveReturnTypeInference.ts, 11, 14))
>deps : Symbol(deps, Decl(contextSensitiveReturnTypeInference.ts, 32, 3))
>foo : Symbol(foo, Decl(contextSensitiveReturnTypeInference.ts, 11, 14))

fn2: data.bar
>fn2 : Symbol(fn2, Decl(contextSensitiveReturnTypeInference.ts, 33, 24))
>data.bar : Symbol(IData.bar, Decl(contextSensitiveReturnTypeInference.ts, 2, 17))
>data : Symbol(data, Decl(contextSensitiveReturnTypeInference.ts, 32, 8))
>bar : Symbol(IData.bar, Decl(contextSensitiveReturnTypeInference.ts, 2, 17))

}),
DEPS
>DEPS : Symbol(DEPS, Decl(contextSensitiveReturnTypeInference.ts, 11, 5))

);

test(
>test : Symbol(test, Decl(contextSensitiveReturnTypeInference.ts, 4, 1))

(deps, data) => {
>deps : Symbol(deps, Decl(contextSensitiveReturnTypeInference.ts, 40, 3))
>data : Symbol(data, Decl(contextSensitiveReturnTypeInference.ts, 40, 8))

return {
fn1() { return deps.foo },
>fn1 : Symbol(fn1, Decl(contextSensitiveReturnTypeInference.ts, 41, 12))
>deps.foo : Symbol(foo, Decl(contextSensitiveReturnTypeInference.ts, 11, 14))
>deps : Symbol(deps, Decl(contextSensitiveReturnTypeInference.ts, 40, 3))
>foo : Symbol(foo, Decl(contextSensitiveReturnTypeInference.ts, 11, 14))

fn2: data.bar
>fn2 : Symbol(fn2, Decl(contextSensitiveReturnTypeInference.ts, 42, 32))
>data.bar : Symbol(IData.bar, Decl(contextSensitiveReturnTypeInference.ts, 2, 17))
>data : Symbol(data, Decl(contextSensitiveReturnTypeInference.ts, 40, 8))
>bar : Symbol(IData.bar, Decl(contextSensitiveReturnTypeInference.ts, 2, 17))
}
},
DEPS
>DEPS : Symbol(DEPS, Decl(contextSensitiveReturnTypeInference.ts, 11, 5))

);

test(
>test : Symbol(test, Decl(contextSensitiveReturnTypeInference.ts, 4, 1))

(deps) => ({
>deps : Symbol(deps, Decl(contextSensitiveReturnTypeInference.ts, 50, 3))

fn1() { return deps.foo },
>fn1 : Symbol(fn1, Decl(contextSensitiveReturnTypeInference.ts, 50, 14))
>deps.foo : Symbol(foo, Decl(contextSensitiveReturnTypeInference.ts, 11, 14))
>deps : Symbol(deps, Decl(contextSensitiveReturnTypeInference.ts, 50, 3))
>foo : Symbol(foo, Decl(contextSensitiveReturnTypeInference.ts, 11, 14))

fn2: 1
>fn2 : Symbol(fn2, Decl(contextSensitiveReturnTypeInference.ts, 51, 30))

}),
DEPS
>DEPS : Symbol(DEPS, Decl(contextSensitiveReturnTypeInference.ts, 11, 5))

);

Loading