From a2f31e1cd6499da07431fdad5d810c70bec6ca65 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Wed, 20 Mar 2019 15:29:36 +0100 Subject: [PATCH] move node/console to common/console, #70319 --- src/vs/base/{node => common}/console.ts | 0 src/vs/base/parts/ipc/node/ipc.cp.ts | 2 +- src/vs/base/test/node/console.test.ts | 2 +- src/vs/workbench/api/common/extHost.protocol.ts | 7 ++----- src/vs/workbench/api/electron-browser/mainThreadConsole.ts | 2 +- .../contrib/debug/electron-browser/debugService.ts | 2 +- .../services/extensions/electron-browser/extensionHost.ts | 2 +- 7 files changed, 7 insertions(+), 10 deletions(-) rename src/vs/base/{node => common}/console.ts (100%) diff --git a/src/vs/base/node/console.ts b/src/vs/base/common/console.ts similarity index 100% rename from src/vs/base/node/console.ts rename to src/vs/base/common/console.ts diff --git a/src/vs/base/parts/ipc/node/ipc.cp.ts b/src/vs/base/parts/ipc/node/ipc.cp.ts index 8009e83c99cd9..f66fb0d9950ad 100644 --- a/src/vs/base/parts/ipc/node/ipc.cp.ts +++ b/src/vs/base/parts/ipc/node/ipc.cp.ts @@ -10,7 +10,7 @@ import { deepClone, assign } from 'vs/base/common/objects'; import { Emitter, Event } from 'vs/base/common/event'; import { createQueuedSender } from 'vs/base/node/processes'; import { ChannelServer as IPCServer, ChannelClient as IPCClient, IChannelClient } from 'vs/base/parts/ipc/node/ipc'; -import { isRemoteConsoleLog, log } from 'vs/base/node/console'; +import { isRemoteConsoleLog, log } from 'vs/base/common/console'; import { CancellationToken } from 'vs/base/common/cancellation'; import * as errors from 'vs/base/common/errors'; import { IChannel } from 'vs/base/parts/ipc/common/ipc'; diff --git a/src/vs/base/test/node/console.test.ts b/src/vs/base/test/node/console.test.ts index f72dbbc4c3030..e7a243a2d42fb 100644 --- a/src/vs/base/test/node/console.test.ts +++ b/src/vs/base/test/node/console.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as assert from 'assert'; -import { getFirstFrame } from 'vs/base/node/console'; +import { getFirstFrame } from 'vs/base/common/console'; import { normalize } from 'vs/base/common/path'; suite('Console', () => { diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts index c0f0872dfa84e..332778774effc 100644 --- a/src/vs/workbench/api/common/extHost.protocol.ts +++ b/src/vs/workbench/api/common/extHost.protocol.ts @@ -45,6 +45,7 @@ import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensio import * as codeInset from 'vs/workbench/contrib/codeinset/common/codeInset'; import * as callHierarchy from 'vs/workbench/contrib/callHierarchy/common/callHierarchy'; import { IRelativePattern } from 'vs/base/common/glob'; +import { IRemoteConsoleLog } from 'vs/base/common/console'; export interface IEnvironment { isExtensionDevelopmentDebug: boolean; @@ -255,11 +256,7 @@ export interface MainThreadErrorsShape extends IDisposable { } export interface MainThreadConsoleShape extends IDisposable { - $logExtensionHostMessage(msg: { - type: string; - severity: string; - arguments: string; - }): void; + $logExtensionHostMessage(msg: IRemoteConsoleLog): void; } export interface ISerializedRegExp { diff --git a/src/vs/workbench/api/electron-browser/mainThreadConsole.ts b/src/vs/workbench/api/electron-browser/mainThreadConsole.ts index 516a418a75e0f..cb51710ddf51d 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadConsole.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadConsole.ts @@ -6,7 +6,7 @@ import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers'; import { MainContext, MainThreadConsoleShape, IExtHostContext } from 'vs/workbench/api/common/extHost.protocol'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; -import { IRemoteConsoleLog, log, parse } from 'vs/base/node/console'; +import { IRemoteConsoleLog, log, parse } from 'vs/base/common/console'; import { parseExtensionDevOptions } from 'vs/workbench/services/extensions/electron-browser/extensionHost'; import { IWindowsService } from 'vs/platform/windows/common/windows'; import { IBroadcastService } from 'vs/workbench/services/broadcast/common/broadcast'; diff --git a/src/vs/workbench/contrib/debug/electron-browser/debugService.ts b/src/vs/workbench/contrib/debug/electron-browser/debugService.ts index 9099481254d43..f776d4142a9a3 100644 --- a/src/vs/workbench/contrib/debug/electron-browser/debugService.ts +++ b/src/vs/workbench/contrib/debug/electron-browser/debugService.ts @@ -35,7 +35,7 @@ import { IWorkspaceContextService, WorkbenchState, IWorkspaceFolder } from 'vs/p import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; 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'; import { IBroadcastService } from 'vs/workbench/services/broadcast/common/broadcast'; -import { IRemoteConsoleLog, parse, getFirstFrame } from 'vs/base/node/console'; +import { IRemoteConsoleLog, parse, getFirstFrame } from 'vs/base/common/console'; import { TaskEvent, TaskEventKind, TaskIdentifier } from 'vs/workbench/contrib/tasks/common/tasks'; import { IDialogService } from 'vs/platform/dialogs/common/dialogs'; import { INotificationService } from 'vs/platform/notification/common/notification'; diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts b/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts index 02de32cfbb55e..3077599aa82b4 100644 --- a/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts +++ b/src/vs/workbench/services/extensions/electron-browser/extensionHost.ts @@ -17,7 +17,7 @@ import * as objects from 'vs/base/common/objects'; import { isWindows } from 'vs/base/common/platform'; import { isEqual } from 'vs/base/common/resources'; import { URI } from 'vs/base/common/uri'; -import { IRemoteConsoleLog, log, parse } from 'vs/base/node/console'; +import { IRemoteConsoleLog, log, parse } from 'vs/base/common/console'; import { findFreePort, randomPort } from 'vs/base/node/ports'; import { IMessagePassingProtocol } from 'vs/base/parts/ipc/node/ipc'; import { PersistentProtocol, generateRandomPipeName } from 'vs/base/parts/ipc/node/ipc.net';