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

Show property assignment for special property assignments in js files

Browse Source
This commit is contained in:
Sheetal Nandi 2019-05-31 12:34:08 -07:00
parent bcf7752c1f
commit 9703b3d6c1
13 changed files with 70 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/services/findAllReferences.ts
View File

@ -41,11 +41,27 @@ namespace ts.FindAllReferences {
// TODO(shkamat)::
// JSXOpeningElement or JSXElement for tagName ?
if (!node.parent || (!isDeclaration(node.parent) && !isExportAssignment(node.parent))) {
if (!node.parent) return undefined;
if (!isDeclaration(node.parent) && !isExportAssignment(node.parent)) {
// Special property assignment in javascript
if (isInJSFile(node)) {
const binaryExpression = isBinaryExpression(node.parent) ?
node.parent :
isPropertyAccessExpression(node.parent) &&
isBinaryExpression(node.parent.parent) &&
node.parent.parent.left === node.parent ?
node.parent.parent :
undefined;
return binaryExpression && getAssignmentDeclarationKind(binaryExpression) !== AssignmentDeclarationKind.None ?
getDeclarationForDeclarationSpan(binaryExpression) :
undefined;
}
return undefined;
}
if (node.parent.name === node || // node is name of declaration, use parent
if (isConstructorDeclaration(node.parent) ||
node.parent.name === node || // node is name of declaration, use parent
// Property name of the import export specifier or binding pattern, use parent
((isImportOrExportSpecifier(node.parent) || isBindingElement(node.parent))
&& node.parent.propertyName === node) ||
@ -56,7 +72,7 @@ namespace ts.FindAllReferences {
return undefined;
}
export function getDeclarationForDeclarationSpan(node: NamedDeclaration | undefined): Node | undefined {
export function getDeclarationForDeclarationSpan(node: NamedDeclaration | BinaryExpression | undefined): Node | undefined {
if (!node) return undefined;
switch (node.kind) {
case SyntaxKind.VariableDeclaration:
@ -84,6 +100,11 @@ namespace ts.FindAllReferences {
undefined :
node;
case SyntaxKind.BinaryExpression:
return isExpressionStatement(node.parent) ?
node.parent :
undefined;
// Not really interesting definition
// TODO(shkamat):: Should we show whole object literal instead?
case SyntaxKind.ShorthandPropertyAssignment:

7
tests/cases/fourslash/renameJsExports01.ts
View File

@ -2,11 +2,12 @@
// @allowJs: true
// @Filename: a.js
////exports.[|{| "isWriteAccess": true, "isDefinition": true |}area|] = function (r) { return r * r; }
////[|exports.[|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 0 |}area|] = function (r) { return r * r; }|]
// @Filename: b.js
////var mod = require('./a');
////var t = mod./**/[|area|](10);
verify.singleReferenceGroup("(property) area: (r: any) => number");
verify.rangesAreRenameLocations();
const [rDef, ...ranges] = test.ranges();
verify.singleReferenceGroup("(property) area: (r: any) => number", ranges);
verify.rangesAreRenameLocations(ranges);

6
tests/cases/fourslash/renameJsExports02.ts
View File

@ -2,12 +2,12 @@
// @allowJs: true
// @Filename: a.js
////module.exports = class [|{| "isWriteAccess": true, "isDefinition": true |}A|] {}
////module.exports = [|class [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 0 |}A|] {}|]
// @Filename: b.js
////const [|{| "isWriteAccess": true, "isDefinition": true |}A|] = require("./a");
////[|const [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 2 |}A|] = require("./a");|]
const [r0, r1] = test.ranges();
const [rDef, r0, r1Def, r1] = test.ranges();
verify.referenceGroups(r0, [
{ definition: "(local class) A", ranges: [r0] },
{ definition: "const A: typeof A", ranges: [r1] }

12
tests/cases/fourslash/renameJsExports03.ts
View File

@ -2,16 +2,16 @@
// @allowJs: true
// @Filename: a.js
////class [|{| "isWriteAccess": true, "isDefinition": true |}A|] {
//// [|constructor|]() { }
////}
////module.exports = [|A|];
////[|class [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 0 |}A|] {
//// [|[|{| "declarationRangeIndex": 2 |}constructor|]() { }|]
////}|]
////[|module.exports = [|{| "declarationRangeIndex": 4 |}A|];|]
// @Filename: b.js
////const [|{| "isWriteAccess": true, "isDefinition": true |}A|] = require("./a");
////[|const [|{| "isWriteAccess": true, "isDefinition": true, "declarationRangeIndex": 6 |}A|] = require("./a");|]
////new [|A|];
const [r0, r1, r2, r3, r4] = test.ranges();
const [r0Def, r0, r1Def, r1, r2Def, r2, r3Def, r3, r4] = test.ranges();
verify.referenceGroups([r0, r2], [
{ definition: "class A", ranges: [r0, r2] },
{ definition: "const A: typeof A", ranges: [r3, r4] }

5
tests/cases/fourslash/renameJsPropertyAssignment.ts
View File

@ -4,7 +4,8 @@
// @Filename: a.js
////function bar() {
////}
////bar.[|foo|] = "foo";
////[|bar.[|{| "declarationRangeIndex": 0 |}foo|] = "foo";|]
////console.log(bar.[|foo|]);
verify.rangesAreRenameLocations();
const [rDef, ...ranges] = test.ranges();
verify.rangesAreRenameLocations(ranges);

5
tests/cases/fourslash/renameJsPropertyAssignment2.ts
View File

@ -4,7 +4,8 @@
// @Filename: a.js
////class Minimatch {
////}
////Minimatch.[|staticProperty|] = "string";
////[|Minimatch.[|{| "declarationRangeIndex": 0 |}staticProperty|] = "string";|]
////console.log(Minimatch.[|staticProperty|]);
verify.rangesAreRenameLocations();
const [rDef, ...ranges] = test.ranges();
verify.rangesAreRenameLocations(ranges);

5
tests/cases/fourslash/renameJsPropertyAssignment3.ts
View File

@ -4,7 +4,8 @@
// @Filename: a.js
////var C = class {
////}
////C.[|staticProperty|] = "string";
////[|C.[|{| "declarationRangeIndex": 0 |}staticProperty|] = "string";|]
////console.log(C.[|staticProperty|]);
verify.rangesAreRenameLocations();
const [rDef, ...ranges] = test.ranges();
verify.rangesAreRenameLocations(ranges);

7
tests/cases/fourslash/renameJsPrototypeProperty01.ts
View File

@ -4,8 +4,9 @@
// @Filename: a.js
////function bar() {
////}
////bar.prototype.[|x|] = 10;
////[|bar.prototype.[|{| "declarationRangeIndex": 0 |}x|] = 10;|]
////var t = new bar();
////t.[|x|] = 11;
////[|t.[|{| "declarationRangeIndex": 2 |}x|] = 11;|]
verify.rangesAreRenameLocations();
const [r0Def, r0, r1Def, r1] = test.ranges();
verify.rangesAreRenameLocations([r0, r1]);

7
tests/cases/fourslash/renameJsPrototypeProperty02.ts
View File

@ -4,8 +4,9 @@
// @Filename: a.js
////function bar() {
////}
////bar.prototype.[|x|] = 10;
////[|bar.prototype.[|{| "declarationRangeIndex": 0 |}x|] = 10;|]
////var t = new bar();
////t.[|x|] = 11;
////[|t.[|{| "declarationRangeIndex": 2 |}x|] = 11;|]
verify.rangesAreRenameLocations();
const [r0Def, r0, r1Def, r1] = test.ranges();
verify.rangesAreRenameLocations([r0, r1]);

7
tests/cases/fourslash/renameJsThisProperty01.ts
View File

@ -3,9 +3,10 @@
// @allowJs: true
// @Filename: a.js
////function bar() {
//// this.[|x|] = 10;
//// [|this.[|{| "declarationRangeIndex": 0 |}x|] = 10;|]
////}
////var t = new bar();
////t.[|x|] = 11;
////[|t.[|{| "declarationRangeIndex": 2 |}x|] = 11;|]
verify.rangesAreRenameLocations();
const [r0Def, r0, r1Def, r1] = test.ranges();
verify.rangesAreRenameLocations([r0, r1]);

7
tests/cases/fourslash/renameJsThisProperty03.ts
View File

@ -4,10 +4,11 @@
// @Filename: a.js
////class C {
//// constructor(y) {
//// this.[|x|] = y;
//// [|this.[|{| "declarationRangeIndex": 0 |}x|] = y;|]
//// }
////}
////var t = new C(12);
////t.[|x|] = 11;
////[|t.[|{| "declarationRangeIndex": 2 |}x|] = 11;|]
verify.rangesAreRenameLocations();
const [rDef, r0, r1Def, r1] = test.ranges();
verify.rangesAreRenameLocations([r0, r1]);

7
tests/cases/fourslash/renameJsThisProperty05.ts
View File

@ -7,8 +7,9 @@
//// this.x = y;
//// }
////}
////C.prototype.[|z|] = 1;
////[|C.prototype.[|{| "declarationRangeIndex": 0 |}z|] = 1;|]
////var t = new C(12);
////t.[|z|] = 11;
////[|t.[|{| "declarationRangeIndex": 2 |}z|] = 11;|]
verify.rangesAreRenameLocations();
const [r0Def, r0, r1Def, r1] = test.ranges();
verify.rangesAreRenameLocations([r0, r1]);

7
tests/cases/fourslash/renameJsThisProperty06.ts
View File

@ -7,8 +7,9 @@
//// this.x = y;
//// }
////}
////C.prototype.[|z|] = 1;
////[|C.prototype.[|{| "declarationRangeIndex": 0 |}z|] = 1;|]
////var t = new C(12);
////t.[|z|] = 11;
////[|t.[|{| "declarationRangeIndex": 2 |}z|] = 11;|]
verify.rangesAreRenameLocations();
const [r0Def, r0, r1Def, r1] = test.ranges();
verify.rangesAreRenameLocations([r0, r1]);