Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

apply feedback from pr

Browse Source
This commit is contained in:
BigAru
2018-10-22 06:57:26 +02:00
parent 595131868f
commit d97e07360c
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/refactors/convertArrowFunctionOrFunctionExpression.ts
+12 -12
View File
@@ -14,15 +14,15 @@ namespace ts.refactor.convertArrowFunctionOrFunctionExpression {
registerRefactor(refactorName, { getEditsForAction, getAvailableActions });
interface FunctionInfo {
selectedVariableDeclaration: boolean;
func: FunctionExpression | ArrowFunction;
readonly selectedVariableDeclaration: boolean;
readonly func: FunctionExpression | ArrowFunction;
}
interface VariableInfo {
variableDeclaration: VariableDeclaration;
variableDeclarationList: VariableDeclarationList;
statement: VariableStatement;
name: Identifier;
readonly variableDeclaration: VariableDeclaration;
readonly variableDeclarationList: VariableDeclarationList;
readonly statement: VariableStatement;
readonly name: Identifier;
}
function getAvailableActions(context: RefactorContext): ApplicableRefactorInfo[] | undefined {
@@ -114,12 +114,12 @@ namespace ts.refactor.convertArrowFunctionOrFunctionExpression {
return initializer;
}
function convertToBlock(func: ArrowFunction | FunctionExpression): Block {
if (isExpression(func.body)) {
return createBlock([createReturn(func.body)], /* multiLine */ true);
function convertToBlock(body: ConciseBody): Block {
if (isExpression(body)) {
return createBlock([createReturn(body)], /* multiLine */ true);
}
else {
return func.body;
return body;
}
}
@@ -136,7 +136,7 @@ namespace ts.refactor.convertArrowFunctionOrFunctionExpression {
function getEditInfoForConvertToAnonymousFunction(context: RefactorContext, func: FunctionExpression | ArrowFunction): RefactorEditInfo {
const { file } = context;
const body = convertToBlock(func);
const body = convertToBlock(func.body);
const newNode = createFunctionExpression(func.modifiers, func.asteriskToken, /* name */ undefined, func.typeParameters, func.parameters, func.type, body);
const edits = textChanges.ChangeTracker.with(context, t => t.replaceNode(file, func, newNode));
return { renameFilename: undefined, renameLocation: undefined, edits };
@@ -144,7 +144,7 @@ namespace ts.refactor.convertArrowFunctionOrFunctionExpression {
function getEditInfoForConvertToNamedFunction(context: RefactorContext, func: FunctionExpression | ArrowFunction): RefactorEditInfo | undefined {
const { file } = context;
const body = convertToBlock(func);
const body = convertToBlock(func.body);
const variableInfo = getVariableInfo(func);
if (!variableInfo) return undefined;