ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-11 02:32:35 -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

3
src/vs/platform/launch/common/launchService.ts → src/vs/platform/launch/common/launch.ts
View File

@@ -2,6 +2,7 @@
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { UriComponents } from 'vs/base/common/uri';
export interface IWindowInfo {
@@ -18,4 +19,4 @@ export interface IMainProcessInfo {
windows: IWindowInfo[];
screenReader: boolean;
gpuFeatureStatus: any;
}
}

18
src/vs/platform/launch/electron-main/launchService.ts
View File

@@ -12,17 +12,17 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
import { OpenContext, IWindowSettings } from 'vs/platform/windows/common/windows';
import { IWindowsMainService, ICodeWindow } from 'vs/platform/windows/electron-main/windows';
import { whenDeleted } from 'vs/base/node/pfs';
import { IWorkspacesMainService } from 'vs/platform/workspaces/common/workspaces';
import { IWorkspacesMainService } from 'vs/platform/workspaces/electron-main/workspacesMainService';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { URI } from 'vs/base/common/uri';
import { BrowserWindow, ipcMain, Event as IpcEvent, app } from 'electron';
import { Event } from 'vs/base/common/event';
import { coalesce } from 'vs/base/common/arrays';
import { IDiagnosticInfoOptions, IDiagnosticInfo, IRemoteDiagnosticInfo, IRemoteDiagnosticError } from 'vs/platform/diagnostics/common/diagnostics';
import { IMainProcessInfo, IWindowInfo } from 'vs/platform/launch/common/launchService';
import { IMainProcessInfo, IWindowInfo } from 'vs/platform/launch/common/launch';
export const ID = 'launchService';
export const ILaunchService = createDecorator<ILaunchService>(ID);
export const ID = 'launchMainService';
export const ILaunchMainService = createDecorator<ILaunchMainService>(ID);
export interface IStartArguments {
args: ParsedArgs;
@@ -51,7 +51,7 @@ function parseOpenUrl(args: ParsedArgs): URI[] {
return [];
}
export interface ILaunchService {
export interface ILaunchMainService {
_serviceBrand: undefined;
start(args: ParsedArgs, userEnv: IProcessEnvironment): Promise<void>;
getMainProcessId(): Promise<number>;
@@ -62,7 +62,7 @@ export interface ILaunchService {
export class LaunchChannel implements IServerChannel {
constructor(private service: ILaunchService) { }
constructor(private service: ILaunchMainService) { }
listen<T>(_: unknown, event: string): Event<T> {
throw new Error(`Event not found: ${event}`);
@@ -91,7 +91,7 @@ export class LaunchChannel implements IServerChannel {
}
}
export class LaunchChannelClient implements ILaunchService {
export class LaunchChannelClient implements ILaunchMainService {
_serviceBrand: undefined;
@@ -118,7 +118,7 @@ export class LaunchChannelClient implements ILaunchService {
}
}
export class LaunchService implements ILaunchService {
export class LaunchMainService implements ILaunchMainService {
_serviceBrand: undefined;
@@ -276,7 +276,7 @@ export class LaunchService implements ILaunchService {
mainPID: process.pid,
mainArguments: process.argv.slice(1),
windows,
screenReader: app.isAccessibilitySupportEnabled(),
screenReader: !!app.accessibilitySupportEnabled,
gpuFeatureStatus: app.getGPUFeatureStatus()
});
}