Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

findAllReferences: forEachRelatedSymbol can always include shorthand destructuring (#23223)

Browse Source 
* findAllReferences: forEachRelatedSymbol can always include shorthand destructuring

* Update rename tests
This commit is contained in:
Andy
2018-04-06 16:30:55 -07:00
committed by GitHub
parent e0dbdad22a
commit 9762598775
10 changed files with 54 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/checker.ts
-3
View File
@@ -25493,9 +25493,6 @@ namespace ts {
}
function getShorthandAssignmentValueSymbol(location: Node): Symbol {
// The function returns a value symbol of an identifier in the short-hand property assignment.
// This is necessary as an identifier in short-hand property assignment can contains two meaning:
// property name and property value.
if (location && location.kind === SyntaxKind.ShorthandPropertyAssignment) {
return resolveEntityName((<ShorthandPropertyAssignment>location).name, SymbolFlags.Value | SymbolFlags.Alias);
}
src/compiler/types.ts
+4
View File
@@ -2839,6 +2839,10 @@ namespace ts {
getSymbolsInScope(location: Node, meaning: SymbolFlags): Symbol[];
getSymbolAtLocation(node: Node): Symbol | undefined;
getSymbolsOfParameterPropertyDeclaration(parameter: ParameterDeclaration, parameterName: string): Symbol[];
/**
* The function returns the value (local variable) symbol of an identifier in the short-hand property assignment.
* This is necessary as an identifier in short-hand property assignment can contains two meaning: property name and property value.
*/
getShorthandAssignmentValueSymbol(location: Node): Symbol | undefined;
getExportSpecifierLocalTargetSymbol(location: ExportSpecifier): Symbol | undefined;
/**
src/services/findAllReferences.ts
+7 -12
View File
@@ -1377,8 +1377,7 @@ namespace ts.FindAllReferences.Core {
forEachRelatedSymbol<void>(symbol, location, checker,
(sym, root, base) => { result.push(base || root || sym); },
parameterProperties => { result.push(...parameterProperties); },
/*allowBaseTypes*/ () => !implementations,
/*includeShorthandDestructuring*/ false);
/*allowBaseTypes*/ () => !implementations);
return result;
}
@@ -1387,7 +1386,6 @@ namespace ts.FindAllReferences.Core {
cbSymbol: (symbol: Symbol, rootSymbol?: Symbol, baseSymbol?: Symbol) => T | undefined,
cbParameterProperties: (s: Symbol[]) => T | undefined,
allowBaseTypes: (rootSymbol: Symbol) => boolean,
includeShorthandDestructuring: boolean,
): T | undefined {
const containingObjectLiteralElement = getContainingObjectLiteralElement(location);
if (containingObjectLiteralElement) {
@@ -1400,11 +1398,9 @@ namespace ts.FindAllReferences.Core {
// If the location is name of property symbol from object literal destructuring pattern
// Search the property symbol
// for ( { property: p2 } of elems) { }
if (includeShorthandDestructuring || containingObjectLiteralElement.kind !== SyntaxKind.ShorthandPropertyAssignment) {
const propertySymbol = getPropertySymbolOfDestructuringAssignment(location, checker);
const res = propertySymbol && cbSymbol(propertySymbol);
if (res) return res;
}
const propertySymbol = getPropertySymbolOfDestructuringAssignment(location, checker);
const res1 = propertySymbol && cbSymbol(propertySymbol);
if (res1) return res1;
/* Because in short-hand property assignment, location has two meaning : property name and as value of the property
* When we do findAllReference at the position of the short-hand property assignment, we would want to have references to position of
@@ -1418,8 +1414,8 @@ namespace ts.FindAllReferences.Core {
* will be included correctly.
*/
const shorthandValueSymbol = checker.getShorthandAssignmentValueSymbol(location.parent);
const res1 = shorthandValueSymbol && cbSymbol(shorthandValueSymbol);
if (res1) return res1;
const res2 = shorthandValueSymbol && cbSymbol(shorthandValueSymbol);
if (res2) return res2;
}
const res = fromRoot(symbol);
@@ -1495,8 +1491,7 @@ namespace ts.FindAllReferences.Core {
? getRelatedSymbol(search, find(paramProps, x => !!(x.flags & SymbolFlags.Property))!, referenceLocation, state)
: undefined,
/*allowBaseTypes*/ rootSymbol =>
!(search.parents && !some(search.parents, parent => explicitlyInheritsFrom(rootSymbol.parent, parent, state.inheritsFromCache, checker))),
/*includeShorthandDestructuring*/ true);
!(search.parents && !some(search.parents, parent => explicitlyInheritsFrom(rootSymbol.parent, parent, state.inheritsFromCache, checker))));
}
/** Gets all symbols for one property. Does not get symbols for every property. */
tests/baselines/reference/api/tsserverlibrary.d.ts
Vendored
+4
View File
@@ -1783,6 +1783,10 @@ declare namespace ts {
getSymbolsInScope(location: Node, meaning: SymbolFlags): Symbol[];
getSymbolAtLocation(node: Node): Symbol | undefined;
getSymbolsOfParameterPropertyDeclaration(parameter: ParameterDeclaration, parameterName: string): Symbol[];
/**
* The function returns the value (local variable) symbol of an identifier in the short-hand property assignment.
* This is necessary as an identifier in short-hand property assignment can contains two meaning: property name and property value.
*/
getShorthandAssignmentValueSymbol(location: Node): Symbol | undefined;
getExportSpecifierLocalTargetSymbol(location: ExportSpecifier): Symbol | undefined;
/**
tests/baselines/reference/api/typescript.d.ts
Vendored
+4
View File
@@ -1783,6 +1783,10 @@ declare namespace ts {
getSymbolsInScope(location: Node, meaning: SymbolFlags): Symbol[];
getSymbolAtLocation(node: Node): Symbol | undefined;
getSymbolsOfParameterPropertyDeclaration(parameter: ParameterDeclaration, parameterName: string): Symbol[];
/**
* The function returns the value (local variable) symbol of an identifier in the short-hand property assignment.
* This is necessary as an identifier in short-hand property assignment can contains two meaning: property name and property value.
*/
getShorthandAssignmentValueSymbol(location: Node): Symbol | undefined;
getExportSpecifierLocalTargetSymbol(location: ExportSpecifier): Symbol | undefined;
/**
tests/cases/fourslash/renameDestructuringAssignmentInFor2.ts
+7 -3
View File
@@ -1,7 +1,7 @@
/// <reference path='fourslash.ts' />
////interface I {
//// property1: number;
//// [|property1|]: number;
//// property2: string;
////}
////var elems: I[];
@@ -10,7 +10,11 @@
////for ({ [|property1|] } = elems[0]; p2 < 100; p2++) {
//// p2 = [|property1|]++;
////}
////for ({ property1: p2 } = elems[0]; p2 < 100; p2++) {
////for ({ [|property1|]: p2 } = elems[0]; p2 < 100; p2++) {
////}
verify.rangesAreRenameLocations();
const ranges = test.ranges();
const [r0, r1, r2, r3, r4] = ranges;
verify.renameLocations([r0, r4], [r0, r2, r4]);
verify.renameLocations([r1, r3], [r1, r2, r3]);
verify.renameLocations(r2, ranges);
tests/cases/fourslash/renameDestructuringAssignmentInForOf2.ts
+7 -3
View File
@@ -1,7 +1,7 @@
/// <reference path='fourslash.ts' />
////interface I {
//// property1: number;
//// [|property1|]: number;
//// property2: string;
////}
////var elems: I[];
@@ -10,7 +10,11 @@
////for ({ [|property1|] } of elems) {
//// [|property1|]++;
////}
////for ({ property1: p2 } of elems) {
////for ({ [|property1|]: p2 } of elems) {
////}
verify.rangesAreRenameLocations();
const ranges = test.ranges();
const [r0, r1, r2, r3, r4] = ranges;
verify.renameLocations([r0, r4], [r0, r2, r4]);
verify.renameLocations([r1, r3], [r1, r2, r3]);
verify.renameLocations(r2, ranges);
tests/cases/fourslash/renameDestructuringAssignmentNestedInArrayLiteral2.ts
+7 -3
View File
@@ -1,11 +1,15 @@
/// <reference path='fourslash.ts' />
////interface I {
//// property1: number;
//// [|property1|]: number;
//// property2: string;
////}
////var elems: I[], p1: number, [|property1|]: number;
////[{ property1: p1 }] = elems;
////[{ [|property1|]: p1 }] = elems;
////[{ [|property1|] }] = elems;
verify.rangesAreRenameLocations();
const ranges = test.ranges();
const [r0, r1, r2, r3] = ranges;
verify.renameLocations([r0, r2], [r0, r2, r3]);
verify.renameLocations(r1, [r1, r3]);
verify.renameLocations(r3, ranges);
tests/cases/fourslash/renameDestructuringAssignmentNestedInFor2.ts
+7 -3
View File
@@ -3,16 +3,20 @@
////interface MultiRobot {
//// name: string;
//// skills: {
//// primary: string;
//// [|primary|]: string;
//// secondary: string;
//// };
////}
////let multiRobot: MultiRobot, [|primary|]: string;
////for ({ skills: { primary: primaryA, secondary: secondaryA } } = multiRobot, i = 0; i < 1; i++) {
////for ({ skills: { [|primary|]: primaryA, secondary: secondaryA } } = multiRobot, i = 0; i < 1; i++) {
//// console.log(primaryA);
////}
////for ({ skills: { [|primary|], secondary } } = multiRobot, i = 0; i < 1; i++) {
//// console.log([|primary|]);
////}
verify.rangesAreRenameLocations();
const ranges = test.ranges();
const [r0, r1, r2, r3, r4] = ranges;
verify.renameLocations([r0, r2], [r0, r2, r3]);
verify.renameLocations([r1, r4], [r1, r3, r4]);
verify.renameLocations(r3, ranges);
tests/cases/fourslash/renameDestructuringAssignmentNestedInForOf2.ts
+7 -4
View File
@@ -3,17 +3,20 @@
////interface MultiRobot {
//// name: string;
//// skills: {
//// primary: string;
//// [|primary|]: string;
//// secondary: string;
//// };
////}
////let multiRobots: MultiRobot[], [|primary|]: string;
////for ({ skills: { primary: primaryA, secondary: secondaryA } } of multiRobots) {
////for ({ skills: { [|primary|]: primaryA, secondary: secondaryA } } of multiRobots) {
//// console.log(primaryA);
////}
////for ({ skills: { [|primary|], secondary } } of multiRobots) {
//// console.log([|primary|]);
////}
verify.rangesAreRenameLocations();
const ranges = test.ranges();
const [r0, r1, r2, r3, r4] = ranges;
verify.renameLocations([r0, r2], [r0, r2, r3]);
verify.renameLocations([r1, r4], [r1, r3, r4]);
verify.renameLocations(r3, ranges);