microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-07 23:08:20 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Contextual typing checks property assignments for type annotation (#43598)

Browse Source 
Property assignments can have a type annotation in JS. This PR adds a
check for it in contextual typing.

Fixes #43379
This commit is contained in:
Nathan Shively-Sanders 2021-04-26 09:19:24 -07:00 committed by GitHub
parent b9c1e98544
commit d5af89c552
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 71 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/compiler/checker.ts
View File

@ -25218,6 +25218,10 @@ namespace ts {
function getContextualTypeForObjectLiteralElement(element: ObjectLiteralElementLike, contextFlags?: ContextFlags) {
const objectLiteral = <ObjectLiteralExpression>element.parent;
const propertyAssignmentType = isPropertyAssignment(element) && getContextualTypeForVariableLikeDeclaration(element);
if (propertyAssignmentType) {
return propertyAssignmentType;
}
const type = getApparentTypeOfContextualType(objectLiteral, contextFlags);
if (type) {
if (hasBindableName(element)) {

25
tests/baselines/reference/typeTagOnPropertyAssignment.symbols Normal file
View File

@ -0,0 +1,25 @@
=== tests/cases/conformance/jsdoc/typeTagOnPropertyAssignment.js ===
const o = {
>o : Symbol(o, Decl(typeTagOnPropertyAssignment.js, 0, 5))
/**
* @type {"a"}
*/
a: "a",
>a : Symbol(a, Decl(typeTagOnPropertyAssignment.js, 0, 11))
/** @type {() => 'b'} */
n: () => 'b'
>n : Symbol(n, Decl(typeTagOnPropertyAssignment.js, 4, 11))
};
o.a
>o.a : Symbol(a, Decl(typeTagOnPropertyAssignment.js, 0, 11))
>o : Symbol(o, Decl(typeTagOnPropertyAssignment.js, 0, 5))
>a : Symbol(a, Decl(typeTagOnPropertyAssignment.js, 0, 11))
o.n
>o.n : Symbol(n, Decl(typeTagOnPropertyAssignment.js, 4, 11))
>o : Symbol(o, Decl(typeTagOnPropertyAssignment.js, 0, 5))
>n : Symbol(n, Decl(typeTagOnPropertyAssignment.js, 4, 11))

29
tests/baselines/reference/typeTagOnPropertyAssignment.types Normal file
View File

@ -0,0 +1,29 @@
=== tests/cases/conformance/jsdoc/typeTagOnPropertyAssignment.js ===
const o = {
>o : { a: "a"; n: () => 'b'; }
>{ /** * @type {"a"} */ a: "a", /** @type {() => 'b'} */ n: () => 'b'} : { a: "a"; n: () => 'b'; }
/**
* @type {"a"}
*/
a: "a",
>a : "a"
>"a" : "a"
/** @type {() => 'b'} */
n: () => 'b'
>n : () => 'b'
>() => 'b' : () => 'b'
>'b' : "b"
};
o.a
>o.a : "a"
>o : { a: "a"; n: () => "b"; }
>a : "a"
o.n
>o.n : () => "b"
>o : { a: "a"; n: () => "b"; }
>n : () => "b"

13
tests/cases/conformance/jsdoc/typeTagOnPropertyAssignment.ts Normal file
View File

@ -0,0 +1,13 @@
// @noEmit: true
// @checkJs: true
// @filename: typeTagOnPropertyAssignment.js
const o = {
/**
* @type {"a"}
*/
a: "a",
/** @type {() => 'b'} */
n: () => 'b'
};
o.a
o.n