Merge from vscode b12f623603e2fc1c5b3037115fa37c1a6acc4165 (#6760)

src/vs/platform/extensionManagement/common/extensionGalleryService.ts

@@ -392,10 +392,10 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 		@IProductService private readonly productService: IProductService,
 		@optional(IStorageService) private readonly storageService: IStorageService,
 	) {
-		const config = productService.extensionsGallery;
+		const config = productService.productConfiguration.extensionsGallery;
 		this.extensionsGalleryUrl = config && config.serviceUrl;
 		this.extensionsControlUrl = config && config.controlUrl;
-		this.commonHeadersPromise = resolveMarketplaceHeaders(productService.version, this.environmentService, this.fileService, this.storageService);
+		this.commonHeadersPromise = resolveMarketplaceHeaders(productService.productConfiguration.version, this.environmentService, this.fileService, this.storageService);
 	}
 
 	private api(path = ''): string {
@@ -440,7 +440,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 					const versionAsset = rawExtension.versions.filter(v => v.version === version)[0];
 					if (versionAsset) {
 						const extension = toExtension(rawExtension, versionAsset, 0, query);
-						if (extension.properties.engine && isEngineValid(extension.properties.engine, this.productService.version)) {
+						if (extension.properties.engine && isEngineValid(extension.properties.engine, this.productService.productConfiguration.version)) {
 							return extension;
 						}
 					}
@@ -788,7 +788,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 		return this.queryGallery(query, CancellationToken.None).then(({ galleryExtensions }) => {
 			if (galleryExtensions.length) {
 				if (compatible) {
-					return Promise.all(galleryExtensions[0].versions.map(v => this.getEngine(v).then(engine => isEngineValid(engine, this.productService.version) ? v : null)))
+					return Promise.all(galleryExtensions[0].versions.map(v => this.getEngine(v).then(engine => isEngineValid(engine, this.productService.productConfiguration.version) ? v : null)))
 						.then(versions => versions
 							.filter(v => !!v)
 							.map(v => ({ version: v!.version, date: v!.lastUpdated })));
@@ -874,7 +874,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 			if (!engine) {
 				return null;
 			}
-			if (isEngineValid(engine, this.productService.version)) {
+			if (isEngineValid(engine, this.productService.productConfiguration.version)) {
 				return Promise.resolve(version);
 			}
 		}
@@ -906,7 +906,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
 		const version = versions[0];
 		return this.getEngine(version)
 			.then(engine => {
-				if (!isEngineValid(engine, this.productService.version)) {
+				if (!isEngineValid(engine, this.productService.productConfiguration.version)) {
 					return this.getLastValidExtensionVersionRecursively(extension, versions.slice(1));
 				}
 
@@ -986,4 +986,4 @@ export async function resolveMarketplaceHeaders(version: string, environmentServ
 
 	return headers;
 
-}
+}

src/vs/platform/extensions/common/extensions.ts

@@ -106,7 +106,7 @@ export interface IExtensionContributions {
 	localizations?: ILocalization[];
 }
 
-export type ExtensionKind = 'ui' | 'workspace';
+export type ExtensionKind = 'ui' | 'workspace' | 'web';
 
 export function isIExtensionIdentifier(thing: any): thing is IExtensionIdentifier {
 	return thing

src/vs/platform/opener/common/opener.ts

@@ -9,7 +9,6 @@ import { IDisposable } from 'vs/base/common/lifecycle';
 
 export const IOpenerService = createDecorator<IOpenerService>('openerService');
 
-
 export interface IOpener {
 	open(resource: URI, options?: { openToSide?: boolean }): Promise<boolean>;
 }
@@ -18,6 +17,9 @@ export interface IOpenerService {
 
 	_serviceBrand: any;
 
+	/**
+	 * Register a participant that can handle the open() call.
+	 */
 	registerOpener(opener: IOpener): IDisposable;
 
 	/**
@@ -27,10 +29,18 @@ export interface IOpenerService {
 	 * @return A promise that resolves when the opening is done.
 	 */
 	open(resource: URI, options?: { openToSide?: boolean }): Promise<boolean>;
+
+	/**
+	 * Opens a URL externally.
+	 *
+	 * @param url A resource to open externally.
+	 */
+	openExternal(resource: URI): Promise<boolean>;
 }
 
 export const NullOpenerService: IOpenerService = Object.freeze({
 	_serviceBrand: undefined,
 	registerOpener() { return { dispose() { } }; },
-	open() { return Promise.resolve(false); }
+	open() { return Promise.resolve(false); },
+	openExternal() { return Promise.resolve(false); }
 });

src/vs/platform/product/browser/productService.ts

@@ -10,44 +10,18 @@ export class ProductService implements IProductService {
 
 	_serviceBrand!: ServiceIdentifier<IProductService>;
 
-	private readonly productConfiguration: IProductConfiguration | null;
+	readonly productConfiguration: IProductConfiguration;
 
 	constructor() {
 		const element = document.getElementById('vscode-remote-product-configuration');
-		this.productConfiguration = element ? JSON.parse(element.getAttribute('data-settings')!) : null;
+		this.productConfiguration = {
+			...element ? JSON.parse(element.getAttribute('data-settings')!) : {
+				version: '1.38.0-unknown',
+				nameLong: 'Unknown',
+				extensionAllowedProposedApi: [],
+			}, ...{ urlProtocol: '', enableTelemetry: false },
+			...{ vscodeVersion: '1.35.0' } // {{SQL CARBON EDIT}} add vscodeversion
+		};
 	}
 
-	get version(): string { return this.productConfiguration && this.productConfiguration.version ? this.productConfiguration.version : '1.38.0-unknown'; }
-
-	get vscodeVersion(): string { return '1.35.0'; } // {{SQL CARBON EDIT}} add vscodeversion
-
-	get recommendedExtensionsByScenario(): { [area: string]: Array<string> } { return this.productConfiguration ? this.productConfiguration.recommendedExtensionsByScenario : {}; }// {{SQL CARBON EDIT}} add getter
-
-	get commit(): string | undefined { return this.productConfiguration ? this.productConfiguration.commit : undefined; }
-
-	get nameLong(): string { return this.productConfiguration ? this.productConfiguration.nameLong : 'Unknown'; }
-
-	get urlProtocol(): string { return ''; }
-
-	get extensionAllowedProposedApi(): readonly string[] { return this.productConfiguration ? this.productConfiguration.extensionAllowedProposedApi : []; }
-
-	get uiExtensions(): readonly string[] | undefined { return this.productConfiguration ? this.productConfiguration.uiExtensions : undefined; }
-
-	get enableTelemetry(): boolean { return false; }
-
-	get sendASmile(): { reportIssueUrl: string, requestFeatureUrl: string } | undefined { return this.productConfiguration ? this.productConfiguration.sendASmile : undefined; }
-
-	get extensionsGallery() { return this.productConfiguration ? this.productConfiguration.extensionsGallery : undefined; }
-
-	get settingsSearchBuildId(): number | undefined { return this.productConfiguration ? this.productConfiguration.settingsSearchBuildId : undefined; }
-
-	get settingsSearchUrl(): string | undefined { return this.productConfiguration ? this.productConfiguration.settingsSearchUrl : undefined; }
-
-	get experimentsUrl(): string | undefined { return this.productConfiguration ? this.productConfiguration.experimentsUrl : undefined; }
-
-	get extensionKeywords(): { [extension: string]: readonly string[]; } | undefined { return this.productConfiguration ? this.productConfiguration.extensionKeywords : undefined; }
-
-	get extensionAllowedBadgeProviders(): readonly string[] | undefined { return this.productConfiguration ? this.productConfiguration.extensionAllowedBadgeProviders : undefined; }
-
-	get aiConfig() { return this.productConfiguration ? this.productConfiguration.aiConfig : undefined; }
 }

src/vs/platform/product/common/product.ts

@@ -11,40 +11,7 @@ export interface IProductService {
 
 	_serviceBrand: ServiceIdentifier<any>;
 
-	readonly version: string;
-	readonly vscodeVersion: string; // {{SQL CARBON EDIT}} add vscode version
-	readonly recommendedExtensionsByScenario: { [area: string]: Array<string> }; // {{SQL CARBON EDIT}} add getter
-	readonly commit?: string;
-	readonly date?: string;
-
-	readonly nameLong: string;
-	readonly urlProtocol: string;
-	readonly extensionAllowedProposedApi: readonly string[];
-	readonly uiExtensions?: readonly string[];
-
-	readonly enableTelemetry: boolean;
-	readonly extensionsGallery?: {
-		readonly serviceUrl: string;
-		readonly itemUrl: string;
-		readonly controlUrl: string;
-		readonly recommendationsUrl: string;
-	};
-
-	readonly sendASmile?: {
-		readonly reportIssueUrl: string;
-		readonly requestFeatureUrl: string;
-	};
-
-	readonly settingsSearchBuildId?: number;
-	readonly settingsSearchUrl?: string;
-
-	readonly experimentsUrl?: string;
-	readonly extensionKeywords?: { [extension: string]: readonly string[]; };
-	readonly extensionAllowedBadgeProviders?: readonly string[];
-
-	readonly aiConfig?: {
-		readonly asimovKey: string;
-	};
+	readonly productConfiguration: IProductConfiguration;
 }
 
 export interface IProductConfiguration {
@@ -76,10 +43,12 @@ export interface IProductConfiguration {
 		readonly controlUrl: string;
 		readonly recommendationsUrl: string;
 	};
-	extensionTips: { [id: string]: string; };
-	recommendedExtensions: string[]; // {{SQL CARBON EDIT}}
-	recommendedExtensionsByScenario: { [area: string]: Array<string> }; // {{SQL CARBON EDIT}}
-	extensionImportantTips: { [id: string]: { name: string; pattern: string; isExtensionPack?: boolean }; };
+	readonly extensionTips: { [id: string]: string; };
+	readonly recommendedExtensions: string[]; // {{SQL CARBON EDIT}}
+	readonly recommendedExtensionsByScenario: { [area: string]: Array<string> }; // {{SQL CARBON EDIT}}
+	readonly vscodeVersion: string; // {{SQL CARBON EDIT}} add vscode version
+	readonly gettingStartedUrl: string; // {SQL CARBON EDIT}
+	readonly extensionImportantTips: { [id: string]: { name: string; pattern: string; isExtensionPack?: boolean }; };
 	readonly exeBasedExtensionTips: { [id: string]: IExeBasedExtensionTip; };
 	readonly extensionKeywords: { [extension: string]: readonly string[]; };
 	readonly extensionAllowedBadgeProviders: readonly string[];
@@ -100,8 +69,6 @@ export interface IProductConfiguration {
 	};
 	readonly documentationUrl: string;
 	readonly releaseNotesUrl: string;
-	readonly gettingStartedUrl: string; // {SQL CARBON EDIT}
-	readonly vscodeVersion: string; // {SQL CARBON EDIT}
 	readonly keyboardShortcutsUrlMac: string;
 	readonly keyboardShortcutsUrlLinux: string;
 	readonly keyboardShortcutsUrlWin: string;

src/vs/platform/product/node/productService.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IProductService } from 'vs/platform/product/common/product';
+import { IProductService, IProductConfiguration } from 'vs/platform/product/common/product';
 import product from 'vs/platform/product/node/product';
 import pkg from 'vs/platform/product/node/package';
 import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
@@ -12,35 +12,12 @@ export class ProductService implements IProductService {
 
 	_serviceBrand!: ServiceIdentifier<IProductService>;
 
-	get version(): string { return pkg.version; }
+	readonly productConfiguration: IProductConfiguration;
 
-	get vscodeVersion(): string { return '1.35.0'; } // {{SQL CARBON EDIT}} add vscodeversion
+	constructor() {
+		this.productConfiguration = {
+			...product, ...{ version: pkg.version }, ...{ vscodeVersion: '1.35.0' } // {{SQL CARBON EDIT}} add vscodeversion}
+		};
+	}
 
-	get recommendedExtensionsByScenario(): { [area: string]: Array<string> } { return product.recommendedExtensionsByScenario; }// {{SQL CARBON EDIT}} add getter
-
-	get commit(): string | undefined { return product.commit; }
-
-	get nameLong(): string { return product.nameLong; }
-
-	get urlProtocol(): string { return product.urlProtocol; }
-
-	get extensionAllowedProposedApi(): readonly string[] { return product.extensionAllowedProposedApi; }
-
-	get uiExtensions(): readonly string[] | undefined { return product.uiExtensions; }
-
-	get enableTelemetry(): boolean { return product.enableTelemetry; }
-
-	get sendASmile(): { reportIssueUrl: string, requestFeatureUrl: string } { return product.sendASmile; }
-
-	get extensionsGallery() { return product.extensionsGallery; }
-
-	get settingsSearchBuildId(): number | undefined { return product.settingsSearchBuildId; }
-
-	get settingsSearchUrl(): string | undefined { return product.settingsSearchUrl; }
-
-	get experimentsUrl(): string | undefined { return product.experimentsUrl; }
-
-	get extensionKeywords(): { [extension: string]: readonly string[]; } | undefined { return product.extensionKeywords; }
-
-	get extensionAllowedBadgeProviders(): readonly string[] | undefined { return product.extensionAllowedBadgeProviders; }
 }

src/vs/platform/storage/browser/storageService.ts

@@ -144,8 +144,10 @@ export class BrowserStorageService extends Disposable implements IStorageService
 		// Signal as event so that clients can still store data
 		this._onWillSaveState.fire({ reason: WillSaveStateReason.SHUTDOWN });
 
-		// Close DBs
-		this.globalStorage.close();
-		this.workspaceStorage.close();
+		// We explicitly do not close our DBs because writing data onBeforeUnload()
+		// can result in unexpected results. Namely, it seems that - even though this
+		// operation is async - sometimes it is being triggered on unload and
+		// succeeds. Often though, the DBs turn out to be empty because the write
+		// never had a chance to complete.
 	}
 }

src/vs/platform/windows/electron-browser/windowsService.ts

@@ -13,17 +13,14 @@ import { URI } from 'vs/base/common/uri';
 import { ParsedArgs } from 'vs/platform/environment/common/environment';
 import { IMainProcessService } from 'vs/platform/ipc/electron-browser/mainProcessService';
 import { IProcessEnvironment } from 'vs/base/common/platform';
+import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
 
 export class WindowsService implements IWindowsService {
 
-	_serviceBrand: any;
+	_serviceBrand!: ServiceIdentifier<any>;
 
 	private channel: IChannel;
 
-	constructor(@IMainProcessService mainProcessService: IMainProcessService) {
-		this.channel = mainProcessService.getChannel('windows');
-	}
-
 	get onWindowOpen(): Event<number> { return this.channel.listen('onWindowOpen'); }
 	get onWindowFocus(): Event<number> { return this.channel.listen('onWindowFocus'); }
 	get onWindowBlur(): Event<number> { return this.channel.listen('onWindowBlur'); }
@@ -31,6 +28,10 @@ export class WindowsService implements IWindowsService {
 	get onWindowUnmaximize(): Event<number> { return this.channel.listen('onWindowUnmaximize'); }
 	get onRecentlyOpenedChange(): Event<void> { return this.channel.listen('onRecentlyOpenedChange'); }
 
+	constructor(@IMainProcessService mainProcessService: IMainProcessService) {
+		this.channel = mainProcessService.getChannel('windows');
+	}
+
 	pickFileFolderAndOpen(options: INativeOpenDialogOptions): Promise<void> {
 		return this.channel.call('pickFileFolderAndOpen', options);
 	}