Fix AsyncPackage Take2

sboulema · Jun 12, 2018 · d37ecf3 · d37ecf3
1 parent e80cc28
commit d37ecf3
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 12 deletions.
diff --git a/TGit/Commands/GitFlowMenuCommands.cs b/TGit/Commands/GitFlowMenuCommands.cs
@@ -167,7 +167,8 @@ private void FinishFeatureCommand(object sender, EventArgs e)
 
         private string FormatCliCommand(string gitCommand, bool appendNextLine = true)
         {
-            return $"echo ^> {Path.GetFileNameWithoutExtension(EnvHelper.Git)} {gitCommand} && \"{EnvHelper.Git}\" {gitCommand}{(appendNextLine ? " && " : string.Empty)}";
+            var git = EnvHelper.GetGit();
+            return $"echo ^> {Path.GetFileNameWithoutExtension(git)} {gitCommand} && \"{git}\" {gitCommand}{(appendNextLine ? " && " : string.Empty)}";
         }
 
         private void FinishFeatureGitHubCommand(object sender, EventArgs e)

diff --git a/TGit/Helpers/EnvHelper.cs b/TGit/Helpers/EnvHelper.cs
@@ -6,8 +6,8 @@ public static class EnvHelper
     {
         public static string BranchName;
         private static string _solutionDir;
-        public static string TortoiseGitProc;
-        public static string Git;
+        private static string _tortoiseGitProc;
+        private static string _git;
         public static DTE Dte;
 
         public static bool IsGitFlow(DTE dte = null)
@@ -42,18 +42,32 @@ public static bool HasStash(DTE dte = null)
             return ProcessHelper.StartProcessGit(dte, "stash list");
         }
 
-        public static void GetTortoiseGitProc() => TortoiseGitProc = FileHelper.GetTortoiseGitProc();
+        public static string GetTortoiseGitProc()
+        {
+            if (string.IsNullOrEmpty(_tortoiseGitProc))
+            {
+                _tortoiseGitProc = FileHelper.GetTortoiseGitProc();
+            }
+            return _tortoiseGitProc;
+        }
 
-        public static void GetGit() => Git = FileHelper.GetMSysGit();
+        public static string GetGit()
+        {
+            if (string.IsNullOrEmpty(_git))
+            {
+                _git = FileHelper.GetMSysGit();
+            }
+            return _git; 
+        }
 
         public static bool HasSolutionDir(DTE dte = null) => !string.IsNullOrEmpty(GetSolutionDir(dte));
 
         public static void Clear()
         {
             BranchName = string.Empty;
             _solutionDir = string.Empty;
-            TortoiseGitProc = string.Empty;
-            Git = string.Empty;
+            _tortoiseGitProc = string.Empty;
+            _git = string.Empty;
         }
     }
 }
diff --git a/TGit/Helpers/ProcessHelper.cs b/TGit/Helpers/ProcessHelper.cs
@@ -28,7 +28,7 @@ public static bool StartProcessGit(DTE dte, string commands, bool showAlert = tr
                 StartInfo = new ProcessStartInfo
                 {
                     FileName = "cmd.exe",
-                    Arguments = $"/c cd /D \"{EnvHelper.GetSolutionDir(dte)}\" && \"{EnvHelper.Git}\" {commands}",
+                    Arguments = $"/c cd /D \"{EnvHelper.GetSolutionDir(dte)}\" && \"{EnvHelper.GetGit()}\" {commands}",
                     UseShellExecute = false,
                     RedirectStandardOutput = true,
                     RedirectStandardError = true,
@@ -57,13 +57,14 @@ public static bool StartProcessGit(DTE dte, string commands, bool showAlert = tr
 
         public static void StartTortoiseGitProc(string args)
         {
+            var tortoiseGitProc = EnvHelper.GetTortoiseGitProc();
             try
             {
-                Process.Start(EnvHelper.TortoiseGitProc, args);
+                Process.Start(tortoiseGitProc, args);
             }
             catch (Exception e)
             {
-                MessageBox.Show(e.Message, $"{EnvHelper.TortoiseGitProc} not found", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                MessageBox.Show(e.Message, $"{tortoiseGitProc} not found", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
         }
 
@@ -83,7 +84,7 @@ public static string StartProcessGitResult(DTE dte, string commands)
                 StartInfo = new ProcessStartInfo
                 {
                     FileName = "cmd.exe",
-                    Arguments = $"/c cd /D \"{EnvHelper.GetSolutionDir(dte)}\" && \"{EnvHelper.Git}\" {commands}",
+                    Arguments = $"/c cd /D \"{EnvHelper.GetSolutionDir(dte)}\" && \"{EnvHelper.GetGit()}\" {commands}",
                     UseShellExecute = false,
                     RedirectStandardOutput = true,
                     RedirectStandardError = true,
@@ -112,7 +113,7 @@ public static string GitResult(string workingDir, string commands)
                 StartInfo = new ProcessStartInfo
                 {
                     FileName = "cmd.exe",
-                    Arguments = $"/c cd /D \"{workingDir}\" && \"{EnvHelper.Git}\" {commands}",
+                    Arguments = $"/c cd /D \"{workingDir}\" && \"{EnvHelper.GetGit()}\" {commands}",
                     UseShellExecute = false,
                     RedirectStandardOutput = true,
                     RedirectStandardError = true,