Skip to content

fix HISTFILE issue #168482

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

Merged
merged 6 commits into from
Dec 9, 2022
Merged

fix HISTFILE issue #168482

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3559faf
fix #168396
meganrogge Dec 8, 2022
4c0f7ff
rm unneeded
meganrogge Dec 8, 2022
be3b680
set histfile at the top
meganrogge Dec 8, 2022
f3aac95
move code, add comment
meganrogge Dec 8, 2022
8966b36
rm check for /Users/meganrogge/Repos/.zsh_history
meganrogge Dec 8, 2022
6b9525d
Update src/vs/workbench/contrib/terminal/browser/media/shellIntegrati…
meganrogge Dec 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions src/vs/workbench/contrib/terminal/browser/media/shellIntegration-rc.zsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,21 @@ fi
# as disable it by unsetting the variable.
VSCODE_SHELL_INTEGRATION=1

# By default, zsh will set the $HISTFILE to the $ZDOTDIR location automatically. In the case of the
# shell integration being injected, this means that the terminal will use a different history file
# to other terminals. To fix this issue, set $HISTFILE back to the default location before ~/.zshrc
# is called as that may depend upon the value.
if [[ "$VSCODE_INJECTION" == "1" ]]; then
HISTFILE=$USER_ZDOTDIR/.zsh_history
fi

# Only fix up ZDOTDIR if shell integration was injected (not manually installed) and has not been called yet
if [[ "$VSCODE_INJECTION" == "1" ]]; then
if [[ $options[norcs] = off && -f $USER_ZDOTDIR/.zshrc ]]; then
VSCODE_ZDOTDIR=$ZDOTDIR
ZDOTDIR=$USER_ZDOTDIR
# A user's custom HISTFILE location might be set when their .zshrc file is sourced below
. $USER_ZDOTDIR/.zshrc
ZDOTDIR=$VSCODE_ZDOTDIR
fi

if [[ -f $USER_ZDOTDIR/.zsh_history && -z $HISTFILE ]]; then
HISTFILE=$USER_ZDOTDIR/.zsh_history
fi
fi

Expand Down