From 43783a33a294bdb8f9a7613da82fa94dbdcde1b8 Mon Sep 17 00:00:00 2001 From: JP Ungaretti Date: Thu, 9 Feb 2023 22:23:58 +0000 Subject: [PATCH] Move helper to iostreams --- pkg/cmd/codespace/common.go | 5 +---- pkg/iostreams/iostreams.go | 7 +++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkg/cmd/codespace/common.go b/pkg/cmd/codespace/common.go index e4569bf43..399c488f8 100644 --- a/pkg/cmd/codespace/common.go +++ b/pkg/cmd/codespace/common.go @@ -57,10 +57,7 @@ func (a *App) StopProgressIndicator() { } func (a *App) RunWithProgress(label string, f func() error) error { - a.StartProgressIndicatorWithLabel(label) - defer a.StopProgressIndicator() - - return f() + return a.io.RunWithProgress(label, f) } // Connects to a codespace using Live Share and returns that session diff --git a/pkg/iostreams/iostreams.go b/pkg/iostreams/iostreams.go index eeb861938..39e879625 100644 --- a/pkg/iostreams/iostreams.go +++ b/pkg/iostreams/iostreams.go @@ -305,6 +305,13 @@ func (s *IOStreams) StopProgressIndicator() { s.progressIndicator = nil } +func (s *IOStreams) RunWithProgress(label string, f func() error) error { + s.StartProgressIndicatorWithLabel(label) + defer s.StopProgressIndicator() + + return f() +} + func (s *IOStreams) StartAlternateScreenBuffer() { if s.alternateScreenBufferEnabled { s.alternateScreenBufferMu.Lock()