Merge from vscode 1eb87b0e9ce9886afeaecec22b31abd0d9b7939f (#7282)

* Merge from vscode 1eb87b0e9ce9886afeaecec22b31abd0d9b7939f * fix various icon issues * fix preview features
2026-03-16 19:11:39 -04:00 · 2019-09-19 21:50:52 -07:00
parent 9d3d64eef3
commit db498db0a8
459 changed files with 10195 additions and 7528 deletions
--- a/src/vs/platform/product/common/product.ts
+++ b/src/vs/platform/product/common/product.ts
@@ -3,125 +3,57 @@
 *  Licensed under the Source EULA. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/

-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+import { IProductConfiguration } from 'vs/platform/product/common/productService';
+import { assign } from 'vs/base/common/objects';
+import { isWeb } from 'vs/base/common/platform';
+import * as path from 'vs/base/common/path';
+import { getPathFromAmdModule } from 'vs/base/common/amd';
+import { env } from 'vs/base/common/process';

-export const IProductService = createDecorator<IProductService>('productService');
+let product: IProductConfiguration;

-export interface IProductService extends Readonly<IProductConfiguration> {
+// Web
+if (isWeb) {

-	_serviceBrand: undefined;
+	// Built time configuration (do NOT modify)
+	product = { /*BUILD->INSERT_PRODUCT_CONFIGURATION*/ } as IProductConfiguration;

+	// Running out of sources
+	if (Object.keys(product).length === 0) {
+		assign(product, {
+			version: '1.39.0-dev',
+			nameLong: 'Visual Studio Code Web Dev',
+			nameShort: 'VSCode Web Dev'
+		});
+	}
 }

-export interface IProductConfiguration {
-	readonly version: string;
-	readonly date?: string;
-	readonly quality?: string;
-	readonly commit?: string;
+// Node: AMD loader
+else if (typeof require !== 'undefined' && typeof require.__$__nodeRequire === 'function') {

-	readonly nameShort: string;
-	readonly nameLong: string;
+	// Obtain values from product.json and package.json
+	const rootPath = path.dirname(getPathFromAmdModule(require, ''));

-	readonly win32AppUserModelId?: string;
-	readonly win32MutexName?: string;
-	readonly applicationName: string;
+	product = assign({}, require.__$__nodeRequire(path.join(rootPath, 'product.json')) as IProductConfiguration);
+	const pkg = require.__$__nodeRequire(path.join(rootPath, 'package.json')) as { version: string; };

-	readonly urlProtocol: string;
-	readonly dataFolderName: string;
+	// Running out of sources
+	if (env['VSCODE_DEV']) {
+		assign(product, {
+			nameShort: `${product.nameShort} Dev`,
+			nameLong: `${product.nameLong} Dev`,
+			dataFolderName: `${product.dataFolderName}-dev`
+		});
+	}

-	readonly downloadUrl?: string;
-	readonly updateUrl?: string;
-	readonly target?: string;
-
-	readonly settingsSearchBuildId?: number;
-	readonly settingsSearchUrl?: string;
-
-	readonly experimentsUrl?: string;
-
-	readonly extensionsGallery?: {
-		readonly serviceUrl: string;
-		readonly itemUrl: string;
-		readonly controlUrl: string;
-		readonly recommendationsUrl: string;
-	};
-
-	readonly extensionTips?: { [id: string]: string; };
-	readonly extensionImportantTips?: { [id: string]: { name: string; pattern: string; isExtensionPack?: boolean }; };
-	readonly exeBasedExtensionTips?: { [id: string]: IExeBasedExtensionTip; };
-	readonly extensionKeywords?: { [extension: string]: readonly string[]; };
-	readonly keymapExtensionTips?: readonly 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 crashReporter?: {
-		readonly companyName: string;
-		readonly productName: string;
-	};
-
-	readonly welcomePage?: string;
-
-	readonly enableTelemetry?: boolean;
-	readonly aiConfig?: {
-		readonly asimovKey: string;
-	};
-
-	readonly sendASmile?: {
-		readonly reportIssueUrl: string,
-		readonly requestFeatureUrl: string
-	};
-
-	readonly documentationUrl?: string;
-	readonly releaseNotesUrl?: string;
-	readonly keyboardShortcutsUrlMac?: string;
-	readonly keyboardShortcutsUrlLinux?: string;
-	readonly keyboardShortcutsUrlWin?: string;
-	readonly introductoryVideosUrl?: string;
-	readonly tipsAndTricksUrl?: string;
-	readonly newsletterSignupUrl?: string;
-	readonly twitterUrl?: string;
-	readonly requestFeatureUrl?: string;
-	readonly reportIssueUrl?: string;
-	readonly licenseUrl?: string;
-	readonly privacyStatementUrl?: string;
-	readonly telemetryOptOutUrl?: string;
-
-	readonly npsSurveyUrl?: string;
-	readonly surveys?: readonly ISurveyData[];
-
-	readonly checksums?: { [path: string]: string; };
-	readonly checksumFailMoreInfoUrl?: string;
-
-	readonly hockeyApp?: {
-		readonly 'win32-ia32': string;
-		readonly 'win32-x64': string;
-		readonly 'linux-x64': string;
-		readonly 'darwin': string;
-	};
-
-	readonly portable?: string;
-
-	readonly uiExtensions?: readonly string[];
-	readonly extensionAllowedProposedApi?: readonly string[];
-
-	readonly msftInternalDomains?: string[];
-	readonly linkProtectionTrustedDomains?: readonly string[];
+	assign(product, {
+		version: pkg.version
+	});
 }

-export interface IExeBasedExtensionTip {
-	friendlyName: string;
-	windowsPath?: string;
-	recommendations: readonly string[];
-	important?: boolean;
-	exeFriendlyName?: string;
+// Unknown
+else {
+	throw new Error('Unable to resolve product configuration');
 }

-export interface ISurveyData {
-	surveyId: string;
-	surveyUrl: string;
-	languageId: string;
-	editCount: number;
-	userProbability: number;
-}
+export default product;
--- a/src/vs/platform/product/common/productService.ts
+++ b/src/vs/platform/product/common/productService.ts
@@ -0,0 +1,128 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
+
+export const IProductService = createDecorator<IProductService>('productService');
+
+export interface IProductService extends Readonly<IProductConfiguration> {
+
+	_serviceBrand: undefined;
+
+}
+
+export interface IProductConfiguration {
+	readonly version: string;
+	readonly date?: string;
+	readonly quality?: string;
+	readonly commit?: string;
+
+	readonly nameShort: string;
+	readonly nameLong: string;
+
+	readonly win32AppUserModelId?: string;
+	readonly win32MutexName?: string;
+	readonly applicationName: string;
+
+	readonly urlProtocol: string;
+	readonly dataFolderName: string;
+
+	readonly downloadUrl?: string;
+	readonly updateUrl?: string;
+	readonly target?: string;
+
+	readonly settingsSearchBuildId?: number;
+	readonly settingsSearchUrl?: string;
+
+	readonly experimentsUrl?: string;
+
+	readonly extensionsGallery?: {
+		readonly serviceUrl: string;
+		readonly itemUrl: string;
+		readonly controlUrl: string;
+		readonly recommendationsUrl: string;
+	};
+
+	readonly extensionTips?: { [id: string]: string; };
+	readonly extensionImportantTips?: { [id: string]: { name: string; pattern: string; isExtensionPack?: boolean }; };
+	readonly exeBasedExtensionTips?: { [id: string]: IExeBasedExtensionTip; };
+	readonly extensionKeywords?: { [extension: string]: readonly string[]; };
+	readonly keymapExtensionTips?: readonly 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 crashReporter?: {
+		readonly companyName: string;
+		readonly productName: string;
+	};
+
+	readonly welcomePage?: string;
+
+	readonly enableTelemetry?: boolean;
+	readonly aiConfig?: {
+		readonly asimovKey: string;
+	};
+
+	readonly sendASmile?: {
+		readonly reportIssueUrl: string,
+		readonly requestFeatureUrl: string
+	};
+
+	readonly documentationUrl?: string;
+	readonly releaseNotesUrl?: string;
+	readonly keyboardShortcutsUrlMac?: string;
+	readonly keyboardShortcutsUrlLinux?: string;
+	readonly keyboardShortcutsUrlWin?: string;
+	readonly introductoryVideosUrl?: string;
+	readonly tipsAndTricksUrl?: string;
+	readonly newsletterSignupUrl?: string;
+	readonly twitterUrl?: string;
+	readonly requestFeatureUrl?: string;
+	readonly reportIssueUrl?: string;
+	readonly licenseUrl?: string;
+	readonly privacyStatementUrl?: string;
+	readonly telemetryOptOutUrl?: string;
+
+	readonly npsSurveyUrl?: string;
+	readonly surveys?: readonly ISurveyData[];
+
+	readonly checksums?: { [path: string]: string; };
+	readonly checksumFailMoreInfoUrl?: string;
+
+	readonly hockeyApp?: {
+		readonly 'win32-ia32': string;
+		readonly 'win32-x64': string;
+		readonly 'linux-x64': string;
+		readonly 'darwin': string;
+	};
+
+	readonly portable?: string;
+
+	readonly uiExtensions?: readonly string[];
+	readonly extensionAllowedProposedApi?: readonly string[];
+
+	readonly msftInternalDomains?: string[];
+	readonly linkProtectionTrustedDomains?: readonly string[];
+	readonly settingsSyncStoreUrl?: string;
+}
+
+export interface IExeBasedExtensionTip {
+	friendlyName: string;
+	windowsPath?: string;
+	recommendations: readonly string[];
+	important?: boolean;
+	exeFriendlyName?: string;
+}
+
+export interface ISurveyData {
+	surveyId: string;
+	surveyUrl: string;
+	languageId: string;
+	editCount: number;
+	userProbability: number;
+}