fixup! Minor code cleanups

gitextensions · Dec 9, 2023 · 9f77227 · 9f77227
1 parent 9330bb4
commit 9f77227
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/GitUI/GitModuleForm.cs b/GitUI/GitModuleForm.cs
@@ -14,7 +14,6 @@ namespace GitUI
     public class GitModuleForm : GitExtensionsForm, IGitUICommandsSource, IGitModuleForm
     {
         private IHotkeySettingsLoader? _hotkeySettingsLoader;
-        private IScriptsManager? _scriptsManager;
         private IScriptsRunner? _scriptsRunner;
         private GitUICommands? _uiCommands;
 
@@ -32,12 +31,6 @@ public IHotkeySettingsLoader HotkeySettingsReader
             private set => _hotkeySettingsLoader = value;
         }
 
-        public IScriptsManager ScriptsManager
-        {
-            get => _scriptsManager ?? throw new InvalidOperationException($"{GetType().FullName} was constructed incorrectly.");
-            private set => _scriptsManager = value;
-        }
-
         public IScriptsRunner ScriptsRunner
         {
             get => _scriptsRunner ?? throw new InvalidOperationException($"{GetType().FullName} was constructed incorrectly.");
@@ -65,7 +58,6 @@ protected set
                 _uiCommands = value;
 
                 _hotkeySettingsLoader = _uiCommands.GetRequiredService<IHotkeySettingsLoader>();
-                _scriptsManager = _uiCommands.GetRequiredService<IScriptsManager>();
                 _scriptsRunner = _uiCommands.GetRequiredService<IScriptsRunner>();
 
                 OnUICommandsChanged(new GitUICommandsChangedEventArgs(oldCommands));
@@ -125,8 +117,7 @@ bool ExecuteScriptCommand()
                     return false;
                 }
 
-                IScriptsRunner scriptsRunner = UICommands.GetRequiredService<IScriptsRunner>();
-                _ = scriptsRunner.RunScript(scriptInfo, owner: this, UICommands, GetScriptOptionsProvider());
+                _ = ScriptsRunner.RunScript(scriptInfo, owner: this, UICommands, GetScriptOptionsProvider());
                 return true;
             }
         }

diff --git a/GitUI/LeftPanel/RepoObjectsTree.ContextActions.cs b/GitUI/LeftPanel/RepoObjectsTree.ContextActions.cs
@@ -245,7 +245,7 @@ private void contextMenu_Opening(object sender, CancelEventArgs e)
 
             if (hasSingleSelection && selectedLocalBranch?.Visible == true)
             {
-                contextMenu.AddUserScripts(runScriptToolStripMenuItem, ExecuteCommand, (script) => script.AddToRevisionGridContextMenu, UICommands);
+                contextMenu.AddUserScripts(runScriptToolStripMenuItem, ExecuteCommand, script => script.AddToRevisionGridContextMenu, UICommands);
             }
             else
             {