diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts index 6408928b962..d95b2c764ca 100644 --- a/src/vs/vscode.d.ts +++ b/src/vs/vscode.d.ts @@ -6098,6 +6098,26 @@ declare module 'vscode' { resolveDebugConfiguration?(folder: WorkspaceFolder | undefined, debugConfiguration: DebugConfiguration, token?: CancellationToken): ProviderResult; } + /** + * Represents the debug console. + */ + export interface DebugConsole { + /** + * Append the given value to the debug console. + * + * @param value A string, falsy values will not be printed. + */ + append(value: string): void; + + /** + * Append the given value and a line feed character + * to the debug console. + * + * @param value A string, falsy values will be printed. + */ + appendLine(value: string): void; + } + /** * Namespace for dealing with debug sessions. */ @@ -6122,6 +6142,11 @@ declare module 'vscode' { */ export let activeDebugSession: DebugSession | undefined; + /** + * The currently active [debug console](#DebugConsole). + */ + export let activeDebugConsole: DebugConsole; + /** * An [event](#Event) which fires when the [active debug session](#debug.activeDebugSession) * has changed. *Note* that the event also fires when the active debug session changes diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts index cdbc6e32d70..0f2291ac19e 100644 --- a/src/vs/vscode.proposed.d.ts +++ b/src/vs/vscode.proposed.d.ts @@ -198,33 +198,6 @@ declare module 'vscode' { //#endregion - /** - * Represents the debug console. - */ - export interface DebugConsole { - /** - * Append the given value to the debug console. - * - * @param value A string, falsy values will not be printed. - */ - append(value: string): void; - - /** - * Append the given value and a line feed character - * to the debug console. - * - * @param value A string, falsy values will be printed. - */ - appendLine(value: string): void; - } - - export namespace debug { - /** - * The [debug console](#DebugConsole) singleton. - */ - export let console: DebugConsole; - } - /** * Represents an action that can be performed in code. * diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts index 4b47691ad36..af59bb8d477 100644 --- a/src/vs/workbench/api/node/extHost.api.impl.ts +++ b/src/vs/workbench/api/node/extHost.api.impl.ts @@ -495,8 +495,8 @@ export function createApiFactory( get activeDebugSession() { return extHostDebugService.activeDebugSession; }, - get console() { - return extHostDebugService.debugConsole; + get activeDebugConsole() { + return extHostDebugService.activeDebugConsole; }, startDebugging(folder: vscode.WorkspaceFolder | undefined, nameOrConfig: string | vscode.DebugConfiguration) { return extHostDebugService.startDebugging(folder, nameOrConfig); diff --git a/src/vs/workbench/api/node/extHostDebugService.ts b/src/vs/workbench/api/node/extHostDebugService.ts index 23c7a043199..4e9bd4c99b4 100644 --- a/src/vs/workbench/api/node/extHostDebugService.ts +++ b/src/vs/workbench/api/node/extHostDebugService.ts @@ -40,8 +40,8 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape { private _onDidReceiveDebugSessionCustomEvent: Emitter; get onDidReceiveDebugSessionCustomEvent(): Event { return this._onDidReceiveDebugSessionCustomEvent.event; } - private _debugConsole: ExtHostDebugConsole; - get debugConsole(): ExtHostDebugConsole { return this._debugConsole; } + private _activeDebugConsole: ExtHostDebugConsole; + get activeDebugConsole(): ExtHostDebugConsole { return this._activeDebugConsole; } constructor(mainContext: IMainContext, workspace: ExtHostWorkspace) { @@ -58,7 +58,7 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape { this._debugServiceProxy = mainContext.get(MainContext.MainThreadDebugService); - this._debugConsole = new ExtHostDebugConsole(this._debugServiceProxy); + this._activeDebugConsole = new ExtHostDebugConsole(this._debugServiceProxy); } public registerDebugConfigurationProvider(type: string, provider: vscode.DebugConfigurationProvider): vscode.Disposable {