From db37ab60f1aa1c505f19ab6ba9536e58d366c93a Mon Sep 17 00:00:00 2001
From: "Tyler Leonhardt (POWERSHELL)" <tyleonha@microsoft.com>
Date: Tue, 2 Apr 2019 10:26:30 -0700
Subject: [PATCH 1/2] set featureFlag default to null so that it can be
 resolved by settings

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f15211eb74..0780a53129 100644
--- a/package.json
+++ b/package.json
@@ -738,7 +738,7 @@
         },
         "powershell.developer.featureFlags": {
           "type": "array",
-          "default": [],
+          "default": null,
           "description": "An array of strings that enable experimental features in the PowerShell extension."
         },
         "powershell.developer.powerShellExeIsWindowsDevBuild": {

From 9e9b279cb6ab917469bb2678b7c7a3808faf447a Mon Sep 17 00:00:00 2001
From: Tyler Leonhardt <tylerl0706@gmail.com>
Date: Tue, 2 Apr 2019 10:47:57 -0700
Subject: [PATCH 2/2] added tests

---
 test/settings.test.ts | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 test/settings.test.ts

diff --git a/test/settings.test.ts b/test/settings.test.ts
new file mode 100644
index 0000000000..6ff6732c99
--- /dev/null
+++ b/test/settings.test.ts
@@ -0,0 +1,22 @@
+/*---------------------------------------------------------
+ * Copyright (C) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------*/
+
+import * as assert from "assert";
+import Settings = require("../src/settings");
+
+suite("Settings module", () => {
+    test("Settings load without error", () => {
+        assert.doesNotThrow(Settings.load);
+    });
+
+    // TODO: Remove this test when PSReadLine is in stable
+    test("PSReadLine featureFlag set correctly", () => {
+        const settings: Settings.ISettings = Settings.load();
+        if (process.platform === "win32") {
+            assert.deepEqual(settings.developer.featureFlags, ["PSReadLine"]);
+        } else {
+            assert.deepEqual(settings.developer.featureFlags, []);
+        }
+    });
+});