From 20e5950f545943d4b7febe981fa99339b8564c86 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Thu, 17 Sep 2020 16:49:27 +0200 Subject: [PATCH] sandbox - :lipstick: --- src/vs/platform/diagnostics/node/diagnosticsService.ts | 2 +- src/vs/platform/launch/electron-main/launchMainService.ts | 2 +- src/vs/platform/launch/{common => node}/launch.ts | 0 src/vs/platform/native/electron-sandbox/native.ts | 7 +++++++ src/vs/platform/sign/browser/signService.ts | 2 +- src/vs/platform/{ => theme}/browser/checkbox.ts | 0 .../contrib/preferences/browser/keybindingsEditor.ts | 2 +- src/vs/workbench/services/host/browser/host.ts | 6 ++++++ 8 files changed, 17 insertions(+), 4 deletions(-) rename src/vs/platform/launch/{common => node}/launch.ts (100%) rename src/vs/platform/{ => theme}/browser/checkbox.ts (100%) diff --git a/src/vs/platform/diagnostics/node/diagnosticsService.ts b/src/vs/platform/diagnostics/node/diagnosticsService.ts index a858b96f5b7..4f26ad098d6 100644 --- a/src/vs/platform/diagnostics/node/diagnosticsService.ts +++ b/src/vs/platform/diagnostics/node/diagnosticsService.ts @@ -14,7 +14,7 @@ import { repeat, pad } from 'vs/base/common/strings'; import { isWindows, isLinux } from 'vs/base/common/platform'; import { URI } from 'vs/base/common/uri'; import { ProcessItem } from 'vs/base/common/processes'; -import { IMainProcessInfo } from 'vs/platform/launch/common/launch'; +import { IMainProcessInfo } from 'vs/platform/launch/node/launch'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { Iterable } from 'vs/base/common/iterator'; diff --git a/src/vs/platform/launch/electron-main/launchMainService.ts b/src/vs/platform/launch/electron-main/launchMainService.ts index 83bb6c6660b..e646cc854c4 100644 --- a/src/vs/platform/launch/electron-main/launchMainService.ts +++ b/src/vs/platform/launch/electron-main/launchMainService.ts @@ -18,7 +18,7 @@ import { URI } from 'vs/base/common/uri'; import { BrowserWindow, ipcMain, Event as IpcEvent, app } from 'electron'; 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/launch'; +import { IMainProcessInfo, IWindowInfo } from 'vs/platform/launch/node/launch'; export const ID = 'launchMainService'; export const ILaunchMainService = createDecorator(ID); diff --git a/src/vs/platform/launch/common/launch.ts b/src/vs/platform/launch/node/launch.ts similarity index 100% rename from src/vs/platform/launch/common/launch.ts rename to src/vs/platform/launch/node/launch.ts diff --git a/src/vs/platform/native/electron-sandbox/native.ts b/src/vs/platform/native/electron-sandbox/native.ts index e8b4d4adfb8..bb3f6bc715c 100644 --- a/src/vs/platform/native/electron-sandbox/native.ts +++ b/src/vs/platform/native/electron-sandbox/native.ts @@ -8,4 +8,11 @@ import { ICommonNativeHostService } from 'vs/platform/native/common/native'; export const INativeHostService = createDecorator('nativeHostService'); +/** + * A set of methods specific to a native host, i.e. unsupported in web + * environments. + * + * @see `IHostService` for methods that can be used in native and web + * hosts. + */ export interface INativeHostService extends ICommonNativeHostService { } diff --git a/src/vs/platform/sign/browser/signService.ts b/src/vs/platform/sign/browser/signService.ts index a8605ecbd82..a0e555cef7f 100644 --- a/src/vs/platform/sign/browser/signService.ts +++ b/src/vs/platform/sign/browser/signService.ts @@ -16,6 +16,6 @@ export class SignService implements ISignService { } async sign(value: string): Promise { - return Promise.resolve(this._tkn || ''); + return this._tkn || ''; } } diff --git a/src/vs/platform/browser/checkbox.ts b/src/vs/platform/theme/browser/checkbox.ts similarity index 100% rename from src/vs/platform/browser/checkbox.ts rename to src/vs/platform/theme/browser/checkbox.ts diff --git a/src/vs/workbench/contrib/preferences/browser/keybindingsEditor.ts b/src/vs/workbench/contrib/preferences/browser/keybindingsEditor.ts index de11973bf42..08273a27764 100644 --- a/src/vs/workbench/contrib/preferences/browser/keybindingsEditor.ts +++ b/src/vs/workbench/contrib/preferences/browser/keybindingsEditor.ts @@ -46,7 +46,7 @@ import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget'; import { preferencesEditIcon } from 'vs/workbench/contrib/preferences/browser/preferencesWidgets'; import { Color, RGBA } from 'vs/base/common/color'; import { WORKBENCH_BACKGROUND } from 'vs/workbench/common/theme'; -import { ThemableCheckboxActionViewItem } from 'vs/platform/browser/checkbox'; +import { ThemableCheckboxActionViewItem } from 'vs/platform/theme/browser/checkbox'; const $ = DOM.$; diff --git a/src/vs/workbench/services/host/browser/host.ts b/src/vs/workbench/services/host/browser/host.ts index 25f16cf7b07..222da33fcde 100644 --- a/src/vs/workbench/services/host/browser/host.ts +++ b/src/vs/workbench/services/host/browser/host.ts @@ -9,6 +9,12 @@ import { IWindowOpenable, IOpenWindowOptions, IOpenEmptyWindowOptions } from 'vs export const IHostService = createDecorator('hostService'); +/** + * A set of methods supported in both web and native environments. + * + * @see `INativeHostService` for methods that are specific to native + * environments. + */ export interface IHostService { readonly _serviceBrand: undefined;