Update: Ensure indent handles nested functions correctly (fixes #7249)

[not-an-aardvark]

What is the purpose of this pull request? (put an "X" next to item)

[ ] Documentation update
[x] Bug fix (template)
[ ] New rule (template)
[ ] Changes an existing rule (template)
[ ] Add autofixing to a rule
[ ] Add a CLI option
[ ] Add something to the core
[ ] Other, please explain:

See #7249

Please check each item to ensure your pull request is ready:

• I've read the pull request guide
• I've included tests for my change
• (n/a) I've updated documentation for my change (if appropriate)

What changes did you make? (Give an overview)

This ensures that indent handles the parameters of nested function declarations and function expressions correctly. Previously, it was not accounting for the initial offset of a function, so it would always require the same parameter indent regardless of whether the function itself was indented.

Is there anything you'd like reviewers to focus on?

Nothing in particular.

[eslintbot]

LGTM

[RecuencoJones]

[vitorbal]

@not-an-aardvark looks like there are some conflicts in the test file. Could you do a rebase?

[not-an-aardvark]

I won't have a chance to rebase this until later today. If it's important that we get this change into today's release, feel free to rebase and push to my branch.

edit: Never mind, I ended up having time to rebase.

[eslintbot]

LGTM

[nzakas]

LGTM