ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-21 12:20:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 52dcb723a39ae75bee1bd56b3312d7fcdc87aeed (#6719)

Browse Source
This commit is contained in:
Anthony Dresser
2019-08-12 21:31:51 -07:00
committed by GitHub
parent 00250839fc
commit 7eba8c4c03
616 changed files with 9472 additions and 7087 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/vs/platform/product/browser/productService.ts
View File

@@ -8,6 +8,8 @@ import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiatio
export class ProductService implements IProductService {
_serviceBrand!: ServiceIdentifier<IProductService>;
private readonly productConfiguration: IProductConfiguration | null;
constructor() {
@@ -15,9 +17,7 @@ export class ProductService implements IProductService {
this.productConfiguration = element ? JSON.parse(element.getAttribute('data-settings')!) : null;
}
_serviceBrand: ServiceIdentifier<IProductService>;
get version(): string { return '1.35.0'; }
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
@@ -25,7 +25,7 @@ export class ProductService implements IProductService {
get commit(): string | undefined { return this.productConfiguration ? this.productConfiguration.commit : undefined; }
get nameLong(): string { return ''; }
get nameLong(): string { return this.productConfiguration ? this.productConfiguration.nameLong : 'Unknown'; }
get urlProtocol(): string { return ''; }

7
src/vs/platform/product/common/product.ts
View File

@@ -3,17 +3,19 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
import { createDecorator, ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
export const IProductService = createDecorator<IProductService>('productService');
export interface IProductService {
_serviceBrand: any;
_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;
@@ -46,6 +48,7 @@ export interface IProductService {
}
export interface IProductConfiguration {
readonly version: string;
nameShort: string;
nameLong: string;
readonly applicationName: string;

2
src/vs/platform/product/node/productService.ts
View File

@@ -10,7 +10,7 @@ import { ServiceIdentifier } from 'vs/platform/instantiation/common/instantiatio
export class ProductService implements IProductService {
_serviceBrand: ServiceIdentifier<IProductService>;
_serviceBrand!: ServiceIdentifier<IProductService>;
get version(): string { return pkg.version; }