Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix: object-shorthand providing invalid fixes for typescript #12260

Merged
merged 4 commits into from Sep 14, 2019
Merged

Fix: object-shorthand providing invalid fixes for typescript #12260

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a00df7
Fix: object-shorthand providing invalid fixes for typescript
bradzacher Sep 11, 2019
d400622
Chore: refactor to not rely on async modifier check
bradzacher Sep 12, 2019
fd60af4
Chore: ensure return type isn't wiped for no arguments
bradzacher Sep 12, 2019
09204f6
Chore: add ts code test to prevent regressions
bradzacher Sep 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions lib/rules/object-shorthand.js
View file
Open in desktop
Expand Up @@ -264,10 +264,13 @@ module.exports = {
keyPrefix + keyText + sourceCode.text.slice(tokenBeforeParams.range[1], node.value.range[1])
);
}

const arrowToken = sourceCode.getTokenBefore(node.value.body, { filter: token => token.value === "=>" });
const tokenBeforeArrow = sourceCode.getTokenBefore(arrowToken);
const hasParensAroundParameters = tokenBeforeArrow.type === "Punctuator" && tokenBeforeArrow.value === ")";
const oldParamText = sourceCode.text.slice(sourceCode.getFirstToken(node.value, node.value.async ? 1 : 0).range[0], tokenBeforeArrow.range[1]);

const firstToken = sourceCode.getFirstToken(node.value, node.value.async ? 1 : 0);
bradzacher marked this conversation as resolved.
Show resolved Hide resolved
const hasParensAroundParameters = firstToken.type === "Punctuator" && firstToken.value === "(";
const oldParamText = sourceCode.text.slice(firstToken.range[0], tokenBeforeArrow.range[1]);
const newParamText = hasParensAroundParameters ? oldParamText : `(${oldParamText})`;

return fixer.replaceTextRange(
Expand Down