Skip to content

Avoid running AddToHistoryHandler on command lines loaded from history file #3643

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 1 commit into from
Apr 7, 2023
Merged

Avoid running AddToHistoryHandler on command lines loaded from history file #3643

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions PSReadLine/History.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ private void ClearSavedCurrentLine()
_savedCurrentLine._editGroupStart = -1;
}

private AddToHistoryOption GetAddToHistoryOption(string line)
private AddToHistoryOption GetAddToHistoryOption(string line, bool fromHistoryFile)
{
// Whitespace only is useless, never add.
if (string.IsNullOrWhiteSpace(line))
Expand All @@ -154,7 +154,7 @@ private AddToHistoryOption GetAddToHistoryOption(string line)
return AddToHistoryOption.SkipAdding;
}

if (Options.AddToHistoryHandler != null)
if (!fromHistoryFile && Options.AddToHistoryHandler != null)
{
if (Options.AddToHistoryHandler == PSConsoleReadLineOptions.DefaultAddToHistoryHandler)
{
Expand Down Expand Up @@ -203,10 +203,11 @@ private string MaybeAddToHistory(
bool fromDifferentSession = false,
bool fromInitialRead = false)
{
var addToHistoryOption = GetAddToHistoryOption(result);
bool fromHistoryFile = fromDifferentSession || fromInitialRead;
var addToHistoryOption = GetAddToHistoryOption(result, fromHistoryFile);

if (addToHistoryOption != AddToHistoryOption.SkipAdding)
{
var fromHistoryFile = fromDifferentSession || fromInitialRead;
_previousHistoryItem = new HistoryItem
{
CommandLine = result,
Expand Down