Fix #285: User's PSScriptAnalyzer settings path not being used

This change fixes an issue caused by the recent refactoring to use
PSScriptAnalyzer as a module rather than a C# library.  We forgot to pass
along the user-specified settings path to the -Settings parameter of the
Invoke-ScriptAnalyzer cmdlet.

Author: daviwil

src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs

@@ -366,7 +366,7 @@ protected async Task HandleDidChangeConfigurationNotification(
             string newSettingsPath = this.currentSettings.ScriptAnalysis.SettingsPath;
             if (!string.Equals(oldScriptAnalysisSettingsPath, newSettingsPath, StringComparison.OrdinalIgnoreCase))
             {
-                this.editorSession.RestartAnalysisService(newSettingsPath);
+                this.editorSession.AnalysisService.SettingsPath = newSettingsPath;
                 settingsPathChanged = true;
             }
 

src/PowerShellEditorServices/Analysis/AnalysisService.cs

@@ -5,7 +5,6 @@
 
 using Microsoft.PowerShell.EditorServices.Utility;
 using System;
-using System.IO;
 using System.Linq;
 using System.Management.Automation.Runspaces;
 using System.Threading;
@@ -44,6 +43,21 @@ public class AnalysisService : IDisposable
 
         #endregion // Private Fields
 
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets the path to a settings file (.psd1)
+        /// containing PSScriptAnalyzer settings.
+        /// </summary>
+        public string SettingsPath
+        {
+            get;
+            set;
+        }
+
+        #endregion
+
         #region Constructors
 
         /// <summary>
@@ -56,6 +70,7 @@ public AnalysisService(IConsoleHost consoleHost, string settingsPath = null)
         {
             try
             {
+                this.SettingsPath = settingsPath;
                 this.analysisRunspace = RunspaceFactory.CreateRunspace(InitialSessionState.CreateDefault2());
                 this.analysisRunspace.ThreadOptions = PSThreadOptions.ReuseThread;
                 this.analysisRunspace.Open();
@@ -219,17 +234,28 @@ private IEnumerable<PSObject> GetDiagnosticRecords(ScriptFile file)
 
             if (this.scriptAnalyzerModuleInfo != null)
             {
-                using (var ps = System.Management.Automation.PowerShell.Create())
+                using (var powerShell = System.Management.Automation.PowerShell.Create())
                 {
-                    ps.Runspace = this.analysisRunspace;
+                    powerShell.Runspace = this.analysisRunspace;
                     Logger.Write(
                         LogLevel.Verbose,
                         String.Format("Running PSScriptAnalyzer against {0}", file.FilePath));
 
-                    diagnosticRecords = ps.AddCommand("Invoke-ScriptAnalyzer")
-                        .AddParameter("ScriptDefinition", file.Contents)
-                        .AddParameter("IncludeRule", IncludedRules)
-                        .Invoke();
+                    powerShell
+                        .AddCommand("Invoke-ScriptAnalyzer")
+                        .AddParameter("ScriptDefinition", file.Contents);
+
+                    // Use a settings file if one is provided, otherwise use the default rule list.
+                    if (!string.IsNullOrWhiteSpace(this.SettingsPath))
+                    {
+                        powerShell.AddParameter("Settings", this.SettingsPath);
+                    }
+                    else
+                    {
+                        powerShell.AddParameter("IncludeRule", IncludedRules);
+                    }
+
+                    diagnosticRecords = powerShell.Invoke();
                 }
             }
 

src/PowerShellEditorServices/Session/EditorSession.cs

@@ -104,16 +104,6 @@ public void StartDebugSession(HostDetails hostDetails, ProfilePaths profilePaths
             this.Workspace = new Workspace(this.PowerShellContext.PowerShellVersion);
         }
 
-        /// <summary>
-        /// Restarts the AnalysisService so it can be configured with a new settings file.
-        /// </summary>
-        /// <param name="settingsPath">Path to the settings file.</param>
-        public void RestartAnalysisService(string settingsPath)
-        {
-            this.AnalysisService?.Dispose();
-            InstantiateAnalysisService(settingsPath);
-        }
-
         internal void InstantiateAnalysisService(string settingsPath = null)
         {
             // Only enable the AnalysisService if the machine has PowerShell