From 09343d65b8a3a298f239353569ceac438f9f622d Mon Sep 17 00:00:00 2001
From: Aasim Khan <aasimkhan30@gmail.com>
Date: Wed, 17 Jul 2024 15:53:08 -0700
Subject: [PATCH] Rename enablePreviewFeatures configuration option to
 enableExperimental features and hide the settings flag (#17932)

---
 localization/xliff/enu/localizedPackage.json.enu.xlf | 3 ---
 package.json                                         | 9 ++-------
 package.nls.json                                     | 1 -
 src/constants/constants.ts                           | 2 +-
 src/controllers/mainController.ts                    | 2 +-
 5 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/localization/xliff/enu/localizedPackage.json.enu.xlf b/localization/xliff/enu/localizedPackage.json.enu.xlf
index 5c1da55b..819a5188 100644
--- a/localization/xliff/enu/localizedPackage.json.enu.xlf
+++ b/localization/xliff/enu/localizedPackage.json.enu.xlf
@@ -425,9 +425,6 @@
         <trans-unit id="mssql.objectExplorer.expandTimeout">
             <source xml:lang="en">The timeout in seconds for expanding a node in Object Explorer. The default value is 45 seconds.</source>
         </trans-unit>
-        <trans-unit id="mssql.enablePreviewFeaturesDescription">
-            <source xml:lang="en">Enable preview features in the extension. Requires a restart of VS Code to take effect.</source>
-        </trans-unit>
         <trans-unit id="mssql.newTable">
             <source xml:lang="en">New Table</source>
         </trans-unit>
diff --git a/package.json b/package.json
index 3560e5c5..1b1fddda 100644
--- a/package.json
+++ b/package.json
@@ -349,12 +349,12 @@
         },
         {
           "command": "mssql.newTable",
-          "when": "view == objectExplorer && viewItem == TablesFolder && config.mssql.enablePreviewFeatures",
+          "when": "view == objectExplorer && viewItem == TablesFolder && config.mssql.enableExperimentalFeatures",
           "group": "inline"
         },
         {
           "command": "mssql.editTable",
-          "when": "view == objectExplorer && viewItem == Table && config.mssql.enablePreviewFeatures",
+          "when": "view == objectExplorer && viewItem == Table && config.mssql.enableExperimentalFeatures",
           "group": "inline"
         }
       ],
@@ -673,11 +673,6 @@
       "type": "object",
       "title": "%mssql.Configuration%",
       "properties": {
-        "mssql.enablePreviewFeatures": {
-          "type": "boolean",
-          "default": false,
-          "description": "%mssql.enablePreviewFeaturesDescription%"
-        },
         "mssql.azureActiveDirectory": {
           "type": "string",
           "default": "AuthCodeGrant",
diff --git a/package.nls.json b/package.nls.json
index 71aa3a16..72e58944 100644
--- a/package.nls.json
+++ b/package.nls.json
@@ -140,7 +140,6 @@
 "mssql.objectExplorer.enableGroupBySchema":"Enable Group By Schema",
 "mssql.objectExplorer.disableGroupBySchema":"Disable Group By Schema",
 "mssql.objectExplorer.expandTimeout":"The timeout in seconds for expanding a node in Object Explorer. The default value is 45 seconds.",
-"mssql.enablePreviewFeaturesDescription":"Enable preview features in the extension. Requires a restart of VS Code to take effect.",
 "mssql.newTable":"New Table",
 "mssql.editTable":"Edit Table"
 }
diff --git a/src/constants/constants.ts b/src/constants/constants.ts
index 8d56381e..0091da79 100644
--- a/src/constants/constants.ts
+++ b/src/constants/constants.ts
@@ -155,7 +155,7 @@ export const configPersistQueryResultTabs = 'persistQueryResultTabs';
 export const configQueryHistoryLimit = 'queryHistoryLimit';
 export const configEnableQueryHistoryCapture = 'enableQueryHistoryCapture';
 export const configEnableQueryHistoryFeature = 'enableQueryHistoryFeature';
-export const configEnablePreviewFeatures = 'enablePreviewFeatures';
+export const configEnableExperimentalFeatures = 'enableExperimentalFeatures';
 
 // ToolsService Constants
 export const serviceInstallingTo = 'Installing SQL tools service to';
diff --git a/src/controllers/mainController.ts b/src/controllers/mainController.ts
index 71c8c952..4cbc689c 100644
--- a/src/controllers/mainController.ts
+++ b/src/controllers/mainController.ts
@@ -125,7 +125,7 @@ export default class MainController implements vscode.Disposable {
 	}
 
 	public get isPreviewEnabled(): boolean {
-		return this.configuration.get(Constants.configEnablePreviewFeatures);
+		return this.configuration.get(Constants.configEnableExperimentalFeatures);
 	}
 
 	/**