From ec1e54db9a88c303fdf69ff4220d88cf89b67550 Mon Sep 17 00:00:00 2001
From: Alex Ma <alma1@microsoft.com>
Date: Thu, 17 Oct 2019 09:51:33 -0700
Subject: [PATCH] Handling for parsing of iconpaths (#7738)

* Check if light and dark are URI

* Added a map in the extensionsRegistry to check

* Moved resolve check to connectionProviderExtension

* removed resolvedUsers from extensionsRegistry.ts

* removed unused imports and spaces

* Formatting for import

* Simplified resolver check.

* ToString is sufficient to avoid any complications

* Small formatting fix

* removed extra comment
---
 .../connection/common/connectionProviderExtension.ts     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/sql/workbench/parts/connection/common/connectionProviderExtension.ts b/src/sql/workbench/parts/connection/common/connectionProviderExtension.ts
index e1db88a832..dd42d86444 100644
--- a/src/sql/workbench/parts/connection/common/connectionProviderExtension.ts
+++ b/src/sql/workbench/parts/connection/common/connectionProviderExtension.ts
@@ -13,6 +13,7 @@ import { deepClone } from 'vs/base/common/objects';
 import * as azdata from 'azdata';
 import * as resources from 'vs/base/common/resources';
 
+
 export interface ConnectionProviderProperties {
 	providerId: string;
 	displayName: string;
@@ -184,8 +185,8 @@ function resolveIconPath(extension: IExtensionPointUser<any>): void {
 		if (Array.isArray(iconPath)) {
 			for (let e of iconPath) {
 				e.path = {
-					light: resources.joinPath(extension.description.extensionLocation, e.path.light),
-					dark: resources.joinPath(extension.description.extensionLocation, e.path.dark)
+					light: resources.joinPath(extension.description.extensionLocation, e.path.light.toString()),
+					dark: resources.joinPath(extension.description.extensionLocation, e.path.dark.toString())
 				};
 			}
 		} else if (typeof iconPath === 'string') {
@@ -195,8 +196,8 @@ function resolveIconPath(extension: IExtensionPointUser<any>): void {
 			};
 		} else {
 			iconPath = {
-				light: resources.joinPath(extension.description.extensionLocation, iconPath.light),
-				dark: resources.joinPath(extension.description.extensionLocation, iconPath.dark)
+				light: resources.joinPath(extension.description.extensionLocation, iconPath.light.toString()),
+				dark: resources.joinPath(extension.description.extensionLocation, iconPath.dark.toString())
 			};
 		}
 	};