mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-16 18:46:40 -05:00
Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973 (#6381)
* Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973 * disable strict null check
This commit is contained in:
21
src/vs/platform/launch/common/launchService.ts
Normal file
21
src/vs/platform/launch/common/launchService.ts
Normal file
@@ -0,0 +1,21 @@
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* 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 {
|
||||
pid: number;
|
||||
title: string;
|
||||
folderURIs: UriComponents[];
|
||||
remoteAuthority?: string;
|
||||
}
|
||||
|
||||
export interface IMainProcessInfo {
|
||||
mainPID: number;
|
||||
// All arguments after argv[0], the exec path
|
||||
mainArguments: string[];
|
||||
windows: IWindowInfo[];
|
||||
screenReader: boolean;
|
||||
gpuFeatureStatus: any;
|
||||
}
|
||||
@@ -8,18 +8,19 @@ import { ILogService } from 'vs/platform/log/common/log';
|
||||
import { IURLService } from 'vs/platform/url/common/url';
|
||||
import { IProcessEnvironment, isMacintosh } from 'vs/base/common/platform';
|
||||
import { ParsedArgs, IEnvironmentService } from 'vs/platform/environment/common/environment';
|
||||
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
|
||||
import { createDecorator, ServiceIdentifier } 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 { IConfigurationService } from 'vs/platform/configuration/common/configuration';
|
||||
import { URI, UriComponents } from 'vs/base/common/uri';
|
||||
import { BrowserWindow, ipcMain, Event as IpcEvent } from 'electron';
|
||||
import { URI } from 'vs/base/common/uri';
|
||||
import { BrowserWindow, ipcMain, Event as IpcEvent, app } from 'electron';
|
||||
import { Event } from 'vs/base/common/event';
|
||||
import { hasArgs } from 'vs/platform/environment/node/argv';
|
||||
import { coalesce } from 'vs/base/common/arrays';
|
||||
import { IDiagnosticInfoOptions, IDiagnosticInfo, IRemoteDiagnosticInfo, IRemoteDiagnosticError } from 'vs/platform/diagnostics/common/diagnosticsService';
|
||||
import { IMainProcessInfo, IWindowInfo } from 'vs/platform/launch/common/launchService';
|
||||
|
||||
export const ID = 'launchService';
|
||||
export const ILaunchService = createDecorator<ILaunchService>(ID);
|
||||
@@ -29,20 +30,6 @@ export interface IStartArguments {
|
||||
userEnv: IProcessEnvironment;
|
||||
}
|
||||
|
||||
export interface IWindowInfo {
|
||||
pid: number;
|
||||
title: string;
|
||||
folderURIs: UriComponents[];
|
||||
remoteAuthority?: string;
|
||||
}
|
||||
|
||||
export interface IMainProcessInfo {
|
||||
mainPID: number;
|
||||
// All arguments after argv[0], the exec path
|
||||
mainArguments: string[];
|
||||
windows: IWindowInfo[];
|
||||
}
|
||||
|
||||
export interface IRemoteDiagnosticOptions {
|
||||
includeProcesses?: boolean;
|
||||
includeWorkspaceMetadata?: boolean;
|
||||
@@ -107,7 +94,7 @@ export class LaunchChannel implements IServerChannel {
|
||||
|
||||
export class LaunchChannelClient implements ILaunchService {
|
||||
|
||||
_serviceBrand: any;
|
||||
_serviceBrand: ServiceIdentifier<ILaunchService>;
|
||||
|
||||
constructor(private channel: IChannel) { }
|
||||
|
||||
@@ -134,7 +121,7 @@ export class LaunchChannelClient implements ILaunchService {
|
||||
|
||||
export class LaunchService implements ILaunchService {
|
||||
|
||||
_serviceBrand: any;
|
||||
_serviceBrand: ServiceIdentifier<ILaunchService>;
|
||||
|
||||
constructor(
|
||||
@ILogService private readonly logService: ILogService,
|
||||
@@ -288,7 +275,9 @@ export class LaunchService implements ILaunchService {
|
||||
return Promise.resolve({
|
||||
mainPID: process.pid,
|
||||
mainArguments: process.argv.slice(1),
|
||||
windows
|
||||
windows,
|
||||
screenReader: app.isAccessibilitySupportEnabled(),
|
||||
gpuFeatureStatus: app.getGPUFeatureStatus()
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user