From 96fe3c2734436a637b8ba01c085361a025239aea Mon Sep 17 00:00:00 2001
From: Akash Satheesan <akash@coder.com>
Date: Sat, 1 May 2021 01:03:07 +0530
Subject: [PATCH] fix(lib/vscode): conflicts in productService.ts

---
 lib/vscode/src/vs/base/common/product.ts      |   3 +
 .../platform/product/common/productService.ts | 160 ------------------
 2 files changed, 3 insertions(+), 160 deletions(-)

diff --git a/lib/vscode/src/vs/base/common/product.ts b/lib/vscode/src/vs/base/common/product.ts
index 129b8dec..9bfd5ae6 100644
--- a/lib/vscode/src/vs/base/common/product.ts
+++ b/lib/vscode/src/vs/base/common/product.ts
@@ -26,6 +26,9 @@ export type ExtensionUntrustedWorkspaceSupport = {
 };
 
 export interface IProductConfiguration {
+	// NOTE@coder: add codeServerVersion
+	readonly codeServerVersion?: string;
+
 	readonly version: string;
 	readonly date?: string;
 	readonly quality?: string;
diff --git a/lib/vscode/src/vs/platform/product/common/productService.ts b/lib/vscode/src/vs/platform/product/common/productService.ts
index 1bf38a79..857189f8 100644
--- a/lib/vscode/src/vs/platform/product/common/productService.ts
+++ b/lib/vscode/src/vs/platform/product/common/productService.ts
@@ -13,163 +13,3 @@ export interface IProductService extends Readonly<IProductConfiguration> {
 	readonly _serviceBrand: undefined;
 
 }
-<<<<<<< HEAD
-
-export interface IBuiltInExtension {
-	readonly name: string;
-	readonly version: string;
-	readonly repo: string;
-	readonly metadata: any;
-}
-
-export type ConfigurationSyncStore = {
-	url: string,
-	insidersUrl: string,
-	stableUrl: string,
-	canSwitch: boolean,
-	authenticationProviders: IStringDictionary<{ scopes: string[] }>
-};
-
-export interface IProductConfiguration {
-	readonly codeServerVersion?: string;
-
-	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; // location for extensions (e.g. ~/.vscode-insiders)
-
-	readonly builtInExtensions?: IBuiltInExtension[];
-
-	readonly downloadUrl?: string;
-	readonly updateUrl?: string;
-	readonly webEndpointUrl?: string;
-	readonly target?: string;
-
-	readonly settingsSearchBuildId?: number;
-	readonly settingsSearchUrl?: string;
-
-	readonly tasConfig?: {
-		endpoint: string;
-		telemetryEventName: string;
-		featuresTelemetryPropertyName: string;
-		assignmentContextTelemetryPropertyName: 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?: IStringDictionary<ImportantExtensionTip>;
-	readonly configBasedExtensionTips?: { [id: string]: IConfigBasedExtensionTip; };
-	readonly exeBasedExtensionTips?: { [id: string]: IExeBasedExtensionTip; };
-	readonly remoteExtensionTips?: { [remoteName: string]: IRemoteExtensionTip; };
-	readonly extensionKeywords?: { [extension: string]: readonly string[]; };
-	readonly keymapExtensionTips?: readonly string[];
-	readonly trustedExtensionUrlPublicKeys?: { [id: string]: string[]; };
-
-	readonly crashReporter?: {
-		readonly companyName: string;
-		readonly productName: 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 reportMarketplaceIssueUrl?: string;
-	readonly licenseUrl?: string;
-	readonly privacyStatementUrl?: string;
-	readonly telemetryOptOutUrl?: string;
-
-	readonly npsSurveyUrl?: string;
-	readonly cesSurveyUrl?: string;
-	readonly surveys?: readonly ISurveyData[];
-
-	readonly checksums?: { [path: string]: string; };
-	readonly checksumFailMoreInfoUrl?: string;
-
-	readonly appCenter?: IAppCenterConfiguration;
-
-	readonly portable?: string;
-
-	readonly extensionKind?: { readonly [extensionId: string]: ExtensionKind[]; };
-	readonly extensionSyncedKeys?: { readonly [extensionId: string]: string[]; };
-	readonly extensionAllowedProposedApi?: readonly string[];
-
-	readonly msftInternalDomains?: string[];
-	readonly linkProtectionTrustedDomains?: readonly string[];
-
-	readonly 'configurationSync.store'?: ConfigurationSyncStore;
-
-	readonly darwinUniversalAssetId?: string;
-}
-
-export type ImportantExtensionTip = { name: string; languages?: string[]; pattern?: string; isExtensionPack?: boolean };
-
-export interface IAppCenterConfiguration {
-	readonly 'win32-ia32': string;
-	readonly 'win32-x64': string;
-	readonly 'linux-x64': string;
-	readonly 'darwin': string;
-}
-
-export interface IConfigBasedExtensionTip {
-	configPath: string;
-	configName: string;
-	recommendations: IStringDictionary<{ name: string, remotes?: string[], important?: boolean, isExtensionPack?: boolean }>;
-}
-
-export interface IExeBasedExtensionTip {
-	friendlyName: string;
-	windowsPath?: string;
-	important?: boolean;
-	recommendations: IStringDictionary<{ name: string, important?: boolean, isExtensionPack?: boolean }>;
-}
-
-export interface IRemoteExtensionTip {
-	friendlyName: string;
-	extensionId: string;
-}
-
-export interface ISurveyData {
-	surveyId: string;
-	surveyUrl: string;
-	languageId: string;
-	editCount: number;
-	userProbability: number;
-}
-=======
->>>>>>> 58ce849223667f77dc0d6d7658870ca3f815e17f