microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-09 16:39:46 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge pull request #21845 from amcasey/GH21793

Browse Source 
Harden Extract Symbol against symbols without declarations
This commit is contained in:
Andrew Casey
2018-02-12 10:40:31 -08:00
committed by GitHub
parent 3fb481ff40 e65a1a429c
commit ddf206b184
4 changed files with 57 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/harness/unittests/extractFunctions.ts
View File

@@ -552,6 +552,11 @@ export default class {
M() {
[#|1 + 1|];
}
}`);
testExtractFunction("extractFunction_NoDeclarations", `
function F() {
[#|arguments.length|]; // arguments has no declaration
}`);
});

6
src/services/refactors/extractSymbol.ts
View File

@@ -1689,7 +1689,8 @@ namespace ts.refactor.extractSymbol {
return symbolId;
}
// find first declaration in this file
const declInFile = find(symbol.getDeclarations(), d => d.getSourceFile() === sourceFile);
const decls = symbol.getDeclarations();
const declInFile = decls && find(decls, d => d.getSourceFile() === sourceFile);
if (!declInFile) {
return undefined;
}
@@ -1782,7 +1783,8 @@ namespace ts.refactor.extractSymbol {
if (!symbol) {
return undefined;
}
if (symbol.getDeclarations().some(d => d.parent === scopeDecl)) {
const decls = symbol.getDeclarations();
if (decls && decls.some(d => d.parent === scopeDecl)) {
return createIdentifier(symbol.name);
}
const prefix = tryReplaceWithQualifiedNameOrPropertyAccess(symbol.parent, scopeDecl, isTypeNode);

24
tests/baselines/reference/extractFunction/extractFunction_NoDeclarations.js Normal file
View File

@@ -0,0 +1,24 @@
// ==ORIGINAL==
function F() {
/*[#|*/arguments.length/*|]*/; // arguments has no declaration
}
// ==SCOPE::Extract to inner function in function 'F'==
function F() {
/*RENAME*/newFunction(); // arguments has no declaration
function newFunction() {
arguments.length;
}
}
// ==SCOPE::Extract to function in global scope==
function F() {
/*RENAME*/newFunction(); // arguments has no declaration
}
function newFunction() {
arguments.length;
}

24
tests/baselines/reference/extractFunction/extractFunction_NoDeclarations.ts Normal file
View File

@@ -0,0 +1,24 @@
// ==ORIGINAL==
function F() {
/*[#|*/arguments.length/*|]*/; // arguments has no declaration
}
// ==SCOPE::Extract to inner function in function 'F'==
function F() {
/*RENAME*/newFunction(); // arguments has no declaration
function newFunction() {
arguments.length;
}
}
// ==SCOPE::Extract to function in global scope==
function F() {
/*RENAME*/newFunction(); // arguments has no declaration
}
function newFunction() {
arguments.length;
}