convertToEs6Module: Avoid replacing entire function #22507
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
changed the title
ghost
mentioned this pull request
ghost
force-pushed
the
convertExportsDotXEquals
branch
4 times, most recently
from
3fde583 to
9e99f5d
Compare
ghost
force-pushed
the
convertExportsDotXEquals
branch
from
9e99f5d to
5c13eaf
Compare
amcasey
reviewed
Apr 12, 2018
| ////} | ||
|
|
||
| // TODO: GH#22492 Should be a able access `exports.z` inside `exports.f` | ||
|
|
||
| verify.codeFix({ | ||
| description: "Convert to ES6 module", | ||
| // TODO: GH#22492 |
There was a problem hiding this comment.
Isn't this the bug that this change fixes?
| if (lparen) { | ||
| // `() => {}` --> `function f() {}` | ||
| this.insertNodesAt(sourceFile, lparen.getStart(sourceFile), [createToken(SyntaxKind.FunctionKeyword), createIdentifier(name)], { joiner: " " }); | ||
| this.deleteNode(sourceFile, arrow); |
There was a problem hiding this comment.
Will this destroy any trivia? Does it matter?
There was a problem hiding this comment.
This is a bug already, see #23373
| const arrow = findChildOfKind(node, SyntaxKind.EqualsGreaterThanToken, sourceFile)!; | ||
| const lparen = findChildOfKind(node, SyntaxKind.OpenParenToken, sourceFile); | ||
| if (lparen) { | ||
| // `() => {}` --> `function f() {}` |
There was a problem hiding this comment.
(Or is there some reason that's impossible here?)
There was a problem hiding this comment.
See if (node.body.kind !== SyntaxKind.Block) below
src/services/textChanges.ts
Outdated
| } | ||
| else { | ||
| // `x => {}` -> `function f(x) {}` | ||
| this.insertNodesAt(sourceFile, first(node.parameters).getStart(sourceFile), [createToken(SyntaxKind.FunctionKeyword), createIdentifier(name + "(")], { joiner: " " }); |
There was a problem hiding this comment.
The lparen is in the identifier because we don't want a space between them? If we're going to do that, why not just insert raw text?
There was a problem hiding this comment.
Good idea, when I first wrote this we didn't have insertText.
src/services/textChanges.ts
Outdated
| else { | ||
| // `x => {}` -> `function f(x) {}` | ||
| this.insertNodesAt(sourceFile, first(node.parameters).getStart(sourceFile), [createToken(SyntaxKind.FunctionKeyword), createIdentifier(name + "(")], { joiner: " " }); | ||
| // Replaceing full range of arrow to get rid of the leading space -- replace ` =>` with `)` |
src/services/textChanges.ts
Outdated
| // `x => {}` -> `function f(x) {}` | ||
| this.insertNodesAt(sourceFile, first(node.parameters).getStart(sourceFile), [createToken(SyntaxKind.FunctionKeyword), createIdentifier(name + "(")], { joiner: " " }); | ||
| // Replaceing full range of arrow to get rid of the leading space -- replace ` =>` with `)` | ||
| this.replaceRange(sourceFile, arrow, createToken(SyntaxKind.CloseParenToken)); |
There was a problem hiding this comment.
This will definitely clobber trivia.
| @@ -303,7 +300,27 @@ namespace ts.codefix { | |||
| return makeExportDeclaration([createExportSpecifier(/*propertyName*/ undefined, "default")], moduleSpecifier); | |||
| } | |||
|
|
|||
| function convertExportsDotXEquals(name: string | undefined, exported: Expression): Statement { | |||
| function convertExportsDotXEquals({ left, right, parent }: BinaryExpression & { left: PropertyAccessExpression }, sourceFile: SourceFile, changes: textChanges.ChangeTracker): void { | |||
There was a problem hiding this comment.
Could "ExportsDotXEquals" be rephrased as "ExportsPropertyAssignment"?
| const name = left.name.text; | ||
| if ((isFunctionExpression(right) || isArrowFunction(right) || isClassExpression(right)) && (!right.name || right.name.text === name)) { | ||
| // `exports.f = function() {}` -> `export function f() {}` -- Replace `exports.f = ` with `export `, and insert the name after `function`. | ||
| changes.replaceRange(sourceFile, { pos: left.getStart(sourceFile), end: right.getStart(sourceFile) }, createToken(SyntaxKind.ExportKeyword), { suffix: " " }); |
There was a problem hiding this comment.
Will this clobber trivia on the LHS of the assignment?
| if (!right.name) changes.insertName(sourceFile, right, name); | ||
|
|
||
| const semi = findChildOfKind(parent, SyntaxKind.SemicolonToken, sourceFile); | ||
| if (semi) changes.deleteNode(sourceFile, semi, { useNonAdjustedEndPosition: true }); |
There was a problem hiding this comment.
Will this clobber trailing trivia on the semicolon?
mhegazy
approved these changes
Apr 13, 2018
This pull request was closed.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #22492
Will rebase once #22361 is in.