Skip to content

Commit 0359d41

Browse files
author
Benjamin Pasero
committed
sandbox - issue service is not common
1 parent 9451800 commit 0359d41

7 files changed

Lines changed: 28 additions & 15 deletions

File tree

‎src/vs/code/electron-main/app.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ import { getMachineId } from 'vs/base/node/id';
4444
import { Win32UpdateService } from 'vs/platform/update/electron-main/updateService.win32';
4545
import { LinuxUpdateService } from 'vs/platform/update/electron-main/updateService.linux';
4646
import { DarwinUpdateService } from 'vs/platform/update/electron-main/updateService.darwin';
47-
import { IIssueService } from 'vs/platform/issue/common/issue';
48-
import { IssueMainService } from 'vs/platform/issue/electron-main/issueMainService';
47+
import { IssueMainService, IIssueMainService } from 'vs/platform/issue/electron-main/issueMainService';
4948
import { LoggerChannel } from 'vs/platform/log/common/logIpc';
5049
import { setUnexpectedErrorHandler, onUnexpectedError } from 'vs/base/common/errors';
5150
import { ElectronURLListener } from 'vs/platform/url/electron-main/electronUrlListener';
@@ -470,7 +469,7 @@ export class CodeApplication extends Disposable {
470469
const diagnosticsChannel = getDelayedChannel(sharedProcessReady.then(client => client.getChannel('diagnostics')));
471470
services.set(IDiagnosticsService, new SyncDescriptor(DiagnosticsService, [diagnosticsChannel]));
472471

473-
services.set(IIssueService, new SyncDescriptor(IssueMainService, [machineId, this.userEnv]));
472+
services.set(IIssueMainService, new SyncDescriptor(IssueMainService, [machineId, this.userEnv]));
474473
services.set(IElectronMainService, new SyncDescriptor(ElectronMainService));
475474
services.set(IWorkspacesService, new SyncDescriptor(WorkspacesService));
476475
services.set(IMenubarMainService, new SyncDescriptor(MenubarMainService));
@@ -554,8 +553,8 @@ export class CodeApplication extends Disposable {
554553
const updateChannel = new UpdateChannel(updateService);
555554
electronIpcServer.registerChannel('update', updateChannel);
556555

557-
const issueService = accessor.get(IIssueService);
558-
const issueChannel = createChannelReceiver(issueService);
556+
const issueMainService = accessor.get(IIssueMainService);
557+
const issueChannel = createChannelReceiver(issueMainService);
559558
electronIpcServer.registerChannel('issue', issueChannel);
560559

561560
const electronMainService = accessor.get(IElectronMainService);

‎src/vs/platform/issue/common/issue.ts‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
7-
8-
export const IIssueService = createDecorator<IIssueService>('issueService');
9-
106
// Since data sent through the service is serialized to JSON, functions will be lost, so Color objects
117
// should not be sent as their 'toString' method will be stripped. Instead convert to strings before sending.
128
export interface WindowStyles {
@@ -91,7 +87,7 @@ export interface ProcessExplorerData extends WindowData {
9187
styles: ProcessExplorerStyles;
9288
}
9389

94-
export interface IIssueService {
90+
export interface ICommonIssueService {
9591
_serviceBrand: undefined;
9692
openReporter(data: IssueReporterData): Promise<void>;
9793
openProcessExplorer(data: ProcessExplorerData): Promise<void>;

‎src/vs/platform/issue/electron-main/issueMainService.ts‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import { localize } from 'vs/nls';
77
import * as objects from 'vs/base/common/objects';
88
import { parseArgs, OPTIONS } from 'vs/platform/environment/node/argv';
9-
import { IIssueService, IssueReporterData, IssueReporterFeatures, ProcessExplorerData } from 'vs/platform/issue/common/issue';
9+
import { ICommonIssueService, IssueReporterData, IssueReporterFeatures, ProcessExplorerData } from 'vs/platform/issue/common/issue';
1010
import { BrowserWindow, ipcMain, screen, IpcMainEvent, Display, shell } from 'electron';
1111
import { ILaunchMainService } from 'vs/platform/launch/electron-main/launchMainService';
1212
import { PerformanceInfo, isRemoteDiagnosticError } from 'vs/platform/diagnostics/common/diagnostics';
@@ -19,10 +19,15 @@ import { IWindowState } from 'vs/platform/windows/electron-main/windows';
1919
import { listProcesses } from 'vs/base/node/ps';
2020
import { IDialogMainService } from 'vs/platform/dialogs/electron-main/dialogs';
2121
import { URI } from 'vs/base/common/uri';
22+
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
2223

2324
const DEFAULT_BACKGROUND_COLOR = '#1E1E1E';
2425

25-
export class IssueMainService implements IIssueService {
26+
export const IIssueMainService = createDecorator<IIssueMainService>('issueMainService');
27+
28+
export interface IIssueMainService extends ICommonIssueService { }
29+
30+
export class IssueMainService implements ICommonIssueService {
2631
_serviceBrand: undefined;
2732
_issueWindow: BrowserWindow | null = null;
2833
_issueParentWindow: BrowserWindow | null = null;

‎src/vs/platform/issue/electron-sandbox/issue.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/*---------------------------------------------------------------------------------------------
2+
* Copyright (c) Microsoft Corporation. All rights reserved.
3+
* Licensed under the MIT License. See License.txt in the project root for license information.
4+
*--------------------------------------------------------------------------------------------*/
5+
6+
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
7+
import { ICommonIssueService } from 'vs/platform/issue/common/issue';
8+
9+
export const IIssueService = createDecorator<IIssueService>('issueService');
10+
11+
export interface IIssueService extends ICommonIssueService { }

‎src/vs/workbench/contrib/issue/electron-browser/issue.contribution.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
1313
import { IWorkbenchIssueService } from 'vs/workbench/contrib/issue/electron-browser/issue';
1414
import { WorkbenchIssueService } from 'vs/workbench/contrib/issue/electron-browser/issueService';
1515
import { CommandsRegistry } from 'vs/platform/commands/common/commands';
16-
import { IIssueService, IssueReporterData } from 'vs/platform/issue/common/issue';
16+
import { IssueReporterData } from 'vs/platform/issue/common/issue';
17+
import { IIssueService } from 'vs/platform/issue/electron-sandbox/issue';
1718
import { OpenIssueReporterArgs, OpenIssueReporterActionId } from 'vs/workbench/contrib/issue/common/commands';
1819

1920
const helpCategory = { value: nls.localize('help', "Help"), original: 'Help' };

‎src/vs/workbench/contrib/issue/electron-browser/issueService.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import { IssueReporterStyles, IIssueService, IssueReporterData, ProcessExplorerData, IssueReporterExtensionData } from 'vs/platform/issue/common/issue';
6+
import { IssueReporterStyles, IssueReporterData, ProcessExplorerData, IssueReporterExtensionData } from 'vs/platform/issue/common/issue';
7+
import { IIssueService } from 'vs/platform/issue/electron-sandbox/issue';
78
import { IColorTheme, IThemeService } from 'vs/platform/theme/common/themeService';
89
import { textLinkForeground, inputBackground, inputBorder, inputForeground, buttonBackground, buttonHoverBackground, buttonForeground, inputValidationErrorBorder, foreground, inputActiveOptionBorder, scrollbarSliderActiveBackground, scrollbarSliderBackground, scrollbarSliderHoverBackground, editorBackground, editorForeground, listHoverBackground, listHoverForeground, listHighlightForeground, textLinkActiveForeground, inputValidationErrorBackground, inputValidationErrorForeground } from 'vs/platform/theme/common/colorRegistry';
910
import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';

‎src/vs/workbench/services/issue/electron-sandbox/issueService.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import { IIssueService } from 'vs/platform/issue/common/issue';
6+
import { IIssueService } from 'vs/platform/issue/electron-sandbox/issue';
77
import { IMainProcessService } from 'vs/platform/ipc/electron-sandbox/mainProcessService';
88
import { createChannelSender } from 'vs/base/parts/ipc/common/ipc';
99
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';

0 commit comments

Comments
 (0)