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.

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

get shell integration to work for zsh #143305

Merged
merged 7 commits into from Feb 18, 2022
Merged

get shell integration to work for zsh #143305

merged 7 commits into from Feb 18, 2022

Conversation

meganrogge
Copy link
Contributor

@meganrogge meganrogge commented Feb 17, 2022

This PR fixes #141620

@meganrogge meganrogge self-assigned this Feb 17, 2022
@@ -273,6 +273,10 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
shellLaunchConfig.env = shellLaunchConfig.env || {} as IProcessEnvironment;
shellLaunchConfig.env['VSCODE_SHELL_LOGIN'] = '1';
}
if (env?.['ZDOTDIR']) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think ?. for here and above isn't actually needed anymore, we should also remove the TODO: fix above

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We may also be able to remove these all together as env is passed into createProcess? See how VSCODE_SHELL_HIDE_WELCOME doesn't need to get set on shellLaunchConfig.env

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see this TODO - slc.env is used, not env in remote terminal backend

env: IProcessEnvironment, // TODO: This is ignored

@meganrogge meganrogge merged commit 7181933 into main Feb 18, 2022
@meganrogge meganrogge deleted the merogge/fix-zsh branch February 18, 2022 01:30
@github-actions github-actions bot locked and limited conversation to collaborators Apr 4, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Shell integration zsh hooks don't load on macOS/Linux sometimes
2 participants