microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-04 21:53:42 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

fix(49419): Referencing this through a variable causes "Rename Symbol" to misbehave in Javascript (#56540)

Browse Source
This commit is contained in:
Oleksandr T 2023-12-12 01:12:55 +02:00 committed by GitHub
parent ca9cb7c5c2
commit 369eeb1bde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 42 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/compiler/checker.ts
View File

@ -46946,9 +46946,13 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
case AssignmentDeclarationKind.ExportsProperty:
case AssignmentDeclarationKind.PrototypeProperty:
return getSymbolOfNode(entityName.parent);
case AssignmentDeclarationKind.Property:
if (isPropertyAccessExpression(entityName.parent) && getLeftmostAccessExpression(entityName.parent) === entityName) {
return undefined;
}
// falls through
case AssignmentDeclarationKind.ThisProperty:
case AssignmentDeclarationKind.ModuleExports:
case AssignmentDeclarationKind.Property:
return getSymbolOfDeclaration(entityName.parent.parent as BinaryExpression);
}
}

6
tests/baselines/reference/inferringClassMembersFromAssignments6.symbols
View File

@ -10,12 +10,12 @@ function Foonly() {
self.x = 1
>self.x : Symbol(Foonly.x, Decl(inferringClassMembersFromAssignments6.js, 1, 19))
>self : Symbol(Foonly.x, Decl(inferringClassMembersFromAssignments6.js, 1, 19))
>self : Symbol(self, Decl(inferringClassMembersFromAssignments6.js, 1, 7))
>x : Symbol(Foonly.x, Decl(inferringClassMembersFromAssignments6.js, 1, 19))
self.m = function() {
>self.m : Symbol(Foonly.m, Decl(inferringClassMembersFromAssignments6.js, 2, 14))
>self : Symbol(Foonly.m, Decl(inferringClassMembersFromAssignments6.js, 2, 14))
>self : Symbol(self, Decl(inferringClassMembersFromAssignments6.js, 1, 7))
>m : Symbol(Foonly.m, Decl(inferringClassMembersFromAssignments6.js, 2, 14))
console.log(self.x)
@ -39,7 +39,7 @@ Foonly.prototype.mreal = function() {
self.y = 2
>self.y : Symbol(Foonly.y, Decl(inferringClassMembersFromAssignments6.js, 8, 19))
>self : Symbol(Foonly.y, Decl(inferringClassMembersFromAssignments6.js, 8, 19))
>self : Symbol(self, Decl(inferringClassMembersFromAssignments6.js, 8, 7))
>y : Symbol(Foonly.y, Decl(inferringClassMembersFromAssignments6.js, 8, 19))
}
const foo = new Foonly()

6
tests/baselines/reference/inferringClassMembersFromAssignments7.symbols
View File

@ -11,12 +11,12 @@ class C {
self.x = 1
>self.x : Symbol(C.x, Decl(inferringClassMembersFromAssignments7.js, 2, 23))
>self : Symbol(C.x, Decl(inferringClassMembersFromAssignments7.js, 2, 23))
>self : Symbol(self, Decl(inferringClassMembersFromAssignments7.js, 2, 11))
>x : Symbol(C.x, Decl(inferringClassMembersFromAssignments7.js, 2, 23))
self.m = function() {
>self.m : Symbol(C.m, Decl(inferringClassMembersFromAssignments7.js, 3, 18))
>self : Symbol(C.m, Decl(inferringClassMembersFromAssignments7.js, 3, 18))
>self : Symbol(self, Decl(inferringClassMembersFromAssignments7.js, 2, 11))
>m : Symbol(C.m, Decl(inferringClassMembersFromAssignments7.js, 3, 18))
console.log(self.x)
@ -37,7 +37,7 @@ class C {
self.y = 2
>self.y : Symbol(C.y, Decl(inferringClassMembersFromAssignments7.js, 9, 23))
>self : Symbol(C.y, Decl(inferringClassMembersFromAssignments7.js, 9, 23))
>self : Symbol(self, Decl(inferringClassMembersFromAssignments7.js, 9, 11))
>y : Symbol(C.y, Decl(inferringClassMembersFromAssignments7.js, 9, 23))
}
}

15
tests/baselines/reference/renameJsPropertyAssignment4.baseline.jsonc Normal file
View File

@ -0,0 +1,15 @@
// === findRenameLocations ===
// === /a.js ===
// function f() {
// <|var /*RENAME*/[|fooRENAME|] = this;|>
// <|[|fooRENAME|].x = 1;|>
// }
// === findRenameLocations ===
// === /a.js ===
// function f() {
// <|var [|fooRENAME|] = this;|>
// /*RENAME*/<|[|fooRENAME|].x = 1;|>
// }

2
tests/baselines/reference/typeFromPropertyAssignment10.symbols
View File

@ -93,7 +93,7 @@ Outer.app.Application = (function () {
me.view = new Outer.app.SomeView();
>me.view : Symbol(Application.view, Decl(application.js, 7, 22))
>me : Symbol(Application.view, Decl(application.js, 7, 22))
>me : Symbol(me, Decl(application.js, 7, 11))
>view : Symbol(Application.view, Decl(application.js, 7, 22))
>Outer.app.SomeView : Symbol(Outer.app.SomeView, Decl(someview.js, 0, 0))
>Outer.app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(someview.js, 6, 6), Decl(someview.js, 15, 6), Decl(application.js, 0, 6))

2
tests/baselines/reference/typeFromPropertyAssignment10_1.symbols
View File

@ -93,7 +93,7 @@ Outer.app.Application = (function () {
me.view = new Outer.app.SomeView();
>me.view : Symbol(Application.view, Decl(application.js, 7, 22))
>me : Symbol(Application.view, Decl(application.js, 7, 22))
>me : Symbol(me, Decl(application.js, 7, 11))
>view : Symbol(Application.view, Decl(application.js, 7, 22))
>Outer.app.SomeView : Symbol(Outer.app.SomeView, Decl(someview.js, 0, 0))
>Outer.app : Symbol(Outer.app, Decl(module.js, 0, 24), Decl(someview.js, 0, 6), Decl(someview.js, 6, 6), Decl(someview.js, 15, 6), Decl(application.js, 0, 6))

2
tests/baselines/reference/typeFromPropertyAssignment40.symbols
View File

@ -10,7 +10,7 @@ function Outer() {
self.y = 2
>self.y : Symbol(Outer.y, Decl(typeFromPropertyAssignment40.js, 1, 19))
>self : Symbol(Outer.y, Decl(typeFromPropertyAssignment40.js, 1, 19))
>self : Symbol(self, Decl(typeFromPropertyAssignment40.js, 1, 7))
>y : Symbol(Outer.y, Decl(typeFromPropertyAssignment40.js, 1, 19))
}
/** @type {Outer} */

2
tests/baselines/reference/typeFromPropertyAssignment9.symbols
View File

@ -46,7 +46,7 @@ my.predicate.query = function () {
me.property = false;
>me.property : Symbol(query.property, Decl(a.js, 9, 18))
>me : Symbol(query.property, Decl(a.js, 9, 18))
>me : Symbol(me, Decl(a.js, 9, 7))
>property : Symbol(query.property, Decl(a.js, 9, 18))
};

2
tests/baselines/reference/typeFromPropertyAssignment9_1.symbols
View File

@ -46,7 +46,7 @@ my.predicate.query = function () {
me.property = false;
>me.property : Symbol(query.property, Decl(a.js, 9, 18))
>me : Symbol(query.property, Decl(a.js, 9, 18))
>me : Symbol(me, Decl(a.js, 9, 7))
>property : Symbol(query.property, Decl(a.js, 9, 18))
};

11
tests/cases/fourslash/renameJsPropertyAssignment4.ts Normal file
View File

@ -0,0 +1,11 @@
/// <reference path="fourslash.ts" />
// @allowJs: true
// @Filename: /a.js
////function f() {
//// var /*1*/foo = this;
//// /*2*/foo.x = 1;
////}
goTo.file("/a.js")
verify.baselineRename(["1", "2"]);