ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-02 01:25:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 1eb87b0e9ce9886afeaecec22b31abd0d9b7939f (#7282)

Browse Source 
* Merge from vscode 1eb87b0e9ce9886afeaecec22b31abd0d9b7939f

* fix various icon issues

* fix preview features
This commit is contained in:
Anthony Dresser
2019-09-19 21:50:52 -07:00
committed by GitHub
parent 9d3d64eef3
commit db498db0a8
459 changed files with 10195 additions and 7528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/platform/lifecycle/electron-browser/lifecycleService.ts
View File

@@ -19,7 +19,7 @@ export class LifecycleService extends AbstractLifecycleService {
_serviceBrand: undefined;
private shutdownReason: ShutdownReason;
private shutdownReason: ShutdownReason | undefined;
constructor(
@INotificationService private readonly notificationService: INotificationService,

14
src/vs/platform/lifecycle/electron-main/lifecycleMain.ts → src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts
View File

@@ -14,7 +14,7 @@ import { isMacintosh, isWindows } from 'vs/base/common/platform';
import { Disposable } from 'vs/base/common/lifecycle';
import { Barrier } from 'vs/base/common/async';
export const ILifecycleService = createDecorator<ILifecycleService>('lifecycleService');
export const ILifecycleMainService = createDecorator<ILifecycleMainService>('lifecycleMainService');
export const enum UnloadReason {
CLOSE = 1,
@@ -38,7 +38,7 @@ export interface ShutdownEvent {
join(promise: Promise<void>): void;
}
export interface ILifecycleService {
export interface ILifecycleMainService {
_serviceBrand: undefined;
@@ -129,7 +129,7 @@ export const enum LifecycleMainPhase {
AfterWindowOpen = 3
}
export class LifecycleService extends Disposable implements ILifecycleService {
export class LifecycleMainService extends Disposable implements ILifecycleMainService {
_serviceBrand: undefined;
@@ -178,10 +178,10 @@ export class LifecycleService extends Disposable implements ILifecycleService {
}
private handleRestarted(): void {
this._wasRestarted = !!this.stateService.getItem(LifecycleService.QUIT_FROM_RESTART_MARKER);
this._wasRestarted = !!this.stateService.getItem(LifecycleMainService.QUIT_FROM_RESTART_MARKER);
if (this._wasRestarted) {
this.stateService.removeItem(LifecycleService.QUIT_FROM_RESTART_MARKER); // remove the marker right after if found
this.stateService.removeItem(LifecycleMainService.QUIT_FROM_RESTART_MARKER); // remove the marker right after if found
}
}
@@ -468,7 +468,7 @@ export class LifecycleService extends Disposable implements ILifecycleService {
// Remember the reason for quit was to restart
if (fromUpdate) {
this.stateService.setItem(LifecycleService.QUIT_FROM_RESTART_MARKER, true);
this.stateService.setItem(LifecycleMainService.QUIT_FROM_RESTART_MARKER, true);
}
this.pendingQuitPromise = new Promise(resolve => {
@@ -507,7 +507,7 @@ export class LifecycleService extends Disposable implements ILifecycleService {
if (!quitVetoed) {
// Remember the reason for quit was to restart
this.stateService.setItem(LifecycleService.QUIT_FROM_RESTART_MARKER, true);
this.stateService.setItem(LifecycleMainService.QUIT_FROM_RESTART_MARKER, true);
// Windows: we are about to restart and as such we need to restore the original
// current working directory we had on startup to get the exact same startup