Skip to content
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.

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

fix(50654): "Move to a new file" breaks the declaration of referenced variable #50681

Merged
merged 2 commits into from Oct 26, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/services/refactors/moveToNewFile.ts
Expand Up @@ -402,7 +402,13 @@ namespace ts.refactor {
switch (name.kind) {
case SyntaxKind.Identifier:
if (isUnused(name)) {
changes.delete(sourceFile, name);
if (varDecl.initializer && isRequireCall(varDecl.initializer, /*requireStringLiteralLikeArgument*/ true)) {
changes.delete(sourceFile,
isVariableDeclarationList(varDecl.parent) && length(varDecl.parent.declarations) === 1 ? varDecl.parent.parent : varDecl);
}
else {
changes.delete(sourceFile, name);
}
}
break;
case SyntaxKind.ArrayBindingPattern:
Expand Down
28 changes: 28 additions & 0 deletions tests/cases/fourslash/moveToNewFile_requireImport1.ts
@@ -0,0 +1,28 @@
/// <reference path="fourslash.ts" />

// @allowJs: true

// @filename: /a.js
////module.exports = 1;

// @filename: /b.js
////var a = require("./a");
////[|function f() {
//// a;
////}|]

verify.noErrors();

verify.moveToNewFile({
newFileContents: {
"/b.js": "",

"/f.js":
`var a = require("./a");

function f() {
a;
}
`,
},
});
33 changes: 33 additions & 0 deletions tests/cases/fourslash/moveToNewFile_requireImport2.ts
@@ -0,0 +1,33 @@
/// <reference path="fourslash.ts" />

// @allowJs: true

// @filename: /a.js
////module.exports = 1;

// @filename: /b.js
////var a = require("./a"),
//// b = require("./a"),
//// c = require("./a");
////[|function f() {
//// b;
////}|]

verify.noErrors();

verify.moveToNewFile({
newFileContents: {
"/b.js":
`var a = require("./a"),
c = require("./a");
`,

"/f.js":
`var b = require("./a");

function f() {
b;
}
`,
},
});