From 0e6117f044b51f7a2dc4d759cf05b6312e8c721f Mon Sep 17 00:00:00 2001
From: Charles Gagnon <chgagnon@microsoft.com>
Date: Thu, 30 Apr 2020 10:46:16 -0700
Subject: [PATCH] Only filter preview extensions when preview feat disabled
 (#10212)

* Filter database preview tabs

* Update comment

* Revert changes - just update comment
---
 .../contrib/dashboard/browser/core/dashboardPage.component.ts  | 3 ++-
 .../dashboard/browser/core/dashboardTab.contribution.ts        | 1 -
 src/vs/platform/extensions/common/extensions.ts                | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/sql/workbench/contrib/dashboard/browser/core/dashboardPage.component.ts b/src/sql/workbench/contrib/dashboard/browser/core/dashboardPage.component.ts
index 6b2650672f..ce4b75a480 100644
--- a/src/sql/workbench/contrib/dashboard/browser/core/dashboardPage.component.ts
+++ b/src/sql/workbench/contrib/dashboard/browser/core/dashboardPage.component.ts
@@ -300,7 +300,8 @@ export abstract class DashboardPage extends AngularDisposable implements IConfig
 
 		this.loadNewTabs(allTabs.filter((tab) => tab.group === homeTabGroupId));
 
-		// If preview features are disabled only show the home tab
+		// If preview features are disabled only show the home tab since extension-contributed tabs
+		// are still under preview
 		const extensionTabsEnabled = this.configurationService.getValue('workbench')['enablePreviewFeatures'];
 		if (!extensionTabsEnabled) {
 			allTabs = [];
diff --git a/src/sql/workbench/contrib/dashboard/browser/core/dashboardTab.contribution.ts b/src/sql/workbench/contrib/dashboard/browser/core/dashboardTab.contribution.ts
index 30f51384cd..6bc86994c0 100644
--- a/src/sql/workbench/contrib/dashboard/browser/core/dashboardTab.contribution.ts
+++ b/src/sql/workbench/contrib/dashboard/browser/core/dashboardTab.contribution.ts
@@ -167,7 +167,6 @@ ExtensionsRegistry.registerExtensionPoint<IDashboardTabContrib | IDashboardTabCo
 		if (isValidIcon(icon, extension)) {
 			iconClass = createCSSRuleForIcon(icon, extension);
 		}
-
 		if (result) {
 			registerTab({ description, title, container, provider, when, id, alwaysShow, publisher, isHomeTab, group, iconClass });
 		}
diff --git a/src/vs/platform/extensions/common/extensions.ts b/src/vs/platform/extensions/common/extensions.ts
index c492018fdb..5d17a9e920 100644
--- a/src/vs/platform/extensions/common/extensions.ts
+++ b/src/vs/platform/extensions/common/extensions.ts
@@ -246,8 +246,7 @@ export interface IExtensionDescription extends IExtensionManifest {
 	readonly isUnderDevelopment: boolean;
 	readonly extensionLocation: URI;
 	enableProposedApi?: boolean;
-	// {{ SQL CARBON EDIT }}
-	readonly forceReload?: boolean;
+	readonly forceReload?: boolean; // {{ SQL CARBON EDIT }}
 }
 
 export function isLanguagePackExtension(manifest: IExtensionManifest): boolean {