Skip to content

Commit bef602e

Browse files
alexdimaalexdima
committed
Extract /common/ code
1 parent f3f8c57 commit bef602e

10 files changed

Lines changed: 785 additions & 769 deletions

File tree

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

Lines changed: 767 additions & 0 deletions
Large diffs are not rendered by default.

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

Lines changed: 4 additions & 761 deletions
Large diffs are not rendered by default.

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
import * as assert from 'assert';
77
import { Socket } from 'net';
88
import { EventEmitter } from 'events';
9-
import { Protocol, PersistentProtocol, NodeSocket } from 'vs/base/parts/ipc/node/ipc.net';
9+
import { Protocol, PersistentProtocol } from 'vs/base/parts/ipc/common/ipc.net';
10+
import { NodeSocket } from 'vs/base/parts/ipc/node/ipc.net';
1011
import { VSBuffer } from 'vs/base/common/buffer';
1112

1213
class MessageStream {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ import { getShellEnvironment } from 'vs/code/node/shellEnv';
1414
import { IUpdateService } from 'vs/platform/update/common/update';
1515
import { UpdateChannel } from 'vs/platform/update/node/updateIpc';
1616
import { Server as ElectronIPCServer } from 'vs/base/parts/ipc/electron-main/ipc.electron-main';
17-
import { Server, connect, Client } from 'vs/base/parts/ipc/node/ipc.net';
17+
import { Client } from 'vs/base/parts/ipc/common/ipc.net';
18+
import { Server, connect } from 'vs/base/parts/ipc/node/ipc.net';
1819
import { SharedProcess } from 'vs/code/electron-main/sharedProcess';
1920
import { LaunchService, LaunchChannel, ILaunchService } from 'vs/platform/launch/electron-main/launchService';
2021
import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';

‎src/vs/platform/driver/node/driver.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 { connect as connectNet, Client } from 'vs/base/parts/ipc/node/ipc.net';
6+
import { Client } from 'vs/base/parts/ipc/common/ipc.net';
7+
import { connect as connectNet } from 'vs/base/parts/ipc/node/ipc.net';
78
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
89
import { IChannel, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
910
import { Event } from 'vs/base/common/event';

‎src/vs/platform/ipc/electron-browser/sharedProcessService.ts‎

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

66
import { createDecorator, ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
7-
import { Client, connect } from 'vs/base/parts/ipc/node/ipc.net';
7+
import { Client } from 'vs/base/parts/ipc/common/ipc.net';
8+
import { connect } from 'vs/base/parts/ipc/node/ipc.net';
89
import { IWindowsService, IWindowService } from 'vs/platform/windows/common/windows';
910
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
1011
import { IChannel, IServerChannel, getDelayedChannel } from 'vs/base/parts/ipc/common/ipc';

‎src/vs/platform/remote/node/remoteAgentConnection.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 { Client, PersistentProtocol } from 'vs/base/parts/ipc/node/ipc.net';
6+
import { Client, PersistentProtocol } from 'vs/base/parts/ipc/common/ipc.net';
77
import { RemoteAgentConnectionContext } from 'vs/platform/remote/common/remoteAgentEnvironment';
88
import { Disposable } from 'vs/base/common/lifecycle';
99

‎src/vs/workbench/services/extensions/electron-browser/extensionHost.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ import { URI } from 'vs/base/common/uri';
1919
import { IRemoteConsoleLog, log, parse } from 'vs/base/common/console';
2020
import { findFreePort, randomPort } from 'vs/base/node/ports';
2121
import { IMessagePassingProtocol } from 'vs/base/parts/ipc/common/ipc';
22-
import { PersistentProtocol, generateRandomPipeName, NodeSocket } from 'vs/base/parts/ipc/node/ipc.net';
22+
import { PersistentProtocol } from 'vs/base/parts/ipc/common/ipc.net';
23+
import { generateRandomPipeName, NodeSocket } from 'vs/base/parts/ipc/node/ipc.net';
2324
import { IBroadcast, IBroadcastService } from 'vs/workbench/services/broadcast/common/broadcast';
2425
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
2526
import { EXTENSION_ATTACH_BROADCAST_CHANNEL, EXTENSION_CLOSE_EXTHOST_BROADCAST_CHANNEL, EXTENSION_LOG_BROADCAST_CHANNEL, EXTENSION_RELOAD_BROADCAST_CHANNEL, EXTENSION_TERMINATE_BROADCAST_CHANNEL } from 'vs/platform/extensions/common/extensionHost';

‎src/vs/workbench/services/extensions/node/extensionHostProcess.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import * as net from 'net';
88
import { onUnexpectedError } from 'vs/base/common/errors';
99
import { Event } from 'vs/base/common/event';
1010
import { IMessagePassingProtocol } from 'vs/base/parts/ipc/common/ipc';
11-
import { PersistentProtocol, ProtocolConstants, NodeSocket } from 'vs/base/parts/ipc/node/ipc.net';
11+
import { PersistentProtocol, ProtocolConstants } from 'vs/base/parts/ipc/common/ipc.net';
12+
import { NodeSocket } from 'vs/base/parts/ipc/node/ipc.net';
1213
import product from 'vs/platform/product/node/product';
1314
import { IInitData } from 'vs/workbench/api/common/extHost.protocol';
1415
import { MessageType, createMessageOfType, isMessageOfType, IExtHostSocketMessage, IExtHostReadyMessage } from 'vs/workbench/services/extensions/node/extensionHostProtocol';

‎src/vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import { Disposable } from 'vs/base/common/lifecycle';
77
import { IChannel, IServerChannel, getDelayedChannel } from 'vs/base/parts/ipc/common/ipc';
8-
import { Client } from 'vs/base/parts/ipc/node/ipc.net';
8+
import { Client } from 'vs/base/parts/ipc/common/ipc.net';
99
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
1010
import { connectRemoteAgentManagement } from 'vs/platform/remote/node/remoteAgentConnection';
1111
import { IWindowConfiguration } from 'vs/platform/windows/common/windows';

0 commit comments

Comments
 (0)