Fix shell-integration-features being ignored with manual shell integration

[liby]

Descriptions

The code was short-circuiting the shell integration setup when shell-integration = none, which prevented the feature environment variables from being set. These environment variables are needed even for manual shell integration to work properly.

Changes

• Extracted feature environment variables setup into a separate setup_features function

• Modified the shell integration initialization to ensure features are set up even when shell-integration = none

Fixes #5046

[jparise]

Note that the previous behavior was intentional: when shell integration is disabled, we didn't want to add anything to the shell environment.

[liby]

Note that the previous behavior was intentional: when shell integration is disabled, we didn't want to add anything to the shell environment.

I apologize for not linking the issue in the PR description. This PR is actually implementing the solution proposed by @mitchellh in #5046, where he stated:

Solution: We currently short circuit shell integration if it is "none" but we should respect the features and pass the proper env vars along even if it is "none"

I'll update the PR description for better tracking.

[jparise]

Note that the previous behavior was intentional: when shell integration is disabled, we didn't want to add anything to the shell environment.

I apologize for not linking the issue in the PR description. This PR is actually implementing the solution proposed by @mitchellh in #5046, where he stated:

Solution: We currently short circuit shell integration if it is "none" but we should respect the features and pass the proper env vars along even if it is "none"

Got it. I think that makes sense. If someone doesn't want (automatic) shell integration and doesn't want the environment variables, they can still use:

shell-integration = none
shell-integration-features = false

I think the config documentation for shell-integration-features could use a brief update as part of this change, though. It currently says:

Shell integration features to enable if shell integration itself is enabled.

... which reads more ambiguously now that shell-integration = none will result in the environment variables being set and therefore applying to manual shell integration.

[liby]

I think the config documentation for shell-integration-features could use a brief update as part of this change

Thanks for the feedback! I've updated the documentation for shell-integration-features to make it clearer.

Please let me know if the updated documentation looks good to you.

[jparise]

Just a couple more suggestions, but looks good to me overall!

[mitchellh]

One small but important change and it looks good. Thank you!