Skip to content

fix(10019): for-loop labels cannot be renamed #40064

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

Merged
merged 1 commit into from
Aug 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion src/services/rename.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,13 @@ namespace ts.Rename {

function getRenameInfoForNode(node: Node, typeChecker: TypeChecker, sourceFile: SourceFile, isDefinedInLibraryFile: (declaration: Node) => boolean, options?: RenameInfoOptions): RenameInfo | undefined {
const symbol = typeChecker.getSymbolAtLocation(node);
if (!symbol) return;
if (!symbol) {
if (isLabelName(node)) {
const name = getTextOfNode(node);
return getRenameInfoSuccess(name, name, ScriptElementKind.label, ScriptElementKindModifier.none, node, sourceFile);
}
return undefined;
}
// Only allow a symbol to be renamed if it actually has at least one declaration.
const { declarations } = symbol;
if (!declarations || declarations.length === 0) return;
Expand Down
5 changes: 5 additions & 0 deletions tests/baselines/reference/renameLabel1.baseline
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/*====== /tests/cases/fourslash/renameLabel1.ts ======*/

RENAME: {
break [|RENAME|];
}
5 changes: 5 additions & 0 deletions tests/baselines/reference/renameLabel2.baseline
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/*====== /tests/cases/fourslash/renameLabel2.ts ======*/

[|RENAME|]: {
break RENAME;
}
8 changes: 8 additions & 0 deletions tests/baselines/reference/renameLabel3.baseline
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/*====== /tests/cases/fourslash/renameLabel3.ts ======*/

[|RENAME|]:
for (let i = 0; i <= 10; i++) {
if (i === 0) continue RENAME;
if (i === 1) continue RENAME;
if (i === 10) break RENAME;
}
8 changes: 8 additions & 0 deletions tests/baselines/reference/renameLabel4.baseline
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/*====== /tests/cases/fourslash/renameLabel4.ts ======*/

RENAME:
for (let i = 0; i <= 10; i++) {
if (i === 0) continue RENAME;
if (i === 1) continue [|RENAME|];
if (i === 10) break RENAME;
}
8 changes: 8 additions & 0 deletions tests/baselines/reference/renameLabel5.baseline
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/*====== /tests/cases/fourslash/renameLabel5.ts ======*/

RENAME: for (let i = 0; i <= 10; i++) {
loop2: for (let j = 0; j <= 10; j++) {
if (i === 5) continue [|RENAME|];
if (j === 5) break loop2;
}
}
8 changes: 8 additions & 0 deletions tests/baselines/reference/renameLabel6.baseline
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/*====== /tests/cases/fourslash/renameLabel6.ts ======*/

loop1: for (let i = 0; i <= 10; i++) {
RENAME: for (let j = 0; j <= 10; j++) {
if (i === 5) continue loop1;
if (j === 5) break [|RENAME|];
}
}
7 changes: 7 additions & 0 deletions tests/cases/fourslash/renameLabel1.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/// <reference path="fourslash.ts" />

////foo: {
//// break /**/foo;
////}

verify.baselineRename("", {});
7 changes: 7 additions & 0 deletions tests/cases/fourslash/renameLabel2.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/// <reference path="fourslash.ts" />

/////**/foo: {
//// break foo;
////}

verify.baselineRename("", {});
11 changes: 11 additions & 0 deletions tests/cases/fourslash/renameLabel3.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/// <reference path="fourslash.ts" />

/////**/loop:
////for (let i = 0; i <= 10; i++) {
//// if (i === 0) continue loop;
//// if (i === 1) continue loop;
//// if (i === 10) break loop;
////}

verify.baselineRename("", {});

11 changes: 11 additions & 0 deletions tests/cases/fourslash/renameLabel4.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/// <reference path="fourslash.ts" />

////loop:
////for (let i = 0; i <= 10; i++) {
//// if (i === 0) continue loop;
//// if (i === 1) continue /**/loop;
//// if (i === 10) break loop;
////}

verify.baselineRename("", {});

10 changes: 10 additions & 0 deletions tests/cases/fourslash/renameLabel5.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/// <reference path="fourslash.ts" />

////loop1: for (let i = 0; i <= 10; i++) {
//// loop2: for (let j = 0; j <= 10; j++) {
//// if (i === 5) continue /**/loop1;
//// if (j === 5) break loop2;
//// }
////}

verify.baselineRename("", {});
10 changes: 10 additions & 0 deletions tests/cases/fourslash/renameLabel6.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/// <reference path="fourslash.ts" />

////loop1: for (let i = 0; i <= 10; i++) {
//// loop2: for (let j = 0; j <= 10; j++) {
//// if (i === 5) continue loop1;
//// if (j === 5) break /**/loop2;
//// }
////}

verify.baselineRename("", {});