Skip to content

Port6632 #6904

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
billti merged 5 commits into from
Feb 4, 2016
Merged

Port6632 #6904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2a24e03
Fix find all references for salsa
Jan 26, 2016
ea099e7
Fix for thisProperty
Jan 27, 2016
98149f6
add tests
Jan 27, 2016
477706c
Fix build error
Jan 27, 2016
85bb1e8
Add more tests and comments
Jan 28, 2016
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
14 changes: 14 additions & 0 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15366,6 +15366,20 @@ namespace ts {
return getSymbolOfNode(entityName.parent);
}

if (isInJavaScriptFile(entityName) && entityName.parent.kind === SyntaxKind.PropertyAccessExpression) {
const specialPropertyAssignmentKind = getSpecialPropertyAssignmentKind(entityName.parent.parent);
switch (specialPropertyAssignmentKind) {
case SpecialPropertyAssignmentKind.ExportsProperty:
case SpecialPropertyAssignmentKind.PrototypeProperty:
return getSymbolOfNode(entityName.parent);
case SpecialPropertyAssignmentKind.ThisProperty:
case SpecialPropertyAssignmentKind.ModuleExports:
return getSymbolOfNode(entityName.parent.parent);
default:
// Fall through if it is not a special property assignment
}
}

if (entityName.parent.kind === SyntaxKind.ExportAssignment) {
return resolveEntityName(<Identifier>entityName,
/*all meanings*/ SymbolFlags.Value | SymbolFlags.Type | SymbolFlags.Namespace | SymbolFlags.Alias);
Expand Down
12 changes: 12 additions & 0 deletions tests/cases/fourslash/renameCrossJsTs01.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/// <reference path='fourslash.ts'/>

// @allowJs: true
// @Filename: a.js
////exports.[|area|] = function (r) { return r * r; }

// @Filename: b.ts
////import { [|area|] } from './a';
////var t = /**/[|area|](10);

goTo.marker();
verify.renameLocations( /*findInStrings*/ false, /*findInComments*/ false);
12 changes: 12 additions & 0 deletions tests/cases/fourslash/renameCrossJsTs02.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/// <reference path='fourslash.ts'/>

// @allowJs: true
// @Filename: a.js
////exports./**/[|area|] = function (r) { return r * r; }

// @Filename: b.ts
////import { [|area|] } from './a';
////var t = [|area|](10);

goTo.marker();
verify.renameLocations( /*findInStrings*/ false, /*findInComments*/ false);
12 changes: 12 additions & 0 deletions tests/cases/fourslash/renameJsExports01.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/// <reference path='fourslash.ts'/>

// @allowJs: true
// @Filename: a.js
////exports.[|area|] = function (r) { return r * r; }

// @Filename: b.js
////var mod = require('./a');
////var t = mod./**/[|area|](10);

goTo.marker();
verify.renameLocations( /*findInStrings*/ false, /*findInComments*/ false);
12 changes: 12 additions & 0 deletions tests/cases/fourslash/renameJsExports02.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/// <reference path='fourslash.ts'/>

// @allowJs: true
// @Filename: a.js
////exports./**/[|area|] = function (r) { return r * r; }

// @Filename: b.js
////var mod = require('./a');
////var t = mod.[|area|](10);

goTo.marker();
verify.renameLocations( /*findInStrings*/ false, /*findInComments*/ false);
12 changes: 12 additions & 0 deletions tests/cases/fourslash/renameJsPrototypeProperty01.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/// <reference path='fourslash.ts'/>

// @allowJs: true
// @Filename: a.js
////function bar() {
////}
////bar.prototype.[|x|] = 10;
////var t = new bar();
////t./**/[|x|] = 11;

goTo.marker();
verify.renameLocations( /*findInStrings*/ false, /*findInComments*/ false);
12 changes: 12 additions & 0 deletions tests/cases/fourslash/renameJsPrototypeProperty02.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/// <reference path='fourslash.ts'/>

// @allowJs: true
// @Filename: a.js
////function bar() {
////}
////bar.prototype./**/[|x|] = 10;
////var t = new bar();
////t.[|x|] = 11;

goTo.marker();
verify.renameLocations( /*findInStrings*/ false, /*findInComments*/ false);
12 changes: 12 additions & 0 deletions tests/cases/fourslash/renameJsThisProperty01.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/// <reference path='fourslash.ts'/>

// @allowJs: true
// @Filename: a.js
////function bar() {
//// this.[|x|] = 10;
////}
////var t = new bar();
////t./**/[|x|] = 11;

goTo.marker();
verify.renameLocations( /*findInStrings*/ false, /*findInComments*/ false);
12 changes: 12 additions & 0 deletions tests/cases/fourslash/renameJsThisProperty02.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/// <reference path='fourslash.ts'/>

// @allowJs: true
// @Filename: a.js
////function bar() {
//// this./**/[|x|] = 10;
////}
////var t = new bar();
////t.[|x|] = 11;

goTo.marker();
verify.renameLocations( /*findInStrings*/ false, /*findInComments*/ false);