ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Handling for parsing of iconpaths (#7738)

Browse Source 
* 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
This commit is contained in:
Alex Ma
2019-10-17 09:51:33 -07:00
committed by GitHub
parent 82963ad075
commit ec1e54db9a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/sql/workbench/parts/connection/common/connectionProviderExtension.ts
View File

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