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.

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

OutputConsoleLogger supports not forcing focus onto the Error List #6241

Draft
wants to merge 1 commit into
base: dev
Choose a base branch
from
Draft

OutputConsoleLogger supports not forcing focus onto the Error List #6241

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions src/NuGet.Clients/NuGet.Tools/Commands/ClearNuGetLocalResourcesCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ private void ExecuteClearNuGetLocalResourcesCommand(object sender, EventArgs e)
}
finally
{
OutputConsoleLogger.End();
OutputConsoleLogger.End(bringErrorListToFrontIfSettingsPermit: false);
}
}).PostOnFailure(nameof(NuGetPackage), nameof(ExecuteClearNuGetLocalResourcesCommand));
}
Expand All @@ -111,7 +111,7 @@ public async Task ClearNuGetLocalsCommandExecuteAsync()
}
finally
{
OutputConsoleLogger.End();
OutputConsoleLogger.End(bringErrorListToFrontIfSettingsPermit: false);
}
}

Expand Down
12 changes: 10 additions & 2 deletions src/NuGet.Clients/NuGet.VisualStudio.Common/OutputConsoleLogger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,22 @@ await _semaphore.ExecuteAsync(async () =>
}

public void End()
{
End(bringErrorListToFrontIfSettingsPermit: true);
}

public void End(bool bringErrorListToFrontIfSettingsPermit)
{
Run(async () =>
{
await _outputConsole.WriteLineAsync(Resources.Finished);
await _outputConsole.WriteLineAsync(string.Empty);

// Give the error list focus
await _errorList.Value.BringToFrontIfSettingsPermitAsync();
if (bringErrorListToFrontIfSettingsPermit)
{
// Give the error list focus
await _errorList.Value.BringToFrontIfSettingsPermitAsync();
}
});
}

Expand Down
3 changes: 3 additions & 0 deletions src/NuGet.Clients/NuGet.VisualStudio.Common/UserInterfaceService/INuGetUILogger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,8 @@ public interface INuGetUILogger

/// <summary> End the logging. </summary>
void End();

/// <summary> End the logging without possibly showing the Error List. </summary>
void End(bool bringErrorListToFrontIfSettingsPermit);
}
}
Loading