Commit0c1b36f

authored

fix37816: goToDefinition skips call signatures for jsx components (microsoft#57969)

1 parent9f9682c commit0c1b36fCopy full SHA for 0c1b36f

File tree

+43

-2

lines changed

+43

-2

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ export function getDefinitionAtPosition(program: Program, sourceFile: SourceFile`
`225`	`225`
`226`	`226`	`constcalledDeclaration=tryGetSignatureDeclaration(typeChecker,node);`
`227`	`227`	`// Don't go to the component constructor definition for a JSX element, just go to the component definition.`
`228`		`-if(calledDeclaration&&!(isJsxOpeningLikeElement(node.parent)&&isConstructorLike(calledDeclaration))){`
	`228`	`+if(calledDeclaration&&!(isJsxOpeningLikeElement(node.parent)&&isJsxConstructorLike(calledDeclaration))){`
`229`	`229`	`constsigInfo=createDefinitionFromSignatureDeclaration(typeChecker,calledDeclaration,failedAliasResolution);`
`230`	`230`	`// For a function, if this is the original function definition, return just sigInfo.`
`231`	`231`	`// If this is the original constructor definition, parent is the class.`
`@@ -741,10 +741,11 @@ function tryGetSignatureDeclaration(typeChecker: TypeChecker, node: Node): Signa`
`741`	`741`	`returntryCast(signature&&signature.declaration,(d):d isSignatureDeclaration=>isFunctionLike(d)&&!isFunctionTypeNode(d));`
`742`	`742`	`}`
`743`	`743`
`744`		`-functionisConstructorLike(node:Node):boolean{`
	`744`	`+functionisJsxConstructorLike(node:Node):boolean{`
`745`	`745`	`switch(node.kind){`
`746`	`746`	`caseSyntaxKind.Constructor:`
`747`	`747`	`caseSyntaxKind.ConstructorType:`
	`748`	`+caseSyntaxKind.CallSignature:`
`748`	`749`	`caseSyntaxKind.ConstructSignature:`
`749`	`750`	`returntrue;`
`750`	`751`	`default:`

Lines changed: 29 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,29 @@`
	`1`	`+// === goToDefinition ===`
	`2`	`+// === /tests/cases/fourslash/test.tsx ===`
	`3`	`+// interface FC<P = {}> {`
	`4`	`+// (props: P, context?: any): string;`
	`5`	`+// }`
	`6`	`+//`
	`7`	`+// <\|const [\|Thing\|]: FC = (props) => <div></div>;\|>`
	`8`	`+// const HelloWorld = () => <Thing />;`
	`9`	`+`
	`10`	`+// === /tests/cases/fourslash/./test.tsx ===`
	`11`	`+// interface FC<P = {}> {`
	`12`	`+// (props: P, context?: any): string;`
	`13`	`+// }`
	`14`	`+//`
	`15`	`+// const Thing: FC = (props) => <div></div>;`
	`16`	`+// const HelloWorld = () => </GOTO DEF/[\|Thing\|] />;`
	`17`	`+`
	`18`	`+// === Details ===`
	`19`	`+ [`
	`20`	`+ {`
	`21`	`+"kind":"const",`
	`22`	`+"name":"Thing",`
	`23`	`+"containerName":"",`
	`24`	`+"isLocal":false,`
	`25`	`+"isAmbient":false,`
	`26`	`+"unverified":false,`
	`27`	`+"failedAliasResolution":false`
	`28`	`+ }`
	`29`	`+ ]`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,11 @@`
	`1`	`+/// <reference path='fourslash.ts' />`
	`2`	`+`
	`3`	`+//@filename: ./test.tsx`
	`4`	`+//// interface FC<P = {}> {`
	`5`	`+//// (props: P, context?: any): string;`
	`6`	`+////}`
	`7`	`+////`
	`8`	`+//// const Thing: FC = (props) => <div></div>;`
	`9`	`+//// const HelloWorld = () => <[\|/**/Thing\|] />;`
	`10`	`+`
	`11`	`+verify.baselineGoToDefinition("");`

Comments

(0)