Add this/satisfies tag #1157
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -224,17 +224,22 @@ func (p *Parser) reparseHosted(tag *ast.Node, parent *ast.Node, jsDoc *ast.Node) | |
| } | ||
| } else if parent.Kind == ast.KindReturnStatement { | ||
| ret := parent.AsReturnStatement() | ||
| ret.Expression = p.makeNewCast(p.makeNewType(tag.AsJSDocTypeTag().TypeExpression, nil), ret.Expression, true /*isAssertion*/) | ||
| } else if parent.Kind == ast.KindParenthesizedExpression { | ||
| paren := parent.AsParenthesizedExpression() | ||
| paren.Expression = p.makeNewCast(p.makeNewType(tag.AsJSDocTypeTag().TypeExpression, nil), paren.Expression, true /*isAssertion*/) | ||
| } else if parent.Kind == ast.KindExpressionStatement && | ||
| parent.AsExpressionStatement().Expression.Kind == ast.KindBinaryExpression { | ||
| bin := parent.AsExpressionStatement().Expression.AsBinaryExpression() | ||
| if kind := ast.GetAssignmentDeclarationKind(bin); kind != ast.JSDeclarationKindNone { | ||
| bin.Type = p.makeNewType(tag.AsJSDocTypeTag().TypeExpression, parent.AsExpressionStatement().Expression) | ||
| } | ||
| } | ||
| case ast.KindJSDocSatisfiesTag: | ||
| if parent.Kind == ast.KindParenthesizedExpression { | ||
| paren := parent.AsParenthesizedExpression() | ||
| paren.Expression = p.makeNewCast(p.makeNewType(tag.AsJSDocSatisfiesTag().TypeExpression, nil), paren.Expression, false /*isAssertion*/) | ||
| } | ||
| case ast.KindJSDocTemplateTag: | ||
| if fun, ok := getFunctionLikeHost(parent); ok { | ||
| if fun.TypeParameters() == nil { | ||
|
|
@@ -265,6 +270,32 @@ func (p *Parser) reparseHosted(tag *ast.Node, parent *ast.Node, jsDoc *ast.Node) | |
| } | ||
| } | ||
| } | ||
| case ast.KindJSDocThisTag: | ||
| if fun, ok := getFunctionLikeHost(parent); ok { | ||
|
There was a problem hiding this comment. What's this supposed to do for function-like-expressions that don't have a There was a problem hiding this comment. Copilot already noticed this and I replied that there's already an error logged so it's OK with me to have wonky semantics in a file with errors |
||
| // Only add a this parameter if we don't already have one | ||
| params := fun.Parameters() | ||
| if len(params) == 0 || params[0].Name().Text() != "this" { | ||
| thisParam := p.factory.NewParameterDeclaration( | ||
| nil, /* decorators */ | ||
| nil, /* modifiers */ | ||
| p.factory.NewIdentifier("this"), | ||
| nil, /* questionToken */ | ||
| nil, /* type */ | ||
| nil, /* initializer */ | ||
| ) | ||
| thisParam.AsParameterDeclaration().Type = p.makeNewType(tag.AsJSDocThisTag().TypeExpression, thisParam) | ||
| thisParam.Loc = tag.AsJSDocThisTag().TagName.Loc | ||
| thisParam.Flags = p.contextFlags | ast.NodeFlagsReparsed | ||
|
|
||
| newParams := p.nodeSlicePool.NewSlice(len(params) + 1) | ||
| newParams[0] = thisParam | ||
| for i, param := range params { | ||
| newParams[i+1] = param | ||
| } | ||
|
|
||
| fun.FunctionLikeData().Parameters = p.newNodeList(thisParam.Loc, newParams) | ||
| } | ||
| } | ||
| case ast.KindJSDocReturnTag: | ||
| if fun, ok := getFunctionLikeHost(parent); ok { | ||
| if fun.Type() == nil { | ||
|
|
@@ -319,7 +350,6 @@ func (p *Parser) reparseHosted(tag *ast.Node, parent *ast.Node, jsDoc *ast.Node) | |
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func (p *Parser) makeQuestionIfOptional(parameter *ast.JSDocParameterTag) *ast.Node { | ||
|
|
@@ -366,8 +396,13 @@ func getFunctionLikeHost(host *ast.Node) (*ast.Node, bool) { | |
| return nil, false | ||
| } | ||
|
|
||
| func (p *Parser) makeNewCast(t *ast.TypeNode, e *ast.Node, isAssertion bool) *ast.Node { | ||
| var assert *ast.Node | ||
| if isAssertion { | ||
| assert = p.factory.NewTypeAssertion(t, e) | ||
| } else { | ||
| assert = p.factory.NewSatisfiesExpression(e, t) | ||
| } | ||
| assert.Flags = p.contextFlags | ast.NodeFlagsReparsed | ||
| assert.Loc = core.NewTextRange(e.Pos(), e.End()) | ||
| return assert | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,40 @@ | ||
| --- old.checkJsdocSatisfiesTag1.symbols | ||
| +++ new.checkJsdocSatisfiesTag1.symbols | ||
| @@= skipped -21, +21 lines =@@ | ||
|
|
||
| const t1 = /** @satisfies {T1} */ ({ a: 1 }); | ||
| >t1 : Symbol(t1, Decl(a.js, 19, 5)) | ||
| ->a : Symbol(a, Decl(a.js, 19, 36)) | ||
|
|
||
| const t2 = /** @satisfies {T1} */ ({ a: 1, b: 1 }); | ||
| >t2 : Symbol(t2, Decl(a.js, 20, 5)) | ||
| ->a : Symbol(a, Decl(a.js, 20, 36)) | ||
| ->b : Symbol(b, Decl(a.js, 20, 42)) | ||
|
|
||
| const t3 = /** @satisfies {T1} */ ({}); | ||
| >t3 : Symbol(t3, Decl(a.js, 21, 5)) | ||
| @@= skipped -13, +10 lines =@@ | ||
| /** @type {T2} */ | ||
| const t4 = /** @satisfies {T2} */ ({ a: "a" }); | ||
| >t4 : Symbol(t4, Decl(a.js, 24, 5)) | ||
| ->a : Symbol(a, Decl(a.js, 24, 36)) | ||
|
|
||
| /** @type {(m: string) => string} */ | ||
| const t5 = /** @satisfies {T3} */((m) => m.substring(0)); | ||
| >t5 : Symbol(t5, Decl(a.js, 27, 5)) | ||
| ->m : Symbol(m, Decl(a.js, 27, 35)) | ||
| ->m.substring : Symbol(String.substring, Decl(lib.es5.d.ts, --, --)) | ||
| ->m : Symbol(m, Decl(a.js, 27, 35)) | ||
| ->substring : Symbol(String.substring, Decl(lib.es5.d.ts, --, --)) | ||
|
|
||
| const t6 = /** @satisfies {[number, number]} */ ([1, 2]); | ||
| >t6 : Symbol(t6, Decl(a.js, 28, 5)) | ||
|
|
||
| const t7 = /** @satisfies {T4} */ ({ a: 'test' }); | ||
| >t7 : Symbol(t7, Decl(a.js, 29, 5)) | ||
| ->a : Symbol(a, Decl(a.js, 29, 36)) | ||
|
|
||
| const t8 = /** @satisfies {T4} */ ({ a: 'test', b: 'test' }); | ||
| >t8 : Symbol(t8, Decl(a.js, 30, 5)) | ||
| ->a : Symbol(a, Decl(a.js, 30, 36)) | ||
| ->b : Symbol(b, Decl(a.js, 30, 47)) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.