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(typescript-estree): correct type of ArrayPattern.elements #1451

Merged
merged 1 commit into from Jan 14, 2020
Merged

fix(typescript-estree): correct type of ArrayPattern.elements #1451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions packages/eslint-plugin/src/rules/indent-new-do-not-use/index.ts
View file
Open in desktop
Expand Up @@ -578,7 +578,7 @@ export default createRule<Options, MessageIds>({
* @param offset The amount that the elements should be offset
*/
function addElementListIndent(
elements: TSESTree.Node[],
elements: (TSESTree.Node | null)[],
startToken: TSESTree.Token,
endToken: TSESTree.Token,
offset: number | string,
Expand Down Expand Up @@ -606,7 +606,8 @@ export default createRule<Options, MessageIds>({
offsets.setDesiredOffset(endToken, startToken, 0);

// If the preference is "first" but there is no first element (e.g. sparse arrays w/ empty first slot), fall back to 1 level.
if (offset === 'first' && elements.length && !elements[0]) {
const firstElement = elements[0];
if (offset === 'first' && elements.length && !firstElement) {
return;
}
elements.forEach((element, index) => {
Expand All @@ -628,7 +629,7 @@ export default createRule<Options, MessageIds>({
tokenInfo.isFirstTokenOfLine(getFirstToken(element))
) {
offsets.matchOffsetOf(
getFirstToken(elements[0]),
getFirstToken(firstElement!),
getFirstToken(element),
);
} else {
Expand All @@ -640,6 +641,7 @@ export default createRule<Options, MessageIds>({

if (
previousElement &&
previousElementLastToken &&
previousElementLastToken.loc.end.line -
countTrailingLinebreaks(previousElementLastToken.value) >
startToken.loc.end.line
Expand Down Expand Up @@ -854,7 +856,7 @@ export default createRule<Options, MessageIds>({
) {
const openingBracket = sourceCode.getFirstToken(node)!;
const closingBracket = sourceCode.getTokenAfter(
node.elements[node.elements.length - 1] || openingBracket,
node.elements[node.elements.length - 1] ?? openingBracket,
isClosingBracketToken,
)!;

Expand Down
2 changes: 1 addition & 1 deletion packages/typescript-estree/src/ts-estree/ts-estree.ts
View file
Open in desktop
Expand Up @@ -681,7 +681,7 @@ export interface ArrayExpression extends BaseNode {

export interface ArrayPattern extends BaseNode {
type: AST_NODE_TYPES.ArrayPattern;
elements: DestructuringPattern[];
elements: (DestructuringPattern | null)[];
typeAnnotation?: TSTypeAnnotation;
optional?: boolean;
decorators?: Decorator[];
Expand Down