microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-30 01:04:49 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

moveToNewFile: Support selecting the name of a declaration (#24331)

Browse Source
This commit is contained in:
Andy
2018-05-22 14:00:29 -07:00
committed by GitHub
parent 9cda2bdba0
commit 5622bc2dd6
2 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/services/refactors/moveToNewFile.ts
View File

@@ -22,8 +22,14 @@ namespace ts.refactor {
const startNodeIndex = findIndex(statements, s => s.end > range.pos);
if (startNodeIndex === -1) return undefined;
const startStatement = statements[startNodeIndex];
if (isNamedDeclaration(startStatement) && startStatement.name && rangeContainsRange(startStatement.name, range)) {
return { first: startNodeIndex, afterLast: startNodeIndex + 1 };
}
// Can't only partially include the start node or be partially into the next node
if (range.pos > statements[startNodeIndex].getStart(file)) return undefined;
if (range.pos > startStatement.getStart(file)) return undefined;
const afterEndNodeIndex = findIndex(statements, s => s.end > range.end, startNodeIndex);
// Can't be partially into the next node
if (afterEndNodeIndex !== -1 && (afterEndNodeIndex === 0 || statements[afterEndNodeIndex].getStart(file) < range.end)) return undefined;