Process settings object instead of hashtable literal

Author: Kapil Borle

src/PowerShellEditorServices.Protocol/LanguageServer/ScriptFileMarkersRequest.cs

@@ -3,7 +3,9 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
+using System.Collections;
 using Microsoft.PowerShell.EditorServices.Protocol.MessageProtocol;
+using System.Collections.Generic;
 
 namespace Microsoft.PowerShell.EditorServices.Protocol.LanguageServer
 {
@@ -28,9 +30,15 @@ class ScriptFileMarkerRequestParams
         public string filePath;
 
         /// <summary>
-        /// Settings to provided to ScriptAnalyzer to get the markers.
+        /// Settings to be provided to ScriptAnalyzer to get the markers.
+        ///
+        /// We have this unusual structure because JSON deserializer
+        /// does not deserialize nested hashtables. i.e. it won't
+        /// deserialize a hashtable within a hashtable. But in this case,
+        /// i.e. a hashtable within a dictionary, it will deserialize
+        /// the hashtable.
         /// </summary>
-        public string settings;
+        public Dictionary<string, Hashtable> settings;
     }
 
     /// <summary>

src/PowerShellEditorServices.Protocol/Server/LanguageServer.cs

@@ -239,7 +239,7 @@ private async Task HandleScriptFileMarkersRequest(
         {
             var markers = editorSession.AnalysisService.GetSemanticMarkers(
                 editorSession.Workspace.GetFile(requestParams.filePath),
-                editorSession.LanguageService.GetHashtableFromString(requestParams.settings));
+                editorSession.AnalysisService.GetPSSASettingsHashtable(requestParams.settings));
             await requestContext.SendResult(new ScriptFileMarkerRequestResultParams {
                 markers = markers
             });

src/PowerShellEditorServices/Analysis/AnalysisService.cs

@@ -175,6 +175,27 @@ public IEnumerable<string> GetPSScriptAnalyzerRules()
             return ruleNames;
         }
 
+        /// <summary>
+        /// Construct a PSScriptAnalyzer settings hashtable
+        /// </summary>
+        /// <param name="ruleSettingsMap">A settings hashtable</param>
+        /// <returns></returns>
+        public Hashtable GetPSSASettingsHashtable(IDictionary<string, Hashtable> ruleSettingsMap)
+        {
+            var hashtable = new Hashtable();
+            var ruleSettingsHashtable = new Hashtable();
+
+            hashtable["IncludeRules"] = ruleSettingsMap.Keys.ToArray<object>();
+            hashtable["Rules"] = ruleSettingsHashtable;
+
+            foreach (var kvp in ruleSettingsMap)
+            {
+                ruleSettingsHashtable.Add(kvp.Key, kvp.Value);
+            }
+
+            return hashtable;
+        }
+
         /// <summary>
         /// Disposes the runspace being used by the analysis service.
         /// </summary>