fix: bindCLIShortcuts to proper server

[patak-dev]

Fixes #15159

Description

1ab9596 is the fix, we should use the server instance after the reinit process is done

b4d0cd4 scopes the newServer -> server logic to avoid newServer being used in the future after the reinit and close process is done.

Ref #14890

---

What is the purpose of this pull request?

• Bug fix
• New Feature
• Documentation update
• Other

[patak-dev]

Edit, there was an error introduced by extracting the helper at 5c7d4bc, when the restart failed the return was not longer preventing the rest of the function to execute. This may be related to the below issues. The PR no longer extracts the methods, it just scopes the newServer variable.

This may uncover a race condition: https://github.com/vitejs/vite/actions/runs/7006424666/job/19058242176#step:13:111, or maybe others remember seeing this test being flaky?

Attempt 2 also failed https://github.com/vitejs/vite/actions/runs/7006424666/job/19058714731?pr=15162

Attempt 3 worked, other platforms worked twice without a glitch.

[patak-dev]

It isn't easy to add a test for this one, we are currently not testing shortcuts in CI AFAICS.

[bluwy]

Good call with the scoping 👍