Skip to content

Fix find-all-references for destructured getter #17483

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
3 commits merged into from
Aug 2, 2017
Merged

Fix find-all-references for destructured getter #17483

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
5d8cea4
Fix find-all-references for destructured getter
Jul 28, 2017
da64b3c
Handle setter too
Jul 28, 2017
9b0e512
Use SymbolFlags.Accessor
Aug 1, 2017
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
13 changes: 9 additions & 4 deletions src/services/findAllReferences.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,11 +604,16 @@ namespace ts.FindAllReferences.Core {

function getPropertySymbolOfObjectBindingPatternWithoutPropertyName(symbol: Symbol, checker: TypeChecker): Symbol | undefined {
const bindingElement = getObjectBindingElementWithoutPropertyName(symbol);
if (bindingElement) {
const typeOfPattern = checker.getTypeAtLocation(bindingElement.parent);
return typeOfPattern && checker.getPropertyOfType(typeOfPattern, (<Identifier>bindingElement.name).text);
if (!bindingElement) return undefined;

const typeOfPattern = checker.getTypeAtLocation(bindingElement.parent);
const propSymbol = typeOfPattern && checker.getPropertyOfType(typeOfPattern, (<Identifier>bindingElement.name).text);
if (propSymbol && propSymbol.flags & SymbolFlags.Accessor) {
// See GH#16922
Debug.assert(!!(propSymbol.flags & SymbolFlags.Transient));
return (propSymbol as TransientSymbol).target;
}
return undefined;
return propSymbol;
}

/**
Expand Down
22 changes: 22 additions & 0 deletions tests/cases/fourslash/findAllRefsDestructureGetter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/// <reference path="fourslash.ts" />

////class Test {
//// get [|{| "isDefinition": true, "isWriteAccess": true |}x|]() { return 0; }
////
//// set [|{| "isDefinition": true, "isWriteAccess": true |}y|](a: number) {}
////}
////const { [|{| "isDefinition": true, "isWriteAccess": true |}x|], [|{| "isDefinition": true, "isWriteAccess": true |}y|] } = new Test();
////[|x|]; [|y|];

const [x0, y0, x1, y1, x2, y2] = test.ranges();
verify.referenceGroups(x0, [{ definition: "(property) Test.x: number", ranges: [x0, x1, x2] }]);
verify.referenceGroups([x1, x2], [
{ definition: "(property) Test.x: number", ranges: [x0] },
{ definition: "const x: number", ranges: [x1, x2] },
]);

verify.referenceGroups(y0, [{ definition: "(property) Test.y: number", ranges: [y0, y1, y2] }]);
verify.referenceGroups([y1, y2], [
{ definition: "(property) Test.y: number", ranges: [y0] },
{ definition: "const y: number", ranges: [y1, y2] },
]);