Skip to content

Commit a2f31e1

Browse files
jriekenjrieken
committed
move node/console to common/console, microsoft#70319 
1 parent 19466f3 commit a2f31e1

7 files changed

Lines changed: 7 additions & 10 deletions

File tree

src/vs/base/node/console.ts renamed to src/vs/base/common/console.ts

File renamed without changes.

‎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 { deepClone, assign } from 'vs/base/common/objects';
1010
import { Emitter, Event } from 'vs/base/common/event';
1111
import { createQueuedSender } from 'vs/base/node/processes';
1212
import { ChannelServer as IPCServer, ChannelClient as IPCClient, IChannelClient } from 'vs/base/parts/ipc/node/ipc';
13-
import { isRemoteConsoleLog, log } from 'vs/base/node/console';
13+
import { isRemoteConsoleLog, log } from 'vs/base/common/console';
1414
import { CancellationToken } from 'vs/base/common/cancellation';
1515
import * as errors from 'vs/base/common/errors';
1616
import { IChannel } from 'vs/base/parts/ipc/common/ipc';

‎src/vs/base/test/node/console.test.ts‎

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

66
import * as assert from 'assert';
7-
import { getFirstFrame } from 'vs/base/node/console';
7+
import { getFirstFrame } from 'vs/base/common/console';
88
import { normalize } from 'vs/base/common/path';
99

1010
suite('Console', () => {

‎src/vs/workbench/api/common/extHost.protocol.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensio
4545
import * as codeInset from 'vs/workbench/contrib/codeinset/common/codeInset';
4646
import * as callHierarchy from 'vs/workbench/contrib/callHierarchy/common/callHierarchy';
4747
import { IRelativePattern } from 'vs/base/common/glob';
48+
import { IRemoteConsoleLog } from 'vs/base/common/console';
4849

4950
export interface IEnvironment {
5051
isExtensionDevelopmentDebug: boolean;
@@ -255,11 +256,7 @@ export interface MainThreadErrorsShape extends IDisposable {
255256
}
256257

257258
export interface MainThreadConsoleShape extends IDisposable {
258-
$logExtensionHostMessage(msg: {
259-
type: string;
260-
severity: string;
261-
arguments: string;
262-
}): void;
259+
$logExtensionHostMessage(msg: IRemoteConsoleLog): void;
263260
}
264261

265262
export interface ISerializedRegExp {

‎src/vs/workbench/api/electron-browser/mainThreadConsole.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
77
import { MainContext, MainThreadConsoleShape, IExtHostContext } from 'vs/workbench/api/common/extHost.protocol';
88
import { IEnvironmentService } from 'vs/platform/environment/common/environment';
9-
import { IRemoteConsoleLog, log, parse } from 'vs/base/node/console';
9+
import { IRemoteConsoleLog, log, parse } from 'vs/base/common/console';
1010
import { parseExtensionDevOptions } from 'vs/workbench/services/extensions/electron-browser/extensionHost';
1111
import { IWindowsService } from 'vs/platform/windows/common/windows';
1212
import { IBroadcastService } from 'vs/workbench/services/broadcast/common/broadcast';

‎src/vs/workbench/contrib/debug/electron-browser/debugService.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import { IWorkspaceContextService, WorkbenchState, IWorkspaceFolder } from 'vs/p
3535
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
3636
import { EXTENSION_LOG_BROADCAST_CHANNEL, EXTENSION_ATTACH_BROADCAST_CHANNEL, EXTENSION_TERMINATE_BROADCAST_CHANNEL, EXTENSION_RELOAD_BROADCAST_CHANNEL, EXTENSION_CLOSE_EXTHOST_BROADCAST_CHANNEL } from 'vs/platform/extensions/common/extensionHost';
3737
import { IBroadcastService } from 'vs/workbench/services/broadcast/common/broadcast';
38-
import { IRemoteConsoleLog, parse, getFirstFrame } from 'vs/base/node/console';
38+
import { IRemoteConsoleLog, parse, getFirstFrame } from 'vs/base/common/console';
3939
import { TaskEvent, TaskEventKind, TaskIdentifier } from 'vs/workbench/contrib/tasks/common/tasks';
4040
import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
4141
import { INotificationService } from 'vs/platform/notification/common/notification';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import * as objects from 'vs/base/common/objects';
1717
import { isWindows } from 'vs/base/common/platform';
1818
import { isEqual } from 'vs/base/common/resources';
1919
import { URI } from 'vs/base/common/uri';
20-
import { IRemoteConsoleLog, log, parse } from 'vs/base/node/console';
20+
import { IRemoteConsoleLog, log, parse } from 'vs/base/common/console';
2121
import { findFreePort, randomPort } from 'vs/base/node/ports';
2222
import { IMessagePassingProtocol } from 'vs/base/parts/ipc/node/ipc';
2323
import { PersistentProtocol, generateRandomPipeName } from 'vs/base/parts/ipc/node/ipc.net';

0 commit comments

Comments
 (0)