Skip to content

Commit 2c7366c

Browse files
joaomorenojoaomoreno
committed
fix broken layering
1 parent b14b782 commit 2c7366c

45 files changed

Lines changed: 363 additions & 371 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/vs/base/parts/ipc/electron-browser/ipc.electron-browser.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import { fromNodeEventEmitter } from 'vs/base/common/event';
7-
import { IPCClient } from 'vs/base/parts/ipc/common/ipc';
8-
import { Protocol } from 'vs/base/parts/ipc/common/ipc.electron';
7+
import { IPCClient } from 'vs/base/parts/ipc/node/ipc';
8+
import { Protocol } from 'vs/base/parts/ipc/node/ipc.electron';
99
import { ipcRenderer } from 'electron';
1010

1111
export class Client extends IPCClient {

‎src/vs/base/parts/ipc/electron-main/ipc.electron-main.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import { Event, filterEvent, mapEvent, fromNodeEventEmitter } from 'vs/base/common/event';
7-
import { IPCServer, ClientConnectionEvent } from 'vs/base/parts/ipc/common/ipc';
8-
import { Protocol } from 'vs/base/parts/ipc/common/ipc.electron';
7+
import { IPCServer, ClientConnectionEvent } from 'vs/base/parts/ipc/node/ipc';
8+
import { Protocol } from 'vs/base/parts/ipc/node/ipc.electron';
99
import { ipcMain } from 'electron';
1010

1111
interface WebContents extends Electron.WebContents {

‎src/vs/base/parts/ipc/node/ipc.cp.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { Delayer } from 'vs/base/common/async';
1010
import { deepClone, assign } from 'vs/base/common/objects';
1111
import { Emitter, fromNodeEventEmitter, Event } from 'vs/base/common/event';
1212
import { createQueuedSender } from 'vs/base/node/processes';
13-
import { ChannelServer as IPCServer, ChannelClient as IPCClient, IChannelClient, IChannel } from 'vs/base/parts/ipc/common/ipc';
13+
import { ChannelServer as IPCServer, ChannelClient as IPCClient, IChannelClient, IChannel } from 'vs/base/parts/ipc/node/ipc';
1414
import { isRemoteConsoleLog, log } from 'vs/base/node/console';
1515

1616
/**

src/vs/base/parts/ipc/common/ipc.electron.ts renamed to src/vs/base/parts/ipc/node/ipc.electron.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
7-
import { IMessagePassingProtocol } from 'vs/base/parts/ipc/common/ipc';
7+
import { IMessagePassingProtocol } from 'vs/base/parts/ipc/node/ipc';
88
import { Event, Emitter } from 'vs/base/common/event';
99

1010
/**

‎src/vs/base/parts/ipc/node/ipc.net.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import { Socket, Server as NetServer, createConnection, createServer } from 'net';
99
import { TPromise } from 'vs/base/common/winjs.base';
1010
import { Event, Emitter, once, mapEvent, fromNodeEventEmitter } from 'vs/base/common/event';
11-
import { IMessagePassingProtocol, ClientConnectionEvent, IPCServer, IPCClient } from 'vs/base/parts/ipc/common/ipc';
11+
import { IMessagePassingProtocol, ClientConnectionEvent, IPCServer, IPCClient } from 'vs/base/parts/ipc/node/ipc';
1212
import { join } from 'path';
1313
import { tmpdir } from 'os';
1414
import { generateUuid } from 'vs/base/common/uuid';

src/vs/base/parts/ipc/common/ipc.ts renamed to src/vs/base/parts/ipc/node/ipc.ts

File renamed without changes.

‎src/vs/base/parts/ipc/test/node/testService.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
'use strict';
66

77
import { TPromise } from 'vs/base/common/winjs.base';
8-
import { IChannel } from 'vs/base/parts/ipc/common/ipc';
8+
import { IChannel } from 'vs/base/parts/ipc/node/ipc';
99
import { Event, Emitter } from 'vs/base/common/event';
1010

1111
export interface IMarcoPoloEvent {

‎src/vs/base/test/node/uri.test.data.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2299,8 +2299,8 @@
22992299
/users/foo/src/vs/base/parts/ipc/test/node/ipc.test.ts
23002300
/users/foo/src/vs/base/parts/ipc/test/node/testService.ts
23012301
/users/foo/src/vs/base/parts/ipc/common
2302-
/users/foo/src/vs/base/parts/ipc/common/ipc.electron.ts
2303-
/users/foo/src/vs/base/parts/ipc/common/ipc.ts
2302+
/users/foo/src/vs/base/parts/ipc/node/ipc.electron.ts
2303+
/users/foo/src/vs/base/parts/ipc/node/ipc.ts
23042304
/users/foo/src/vs/base/parts/ipc/electron-browser
23052305
/users/foo/src/vs/base/parts/ipc/electron-browser/ipc.electron-browser.ts
23062306
/users/foo/src/vs/base/parts/ipc/node

‎src/vs/code/electron-browser/issue/issueReporterMain.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,25 @@ import { debounce } from 'vs/base/common/decorators';
1919
import * as platform from 'vs/base/common/platform';
2020
import { Disposable } from 'vs/base/common/lifecycle';
2121
import { Client as ElectronIPCClient } from 'vs/base/parts/ipc/electron-browser/ipc.electron-browser';
22-
import { getDelayedChannel } from 'vs/base/parts/ipc/common/ipc';
22+
import { getDelayedChannel } from 'vs/base/parts/ipc/node/ipc';
2323
import { connect as connectNet } from 'vs/base/parts/ipc/node/ipc.net';
2424
import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
2525
import { IWindowConfiguration, IWindowsService } from 'vs/platform/windows/common/windows';
2626
import { NullTelemetryService, combinedAppender, LogAppender } from 'vs/platform/telemetry/common/telemetryUtils';
2727
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
2828
import { ITelemetryServiceConfig, TelemetryService } from 'vs/platform/telemetry/common/telemetryService';
29-
import { ITelemetryAppenderChannel, TelemetryAppenderClient } from 'vs/platform/telemetry/common/telemetryIpc';
29+
import { ITelemetryAppenderChannel, TelemetryAppenderClient } from 'vs/platform/telemetry/node/telemetryIpc';
3030
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
3131
import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
3232
import { resolveCommonProperties } from 'vs/platform/telemetry/node/commonProperties';
33-
import { WindowsChannelClient } from 'vs/platform/windows/common/windowsIpc';
33+
import { WindowsChannelClient } from 'vs/platform/windows/node/windowsIpc';
3434
import { EnvironmentService } from 'vs/platform/environment/node/environmentService';
3535
import { IssueReporterModel } from 'vs/code/electron-browser/issue/issueReporterModel';
3636
import { IssueReporterData, IssueReporterStyles, IssueType, ISettingsSearchIssueReporterData, IssueReporterFeatures } from 'vs/platform/issue/common/issue';
3737
import BaseHtml from 'vs/code/electron-browser/issue/issueReporterPage';
3838
import { ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
3939
import { createSpdLogService } from 'vs/platform/log/node/spdlogService';
40-
import { LogLevelSetterChannelClient, FollowerLogService } from 'vs/platform/log/common/logIpc';
40+
import { LogLevelSetterChannelClient, FollowerLogService } from 'vs/platform/log/node/logIpc';
4141
import { ILogService, getLogLevel } from 'vs/platform/log/common/log';
4242
import { OcticonLabel } from 'vs/base/browser/ui/octiconLabel/octiconLabel';
4343
import { normalizeGitHubUrl } from 'vs/code/electron-browser/issue/issueReporterUtil';

‎src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
1616
import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
1717
import { IEnvironmentService, ParsedArgs } from 'vs/platform/environment/common/environment';
1818
import { EnvironmentService } from 'vs/platform/environment/node/environmentService';
19-
import { ExtensionManagementChannel } from 'vs/platform/extensionManagement/common/extensionManagementIpc';
19+
import { ExtensionManagementChannel } from 'vs/platform/extensionManagement/node/extensionManagementIpc';
2020
import { IExtensionManagementService, IExtensionGalleryService } from 'vs/platform/extensionManagement/common/extensionManagement';
2121
import { ExtensionManagementService } from 'vs/platform/extensionManagement/node/extensionManagementService';
2222
import { ExtensionGalleryService } from 'vs/platform/extensionManagement/node/extensionGalleryService';
@@ -27,20 +27,20 @@ import { RequestService } from 'vs/platform/request/electron-browser/requestServ
2727
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
2828
import { combinedAppender, NullTelemetryService, ITelemetryAppender, NullAppender, LogAppender } from 'vs/platform/telemetry/common/telemetryUtils';
2929
import { resolveCommonProperties } from 'vs/platform/telemetry/node/commonProperties';
30-
import { TelemetryAppenderChannel } from 'vs/platform/telemetry/common/telemetryIpc';
30+
import { TelemetryAppenderChannel } from 'vs/platform/telemetry/node/telemetryIpc';
3131
import { TelemetryService, ITelemetryServiceConfig } from 'vs/platform/telemetry/common/telemetryService';
3232
import { AppInsightsAppender } from 'vs/platform/telemetry/node/appInsightsAppender';
3333
import { IWindowsService, ActiveWindowManager } from 'vs/platform/windows/common/windows';
34-
import { WindowsChannelClient } from 'vs/platform/windows/common/windowsIpc';
34+
import { WindowsChannelClient } from 'vs/platform/windows/node/windowsIpc';
3535
import { ipcRenderer } from 'electron';
3636
import { createSharedProcessContributions } from 'vs/code/electron-browser/sharedProcess/contrib/contributions';
3737
import { createSpdLogService } from 'vs/platform/log/node/spdlogService';
3838
import { ILogService, LogLevel } from 'vs/platform/log/common/log';
39-
import { LogLevelSetterChannelClient, FollowerLogService } from 'vs/platform/log/common/logIpc';
39+
import { LogLevelSetterChannelClient, FollowerLogService } from 'vs/platform/log/node/logIpc';
4040
import { LocalizationsService } from 'vs/platform/localizations/node/localizations';
4141
import { ILocalizationsService } from 'vs/platform/localizations/common/localizations';
42-
import { LocalizationsChannel } from 'vs/platform/localizations/common/localizationsIpc';
43-
import { DialogChannelClient } from 'vs/platform/dialogs/common/dialogIpc';
42+
import { LocalizationsChannel } from 'vs/platform/localizations/node/localizationsIpc';
43+
import { DialogChannelClient } from 'vs/platform/dialogs/node/dialogIpc';
4444
import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
4545
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
4646

0 commit comments

Comments
 (0)