Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c (#8525)

* Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c

* remove files we don't want

* fix hygiene

* update distro

* update distro

* fix hygiene

* fix strict nulls

* distro

* distro

* fix tests

* fix tests

* add another edit

* fix viewlet icon

* fix azure dialog

* fix some padding

* fix more padding issues
This commit is contained in:
Anthony Dresser
2019-12-04 19:28:22 -08:00
committed by GitHub
parent a8818ab0df
commit f5ce7fb2a5
1507 changed files with 42813 additions and 27370 deletions

View File

@@ -18,6 +18,7 @@ import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService
import { URI } from 'vs/base/common/uri';
import { IOpenerService } from 'vs/platform/opener/common/opener';
import { IElectronService } from 'vs/platform/electron/node/electron';
import { IProductService } from 'vs/platform/product/common/productService';
export class StartupProfiler implements IWorkbenchContribution {
@@ -29,7 +30,8 @@ export class StartupProfiler implements IWorkbenchContribution {
@ILifecycleService lifecycleService: ILifecycleService,
@IExtensionService extensionService: IExtensionService,
@IOpenerService private readonly _openerService: IOpenerService,
@IElectronService private readonly _electronService: IElectronService
@IElectronService private readonly _electronService: IElectronService,
@IProductService private readonly _productService: IProductService
) {
// wait for everything to be ready
Promise.all([
@@ -88,7 +90,7 @@ export class StartupProfiler implements IWorkbenchContribution {
return this._dialogService.confirm({
type: 'info',
message: localize('prof.thanks', "Thanks for helping us."),
detail: localize('prof.detail.restart', "A final restart is required to continue to use '{0}'. Again, thank you for your contribution.", this._environmentService.appNameLong),
detail: localize('prof.detail.restart', "A final restart is required to continue to use '{0}'. Again, thank you for your contribution.", this._productService.nameLong),
primaryButton: localize('prof.restart', "Restart"),
secondaryButton: undefined
}).then(() => {