Fix broken profile loading test

This change fixes the LanguageServerTests.ServiceLoadsProfilesOnDemand
test which was broken by recent changes to our setting loading code.  It
removes a potential condition where sending a null string for the Script
Analyzer settings path causes the AnalysisService to be restarted.  This
restart resulted in a load failure which polluted the console output,
causing the expectations for the profile loading test to fail.

Author: daviwil

src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs

@@ -360,7 +360,7 @@ protected async Task HandleDidChangeConfigurationNotification(
             // If there is a new settings file path, restart the analyzer with the new settigs.
             bool settingsPathChanged = false;
             string newSettingsPath = this.currentSettings.ScriptAnalysis.SettingsPath;
-            if (!(oldScriptAnalysisSettingsPath?.Equals(newSettingsPath, StringComparison.OrdinalIgnoreCase) ?? false))
+            if (!string.Equals(oldScriptAnalysisSettingsPath, newSettingsPath, StringComparison.OrdinalIgnoreCase))
             {
                 this.editorSession.RestartAnalysisService(newSettingsPath);
                 settingsPathChanged = true;

src/PowerShellEditorServices.Protocol/Server/LanguageServerSettings.cs

@@ -44,8 +44,6 @@ public void Update(ScriptAnalysisSettings settings, string workspaceRootPath)
         {
             if (settings != null)
             {
-                Validate.IsNotNullOrEmptyString(nameof(workspaceRootPath), workspaceRootPath);
-
                 this.Enable = settings.Enable;
 
                 string settingsPath = settings.SettingsPath;
@@ -56,7 +54,22 @@ public void Update(ScriptAnalysisSettings settings, string workspaceRootPath)
                 }
                 else if (!Path.IsPathRooted(settingsPath))
                 {
-                    settingsPath = Path.GetFullPath(Path.Combine(workspaceRootPath, settingsPath));
+                    if (string.IsNullOrEmpty(workspaceRootPath))
+                    {
+                        // The workspace root path could be an empty string
+                        // when the user has opened a PowerShell script file
+                        // without opening an entire folder (workspace) first.
+                        // In this case we should just log an error and let
+                        // the specified settings path go through even though
+                        // it will fail to load.
+                        Logger.Write(
+                            LogLevel.Error,
+                            "Could not resolve Script Analyzer settings path due to null or empty workspaceRootPath.");
+                    }
+                    else
+                    {
+                        settingsPath = Path.GetFullPath(Path.Combine(workspaceRootPath, settingsPath));
+                    }
                 }
 
                 this.SettingsPath = settingsPath;

test/PowerShellEditorServices.Test.Host/LanguageServerTests.cs

@@ -619,21 +619,6 @@ public async Task ServiceExecutesNativeCommandAndReceivesCommand()
         [Fact]
         public async Task ServiceLoadsProfilesOnDemand()
         {
-            // Send the configuration change to cause profiles to be loaded
-            await this.languageServiceClient.SendEvent(
-                DidChangeConfigurationNotification<LanguageServerSettingsWrapper>.Type,
-                new DidChangeConfigurationParams<LanguageServerSettingsWrapper>
-                {
-                    Settings = new LanguageServerSettingsWrapper
-                    {
-                        Powershell = new LanguageServerSettings
-                        {
-                            EnableProfileLoading = true,
-                            ScriptAnalysis = null
-                        }
-                    }
-                });
-
             string testProfilePath =
                 Path.GetFullPath(
                     @"..\..\..\PowerShellEditorServices.Test.Shared\Profile\Profile.ps1");
@@ -654,6 +639,28 @@ await this.languageServiceClient.SendEvent(
             // Copy the test profile to the current user's host profile path
             File.Copy(testProfilePath, currentUserCurrentHostPath, true);
 
+            Assert.True(
+                File.Exists(currentUserCurrentHostPath),
+                "Copied profile path does not exist!");
+
+            // Send the configuration change to cause profiles to be loaded
+            await this.languageServiceClient.SendEvent(
+                DidChangeConfigurationNotification<LanguageServerSettingsWrapper>.Type,
+                new DidChangeConfigurationParams<LanguageServerSettingsWrapper>
+                {
+                    Settings = new LanguageServerSettingsWrapper
+                    {
+                        Powershell = new LanguageServerSettings
+                        {
+                            EnableProfileLoading = true,
+                            ScriptAnalysis = new ScriptAnalysisSettings
+                            {
+                                Enable = false
+                            }
+                        }
+                    }
+                });
+
             OutputReader outputReader = new OutputReader(this.protocolClient);
 
             Task<EvaluateResponseBody> evaluateTask =
@@ -665,7 +672,7 @@ await this.languageServiceClient.SendEvent(
                         Context = "repl"
                     });
 
-            // Try reading up to 10 lines to find the
+            // Try reading up to 10 lines to find the expected output line
             string outputString = null;
             for (int i = 0; i < 10; i++)
             {