Code cleanup

Author: Robert Holt

Engine/Commands/GetScriptAnalyzerRuleCommand.cs

@@ -83,9 +83,7 @@ protected override void BeginProcessing()
         {
 
             // Initialize helper
-            Helper.Instance = new Helper(
-                SessionState.InvokeCommand,
-                this);
+            Helper.Instance = new Helper(SessionState.InvokeCommand);
             Helper.Instance.Initialize();
 
             string[] rulePaths = Helper.ProcessCustomRulePaths(customRulePath,

Engine/Commands/InvokeScriptAnalyzerCommand.cs

@@ -265,9 +265,7 @@ protected override void BeginProcessing()
                 }
             }
 #endif
-            Helper.Instance = new Helper(
-                SessionState.InvokeCommand,
-                this);
+            Helper.Instance = new Helper(SessionState.InvokeCommand);
             Helper.Instance.Initialize();
 
             var psVersionTable = this.SessionState.PSVariable.GetValue("PSVersionTable") as Hashtable;

Engine/Formatter.cs

@@ -31,7 +31,7 @@ public static string Format<TCmdlet>(
             ValidateNotNull(settings, "settings");
             ValidateNotNull(cmdlet, "cmdlet");
 
-            Helper.Instance = new Helper(cmdlet.SessionState.InvokeCommand, cmdlet);
+            Helper.Instance = new Helper(cmdlet.SessionState.InvokeCommand);
             Helper.Instance.Initialize();
 
             var ruleOrder = new string[]

Engine/Helper.cs

@@ -28,8 +28,6 @@ public class Helper
 
         private readonly CommandInvocationIntrinsics _invokeCommand;
 
-        private readonly IOutputWriter _outputWriter;
-
         private Dictionary<string, Dictionary<string, object>> _ruleArguments;
 
         private PSVersionTable _psVersionTable;
@@ -125,16 +123,15 @@ private Helper()
         /// A CommandInvocationIntrinsics instance for use in gathering
         /// information about available commands and aliases.
         /// </param>
-        /// <param name="outputWriter">
-        /// An IOutputWriter instance for use in writing output
-        /// to the PowerShell environment.
-        /// </param>
-        public Helper(
-            CommandInvocationIntrinsics invokeCommand,
-            IOutputWriter outputWriter)
+        public Helper(CommandInvocationIntrinsics invokeCommand)
         {
-            this._invokeCommand = invokeCommand;
-            this._outputWriter = outputWriter;
+            _invokeCommand = invokeCommand;
+            _ruleArguments = new Dictionary<string, Dictionary<string, object>>(StringComparer.OrdinalIgnoreCase);
+            _commandInfoCache = new Lazy<CommandInfoCache>(() => new CommandInfoCache());
+            CmdletToAliasDictionary = new Dictionary<string, List<string>>(StringComparer.OrdinalIgnoreCase);
+            AliasToCmdletDictionary = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            KeywordBlockDictionary = new Dictionary<string, List<Tuple<int, int>>>(StringComparer.OrdinalIgnoreCase);
+            VariableAnalysisDictionary = new Dictionary<Ast, VariableAnalysis>();
         }
 
         #region Methods
@@ -143,20 +140,13 @@ public Helper(
         /// </summary>
         public void Initialize()
         {
-            CmdletToAliasDictionary = new Dictionary<String, List<String>>(StringComparer.OrdinalIgnoreCase);
-            AliasToCmdletDictionary = new Dictionary<String, String>(StringComparer.OrdinalIgnoreCase);
-            KeywordBlockDictionary = new Dictionary<String, List<Tuple<int, int>>>(StringComparer.OrdinalIgnoreCase);
-            VariableAnalysisDictionary = new Dictionary<Ast, VariableAnalysis>();
-            _ruleArguments = new Dictionary<string, Dictionary<string, object>>(StringComparer.OrdinalIgnoreCase);
-            _commandInfoCache = new Lazy<CommandInfoCache>(() => new CommandInfoCache());
-
-            IEnumerable<CommandInfo> aliases = this._invokeCommand.GetCommands("*", CommandTypes.Alias, true);
+            IEnumerable<CommandInfo> aliases = _invokeCommand.GetCommands("*", CommandTypes.Alias, nameIsPattern: true);
 
             foreach (AliasInfo aliasInfo in aliases)
             {
                 if (!CmdletToAliasDictionary.ContainsKey(aliasInfo.Definition))
                 {
-                    CmdletToAliasDictionary.Add(aliasInfo.Definition, new List<String>() { aliasInfo.Name });
+                    CmdletToAliasDictionary.Add(aliasInfo.Definition, new List<string>() { aliasInfo.Name });
                 }
                 else
                 {
@@ -1600,7 +1590,7 @@ public NamedAttributeArgumentAst GetShouldProcessAttributeAst(IEnumerable<Attrib
             {
                 throw new ArgumentNullException("attributeAsts");
             }
-            var cmdletBindingAttributeAst = this.GetCmdletBindingAttributeAst(attributeAsts);
+            var cmdletBindingAttributeAst = GetCmdletBindingAttributeAst(attributeAsts);
             if (cmdletBindingAttributeAst == null
                 || cmdletBindingAttributeAst.NamedArguments == null)
             {
@@ -1883,7 +1873,7 @@ public void SetPSVersionTable(Hashtable psVersionTable)
                 throw new ArgumentNullException("psVersionTable");
             }
 
-            this._psVersionTable = new PSVersionTable(psVersionTable);
+            _psVersionTable = new PSVersionTable(psVersionTable);
         }
 
 #if CORECLR
@@ -1892,7 +1882,7 @@ public SemanticVersion GetPSVersion()
         public Version GetPSVersion()
 #endif
         {
-            return _psVersionTable == null ? null : _psVersionTable.PSVersion;
+            return _psVersionTable?.PSVersion;
         }
 
 #endregion Methods

Engine/ScriptAnalyzer.cs

@@ -158,9 +158,7 @@ public void Initialize(
             }
 
             //initialize helper
-            Helper.Instance = new Helper(
-                runspace.SessionStateProxy.InvokeCommand,
-                outputWriter);
+            Helper.Instance = new Helper(runspace.SessionStateProxy.InvokeCommand);
             Helper.Instance.Initialize();