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

goToDefinition: Don't go to jsx constructor signature (#25382)

Browse source
This commit is contained in:
Andy 2018-07-02 17:18:07 -07:00 committed by GitHub
parent 18d8ad120c
commit 5c57e14000
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/services/goToDefinition.ts
View file

@ -28,7 +28,8 @@ namespace ts.GoToDefinition {
} }
const calledDeclaration = tryGetSignatureDeclaration(typeChecker, node); const calledDeclaration = tryGetSignatureDeclaration(typeChecker, node);
if (calledDeclaration) { // Don't go to the component constructor definition for a JSX element, just go to the component definition.
if (calledDeclaration && !(isJsxOpeningLikeElement(node.parent) && isConstructorDeclaration(calledDeclaration))) {
const sigInfo = createDefinitionFromSignatureDeclaration(typeChecker, calledDeclaration); const sigInfo = createDefinitionFromSignatureDeclaration(typeChecker, calledDeclaration);
// For a function, if this is the original function definition, return just sigInfo. // For a function, if this is the original function definition, return just sigInfo.
// If this is the original constructor definition, parent is the class. // If this is the original constructor definition, parent is the class.

13
tests/cases/fourslash/goToDefinitionSignatureAlias.ts
View file

@ -1,5 +1,8 @@
/// <reference path='fourslash.ts'/> /// <reference path='fourslash.ts'/>
// @jsx: preserve
// @Filename: /a.tsx
////function /*f*/f() {} ////function /*f*/f() {}
////const /*g*/g = f; ////const /*g*/g = f;
////const /*h*/h = g; ////const /*h*/h = g;
@ -17,6 +20,13 @@
////const o = { m: /*m*/() => 0 }; ////const o = { m: /*m*/() => 0 };
////o.[|/*useM*/m|](); ////o.[|/*useM*/m|]();
////class Component { /*componentCtr*/constructor(props: {}) {} }
////class /*MyComponent*/MyComponent extends Component {}
////<[|/*jsxMyComponent*/MyComponent|] />
////new [|/*newMyComponent*/MyComponent|]({});
verify.noErrors();
verify.goToDefinition({ verify.goToDefinition({
useF: "f", useF: "f",
useG: ["g", "f"], useG: ["g", "f"],
@ -25,4 +35,7 @@ verify.goToDefinition({
useI: "i", useI: "i",
useJ: ["j", "i"], useJ: ["j", "i"],
useM: "m", useM: "m",
jsxMyComponent: "MyComponent",
newMyComponent: ["MyComponent", "componentCtr"],
}); });

4
tests/cases/fourslash/tsxGoToDefinitionStatelessFunction2.ts
View file

@ -27,7 +27,7 @@
//// let opt = <[|Main/*secondTarget*/Button|] children="chidlren" />; //// let opt = <[|Main/*secondTarget*/Button|] children="chidlren" />;
//// let opt = <[|Main/*thirdTarget*/Button|] onClick={()=>{}} />; //// let opt = <[|Main/*thirdTarget*/Button|] onClick={()=>{}} />;
//// let opt = <[|Main/*fourthTarget*/Button|] onClick={()=>{}} ignore-prop />; //// let opt = <[|Main/*fourthTarget*/Button|] onClick={()=>{}} ignore-prop />;
//// let opt = <[|Main/*fivethTarget*/Button|] goTo="goTo" />; //// let opt = <[|Main/*fifthTarget*/Button|] goTo="goTo" />;
//// let opt = <[|Main/*sixthTarget*/Button|] wrong />; //// let opt = <[|Main/*sixthTarget*/Button|] wrong />;
verify.goToDefinition({ verify.goToDefinition({
@ -35,6 +35,6 @@ verify.goToDefinition({
secondTarget: "thirdSource", secondTarget: "thirdSource",
thirdTarget: "firstSource", thirdTarget: "firstSource",
fourthTarget: "firstSource", fourthTarget: "firstSource",
fivethTarget: "secondSource", fifthTarget: "secondSource",
sixthTarget: "thirdSource" sixthTarget: "thirdSource"
}); });